From 9489f1ee3d473492d1103953eeb2989bf42682cd Mon Sep 17 00:00:00 2001
From: J-Jamet <jeremy.jamet@kunzisoft.com>
Date: Wed, 26 Aug 2020 19:25:30 +0200
Subject: [PATCH] Rename removeUnlinkedAttachments

---
 .../kunzisoft/keepass/database/action/SaveDatabaseRunnable.kt | 2 +-
 .../java/com/kunzisoft/keepass/database/element/Database.kt   | 4 ++--
 .../keepass/database/element/database/DatabaseKDBX.kt         | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

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 6951a345e..9f4756314 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
@@ -34,7 +34,7 @@ open class SaveDatabaseRunnable(protected var context: Context,
     override fun onStartRun() {}
 
     override fun onActionRun() {
-        database.removeUnlinkedAttachment()
+        // TODO as setting database.removeUnlinkedAttachments()
         if (saveDatabase && result.isSuccess) {
             try {
                 database.saveData(context.contentResolver)
diff --git a/app/src/main/java/com/kunzisoft/keepass/database/element/Database.kt b/app/src/main/java/com/kunzisoft/keepass/database/element/Database.kt
index 0f95d0b51..6cc7dbc73 100644
--- a/app/src/main/java/com/kunzisoft/keepass/database/element/Database.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/element/Database.kt
@@ -454,9 +454,9 @@ class Database {
         mDatabaseKDBX?.removeAttachmentIfNotUsed(attachment)
     }
 
-    fun removeUnlinkedAttachment() {
+    fun removeUnlinkedAttachments() {
         // No check in database KDB because unique attachment by entry
-        mDatabaseKDBX?.removeUnlinkedAttachment()
+        mDatabaseKDBX?.removeUnlinkedAttachments()
     }
 
     @Throws(DatabaseOutputException::class)
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 69e8fa460..785334704 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
@@ -553,10 +553,10 @@ class DatabaseKDBX : DatabaseVersioned<UUID, UUID, GroupKDBX, EntryKDBX> {
 
     fun removeAttachmentIfNotUsed(attachment: Attachment) {
         // Remove attachment from pool
-        removeUnlinkedAttachment(attachment.binaryAttachment)
+        removeUnlinkedAttachments(attachment.binaryAttachment)
     }
 
-    fun removeUnlinkedAttachment(vararg binaries: BinaryAttachment) {
+    fun removeUnlinkedAttachments(vararg binaries: BinaryAttachment) {
         // Build binaries to remove with all binaries known
         val binariesToRemove = ArrayList<BinaryAttachment>()
         if (binaries.isEmpty()) {