fix: KDB opening

2025-12-04 15:49:33 +01:00 · 2022-07-05 17:55:12 +02:00
parent 647e3f9383
commit 99e9a92953
1 changed files with 9 additions and 4 deletions
--- 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
@@ -150,10 +150,15 @@ class DatabaseKDB : DatabaseVersioned<Int, UUID, GroupKDB, EntryKDB>() {
        ) else null

        // Build master key
-        this.masterKey = HashManager.hashSha256(
-            passwordBytes,
-            keyFileBytes
-        )
+        if (passwordBytes != null
+            && keyFileBytes != null) {
+            this.masterKey = HashManager.hashSha256(
+                passwordBytes,
+                keyFileBytes
+            )
+        } else {
+            this.masterKey = passwordBytes ?: keyFileBytes ?: byteArrayOf(0)
+        }
    }

    override fun createGroup(): GroupKDB {