From 488bab7c4d4f30d976e473e8c1f4f4fdb386afe6 Mon Sep 17 00:00:00 2001
From: J-Jamet <jeremy.jamet@kunzisoft.com>
Date: Sat, 5 Feb 2022 14:43:53 +0100
Subject: [PATCH] Fix UUID search

---
 .../com/kunzisoft/keepass/database/search/SearchHelper.kt   | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/kunzisoft/keepass/database/search/SearchHelper.kt b/app/src/main/java/com/kunzisoft/keepass/database/search/SearchHelper.kt
index c72eac5c7..c332e3478 100644
--- a/app/src/main/java/com/kunzisoft/keepass/database/search/SearchHelper.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/search/SearchHelper.kt
@@ -182,10 +182,8 @@ class SearchHelper {
                     return true
             }
             if (searchParameters.searchInUUIDs) {
-                val hexString = UuidUtil.toHexString(entry.nodeId.id)
-                if (hexString != null
-                    && hexString.contains(searchQuery, true)
-                )
+                val hexString = UuidUtil.toHexString(entry.nodeId.id) ?: ""
+                if (checkSearchQuery(hexString, searchParameters))
                     return true
             }
             if (searchParameters.searchInOther) {