From aba396f27491ea872140cf77387c32f9a1dbdb60 Mon Sep 17 00:00:00 2001
From: J-Jamet <jeremy.jamet@kunzisoft.com>
Date: Fri, 30 Apr 2021 21:57:59 +0200
Subject: [PATCH] Fix parcelable UUID

---
 .../com/kunzisoft/keepass/database/element/entry/EntryKDBX.kt   | 2 +-
 .../com/kunzisoft/keepass/database/element/group/GroupKDBX.kt   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/kunzisoft/keepass/database/element/entry/EntryKDBX.kt b/app/src/main/java/com/kunzisoft/keepass/database/element/entry/EntryKDBX.kt
index 9700d1775..763fdc4fc 100644
--- a/app/src/main/java/com/kunzisoft/keepass/database/element/entry/EntryKDBX.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/element/entry/EntryKDBX.kt
@@ -78,7 +78,7 @@ class EntryKDBX : EntryVersioned<UUID, UUID, GroupKDBX, EntryKDBX>, NodeKDBXInte
         backgroundColor = parcel.readString() ?: backgroundColor
         overrideURL = parcel.readString() ?: overrideURL
         tags = parcel.readParcelable(Tags::class.java.classLoader) ?: tags
-        previousParentGroup = parcel.readParcelable(ParcelUuid::class.java.classLoader) ?: DatabaseVersioned.UUID_ZERO
+        previousParentGroup = parcel.readParcelable<ParcelUuid>(ParcelUuid::class.java.classLoader)?.uuid ?: DatabaseVersioned.UUID_ZERO
         autoType = parcel.readParcelable(AutoType::class.java.classLoader) ?: autoType
         parcel.readTypedList(history, CREATOR)
         url = parcel.readString() ?: url
diff --git a/app/src/main/java/com/kunzisoft/keepass/database/element/group/GroupKDBX.kt b/app/src/main/java/com/kunzisoft/keepass/database/element/group/GroupKDBX.kt
index 30e7db00a..4e6c7f320 100644
--- a/app/src/main/java/com/kunzisoft/keepass/database/element/group/GroupKDBX.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/element/group/GroupKDBX.kt
@@ -76,7 +76,7 @@ class GroupKDBX : GroupVersioned<UUID, UUID, GroupKDBX, EntryKDBX>, NodeKDBXInte
         enableSearching = if (isSearchingEnabled == -1) null else isSearchingEnabled == 1
         lastTopVisibleEntry = parcel.readSerializable() as UUID
         tags = parcel.readParcelable(Tags::class.java.classLoader) ?: tags
-        previousParentGroup = parcel.readParcelable(ParcelUuid::class.java.classLoader) ?: DatabaseVersioned.UUID_ZERO
+        previousParentGroup = parcel.readParcelable<ParcelUuid>(ParcelUuid::class.java.classLoader)?.uuid ?: DatabaseVersioned.UUID_ZERO
     }
 
     override fun readParentParcelable(parcel: Parcel): GroupKDBX? {