From 7d20c6ca91b20d4911fa501b3b8dd038b22edbd9 Mon Sep 17 00:00:00 2001 From: Satindar Dhillon Date: Tue, 17 Jan 2023 12:52:07 -0800 Subject: [PATCH] use data service item action to handle library list changes --- .../omnivore/ui/library/LibraryViewModel.kt | 32 +++---------------- 1 file changed, 4 insertions(+), 28 deletions(-) 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 1031fc40e..20adabb6a 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 @@ -8,9 +8,7 @@ import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import app.omnivore.omnivore.* -import app.omnivore.omnivore.dataService.DataService -import app.omnivore.omnivore.dataService.sync -import app.omnivore.omnivore.dataService.syncOfflineItemsWithServerIfNeeded +import app.omnivore.omnivore.dataService.* import app.omnivore.omnivore.networking.* import app.omnivore.omnivore.persistence.entities.SavedItemCardData import app.omnivore.omnivore.persistence.entities.SavedItemCardDataWithLabels @@ -137,44 +135,22 @@ class LibraryViewModel @Inject constructor( fun handleSavedItemAction(itemID: String, action: SavedItemAction) { when (action) { SavedItemAction.Delete -> { - removeItemFromList(itemID) - viewModelScope.launch { - networker.deleteSavedItem(itemID) + dataService.deleteSavedItem(itemID) } } SavedItemAction.Archive -> { - removeItemFromList(itemID) viewModelScope.launch { - networker.archiveSavedItem(itemID) + dataService.archiveSavedItem(itemID) } } SavedItemAction.Unarchive -> { - removeItemFromList(itemID) viewModelScope.launch { - networker.unarchiveSavedItem(itemID) + dataService.unarchiveSavedItem(itemID) } } } } - - private fun removeItemFromList(itemID: String) { - viewModelScope.launch { - withContext(Dispatchers.IO) { - dataService.db.savedItemDao().deleteById(itemID) - } - } - } - - private fun searchQuery(): String { - var query = "in:inbox sort:saved" - - if (searchTextLiveData.value != "") { - query = query.plus(" ${searchTextLiveData.value}") - } - - return query - } } enum class SavedItemAction {