Mirrors/FossifyGallery
2
0
Fork 1
mirror of https://github.com/FossifyOrg/Gallery.git synced 2024-11-23 04:57:59 +01:00
Code Issues Projects Releases Packages 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
Show stats 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 { directories_switch_searching.setOnClickListener {
launchSearchActivity() 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() { override fun onStart() {
@ -431,27 +439,22 @@ class MainActivity : SimpleActivity(), DirectoryOperationsListener {
} }
private fun tryLoadGallery() { private fun tryLoadGallery() {
handlePermission(PERMISSION_WRITE_STORAGE) { if (hasPermission(PERMISSION_WRITE_STORAGE)) {
if (it) { if (!config.wasUpgradedFromFreeShown && isPackageInstalled("com.simplemobiletools.gallery")) {
if (!config.wasUpgradedFromFreeShown && isPackageInstalled("com.simplemobiletools.gallery")) { ConfirmationDialog(this, "", R.string.upgraded_from_free, R.string.ok, 0) {}
ConfirmationDialog(this, "", R.string.upgraded_from_free, R.string.ok, 0) {} config.wasUpgradedFromFreeShown = true
config.wasUpgradedFromFreeShown = true
}
checkOTGPath()
checkDefaultSpamFolders()
if (config.showAll) {
showAllMedia()
} else {
getDirectories()
}
setupLayoutManager()
} else {
toast(R.string.no_storage_permissions)
finish()
} }
checkOTGPath()
checkDefaultSpamFolders()
if (config.showAll) {
showAllMedia()
} else {
getDirectories()
}
setupLayoutManager()
} }
} }