fenix/Simple-Gallery
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Gallery.git synced 2025-06-05 21:59:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix #381, handle media pick intents in Show All Folders content view

Browse Source
This commit is contained in:
tibbi
2017-10-02 22:47:23 +02:00
parent 4203939d62
commit 74edee735a
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt
View File

@@ -252,9 +252,14 @@ class MainActivity : SimpleActivity(), DirectoryAdapter.DirOperationsListener {
config.showAll = true config.showAll = true
Intent(this, MediaActivity::class.java).apply { Intent(this, MediaActivity::class.java).apply {
putExtra(DIRECTORY, "/") putExtra(DIRECTORY, "/")
startActivity(this)
if (mIsThirdPartyIntent) {
handleMediaIntent(this)
} else {
startActivity(this)
finish()
}
} }
finish()
} }
private fun changeViewType() { private fun changeViewType() {
@@ -477,7 +482,12 @@ class MainActivity : SimpleActivity(), DirectoryAdapter.DirOperationsListener {
private fun itemClicked(path: String) { private fun itemClicked(path: String) {
Intent(this, MediaActivity::class.java).apply { Intent(this, MediaActivity::class.java).apply {
putExtra(DIRECTORY, path) putExtra(DIRECTORY, path)
handleMediaIntent(this)
}
}
private fun handleMediaIntent(intent: Intent) {
intent.apply {
if (mIsSetWallpaperIntent) { if (mIsSetWallpaperIntent) {
putExtra(SET_WALLPAPER_INTENT, true) putExtra(SET_WALLPAPER_INTENT, true)
startActivityForResult(this, PICK_WALLPAPER) startActivityForResult(this, PICK_WALLPAPER)