From 42515bfb2d6364d4e7ec8cbc84fdb43d07330d9f Mon Sep 17 00:00:00 2001 From: J-Jamet Date: Wed, 26 Aug 2020 11:44:56 +0200 Subject: [PATCH] Encapsulate consume attachment action --- .../keepass/activities/EntryEditActivity.kt | 2 -- .../database/action/SaveDatabaseRunnable.kt | 3 --- .../UpdateCompressionBinariesDatabaseRunnable.kt | 5 ----- .../database/element/database/DatabaseKDBX.kt | 1 + .../AttachmentFileNotificationService.kt | 2 +- .../keepass/tasks/AttachmentFileBinderManager.kt | 15 +++++++++++++-- 6 files changed, 15 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt index 4312a42a2..4b8b3172f 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt @@ -317,11 +317,9 @@ class EntryEditActivity : LockingActivity(), } AttachmentState.COMPLETE -> { entryEditContentsView?.putAttachment(entryAttachmentState) - mAttachmentFileBinderManager?.removeAttachmentAction(entryAttachmentState) } AttachmentState.ERROR -> { mDatabase?.removeAttachmentIfNotUsed(entryAttachmentState.attachment) - mAttachmentFileBinderManager?.removeAttachmentAction(entryAttachmentState) entryEditContentsView?.removeAttachment(entryAttachmentState) } else -> {} diff --git a/app/src/main/java/com/kunzisoft/keepass/database/action/SaveDatabaseRunnable.kt b/app/src/main/java/com/kunzisoft/keepass/database/action/SaveDatabaseRunnable.kt index d9e778d0e..47133e692 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/action/SaveDatabaseRunnable.kt +++ b/app/src/main/java/com/kunzisoft/keepass/database/action/SaveDatabaseRunnable.kt @@ -30,13 +30,10 @@ open class SaveDatabaseRunnable(protected var context: Context, : ActionRunnable() { var mAfterSaveDatabase: ((Result) -> Unit)? = null - protected var mAllowRemoveUnlinkedAttachments = true override fun onStartRun() {} override fun onActionRun() { - if (mAllowRemoveUnlinkedAttachments) - database.removeUnlinkedAttachment() if (saveDatabase && result.isSuccess) { try { database.saveData(context.contentResolver) diff --git a/app/src/main/java/com/kunzisoft/keepass/database/action/UpdateCompressionBinariesDatabaseRunnable.kt b/app/src/main/java/com/kunzisoft/keepass/database/action/UpdateCompressionBinariesDatabaseRunnable.kt index c88c288ac..5b0e279c4 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/action/UpdateCompressionBinariesDatabaseRunnable.kt +++ b/app/src/main/java/com/kunzisoft/keepass/database/action/UpdateCompressionBinariesDatabaseRunnable.kt @@ -31,11 +31,6 @@ class UpdateCompressionBinariesDatabaseRunnable ( saveDatabase: Boolean) : SaveDatabaseRunnable(context, database, saveDatabase) { - init { - // To prevent attachment corruption during compression - mAllowRemoveUnlinkedAttachments = false - } - override fun onStartRun() { // Set new compression if (database.allowDataCompression) { diff --git a/app/src/main/java/com/kunzisoft/keepass/database/element/database/DatabaseKDBX.kt b/app/src/main/java/com/kunzisoft/keepass/database/element/database/DatabaseKDBX.kt index 4fe067ace..ab943f7c9 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/element/database/DatabaseKDBX.kt +++ b/app/src/main/java/com/kunzisoft/keepass/database/element/database/DatabaseKDBX.kt @@ -558,6 +558,7 @@ class DatabaseKDBX : DatabaseVersioned { removeUnlinkedAttachment(attachment.binaryAttachment) } + // TODO buf unlink right element fun removeUnlinkedAttachment(vararg binaries: BinaryAttachment) { // Build binaries to remove with all binaries known val binariesToRemove = ArrayList() diff --git a/app/src/main/java/com/kunzisoft/keepass/notifications/AttachmentFileNotificationService.kt b/app/src/main/java/com/kunzisoft/keepass/notifications/AttachmentFileNotificationService.kt index c56b6e474..7342cc608 100644 --- a/app/src/main/java/com/kunzisoft/keepass/notifications/AttachmentFileNotificationService.kt +++ b/app/src/main/java/com/kunzisoft/keepass/notifications/AttachmentFileNotificationService.kt @@ -47,7 +47,7 @@ import java.util.zip.GZIPOutputStream class AttachmentFileNotificationService: LockNotificationService() { override val notificationId: Int = 10000 - private val attachmentNotificationList = CopyOnWriteArrayList() + private val attachmentNotificationList = ArrayList() private var mActionTaskBinder = ActionTaskBinder() private var mActionTaskListeners = LinkedList() diff --git a/app/src/main/java/com/kunzisoft/keepass/tasks/AttachmentFileBinderManager.kt b/app/src/main/java/com/kunzisoft/keepass/tasks/AttachmentFileBinderManager.kt index 82c42b09c..2b0c0b292 100644 --- a/app/src/main/java/com/kunzisoft/keepass/tasks/AttachmentFileBinderManager.kt +++ b/app/src/main/java/com/kunzisoft/keepass/tasks/AttachmentFileBinderManager.kt @@ -29,6 +29,7 @@ import android.os.Bundle import android.os.IBinder import androidx.fragment.app.FragmentActivity import com.kunzisoft.keepass.database.element.Attachment +import com.kunzisoft.keepass.model.AttachmentState import com.kunzisoft.keepass.model.EntryAttachmentState import com.kunzisoft.keepass.notifications.AttachmentFileNotificationService import com.kunzisoft.keepass.notifications.AttachmentFileNotificationService.Companion.ACTION_ATTACHMENT_FILE_START_DOWNLOAD @@ -46,7 +47,17 @@ class AttachmentFileBinderManager(private val activity: FragmentActivity) { private val mActionTaskListener = object: AttachmentFileNotificationService.ActionTaskListener { override fun onAttachmentAction(fileUri: Uri, entryAttachmentState: EntryAttachmentState) { - onActionTaskListener?.onAttachmentAction(fileUri, entryAttachmentState) + onActionTaskListener?.let { + it.onAttachmentAction(fileUri, entryAttachmentState) + when (entryAttachmentState.downloadState) { + AttachmentState.COMPLETE, + AttachmentState.ERROR -> { + // Finish the action when capture by activity + consummeAttachmentAction(entryAttachmentState) + } + else -> {} + } + } } } @@ -88,7 +99,7 @@ class AttachmentFileBinderManager(private val activity: FragmentActivity) { } @Synchronized - fun removeAttachmentAction(attachment: EntryAttachmentState) { + fun consummeAttachmentAction(attachment: EntryAttachmentState) { mBinder?.getService()?.removeAttachmentAction(attachment) }