Merge pull request #137 from Semper-Viventem/master

Release 0.25.2-beta
Semper-Viventem · Apr 29, 2024 · 40f9635 · 40f9635
2 parents a4827b4 + 231ebdb
commit 40f9635
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -24,8 +24,8 @@ android {
         minSdk = 29
         targetSdk = 34
 
-        versionCode = 1708536353
-        versionName = "0.25.1-beta"
+        versionCode = 1708536354
+        versionName = "0.25.2-beta"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 

diff --git a/app/src/main/java/f/cking/software/domain/interactor/filterchecker/FilterCheckerImpl.kt b/app/src/main/java/f/cking/software/domain/interactor/filterchecker/FilterCheckerImpl.kt
@@ -26,7 +26,9 @@ class FilterCheckerImpl(
         device.firstDetectTimeMs in filter.from..filter.to
     }
     private val name = filterChecker<RadarProfile.Filter.Name>(useCache = true) { device, filter ->
-        device.name != null && device.name.contains(filter.name, filter.ignoreCase)
+        val regexMatch = device.name?.contains(filter.name.toRegex()) ?: false
+        val noCaseSubstringMatch = device.name?.contains(filter.name, filter.ignoreCase) ?: false
+        regexMatch || noCaseSubstringMatch
     }
     private val address = filterChecker<RadarProfile.Filter.Address>(useCache = true) { device, filter ->
         device.address.contains(filter.address.toRegex())

diff --git a/app/src/main/java/f/cking/software/ui/devicelist/DeviceListViewModel.kt b/app/src/main/java/f/cking/software/ui/devicelist/DeviceListViewModel.kt
@@ -288,12 +288,14 @@ class DeviceListViewModel(
         intentHelper.openUrl(BuildConfig.REPORT_ISSUE_URL)
     }
 
-    fun filterQuery(device: DeviceData, query: String?): Boolean {
+    private fun filterQuery(device: DeviceData, query: String?): Boolean {
         return query?.takeIf { it.isNotBlank() }?.let { searchStr ->
             (device.name?.contains(searchStr, true) ?: false)
                     || (device.customName?.contains(searchStr, true) ?: false)
                     || (device.manufacturerInfo?.name?.contains(searchStr, true) ?: false)
                     || device.address.contains(searchStr, true)
+                    || device.address.contains(query.toRegex())
+                    || (device.name?.contains(query.toRegex()) ?: false)
         } ?: true
     }
 

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -102,7 +102,7 @@
     <!-- Select filter -->
     <string name="select_filter">Select filter</string>
     <string name="filter_by_name">By name</string>
-    <string name="filter_by_name_description">Triggers when the device name matches</string>
+    <string name="filter_by_name_description">Triggers when the device name matches by subsrtring or regex</string>
     <string name="filter_by_address">By address</string>
     <string name="filter_by_address_disclaimer">The device address or a regex</string>
     <string name="filter_by_address_description">Triggers when the device address matches</string>
@@ -150,7 +150,7 @@
     <string name="min_interval_to_detect">Min interval to detect</string>
     <string name="time_placeholder">HH:MM</string>
     <string name="filter_unknown_title">Current filter is not supported by your app version</string>
-    <string name="placeholder_device_name">Device name</string>
+    <string name="placeholder_device_name">Device name (or regex)</string>
     <string name="ignore_case">Ignore case</string>
     <string name="placeholder_airdrope_contact">email/phone</string>
     <string name="airdrop_min_lost_period">Min lost period</string>
@@ -179,7 +179,7 @@
     <string name="custom_filter">Custom filter</string>
     <string name="create_filter">Create filter</string>
     <string name="filter_is_not_valid">Filter is not valid</string>
-    <string name="search_query">Search query</string>
+    <string name="search_query">Search query or regex</string>
     <string name="close_search">Close search</string>
     <string name="clear_search">Clear search</string>
     <string name="not_apple">Not apple</string>