diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MainActivity.kt index c53acb145..189905f29 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MainActivity.kt @@ -153,6 +153,14 @@ class MainActivity : SimpleActivity(), DirectoryOperationsListener { directories_switch_searching.setOnClickListener { launchSearchActivity() } + + // just request the permission, tryLoadGallery will then trigger in onResume + handlePermission(PERMISSION_WRITE_STORAGE) { + if (!it) { + toast(R.string.no_storage_permissions) + finish() + } + } } override fun onStart() { @@ -431,27 +439,22 @@ class MainActivity : SimpleActivity(), DirectoryOperationsListener { } private fun tryLoadGallery() { - handlePermission(PERMISSION_WRITE_STORAGE) { - if (it) { - if (!config.wasUpgradedFromFreeShown && isPackageInstalled("com.simplemobiletools.gallery")) { - ConfirmationDialog(this, "", R.string.upgraded_from_free, R.string.ok, 0) {} - config.wasUpgradedFromFreeShown = true - } - - checkOTGPath() - checkDefaultSpamFolders() - - if (config.showAll) { - showAllMedia() - } else { - getDirectories() - } - - setupLayoutManager() - } else { - toast(R.string.no_storage_permissions) - finish() + if (hasPermission(PERMISSION_WRITE_STORAGE)) { + if (!config.wasUpgradedFromFreeShown && isPackageInstalled("com.simplemobiletools.gallery")) { + ConfirmationDialog(this, "", R.string.upgraded_from_free, R.string.ok, 0) {} + config.wasUpgradedFromFreeShown = true } + + checkOTGPath() + checkDefaultSpamFolders() + + if (config.showAll) { + showAllMedia() + } else { + getDirectories() + } + + setupLayoutManager() } }