From 02693d0cbbfc4354491cce5da647cf5547dd1973 Mon Sep 17 00:00:00 2001 From: J-Jamet Date: Tue, 11 Aug 2020 16:57:16 +0200 Subject: [PATCH] Fix database opening after creation --- .../keepass/activities/FileDatabaseSelectActivity.kt | 4 +--- .../com/kunzisoft/keepass/activities/GroupActivity.kt | 3 --- .../keepass/database/action/CreateDatabaseRunnable.kt | 7 ++++--- .../keepass/database/action/LoadDatabaseRunnable.kt | 8 +++----- .../com/kunzisoft/keepass/database/element/Database.kt | 2 ++ 5 files changed, 10 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/FileDatabaseSelectActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/FileDatabaseSelectActivity.kt index 5dd20e011..de66f98c2 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/FileDatabaseSelectActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/FileDatabaseSelectActivity.kt @@ -175,9 +175,7 @@ class FileDatabaseSelectActivity : SpecialModeActivity(), databaseFiles.databaseFileToActivate?.let { databaseFileToAdd -> mAdapterDatabaseHistory?.addDatabaseFileHistory(databaseFileToAdd) } - runOnUiThread { - GroupActivity.launch(this@FileDatabaseSelectActivity) - } + GroupActivity.launch(this@FileDatabaseSelectActivity) } DatabaseFilesViewModel.DatabaseFileAction.UPDATE -> { databaseFiles.databaseFileToActivate?.let { databaseFileToUpdate -> diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt index c56421254..2069396b4 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt @@ -122,9 +122,6 @@ class GroupActivity : LockingActivity(), override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - if (isFinishing) { - return - } mDatabase = Database.getInstance() // Construct main view diff --git a/app/src/main/java/com/kunzisoft/keepass/database/action/CreateDatabaseRunnable.kt b/app/src/main/java/com/kunzisoft/keepass/database/action/CreateDatabaseRunnable.kt index 5cafd00be..885c03bb1 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/action/CreateDatabaseRunnable.kt +++ b/app/src/main/java/com/kunzisoft/keepass/database/action/CreateDatabaseRunnable.kt @@ -43,11 +43,9 @@ class CreateDatabaseRunnable(context: Context, // Create new database record mDatabase.apply { createData(mDatabaseUri, databaseName, rootName) - // Set Database state - loaded = true } } catch (e: Exception) { - mDatabase.closeAndClear() + mDatabase.closeAndClear(context.applicationContext.filesDir) setError(e) } @@ -64,6 +62,9 @@ class CreateDatabaseRunnable(context: Context, .addOrUpdateDatabaseUri(mDatabaseUri, if (PreferencesUtil.rememberKeyFileLocations(context)) mKeyFileUri else null) } + + // Register the current time to init the lock timer + PreferencesUtil.saveCurrentTime(context) } else { Log.e("CreateDatabaseRunnable", "Unable to create the database") } diff --git a/app/src/main/java/com/kunzisoft/keepass/database/action/LoadDatabaseRunnable.kt b/app/src/main/java/com/kunzisoft/keepass/database/action/LoadDatabaseRunnable.kt index 2ac9ab27f..9813b36ce 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/action/LoadDatabaseRunnable.kt +++ b/app/src/main/java/com/kunzisoft/keepass/database/action/LoadDatabaseRunnable.kt @@ -43,11 +43,9 @@ class LoadDatabaseRunnable(private val context: Context, private val mLoadDatabaseResult: ((Result) -> Unit)?) : ActionRunnable() { - private val cacheDirectory = context.applicationContext.filesDir - override fun onStartRun() { // Clear before we load - mDatabase.closeAndClear(cacheDirectory) + mDatabase.closeAndClear(context.applicationContext.filesDir) } override fun onActionRun() { @@ -55,7 +53,7 @@ class LoadDatabaseRunnable(private val context: Context, mDatabase.loadData(mUri, mPass, mKey, mReadonly, context.contentResolver, - cacheDirectory, + context.applicationContext.filesDir, mFixDuplicateUUID, progressTaskUpdater) } @@ -83,7 +81,7 @@ class LoadDatabaseRunnable(private val context: Context, // Register the current time to init the lock timer PreferencesUtil.saveCurrentTime(context) } else { - mDatabase.closeAndClear(cacheDirectory) + mDatabase.closeAndClear(context.applicationContext.filesDir) } } diff --git a/app/src/main/java/com/kunzisoft/keepass/database/element/Database.kt b/app/src/main/java/com/kunzisoft/keepass/database/element/Database.kt index 04f611939..e46670af3 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/element/Database.kt +++ b/app/src/main/java/com/kunzisoft/keepass/database/element/Database.kt @@ -315,6 +315,8 @@ class Database { fun createData(databaseUri: Uri, databaseName: String, rootName: String) { setDatabaseKDBX(DatabaseKDBX(databaseName, rootName)) this.fileUri = databaseUri + // Set Database state + this.loaded = true } @Throws(LoadDatabaseException::class)