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 merge and save copy

Browse Source
This commit is contained in:
J-Jamet
2022-02-12 19:17:32 +01:00
parent ca51f591de
commit 3cef086b69
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/com/kunzisoft/keepass/database/action/DatabaseTaskProvider.kt
View File

@@ -358,12 +358,8 @@ class DatabaseTaskProvider {
fun startDatabaseMerge(fromDatabaseUri: Uri? = null,
mainCredential: MainCredential? = null) {
start(Bundle().apply {
if (fromDatabaseUri != null) {
putParcelable(DatabaseTaskNotificationService.DATABASE_URI_KEY, fromDatabaseUri)
}
if (mainCredential != null) {
putParcelable(DatabaseTaskNotificationService.MAIN_CREDENTIAL_KEY, mainCredential)
}
putParcelable(DatabaseTaskNotificationService.DATABASE_URI_KEY, fromDatabaseUri)
putParcelable(DatabaseTaskNotificationService.MAIN_CREDENTIAL_KEY, mainCredential)
}
, ACTION_DATABASE_MERGE_TASK)
}
@@ -701,9 +697,7 @@ class DatabaseTaskProvider {
fun startDatabaseSave(save: Boolean, saveToUri: Uri? = null) {
start(Bundle().apply {
putBoolean(DatabaseTaskNotificationService.SAVE_DATABASE_KEY, save)
if (saveToUri != null) {
putParcelable(DatabaseTaskNotificationService.DATABASE_URI_KEY, saveToUri)
}
putParcelable(DatabaseTaskNotificationService.DATABASE_URI_KEY, saveToUri)
}
, ACTION_DATABASE_SAVE)
}

9
app/src/main/java/com/kunzisoft/keepass/database/element/Database.kt
View File

@@ -909,9 +909,10 @@ class Database {
}
@Throws(DatabaseOutputException::class)
fun saveData(uri: Uri?, contentResolver: ContentResolver) {
fun saveData(databaseCopyUri: Uri?, contentResolver: ContentResolver) {
try {
(uri ?: this.fileUri)?.let { saveUri ->
val saveUri = databaseCopyUri ?: this.fileUri
if (saveUri != null) {
if (saveUri.scheme == "file") {
saveUri.path?.let { filename ->
val tempFile = File("$filename.tmp")
@@ -960,7 +961,9 @@ class Database {
outputStream?.close()
}
}
this.dataModifiedSinceLastLoading = false
if (databaseCopyUri == null) {
this.dataModifiedSinceLastLoading = false
}
}
} catch (e: Exception) {
Log.e(TAG, "Unable to save database", e)