From cea7f1c2d15e65e82d0a3a00c78fc3740bb78758 Mon Sep 17 00:00:00 2001
From: J-Jamet <jeremy.jamet@kunzisoft.com>
Date: Sat, 12 Feb 2022 12:38:44 +0100
Subject: [PATCH] Remove unused code

---
 .../keepass/database/merge/DatabaseKDBXMerger.kt          | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/kunzisoft/keepass/database/merge/DatabaseKDBXMerger.kt b/app/src/main/java/com/kunzisoft/keepass/database/merge/DatabaseKDBXMerger.kt
index b2cef2c65..eb5f67df3 100644
--- a/app/src/main/java/com/kunzisoft/keepass/database/merge/DatabaseKDBXMerger.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/merge/DatabaseKDBXMerger.kt
@@ -115,9 +115,7 @@ class DatabaseKDBXMerger(private var database: DatabaseKDBX) {
                     this.notes = srcEntryToMerge.notes
                     // TODO attachment
                 }
-                if (entry != null) {
-                    entry.updateWith(entryToMerge, false)
-                } else if (parentEntryToMerge != null) {
+                if (entry == null && parentEntryToMerge != null) {
                     database.addEntryTo(entryToMerge, parentEntryToMerge)
                 }
             }
@@ -148,9 +146,7 @@ class DatabaseKDBXMerger(private var database: DatabaseKDBX) {
                 this.expires = srcGroupToMerge.expires
                 this.title = srcGroupToMerge.title
             }
-            if (group != null) {
-                // Normally not append
-            } else if (parentGroupToMerge != null) {
+            if (group == null && parentGroupToMerge != null) {
                 database.addGroupTo(groupToMerge, parentGroupToMerge)
             }
         }