rixxc/KeePassDX
1
0
Fork 0
mirror of https://github.com/Kunzisoft/KeePassDX.git synced 2025-12-04 15:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix show error

Browse Source
This commit is contained in:
J-Jamet
2021-08-19 15:04:16 +02:00
parent 8379ffe1ce
commit e1733512c4
2 changed files with 71 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/com/kunzisoft/keepass/activities/FileDatabaseSelectActivity.kt
View File

@@ -200,8 +200,8 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
override fun onDatabaseRetrieved(database: Database?) {
super.onDatabaseRetrieved(database)
if (database?.loaded == true) {
launchGroupActivity(database)
if (database != null) {
launchGroupActivityIfLoaded(database)
}
}
@@ -221,9 +221,8 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
PreferencesUtil.enableReadOnlyDatabase(this@FileDatabaseSelectActivity))
}
ACTION_DATABASE_LOAD_TASK -> {
if (result.isSuccess
&& database.loaded) {
launchGroupActivity(database)
if (result.isSuccess) {
launchGroupActivityIfLoaded(database)
} else {
var resultError = ""
val resultMessage = result.message
@@ -265,13 +264,15 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
{ onLaunchActivitySpecialMode() })
}
private fun launchGroupActivity(database: Database) {
private fun launchGroupActivityIfLoaded(database: Database) {
if (database.loaded) {
GroupActivity.launch(this,
database,
{ onValidateSpecialMode() },
{ onCancelSpecialMode() },
{ onLaunchActivitySpecialMode() })
}
}
override fun onValidateSpecialMode() {
super.onValidateSpecialMode()
@@ -311,9 +312,7 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
}
mDatabase?.let { database ->
if (database.loaded) {
launchGroupActivity(database)
}
launchGroupActivityIfLoaded(database)
}
}

24
app/src/main/java/com/kunzisoft/keepass/activities/PasswordActivity.kt
View File

@@ -230,20 +230,14 @@ open class PasswordActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bui
checkPermission()
mDatabase?.let { database ->
if (database.loaded) {
clearCredentialsViews(true)
launchGroupActivity(database)
}
launchGroupActivityIfLoaded(database)
}
}
override fun onDatabaseRetrieved(database: Database?) {
super.onDatabaseRetrieved(database)
if (database?.loaded == true) {
// If the database isn't accessible make sure to clear the password field, if it
// was saved in the instance state
clearCredentialsViews(true)
launchGroupActivity(database)
if (database != null) {
launchGroupActivityIfLoaded(database)
}
}
@@ -255,14 +249,11 @@ open class PasswordActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bui
super.onDatabaseActionFinished(database, actionTask, result)
when (actionTask) {
ACTION_DATABASE_LOAD_TASK -> {
// CHeck if database really loaded
if (database.loaded) {
// Recheck advanced unlock if error
advancedUnlockFragment?.initAdvancedUnlockMode()
if (result.isSuccess) {
clearCredentialsViews(true)
launchGroupActivity(database)
launchGroupActivityIfLoaded(database)
} else {
var resultError = ""
val resultException = result.exception
@@ -325,7 +316,6 @@ open class PasswordActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bui
}
}
}
}
private fun getUriFromIntent(intent: Intent?) {
// If is a view intent
@@ -348,7 +338,10 @@ open class PasswordActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bui
getUriFromIntent(intent)
}
private fun launchGroupActivity(database: Database) {
private fun launchGroupActivityIfLoaded(database: Database) {
// Check if database really loaded
if (database.loaded) {
clearCredentialsViews(true)
GroupActivity.launch(this,
database,
{ onValidateSpecialMode() },
@@ -356,6 +349,7 @@ open class PasswordActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bui
{ onLaunchActivitySpecialMode() }
)
}
}
override fun onValidateSpecialMode() {
super.onValidateSpecialMode()