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 creating database

Browse Source
This commit is contained in:
J-Jamet
2019-11-21 10:04:34 +01:00
parent fe56d06b5d
commit 0957df752a
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -163,13 +163,15 @@ class FileDatabaseSelectActivity : StylishActivity(),
}
// Attach the dialog thread to this activity
mProgressDialogThread?.onActionFinish = { actionTask, _ ->
when (actionTask) {
ACTION_DATABASE_CREATE_TASK -> {
// TODO Check
// mAdapterDatabaseHistory?.notifyDataSetChanged()
// updateFileListVisibility()
GroupActivity.launch(this)
mProgressDialogThread = ProgressDialogThread(this).apply {
onActionFinish = { actionTask, _ ->
when (actionTask) {
ACTION_DATABASE_CREATE_TASK -> {
// TODO Check
// mAdapterDatabaseHistory?.notifyDataSetChanged()
// updateFileListVisibility()
GroupActivity.launch(this@FileDatabaseSelectActivity)
}
}
}
}

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

@@ -101,7 +101,7 @@ class PasswordActivity : StylishActivity() {
private var readOnly: Boolean = false
private var progressDialogThread: ProgressDialogThread? = null
private var mProgressDialogThread: ProgressDialogThread? = null
private var advancedUnlockedManager: AdvancedUnlockedManager? = null
@@ -163,7 +163,7 @@ class PasswordActivity : StylishActivity() {
enableOrNotTheConfirmationButton()
}
progressDialogThread = ProgressDialogThread(this).apply {
mProgressDialogThread = ProgressDialogThread(this).apply {
onActionFinish = { actionTask, result ->
when (actionTask) {
ACTION_DATABASE_LOAD_TASK -> {
@@ -274,7 +274,7 @@ class PasswordActivity : StylishActivity() {
// For check shutdown
super.onResume()
progressDialogThread?.registerProgressTask()
mProgressDialogThread?.registerProgressTask()
initUriFromIntent()
}
@@ -461,7 +461,7 @@ class PasswordActivity : StylishActivity() {
}
override fun onPause() {
progressDialogThread?.unregisterProgressTask()
mProgressDialogThread?.unregisterProgressTask()
super.onPause()
}
@@ -529,7 +529,7 @@ class PasswordActivity : StylishActivity() {
readOnly: Boolean,
cipherDatabaseEntity: CipherDatabaseEntity?,
fixDuplicateUUID: Boolean) {
progressDialogThread?.startDatabaseLoad(
mProgressDialogThread?.startDatabaseLoad(
databaseUri,
password,
keyFile,