mirror of
https://github.com/Kunzisoft/KeePassDX.git
synced 2026-11-20 17:11:32 -08:00
Fix database opening after creation
This commit is contained in:
1 parent
23155279ab
commit
02693d0cbb
5 files changed
+10
-14
No files matched your search
@@ -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 ->
|
||||
|
||||
@@ -122,9 +122,6 @@ class GroupActivity : LockingActivity(),
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
super.onCreate(savedInstanceState)
|
||||
|
||||
if (isFinishing) {
|
||||
return
|
||||
}
|
||||
mDatabase = Database.getInstance()
|
||||
|
||||
// Construct main view
|
||||
|
||||
@@ -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")
|
||||
}
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in new issue
Block a user