From 59607efa62bde08359835608b5c9b3f05ac2991f Mon Sep 17 00:00:00 2001
From: J-Jamet <jeremy.jamet@kunzisoft.com>
Date: Sun, 25 Oct 2020 17:48:16 +0100
Subject: [PATCH] Fix backup search #759

---
 CHANGELOG                                      |  1 +
 .../database/element/database/DatabaseKDB.kt   | 18 +++++++++++++-----
 .../metadata/android/en-US/changelogs/44.txt   |  1 +
 .../metadata/android/fr-FR/changelogs/44.txt   |  1 +
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index d29708aba..1e3e13ca3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,7 @@ KeePassDX(2.9)
  * Fix biometric issues #724 #740 #731
  * Fix autofill #725 #551
  * Fix subdomain search #728
+ * Fix backup search #759
  * Small fixes and translations #732 #736 #737 #738 #742
 
 KeePassDX(2.8.7)
diff --git a/app/src/main/java/com/kunzisoft/keepass/database/element/database/DatabaseKDB.kt b/app/src/main/java/com/kunzisoft/keepass/database/element/database/DatabaseKDB.kt
index 579aa62c9..3f1461d48 100644
--- a/app/src/main/java/com/kunzisoft/keepass/database/element/database/DatabaseKDB.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/element/database/DatabaseKDB.kt
@@ -186,6 +186,10 @@ class DatabaseKDB : DatabaseVersioned<Int, UUID, GroupKDB, EntryKDB>() {
     override fun isInRecycleBin(group: GroupKDB): Boolean {
         var currentGroup: GroupKDB? = group
 
+        // Init backup group variable
+        if (backupGroupId == BACKUP_FOLDER_UNDEFINED_ID)
+            findBackupGroupId()
+
         if (backupGroup == null)
             return false
 
@@ -203,17 +207,21 @@ class DatabaseKDB : DatabaseVersioned<Int, UUID, GroupKDB, EntryKDB>() {
         return false
     }
 
-    /**
-     * Ensure that the backup tree exists if enabled, and create it
-     * if it doesn't exist
-     */
-    fun ensureBackupExists() {
+    private fun findBackupGroupId() {
         rootGroups.forEach { currentGroup ->
             if (currentGroup.level == 0
                     && currentGroup.title.equals(BACKUP_FOLDER_TITLE, ignoreCase = true)) {
                 backupGroupId = currentGroup.id
             }
         }
+    }
+
+    /**
+     * Ensure that the backup tree exists if enabled, and create it
+     * if it doesn't exist
+     */
+    fun ensureBackupExists() {
+        findBackupGroupId()
 
         if (backupGroup == null) {
             // Create recycle bin
diff --git a/fastlane/metadata/android/en-US/changelogs/44.txt b/fastlane/metadata/android/en-US/changelogs/44.txt
index 93f0bb6f8..fecaa469c 100644
--- a/fastlane/metadata/android/en-US/changelogs/44.txt
+++ b/fastlane/metadata/android/en-US/changelogs/44.txt
@@ -5,4 +5,5 @@
  * Fix biometric issues #724 #740 #731
  * Fix autofill #725 #551
  * Fix subdomain search #728
+ * Fix backup search #759
  * Small fixes and translations #732 #736 #737 #738 #742
\ No newline at end of file
diff --git a/fastlane/metadata/android/fr-FR/changelogs/44.txt b/fastlane/metadata/android/fr-FR/changelogs/44.txt
index 04473cb58..55fcc365c 100644
--- a/fastlane/metadata/android/fr-FR/changelogs/44.txt
+++ b/fastlane/metadata/android/fr-FR/changelogs/44.txt
@@ -5,4 +5,5 @@
  * Correction de problèmes biométriques #724 #740 #731
  * Correction de l'autofill #725 #551
  * Correction de la recherche de sous-domaine #728
+ * Correction de la recherche de backup #759
  * Petites corrections et traductions #732 #736 #737 #738 #742
\ No newline at end of file