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

Move error in init uri method

Browse Source
This commit is contained in:
J-Jamet
2019-08-26 08:03:16 +02:00
parent 1965336077
commit c65ed41efd
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -225,29 +225,30 @@ class PasswordActivity : StylishActivity() {
keyFileUri = UriUtil.parseUriFile(intent.getStringExtra(KEY_KEYFILE)) keyFileUri = UriUtil.parseUriFile(intent.getStringExtra(KEY_KEYFILE))
} }
// Stop activity here if we can't retrieve database URI
if (errorStringId != null) {
Toast.makeText(this@PasswordActivity, errorStringId, Toast.LENGTH_LONG).show()
finish()
return
}
// Post init uri with KeyFile if needed // Post init uri with KeyFile if needed
if (mRememberKeyFile && (keyFileUri == null || keyFileUri.toString().isEmpty())) { if (mRememberKeyFile && (keyFileUri == null || keyFileUri.toString().isEmpty())) {
// Retrieve KeyFile in a thread // Retrieve KeyFile in a thread
databaseUri?.let { databaseUriNotNull -> databaseUri?.let { databaseUriNotNull ->
FileDatabaseHistory.getInstance(applicationContext) FileDatabaseHistory.getInstance(applicationContext)
.getKeyFileUriByDatabaseUri(databaseUriNotNull) { .getKeyFileUriByDatabaseUri(databaseUriNotNull) {
onPostInitUri(databaseUri, it, errorStringId) onPostInitUri(databaseUri, it)
} }
} }
} else { } else {
onPostInitUri(databaseUri, keyFileUri, errorStringId) onPostInitUri(databaseUri, keyFileUri)
} }
} }
private fun onPostInitUri(databaseFileUri: Uri?, keyFileUri: Uri?, errorStringId: Int?) { private fun onPostInitUri(databaseFileUri: Uri?, keyFileUri: Uri?) {
mDatabaseFileUri = databaseFileUri mDatabaseFileUri = databaseFileUri
if (errorStringId != null) {
Toast.makeText(this@PasswordActivity, errorStringId, Toast.LENGTH_LONG).show()
finish()
return
}
// Define title // Define title
val dbUriString = databaseFileUri?.toString() ?: "" val dbUriString = databaseFileUri?.toString() ?: ""
if (dbUriString.isNotEmpty()) { if (dbUriString.isNotEmpty()) {