fenix/Simple-Gallery
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Gallery.git synced 2025-06-05 21:59:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

avoid loading the gallery twice at first launch, caused by permission

Browse Source
This commit is contained in:
tibbi
2020-04-25 12:52:52 +02:00
parent a2037bef9f
commit 963fd57113
1 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MainActivity.kt
View File

@@ -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()
}
}