From 1228a03d39caf27127c2b1e2441b6566846edfbb Mon Sep 17 00:00:00 2001
From: J-Jamet <jeremy.jamet@kunzisoft.com>
Date: Mon, 19 Apr 2021 18:34:44 +0200
Subject: [PATCH] searchInEntry as instance method

---
 .../keepass/database/search/SearchHelper.kt   | 70 +++++++++----------
 1 file changed, 35 insertions(+), 35 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 7538af08c..8e11aa3e6 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
@@ -89,6 +89,41 @@ class SearchHelper {
         return searchFound
     }
 
+    private fun searchInEntry(entry: Entry,
+                              searchParameters: SearchParameters): Boolean {
+        // Search all strings in the KDBX entry
+        if (searchParameters.searchInTitles) {
+            if (checkSearchQuery(entry.title, searchParameters))
+                return true
+        }
+        if (searchParameters.searchInUserNames) {
+            if (checkSearchQuery(entry.username, searchParameters))
+                return true
+        }
+        if (searchParameters.searchInPasswords) {
+            if (checkSearchQuery(entry.password, searchParameters))
+                return true
+        }
+        if (searchParameters.searchInUrls) {
+            if (checkSearchQuery(entry.url, searchParameters))
+                return true
+        }
+        if (searchParameters.searchInNotes) {
+            if (checkSearchQuery(entry.notes, searchParameters))
+                return true
+        }
+        if (searchParameters.searchInOther) {
+            entry.getExtraFields().forEach { field ->
+                if (field.name != OTP_FIELD
+                        || (field.name == OTP_FIELD && searchParameters.searchInOTP)) {
+                    if (checkSearchQuery(field.protectedValue.toString(), searchParameters))
+                        return true
+                }
+            }
+        }
+        return false
+    }
+
     companion object {
         const val MAX_SEARCH_ENTRY = 10
 
@@ -138,40 +173,5 @@ class SearchHelper {
             }
             return false
         }
-
-        private fun searchInEntry(entry: Entry,
-                                  searchParameters: SearchParameters): Boolean {
-            // Search all strings in the KDBX entry
-            if (searchParameters.searchInTitles) {
-                if (checkSearchQuery(entry.title, searchParameters))
-                    return true
-            }
-            if (searchParameters.searchInUserNames) {
-                if (checkSearchQuery(entry.username, searchParameters))
-                    return true
-            }
-            if (searchParameters.searchInPasswords) {
-                if (checkSearchQuery(entry.password, searchParameters))
-                    return true
-            }
-            if (searchParameters.searchInUrls) {
-                if (checkSearchQuery(entry.url, searchParameters))
-                    return true
-            }
-            if (searchParameters.searchInNotes) {
-                if (checkSearchQuery(entry.notes, searchParameters))
-                    return true
-            }
-            if (searchParameters.searchInOther) {
-                entry.getExtraFields().forEach { field ->
-                    if (field.name != OTP_FIELD
-                            || (field.name == OTP_FIELD && searchParameters.searchInOTP)) {
-                        if (checkSearchQuery(field.protectedValue.toString(), searchParameters))
-                            return true
-                    }
-                }
-            }
-            return false
-        }
     }
 }