Keep search context #1141

Kunzisoft · Feb 5, 2022 · 741defd · 741defd
1 parent e259b37
commit 741defd
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 9 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,6 @@
 KeePassDX(3.3.0)
  * Quick search and dynamic filters #163 #462 #521
+ * Keep search context #1141
 
 KeePassDX(3.2.0)
  * Manage data merge #840 #977

diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt
@@ -327,15 +327,17 @@ class GroupActivity : DatabaseLockActivity(),
             mainGroup.touch(modified = false, touchParents = false)
         }
 
-        // Observe group
+        // Observe current group (main or search group visible)
         mGroupViewModel.group.observe(this) {
             val currentGroup = it.group
             mCurrentGroup = currentGroup
             if (currentGroup.isVirtual) {
-                mSearchState = SearchState(it.searchParameters, it.showFromPosition)
-                searchFiltersView?.searchParameters = it.searchParameters
+                val searchParameters = it.searchParameters
+                mSearchState = SearchState(searchParameters, it.showFromPosition)
+                addSearchParametersInView(searchParameters)
             }
-            // Main group in activity is managed with another variable to keep value during orientation
+            // Main and search groups in activity are managed with another variables
+            // to keep values during orientation
 
             // Expand the search view if defined in settings
             if (mRequestStartupSearch
@@ -1035,6 +1037,15 @@ class GroupActivity : DatabaseLockActivity(),
         super.onPause()
 
         finishNodeAction()
+        searchView?.setOnQueryTextListener(null)
+    }
+
+    private fun addSearchParametersInView(searchParameters: SearchParameters) {
+        searchView?.setOnQueryTextListener(null)
+        searchView?.setQuery(searchParameters.searchQuery, false)
+        searchFiltersView?.searchParameters = searchParameters
+        searchFiltersView?.visibility = View.VISIBLE
+        searchView?.setOnQueryTextListener(mOnSearchQueryTextListener)
     }
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
@@ -1078,10 +1089,8 @@ class GroupActivity : DatabaseLockActivity(),
                 // already open
                 if (searchState != null) {
                     it.expandActionView()
-                    setQuery(searchState.searchParameters.searchQuery, false)
-                    searchFiltersView?.visibility = View.VISIBLE
+                    addSearchParametersInView(searchState.searchParameters)
                 }
-                setOnQueryTextListener(mOnSearchQueryTextListener)
             }
             mLockSearchListeners = false
         }

diff --git a/fastlane/metadata/android/en-US/changelogs/98.txt b/fastlane/metadata/android/en-US/changelogs/98.txt
@@ -1 +1,2 @@
- * Quick search and dynamic filters #163 #462 #521
+ * Quick search and dynamic filters #163 #462 #521
+ * Keep search context #1141
diff --git a/fastlane/metadata/android/fr-FR/changelogs/98.txt b/fastlane/metadata/android/fr-FR/changelogs/98.txt
@@ -1 +1,2 @@
- * Recherche rapide et filtres dynamiques #163 #462 #521
+ * Recherche rapide et filtres dynamiques #163 #462 #521
+ * Garde le contexte de recherche #1141