fix bug and clean up SearchParameters

TeamAmaze · Jan 12, 2024 · f56d313 · f56d313
1 parent 2d1a9a3
commit f56d313
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/...n/java/com/amaze/filemanager/asynchronous/asynctasks/searchfilesystem/SearchParameters.kt b/...n/java/com/amaze/filemanager/asynchronous/asynctasks/searchfilesystem/SearchParameters.kt
@@ -23,18 +23,17 @@ package com.amaze.filemanager.asynchronous.asynctasks.searchfilesystem
 import java.util.EnumSet
 
 typealias SearchParameters = EnumSet<SearchParameter>
-infix fun SearchParameters.allOf(other: SearchParameters) = this.containsAll(other)
 infix fun SearchParameters.and(other: SearchParameter): SearchParameters = SearchParameters.of(
     other,
     *this.toTypedArray()
 )
 operator fun SearchParameters.plus(other: SearchParameter): SearchParameters = this and other
 
 fun searchParametersFromBoolean(
-    showHiddenFiles: Boolean,
-    isRegexEnabled: Boolean,
-    isRegexMatchesEnabled: Boolean,
-    isRoot: Boolean
+    showHiddenFiles: Boolean = false,
+    isRegexEnabled: Boolean = false,
+    isRegexMatchesEnabled: Boolean = false,
+    isRoot: Boolean = false
 ): SearchParameters {
     val searchParameterList = mutableListOf<SearchParameter>()
 
@@ -43,5 +42,9 @@ fun searchParametersFromBoolean(
     if (isRegexMatchesEnabled) searchParameterList.add(SearchParameter.REGEX_MATCHES)
     if (isRoot) searchParameterList.add(SearchParameter.ROOT)
 
-    return SearchParameters.copyOf(searchParameterList)
+    return if (searchParameterList.isEmpty()) {
+        SearchParameters.noneOf(SearchParameter::class.java)
+    } else {
+        SearchParameters.copyOf(searchParameterList)
+    }
 }
diff --git a/app/src/main/java/com/amaze/filemanager/ui/activities/MainActivityViewModel.kt b/app/src/main/java/com/amaze/filemanager/ui/activities/MainActivityViewModel.kt
@@ -197,15 +197,11 @@ class MainActivityViewModel(val applicationContext: Application) :
         query: String
     ): MutableLiveData<ArrayList<HybridFileParcelable>> {
         val sharedPref = PreferenceManager.getDefaultSharedPreferences(mainActivity)
-        val showHiddenFiles = sharedPref.getBoolean(PREFERENCE_SHOW_HIDDENFILES, false)
-        val isRegexEnabled = sharedPref.getBoolean(PREFERENCE_REGEX, false)
-        val isMatchesEnabled = sharedPref.getBoolean(PREFERENCE_REGEX_MATCHES, false)
-        val isRoot = mainActivity.isRootExplorer
         val searchParameters = searchParametersFromBoolean(
-            showHiddenFiles,
-            isRegexEnabled,
-            isMatchesEnabled,
-            isRoot
+            showHiddenFiles = sharedPref.getBoolean(PREFERENCE_SHOW_HIDDENFILES, false),
+            isRegexEnabled = sharedPref.getBoolean(PREFERENCE_REGEX, false),
+            isRegexMatchesEnabled = sharedPref.getBoolean(PREFERENCE_REGEX_MATCHES, false),
+            isRoot = mainActivity.isRootExplorer
         )
 
         val path = mainActivity.currentMainFragment?.currentPath ?: ""