From b5f8a07a7fdff3a6d27f14cdfc075b5e0723861c Mon Sep 17 00:00:00 2001
From: Satindar Dhillon <satindar@gmail.com>
Date: Mon, 20 Mar 2023 16:55:46 -0700
Subject: [PATCH] check if label query list is not empty efore appending label
 to query string

---
 android/Omnivore/app/build.gradle                           | 4 ++--
 .../java/app/omnivore/omnivore/dataService/LibrarySync.kt   | 4 ++++
 .../app/omnivore/omnivore/ui/library/LibraryViewModel.kt    | 6 ++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/android/Omnivore/app/build.gradle b/android/Omnivore/app/build.gradle
index ecfebee7f..d6eb30ece 100644
--- a/android/Omnivore/app/build.gradle
+++ b/android/Omnivore/app/build.gradle
@@ -17,8 +17,8 @@ android {
         applicationId "app.omnivore.omnivore"
         minSdk 26
         targetSdk 33
-        versionCode 28
-        versionName "0.0.28"
+        versionCode 29
+        versionName "0.0.29"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/dataService/LibrarySync.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/dataService/LibrarySync.kt
index c312f0c64..b677c484f 100644
--- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/dataService/LibrarySync.kt
+++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/dataService/LibrarySync.kt
@@ -28,6 +28,8 @@ suspend fun DataService.librarySearch(cursor: String?, query: String): SavedItem
   db.savedItemLabelDao().insertAll(labels)
   db.savedItemAndSavedItemLabelCrossRefDao().insertAll(crossRefs)
 
+  Log.d("sync", "found ${searchResult.items.size} items with search api. Query: $query")
+
   return SavedItemSyncResult(
     hasError = false,
     hasMoreItems = false,
@@ -93,6 +95,8 @@ suspend fun DataService.sync(since: String, cursor: String?, limit: Int = 20): S
   db.savedItemLabelDao().insertAll(labels)
   db.savedItemAndSavedItemLabelCrossRefDao().insertAll(crossRefs)
 
+  Log.d("sync", "found ${syncResult.items.size} items with sync api. Since: $since")
+
   return SavedItemSyncResult(
     hasError = false,
     hasMoreItems = syncResult.hasMoreItems,
diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/library/LibraryViewModel.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/library/LibraryViewModel.kt
index 6e078be31..9dd990619 100644
--- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/library/LibraryViewModel.kt
+++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/library/LibraryViewModel.kt
@@ -333,8 +333,10 @@ class LibraryViewModel @Inject constructor(
     }
 
     activeLabelsLiveData.value?.let {
-      query += " label:"
-      query += it.joinToString { label -> label.name }
+      if (it.isNotEmpty()) {
+        query += " label:"
+        query += it.joinToString { label -> label.name }
+      }
     }
 
     return query