PatchesAndForks/FossifyGalleryVisibilityPatch
1
0
Fork 0
forked from Mirrors/FossifyGallery
Code Pull requests Activity

Merge pull request #2412 from KryptKode/feat/request_access_media_location

Browse source 
request ACCESS_MEDIA_LOCATION permission
This commit is contained in:
Tibor Kaputa 2022-04-15 08:51:56 +02:00 committed by GitHub
commit 4ce5425cd4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MainActivity.kt
View file

@ -145,7 +145,7 @@ class MainActivity : SimpleActivity(), DirectoryOperationsListener {
} }
// just request the permission, tryLoadGallery will then trigger in onResume // just request the permission, tryLoadGallery will then trigger in onResume
handlePermission(PERMISSION_WRITE_STORAGE) { handleMediaPermissions {
if (!it) { if (!it) {
toast(R.string.no_storage_permissions) toast(R.string.no_storage_permissions)
finish() finish()
@ -153,6 +153,15 @@ class MainActivity : SimpleActivity(), DirectoryOperationsListener {
} }
} }
private fun handleMediaPermissions(callback: (granted: Boolean) -> Unit) {
handlePermission(PERMISSION_WRITE_STORAGE) { granted ->
callback(granted)
if (granted && isSPlus()) {
handlePermission(PERMISSION_MEDIA_LOCATION) {}
}
}
}
override fun onStart() { override fun onStart() {
super.onStart() super.onStart()
mTempShowHiddenHandler.removeCallbacksAndMessages(null) mTempShowHiddenHandler.removeCallbacksAndMessages(null)
@ -435,9 +444,9 @@ class MainActivity : SimpleActivity(), DirectoryOperationsListener {
private fun tryLoadGallery() { private fun tryLoadGallery() {
// avoid calling anything right after granting the permission, it will be called from onResume() // avoid calling anything right after granting the permission, it will be called from onResume()
val wasMissingPermission = config.appRunCount == 1 && !hasPermission(PERMISSION_WRITE_STORAGE) val wasMissingPermission = config.appRunCount == 1 && !hasPermission(PERMISSION_WRITE_STORAGE)
handlePermission(PERMISSION_WRITE_STORAGE) { handleMediaPermissions {
if (wasMissingPermission) { if (wasMissingPermission) {
return@handlePermission return@handleMediaPermissions
} }
if (it) { if (it) {