From 4315f343985922f0516b66a6df64db71f3ae6749 Mon Sep 17 00:00:00 2001
From: J-Jamet <jeremy.jamet@kunzisoft.com>
Date: Fri, 30 Apr 2021 21:46:01 +0200
Subject: [PATCH] Add previous parent group as condition to migrate to 4.1

---
 .../keepass/database/file/DatabaseHeaderKDBX.kt        | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/kunzisoft/keepass/database/file/DatabaseHeaderKDBX.kt b/app/src/main/java/com/kunzisoft/keepass/database/file/DatabaseHeaderKDBX.kt
index 1c486deec..ab4856c6e 100644
--- a/app/src/main/java/com/kunzisoft/keepass/database/file/DatabaseHeaderKDBX.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/file/DatabaseHeaderKDBX.kt
@@ -28,6 +28,7 @@ import com.kunzisoft.keepass.database.crypto.kdf.KdfFactory
 import com.kunzisoft.keepass.database.crypto.kdf.KdfParameters
 import com.kunzisoft.keepass.database.element.database.CompressionAlgorithm
 import com.kunzisoft.keepass.database.element.database.DatabaseKDBX
+import com.kunzisoft.keepass.database.element.database.DatabaseVersioned
 import com.kunzisoft.keepass.database.element.entry.EntryKDBX
 import com.kunzisoft.keepass.database.element.group.GroupKDBX
 import com.kunzisoft.keepass.database.element.node.NodeKDBXInterface
@@ -95,6 +96,7 @@ class DatabaseHeaderKDBX(private val databaseV4: DatabaseKDBX) : DatabaseHeader(
         var containsCustomIconWithNameOrLastModificationTime = false
         var containsCustomData = false
         var containsCustomDataWithLastModificationTime = false
+        var containsPreviousParentGroup = false
         override fun operate(node: T): Boolean {
             if (node.containsCustomIconWithNameOrLastModificationTime()) {
                 containsCustomIconWithNameOrLastModificationTime = true
@@ -105,6 +107,9 @@ class DatabaseHeaderKDBX(private val databaseV4: DatabaseKDBX) : DatabaseHeader(
                     containsCustomDataWithLastModificationTime = true
                 }
             }
+            if (node.previousParentGroup != DatabaseVersioned.UUID_ZERO) {
+                containsPreviousParentGroup = true
+            }
             return true
         }
     }
@@ -140,6 +145,8 @@ class DatabaseHeaderKDBX(private val databaseV4: DatabaseKDBX) : DatabaseHeader(
                 || groupHandler.containsCustomIconWithNameOrLastModificationTime
         val containsCustomDataWithLastModificationTime = entryHandler.containsCustomDataWithLastModificationTime
                 || groupHandler.containsCustomDataWithLastModificationTime
+        val containsPreviousParentGroup = entryHandler.containsPreviousParentGroup
+                || groupHandler.containsPreviousParentGroup
 
         // https://keepass.info/help/kb/kdbx_4.html
         // If AES is not use, it's at least 4.0
@@ -151,7 +158,8 @@ class DatabaseHeaderKDBX(private val databaseV4: DatabaseKDBX) : DatabaseHeader(
         return if (containsGroupWithTag
                 || containsEntryWithPasswordQualityEstimationDisabled
                 || containsCustomIconWithNameOrLastModificationTime
-                || containsCustomDataWithLastModificationTime) {
+                || containsCustomDataWithLastModificationTime
+                || containsPreviousParentGroup) {
             FILE_VERSION_41
         } else if (kdfIsNotAes
                 || containsHeaderCustomData