diff --git a/app/src/androidTest/java/com/duckduckgo/app/browser/BrowserViewModelTest.kt b/app/src/androidTest/java/com/duckduckgo/app/browser/BrowserViewModelTest.kt index f8cfd17b7244..761c87599e09 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/browser/BrowserViewModelTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/browser/BrowserViewModelTest.kt @@ -21,7 +21,6 @@ import androidx.lifecycle.MutableLiveData import androidx.lifecycle.Observer import com.duckduckgo.app.CoroutineTestRule import com.duckduckgo.app.browser.BrowserViewModel.Command -import com.duckduckgo.app.browser.BrowserViewModel.Command.DisplayMessage import com.duckduckgo.app.browser.omnibar.OmnibarEntryConverter import com.duckduckgo.app.fire.DataClearer import com.duckduckgo.app.global.events.db.UserEventsStore @@ -177,13 +176,6 @@ class BrowserViewModelTest { verify(mockCommandObserver, never()).onChanged(any()) } - @Test - fun whenClearCompleteThenMessageDisplayed() { - testee.onClearComplete() - verify(mockCommandObserver).onChanged(commandCaptor.capture()) - assertEquals(DisplayMessage(R.string.fireDataCleared), commandCaptor.lastValue) - } - @Test fun whenUserSelectedToRateAppThenPlayStoreCommandTriggered() { testee.onUserSelectedToRateApp(PromptCount.first()) diff --git a/app/src/androidTest/java/com/duckduckgo/app/tabs/ui/TabSwitcherViewModelTest.kt b/app/src/androidTest/java/com/duckduckgo/app/tabs/ui/TabSwitcherViewModelTest.kt index 2b18abdba577..f43c719cf0dd 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/tabs/ui/TabSwitcherViewModelTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/tabs/ui/TabSwitcherViewModelTest.kt @@ -21,7 +21,6 @@ package com.duckduckgo.app.tabs.ui import androidx.arch.core.executor.testing.InstantTaskExecutorRule import androidx.lifecycle.Observer import com.duckduckgo.app.CoroutineTestRule -import com.duckduckgo.app.browser.R import com.duckduckgo.app.browser.session.WebViewSessionInMemoryStorage import com.duckduckgo.app.tabs.model.TabEntity import com.duckduckgo.app.tabs.model.TabRepository @@ -105,14 +104,6 @@ class TabSwitcherViewModelTest { verify(mockTabRepository).delete(entity) } - @Test - fun whenClearCompleteThenMessageDisplayedAndSwitcherClosed() { - testee.onClearComplete() - verify(mockCommandObserver, times(2)).onChanged(commandCaptor.capture()) - assertEquals(Command.DisplayMessage(R.string.fireDataCleared), commandCaptor.allValues[0]) - assertEquals(Command.Close, commandCaptor.allValues[1]) - } - @Test fun whenOnMarkTabAsDeletableThenCallMarkDeletable() = runBlocking { val entity = TabEntity("abc", "", "", position = 0) diff --git a/app/src/main/java/com/duckduckgo/app/browser/BrowserActivity.kt b/app/src/main/java/com/duckduckgo/app/browser/BrowserActivity.kt index f3f7da227a90..3884d717c585 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/BrowserActivity.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/BrowserActivity.kt @@ -288,7 +288,6 @@ class BrowserActivity : DuckDuckGoActivity(), CoroutineScope by MainScope() { when (command) { is Query -> currentTab?.submitQuery(command.query) is Refresh -> currentTab?.onRefreshRequested() - is Command.DisplayMessage -> Toast.makeText(applicationContext, command.messageId, Toast.LENGTH_LONG).show() is Command.LaunchPlayStore -> launchPlayStore() is Command.ShowAppEnjoymentPrompt -> showAppEnjoymentPrompt(AppEnjoymentDialogFragment.create(command.promptCount, viewModel)) is Command.ShowAppRatingPrompt -> showAppEnjoymentPrompt(RateAppDialogFragment.create(command.promptCount, viewModel)) @@ -320,7 +319,6 @@ class BrowserActivity : DuckDuckGoActivity(), CoroutineScope by MainScope() { dialog.clearStarted = { removeObservers() } - dialog.clearComplete = { viewModel.onClearComplete() } dialog.setOnShowListener { currentTab?.onFireDialogVisibilityChanged(isVisible = true) } dialog.setOnCancelListener { pixel.fire(if (dialog.ctaVisible) FIRE_DIALOG_PROMOTED_CANCEL else FIRE_DIALOG_CANCEL) diff --git a/app/src/main/java/com/duckduckgo/app/browser/BrowserViewModel.kt b/app/src/main/java/com/duckduckgo/app/browser/BrowserViewModel.kt index 047261a1710b..482e20932e4c 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/BrowserViewModel.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/BrowserViewModel.kt @@ -16,12 +16,10 @@ package com.duckduckgo.app.browser -import androidx.annotation.StringRes import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.Observer import androidx.lifecycle.ViewModel -import com.duckduckgo.app.browser.BrowserViewModel.Command.DisplayMessage import com.duckduckgo.app.browser.BrowserViewModel.Command.Refresh import com.duckduckgo.app.browser.omnibar.OmnibarEntryConverter import com.duckduckgo.app.browser.omnibar.QueryUrlConverter @@ -79,7 +77,6 @@ class BrowserViewModel( sealed class Command { object Refresh : Command() data class Query(val query: String) : Command() - data class DisplayMessage(@StringRes val messageId: Int) : Command() object LaunchPlayStore : Command() object LaunchFeedbackView : Command() data class ShowAppEnjoymentPrompt(val promptCount: PromptCount) : Command() @@ -168,10 +165,6 @@ class BrowserViewModel( if (resultCode == RELOAD_RESULT_CODE) command.value = Refresh } - fun onClearComplete() { - command.value = DisplayMessage(R.string.fireDataCleared) - } - /** * To ensure the best UX, we might not want to show anything to the user while the clear is taking place. * This method will await until the ApplicationClearDataState.FINISHED event is received before observing for other changes diff --git a/app/src/main/java/com/duckduckgo/app/global/view/FireDialog.kt b/app/src/main/java/com/duckduckgo/app/global/view/FireDialog.kt index 7dca656cd977..7ab0553d642a 100644 --- a/app/src/main/java/com/duckduckgo/app/global/view/FireDialog.kt +++ b/app/src/main/java/com/duckduckgo/app/global/view/FireDialog.kt @@ -60,7 +60,6 @@ class FireDialog( ) : BottomSheetDialog(context, R.style.FireDialog), CoroutineScope by MainScope() { var clearStarted: (() -> Unit) = {} - var clearComplete: (() -> Unit) = {} val ctaVisible: Boolean get() = daxCtaContainer?.isVisible == true diff --git a/app/src/main/java/com/duckduckgo/app/tabs/ui/TabSwitcherActivity.kt b/app/src/main/java/com/duckduckgo/app/tabs/ui/TabSwitcherActivity.kt index 1fc1268d4103..61818c8c9d5b 100644 --- a/app/src/main/java/com/duckduckgo/app/tabs/ui/TabSwitcherActivity.kt +++ b/app/src/main/java/com/duckduckgo/app/tabs/ui/TabSwitcherActivity.kt @@ -22,7 +22,6 @@ import android.os.Bundle import android.view.Menu import android.view.MenuItem import android.widget.TextView -import android.widget.Toast import androidx.appcompat.widget.Toolbar import androidx.lifecycle.Observer import androidx.recyclerview.widget.GridLayoutManager @@ -42,7 +41,6 @@ import com.duckduckgo.app.statistics.pixels.Pixel import com.duckduckgo.app.tabs.model.TabEntity import com.duckduckgo.app.tabs.ui.TabSwitcherViewModel.Command import com.duckduckgo.app.tabs.ui.TabSwitcherViewModel.Command.Close -import com.duckduckgo.app.tabs.ui.TabSwitcherViewModel.Command.DisplayMessage import com.google.android.material.snackbar.BaseTransientBottomBar import com.google.android.material.snackbar.Snackbar import kotlinx.coroutines.CoroutineScope @@ -172,7 +170,6 @@ class TabSwitcherActivity : DuckDuckGoActivity(), TabSwitcherListener, Coroutine private fun processCommand(command: Command?) { when (command) { - is DisplayMessage -> Toast.makeText(applicationContext, command.messageId, Toast.LENGTH_LONG).show() is Close -> finishAfterTransition() } } @@ -202,7 +199,6 @@ class TabSwitcherActivity : DuckDuckGoActivity(), TabSwitcherListener, Coroutine settingsDataStore = settingsDataStore, userEventsStore = userEventsStore ) - dialog.clearComplete = { viewModel.onClearComplete() } dialog.show() } @@ -240,7 +236,8 @@ class TabSwitcherActivity : DuckDuckGoActivity(), TabSwitcherListener, Coroutine BaseTransientBottomBar.BaseCallback.DISMISS_EVENT_SWIPE, BaseTransientBottomBar.BaseCallback.DISMISS_EVENT_TIMEOUT -> launch { viewModel.purgeDeletableTabs() } BaseTransientBottomBar.BaseCallback.DISMISS_EVENT_CONSECUTIVE, - BaseTransientBottomBar.BaseCallback.DISMISS_EVENT_MANUAL -> { /* noop */ } + BaseTransientBottomBar.BaseCallback.DISMISS_EVENT_MANUAL -> { /* noop */ + } } } }) diff --git a/app/src/main/java/com/duckduckgo/app/tabs/ui/TabSwitcherViewModel.kt b/app/src/main/java/com/duckduckgo/app/tabs/ui/TabSwitcherViewModel.kt index c51ea2cd9af7..c2bab9889dc3 100644 --- a/app/src/main/java/com/duckduckgo/app/tabs/ui/TabSwitcherViewModel.kt +++ b/app/src/main/java/com/duckduckgo/app/tabs/ui/TabSwitcherViewModel.kt @@ -16,12 +16,10 @@ package com.duckduckgo.app.tabs.ui -import androidx.annotation.StringRes import androidx.lifecycle.LiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.asLiveData import androidx.lifecycle.viewModelScope -import com.duckduckgo.app.browser.R import com.duckduckgo.app.browser.session.WebViewSessionStorage import com.duckduckgo.app.global.SingleLiveEvent import com.duckduckgo.app.global.plugins.view_model.ViewModelFactoryPlugin @@ -41,7 +39,6 @@ class TabSwitcherViewModel(private val tabRepository: TabRepository, private val val command: SingleLiveEvent = SingleLiveEvent() sealed class Command { - data class DisplayMessage(@StringRes val messageId: Int) : Command() object Close : Command() } @@ -71,11 +68,6 @@ class TabSwitcherViewModel(private val tabRepository: TabRepository, private val suspend fun purgeDeletableTabs() { tabRepository.purgeDeletableTabs() } - - fun onClearComplete() { - command.value = Command.DisplayMessage(R.string.fireDataCleared) - command.value = Command.Close - } } @ContributesMultibinding(AppObjectGraph::class)