Skip to content

Commit a3036b1

Browse files
committed
Handle EXTRA_MIME_TYPES in get content intents
1 parent c9585bb commit a3036b1

4 files changed

Lines changed: 15 additions & 5 deletions

File tree

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,21 @@ class ViewPagerAdapter(val activity: SimpleActivity, val tabsToShow: ArrayList<I
3030
} else {
3131
""
3232
}
33+
val passedExtraMimeTypes = activity.intent.getStringArrayExtra(Intent.EXTRA_MIME_TYPES)
34+
val extraMimeTypes = if (isGetContentIntent && passedExtraMimeTypes != null) {
35+
passedExtraMimeTypes
36+
} else {
37+
null
38+
}
3339

3440
this.isGetRingtonePicker = isPickRingtoneIntent
3541
this.isPickMultipleIntent = allowPickingMultipleIntent
3642
this.isGetContentIntent = isGetContentIntent
37-
this.wantedMimeType = getContentMimeType
43+
if (extraMimeTypes != null) {
44+
this.wantedMimeTypes = extraMimeTypes.toList()
45+
} else {
46+
this.wantedMimeTypes = listOf(getContentMimeType)
47+
}
3848
this.updateIsCreateDocumentIntent(isCreateDocumentIntent)
3949

4050
setupFragment(activity)

app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/ItemsFragment.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ class ItemsFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerF
225225
for (file in files) {
226226
val listItem = getListItemFromFile(file, isSortingBySize, lastModifieds, false)
227227
if (listItem != null) {
228-
if (isProperMimeType(wantedMimeType, file.absolutePath, file.isDirectory)) {
228+
if (wantedMimeTypes.any { isProperMimeType(it, file.absolutePath, file.isDirectory) }) {
229229
items.add(listItem)
230230
}
231231
}
@@ -279,7 +279,7 @@ class ItemsFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerF
279279
val listItems = ArrayList<ListItem>()
280280
fileDirItems.forEach {
281281
val listItem = ListItem(it.path, it.name, it.isDirectory, it.children, it.size, it.modified, false, false)
282-
if (isProperMimeType(wantedMimeType, it.path, it.isDirectory)) {
282+
if (wantedMimeTypes.any { mimeType -> isProperMimeType(mimeType, it.path, it.isDirectory) }) {
283283
listItems.add(listItem)
284284
}
285285
}

app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/MyViewPagerFragment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ abstract class MyViewPagerFragment<BINDING : MyViewPagerFragment.InnerBinding>(c
2626
var isGetContentIntent = false
2727
var isGetRingtonePicker = false
2828
var isPickMultipleIntent = false
29-
var wantedMimeType = ""
29+
var wantedMimeTypes = listOf("")
3030
protected var isCreateDocumentIntent = false
3131
protected lateinit var innerBinding: BINDING
3232

app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/RecentsFragment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ class RecentsFragment(context: Context, attributeSet: AttributeSet) : MyViewPage
179179
val modified = cursor.getLongValue(FileColumns.DATE_MODIFIED) * 1000
180180
val fileDirItem = ListItem(path, name, false, 0, size, modified, false, false)
181181
if ((showHidden || !name.startsWith(".")) && activity?.getDoesFilePathExist(path) == true) {
182-
if (isProperMimeType(wantedMimeType, path, false)) {
182+
if (wantedMimeTypes.any { isProperMimeType(it, path, false) }) {
183183
listItems.add(fileDirItem)
184184
}
185185
}

0 commit comments

Comments
 (0)