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 warning dialog during creation state

Browse Source
This commit is contained in:
J-Jamet
2021-08-29 12:11:06 +02:00
parent 84c26b7c40
commit 9935826877
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/com/kunzisoft/keepass/services/DatabaseTaskNotificationService.kt
View File

@@ -63,6 +63,7 @@ open class DatabaseTaskNotificationService : LockNotificationService(), Progress
private var mActionTaskListeners = LinkedList<ActionTaskListener>() private var mActionTaskListeners = LinkedList<ActionTaskListener>()
private var mActionRunning = false private var mActionRunning = false
private var mTaskRemovedRequested = false private var mTaskRemovedRequested = false
private var mCreationState = false
private var mIconId: Int = R.drawable.notification_ic_database_load private var mIconId: Int = R.drawable.notification_ic_database_load
private var mTitleId: Int = R.string.database_opened private var mTitleId: Int = R.string.database_opened
@@ -158,7 +159,7 @@ open class DatabaseTaskNotificationService : LockNotificationService(), Progress
Log.i(TAG, "Database file modified " + Log.i(TAG, "Database file modified " +
"$previousDatabaseInfo != $lastFileDatabaseInfo ") "$previousDatabaseInfo != $lastFileDatabaseInfo ")
// Call listener to indicate a change in database info // Call listener to indicate a change in database info
if (previousDatabaseInfo != null) { if (!mCreationState && previousDatabaseInfo != null) {
mDatabaseInfoListeners.forEach { listener -> mDatabaseInfoListeners.forEach { listener ->
listener.onDatabaseInfoChanged(previousDatabaseInfo, lastFileDatabaseInfo) listener.onDatabaseInfoChanged(previousDatabaseInfo, lastFileDatabaseInfo)
} }
@@ -517,6 +518,8 @@ open class DatabaseTaskNotificationService : LockNotificationService(), Progress
if (databaseUri == null) if (databaseUri == null)
return null return null
mCreationState = true
return CreateDatabaseRunnable(this, return CreateDatabaseRunnable(this,
database, database,
databaseUri, databaseUri,
@@ -551,6 +554,8 @@ open class DatabaseTaskNotificationService : LockNotificationService(), Progress
if (databaseUri == null) if (databaseUri == null)
return null return null
mCreationState = false
return LoadDatabaseRunnable( return LoadDatabaseRunnable(
this, this,
database, database,