Skip to content

Check EXTRA_MIME_TYPES on incoming intent #404

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
naveensingh merged 4 commits into from
Apr 29, 2025
Merged

Check EXTRA_MIME_TYPES on incoming intent #404

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ff8158c
ACTION_GET_CONTENT with multiple mime types
moffatman Feb 8, 2025
e3b18a5
Actually fix picker
moffatman Feb 14, 2025
1b1e190
Check EXTRA_MIME_TYPES instead of splitting type
moffatman Feb 14, 2025
3174123
Merge branch 'master' into master
naveensingh Apr 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 16 additions & 7 deletions app/src/main/kotlin/org/fossify/gallery/activities/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,10 +629,10 @@ class MainActivity : SimpleActivity(), DirectoryOperationsListener {

mShouldStopFetching = true
mIsGettingDirs = true
val getImagesOnly = mIsPickImageIntent || mIsGetImageContentIntent
val getVideosOnly = mIsPickVideoIntent || mIsGetVideoContentIntent
val getImages = mIsPickImageIntent || mIsGetImageContentIntent
val getVideos = mIsPickVideoIntent || mIsGetVideoContentIntent

getCachedDirectories(getVideosOnly, getImagesOnly) {
getCachedDirectories(getVideos && !getImages, getImages && !getVideos) {
gotDirectories(addTempFolderIfNeeded(it))
}
}
Expand Down Expand Up @@ -970,16 +970,23 @@ class MainActivity : SimpleActivity(), DirectoryOperationsListener {
return intent.action == Intent.ACTION_GET_CONTENT && intent.type != null
}

private fun anyExtraMimeTypeStartingWith(intent: Intent, mimeTypePrefix: String): Boolean {
return intent.getStringArrayExtra(Intent.EXTRA_MIME_TYPES)
?.any { it.startsWith(mimeTypePrefix) } == true
}

private fun isGetImageContentIntent(intent: Intent): Boolean {
return isGetContentIntent(intent)
&& (intent.type!!.startsWith("image/")
|| intent.type == Images.Media.CONTENT_TYPE)
|| intent.type == Images.Media.CONTENT_TYPE
|| anyExtraMimeTypeStartingWith(intent, "image/"))
}

private fun isGetVideoContentIntent(intent: Intent): Boolean {
return isGetContentIntent(intent)
&& (intent.type!!.startsWith("video/")
|| intent.type == Video.Media.CONTENT_TYPE)
|| intent.type == Video.Media.CONTENT_TYPE
|| anyExtraMimeTypeStartingWith(intent, "video/"))
}

private fun isGetAnyContentIntent(intent: Intent): Boolean {
Expand Down Expand Up @@ -1116,8 +1123,10 @@ class MainActivity : SimpleActivity(), DirectoryOperationsListener {
// cached folders have been loaded, recheck folders one by one starting with the first displayed
mLastMediaFetcher?.shouldStop = true
mLastMediaFetcher = MediaFetcher(applicationContext)
val getImagesOnly = mIsPickImageIntent || mIsGetImageContentIntent
val getVideosOnly = mIsPickVideoIntent || mIsGetVideoContentIntent
val getImages = mIsPickImageIntent || mIsGetImageContentIntent
val getVideos = mIsPickVideoIntent || mIsGetVideoContentIntent
val getImagesOnly = getImages && !getVideos
val getVideosOnly = getVideos && !getImages
val favoritePaths = getFavoritePaths()
val hiddenString = getString(R.string.hidden)
val albumCovers = config.parseAlbumCovers()
Expand Down
Loading