fenix
/
Simple-File-Manager
mirror of https://github.com/SimpleMobileTools/Simple-File-Manager.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #727 from esensar/fix/recents-mime-type 

Set intent data into fragments before starting them
This commit is contained in:
Tibor Kaputa 2023-07-21 21:43:33 +02:00 committed by GitHub
parent afdc8c97a8 580cd1f75a
commit 0aa0094e2c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/MainActivity.kt
View File

@ -373,24 +373,6 @@ class MainActivity : SimpleActivity() {
openPath(config.homeFolder) openPath(config.homeFolder)
} }
val isPickRingtoneIntent = intent.action == RingtoneManager.ACTION_RINGTONE_PICKER
val isGetContentIntent = intent.action == Intent.ACTION_GET_CONTENT || intent.action == Intent.ACTION_PICK
val isCreateDocumentIntent = intent.action == Intent.ACTION_CREATE_DOCUMENT
val allowPickingMultipleIntent = intent.getBooleanExtra(Intent.EXTRA_ALLOW_MULTIPLE, false)
val getContentMimeType = if (isGetContentIntent) {
intent.type ?: ""
} else {
""
}
getAllFragments().forEach {
it?.isGetRingtonePicker = isPickRingtoneIntent
it?.isPickMultipleIntent = allowPickingMultipleIntent
it?.isGetContentIntent = isGetContentIntent
it?.wantedMimeType = getContentMimeType
it?.updateIsCreateDocumentIntent(isCreateDocumentIntent)
}
if (refreshRecents) { if (refreshRecents) {
recents_fragment?.refreshFragment() recents_fragment?.refreshFragment()
} }

18
app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/ViewPagerAdapter.kt
View File

@ -1,5 +1,7 @@
package com.simplemobiletools.filemanager.pro.adapters package com.simplemobiletools.filemanager.pro.adapters
import android.content.Intent
import android.media.RingtoneManager
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import androidx.viewpager.widget.PagerAdapter import androidx.viewpager.widget.PagerAdapter
@ -19,6 +21,22 @@ class ViewPagerAdapter(val activity: SimpleActivity, val tabsToShow: ArrayList<I
container.addView(view) container.addView(view)
(view as MyViewPagerFragment).apply { (view as MyViewPagerFragment).apply {
val isPickRingtoneIntent = activity.intent.action == RingtoneManager.ACTION_RINGTONE_PICKER
val isGetContentIntent = activity.intent.action == Intent.ACTION_GET_CONTENT || activity.intent.action == Intent.ACTION_PICK
val isCreateDocumentIntent = activity.intent.action == Intent.ACTION_CREATE_DOCUMENT
val allowPickingMultipleIntent = activity.intent.getBooleanExtra(Intent.EXTRA_ALLOW_MULTIPLE, false)
val getContentMimeType = if (isGetContentIntent) {
activity.intent.type ?: ""
} else {
""
}
this.isGetRingtonePicker = isPickRingtoneIntent
this.isPickMultipleIntent = allowPickingMultipleIntent
this.isGetContentIntent = isGetContentIntent
this.wantedMimeType = getContentMimeType
this.updateIsCreateDocumentIntent(isCreateDocumentIntent)
setupFragment(activity) setupFragment(activity)
onResume(activity.getProperTextColor()) onResume(activity.getProperTextColor())
} }