address PR comments

duckduckgo · Nov 21, 2023 · ffd2edd · ffd2edd
1 parent f26a7ba
commit ffd2edd
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 19 deletions.
diff --git a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt
@@ -672,10 +672,10 @@ class BrowserTabViewModel @Inject constructor(
         observeAccessibilitySettings()
 
         savedSitesRepository.getFavorites()
-            .flowOn(dispatchers.io())
             .combine(hiddenIds) { favorites, hiddenIds ->
                 favorites.filter { it.id !in hiddenIds.favorites }
             }
+            .flowOn(dispatchers.io())
             .onEach { filteredFavourites ->
                 withContext(dispatchers.main()) {
                     val favorites = filteredFavourites.map { FavoritesQuickAccessAdapter.QuickAccessFavorite(it) }
@@ -685,7 +685,6 @@ class BrowserTabViewModel @Inject constructor(
                     browserViewState.value = currentBrowserViewState().copy(favorite = favorite)
                 }
             }
-            .flowOn(dispatchers.main())
             .launchIn(viewModelScope)
 
         savedSitesRepository.getBookmarks()
@@ -2802,7 +2801,6 @@ class BrowserTabViewModel @Inject constructor(
     }
 
     private fun hide(savedSite: SavedSite) {
-        Timber.d("FLOW: hide $savedSite")
         viewModelScope.launch(dispatchers.io()) {
             when (savedSite) {
                 is Bookmark -> {
@@ -2818,23 +2816,20 @@ class BrowserTabViewModel @Inject constructor(
                     hiddenIds.emit(hiddenIds.value.copy(favorites = hiddenIds.value.favorites + savedSite.id))
                 }
             }
-            Timber.d("FLOW: hide ${hiddenIds.value}")
             withContext(dispatchers.main()) {
                 command.value = DeleteSavedSiteConfirmation(savedSite)
             }
         }
     }
 
     fun undoDelete(savedSite: SavedSite) {
-        Timber.d("FLOW: undoDelete $savedSite")
         viewModelScope.launch(dispatchers.io()) {
             hiddenIds.emit(
                 hiddenIds.value.copy(
                     favorites = hiddenIds.value.favorites - savedSite.id,
                     bookmarks = hiddenIds.value.bookmarks - savedSite.id,
                 ),
             )
-            Timber.d("FLOW: hide ${hiddenIds.value}")
         }
     }
 

diff --git a/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchActivity.kt b/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchActivity.kt
@@ -50,7 +50,6 @@ import com.duckduckgo.app.statistics.pixels.Pixel
 import com.duckduckgo.app.systemsearch.SystemSearchViewModel.Command.*
 import com.duckduckgo.app.tabs.ui.GridViewColumnCalculator
 import com.duckduckgo.common.ui.DuckDuckGoActivity
-import com.duckduckgo.common.ui.view.*
 import com.duckduckgo.common.ui.view.hideKeyboard
 import com.duckduckgo.common.ui.view.toPx
 import com.duckduckgo.common.ui.viewbinding.viewBinding
@@ -64,7 +63,6 @@ import com.duckduckgo.voice.api.VoiceSearchLauncher.Source.WIDGET
 import com.google.android.material.snackbar.BaseTransientBottomBar
 import com.google.android.material.snackbar.Snackbar
 import javax.inject.Inject
-import timber.log.Timber
 
 @InjectWith(ActivityScope::class)
 class SystemSearchActivity : DuckDuckGoActivity() {
@@ -420,11 +418,8 @@ class SystemSearchActivity : DuckDuckGoActivity() {
                         transientBottomBar: Snackbar?,
                         event: Int,
                     ) {
-                        // when snackbar is not dismissed because of an action we want to
-                        // actually delete the saved site
-                        Timber.d("Bookmark: dismissed with $event")
                         if (event != DISMISS_EVENT_ACTION) {
-                            viewModel.deleteQuickAccessItem(savedSite)
+                            viewModel.deleteSavedSiteSnackbarDismissed(savedSite)
                         }
                     }
                 },

diff --git a/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchViewModel.kt b/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchViewModel.kt
@@ -23,9 +23,7 @@ import com.duckduckgo.anvil.annotations.ContributesViewModel
 import com.duckduckgo.app.autocomplete.api.AutoComplete
 import com.duckduckgo.app.autocomplete.api.AutoComplete.AutoCompleteResult
 import com.duckduckgo.app.bookmarks.ui.EditSavedSiteDialogFragment
-import com.duckduckgo.app.browser.BrowserTabViewModel.Command.DeleteSavedSiteConfirmation
 import com.duckduckgo.app.browser.favorites.FavoritesQuickAccessAdapter
-import com.duckduckgo.app.browser.favorites.FavoritesQuickAccessAdapter.QuickAccessFavorite
 import com.duckduckgo.app.global.SingleLiveEvent
 import com.duckduckgo.app.onboarding.store.AppStage
 import com.duckduckgo.app.onboarding.store.UserStageStore
@@ -34,7 +32,6 @@ import com.duckduckgo.app.pixels.AppPixelName.*
 import com.duckduckgo.app.settings.db.SettingsDataStore
 import com.duckduckgo.app.statistics.pixels.Pixel
 import com.duckduckgo.app.systemsearch.SystemSearchViewModel.Command.UpdateVoiceSearch
-import com.duckduckgo.app.systemsearch.SystemSearchViewModel.Suggestions.QuickAccessItems
 import com.duckduckgo.common.utils.DispatcherProvider
 import com.duckduckgo.di.scopes.ActivityScope
 import com.duckduckgo.savedsites.api.SavedSitesRepository
@@ -124,18 +121,17 @@ class SystemSearchViewModel @Inject constructor(
         refreshAppList()
 
         savedSitesRepository.getFavorites()
-            .flowOn(dispatchers.io())
             .combine(hiddenIds) { favorites, hiddenIds ->
                 favorites.filter { it.id !in hiddenIds.favorites }
             }
+            .flowOn(dispatchers.io())
             .onEach { filteredFavourites ->
                 withContext(dispatchers.main()) {
                     latestQuickAccessItems =
                         Suggestions.QuickAccessItems(filteredFavourites.map { FavoritesQuickAccessAdapter.QuickAccessFavorite(it) })
                     resultsViewState.postValue(latestQuickAccessItems)
                 }
             }
-            .flowOn(dispatchers.main())
             .launchIn(viewModelScope)
     }
 
@@ -349,7 +345,7 @@ class SystemSearchViewModel @Inject constructor(
         }
     }
 
-    fun deleteQuickAccessItem(savedSite: SavedSite) {
+    fun deleteSavedSiteSnackbarDismissed(savedSite: SavedSite) {
         when (savedSite) {
             is SavedSite.Favorite -> {
                 viewModelScope.launch(dispatchers.io() + NonCancellable) {

diff --git a/app/src/test/java/com/duckduckgo/app/systemsearch/SystemSearchViewModelTest.kt b/app/src/test/java/com/duckduckgo/app/systemsearch/SystemSearchViewModelTest.kt
@@ -377,13 +377,15 @@ class SystemSearchViewModelTest {
         assertFalse(viewState.favorites.isEmpty())
 
         testee.undoDelete(savedSite)
+
+        assertFalse(viewState.favorites.isEmpty())
     }
 
     @Test
     fun whenQuickAccessDeletedThenRepositoryDeletesSavedSite() = runTest {
         val savedSite = Favorite("favorite1", "title", "http://example.com", "timestamp", 0)
 
-        testee.deleteQuickAccessItem(savedSite)
+        testee.deleteSavedSiteSnackbarDismissed(savedSite)
 
         verify(mocksavedSitesRepository).delete(savedSite)
     }