mirror of
https://github.com/SimpleMobileTools/Simple-Gallery.git
synced 2025-06-05 21:59:19 +02:00
avoid loading the gallery twice at first launch, caused by permission
This commit is contained in:
@ -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,8 +439,7 @@ 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
|
||||||
@ -448,10 +455,6 @@ class MainActivity : SimpleActivity(), DirectoryOperationsListener {
|
|||||||
}
|
}
|
||||||
|
|
||||||
setupLayoutManager()
|
setupLayoutManager()
|
||||||
} else {
|
|
||||||
toast(R.string.no_storage_permissions)
|
|
||||||
finish()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user