Fixed recents not showing results when no filter

Chooloo · Apr 3, 2021 · ed210f6 · ed210f6 · EdricTruong · Apr 3, 2021
1 parent 3b47e96
commit ed210f6
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 36 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "com.chooloo.www.koler"
         minSdkVersion 25
         targetSdkVersion 30
-        versionCode 52
-        versionName "v1.0.2"
+        versionCode 53
+        versionName "v1.0.3"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         javaCompileOptions {

diff --git a/app/src/main/java/com/chooloo/www/koler/contentresolver/RecentsContentResolver.kt b/app/src/main/java/com/chooloo/www/koler/contentresolver/RecentsContentResolver.kt
@@ -34,11 +34,12 @@ class RecentsContentResolver(
 
     override val sortOrder = "${CallLog.Calls.DATE} DESC"
 
-    override val selection
-        get() = SelectionBuilder()
-            .addSelection(CallLog.Calls._ID, recentId)
-            .addString("(${CallLog.Calls.CACHED_NAME} LIKE '%$filter%' OR ${CallLog.Calls.NUMBER} LIKE '%$filter%')")
-            .build()
+    override val selection: String
+        get() {
+            val selection = SelectionBuilder().addSelection(CallLog.Calls._ID, recentId)
+            filter?.let { selection.addString("(${CallLog.Calls.CACHED_NAME} LIKE '%$filter%' OR ${CallLog.Calls.NUMBER} LIKE '%$filter%')") }
+            return selection.build()
+        }
 
     override val projection = arrayOf(
         CallLog.Calls._ID,

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
@@ -48,15 +48,6 @@
 
 
 
-    <string name="pref_category_call">Llamar</string>
-    <string name="pref_category_pages">Paginas</string>
-    <string name="pref_category_support">Apoyo</string>
-    <string name="pref_category_contact">Contacto</string>
-    <string name="pref_category_scurity">Seguridad</string>
-    <string name="pref_category_personalization">Personalización</string>
-
-
-
     <string name="pref_key_rate">calificar</string>
     <string name="pref_key_email">Email</string>
     <string name="pref_key_donate">donar</string>

diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
@@ -40,23 +40,14 @@
 
 
 
-    <string name="call_status_dialing">Composizione ...</string>
+    <string name="call_status_dialing">Composizione …</string>
     <string name="call_status_holding">Chiamata in attesa</string>
     <string name="call_status_incoming">Chiamata in arrivo</string>
     <string name="call_status_disconnected">Chiamata terminata</string>
     <string name="call_status_active">Chiamata in corso</string>
 
 
 
-    <string name="pref_category_call">Chiamata</string>
-    <string name="pref_category_pages">Pages</string>
-    <string name="pref_category_support">Supporto</string>
-    <string name="pref_category_contact">Contatto</string>
-    <string name="pref_category_scurity">Sicurezza</string>
-    <string name="pref_category_personalization">Personalizzazione</string>
-
-
-
     <string name="pref_key_rate">Vota</string>
     <string name="pref_key_email">e-mail</string>
     <string name="pref_key_donate">donare</string>

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
@@ -45,18 +45,8 @@
     <string name="call_status_incoming">Входящий звонок</string>
     <string name="call_status_disconnected">Звонок окончен</string>
     <string name="call_status_active">Звонок в процессе</string>
-
 
-
-    <string name="pref_category_call">Вызов</string>
-    <string name="pref_category_pages">Страницы</string>
-    <string name="pref_category_support">Служба поддержки</string>
-    <string name="pref_category_contact">Контакт</string>
-    <string name="pref_category_scurity">Безопасность</string>
-    <string name="pref_category_personalization">Персонализация</string>
-
 
-
     <string name="pref_key_rate">оценивать</string>
     <string name="pref_key_email">Эл. адрес</string>
     <string name="pref_key_donate">пожертвовать</string>