Merge branch 'hotfix/5.207.1'

Author: CDRussell

app/build.gradle

@@ -437,10 +437,8 @@ dependencies {
     androidTestImplementation "androidx.test.ext:junit-ktx:_"
     androidTestImplementation "androidx.test.espresso:espresso-core:_"
     androidTestImplementation "androidx.test.espresso:espresso-web:_"
-    androidTestImplementation project(':feature-toggles-test')
 
     testImplementation project(':vpn-api-test')
-    testImplementation project(':feature-toggles-test')
     testImplementation "org.mockito.kotlin:mockito-kotlin:_"
     testImplementation Testing.junit4
     testImplementation AndroidX.archCore.testing

app/src/androidTest/java/com/duckduckgo/app/browser/BrowserTabViewModelTest.kt

@@ -167,8 +167,6 @@ import com.duckduckgo.common.utils.device.DeviceInfo
 import com.duckduckgo.downloads.api.DownloadStateListener
 import com.duckduckgo.downloads.api.FileDownloader
 import com.duckduckgo.downloads.api.FileDownloader.PendingFileDownload
-import com.duckduckgo.feature.toggles.api.FakeFeatureToggleFactory
-import com.duckduckgo.feature.toggles.api.FakeToggleStore
 import com.duckduckgo.feature.toggles.api.FeatureToggle
 import com.duckduckgo.feature.toggles.api.Toggle
 import com.duckduckgo.history.api.HistoryEntry.VisitedPage
@@ -474,7 +472,6 @@ class BrowserTabViewModelTest {
     private val mockUserBrowserProperties: UserBrowserProperties = mock()
     private val mockAutoCompleteRepository: AutoCompleteRepository = mock()
     private val commandActionMapper: CommandActionMapper = mock()
-    private val newStateKillSwitch = FakeFeatureToggleFactory.create(NewStateKillSwitch::class.java, FakeToggleStore())
 
     @Before
     fun before() {
@@ -557,7 +554,7 @@ class BrowserTabViewModelTest {
         whenever(fireproofDialogsEventHandler.event).thenReturn(fireproofDialogsEventHandlerLiveData)
         whenever(cameraHardwareChecker.hasCameraHardware()).thenReturn(true)
         whenever(mockPrivacyProtectionsPopupManager.viewState).thenReturn(flowOf(PrivacyProtectionsPopupViewState.Gone))
-        newStateKillSwitch.self().setEnabled(Toggle.State(true))
+
         testee = BrowserTabViewModel(
             statisticsUpdater = mockStatisticsUpdater,
             queryUrlConverter = mockOmnibarConverter,
@@ -622,7 +619,6 @@ class BrowserTabViewModelTest {
             userBrowserProperties = mockUserBrowserProperties,
             history = mockNavigationHistory,
             commandActionMapper = commandActionMapper,
-            newStateKillSwitch = newStateKillSwitch,
         )
 
         testee.loadData("abc", null, false)
@@ -5349,39 +5345,6 @@ class BrowserTabViewModelTest {
         verify(mockPixel).fire(OnboardingExperimentPixel.PixelName.ONBOARDING_VISIT_SITE_CUSTOM)
     }
 
-    @Test
-    fun whenNavigationStateUnchangedButDifferentUrlThenUpdateUrl() {
-        val httpUrl = "http://example.com/"
-        val httpsUrl = "https://example.com/"
-        loadUrl(httpsUrl, isBrowserShowing = true)
-        assertEquals(httpsUrl, testee.url)
-        assertEquals(httpsUrl, omnibarViewState().omnibarText)
-        testee.siteLiveData.value?.url = httpUrl
-        assertEquals(httpUrl, testee.siteLiveData.value?.url)
-
-        updateUrl(httpsUrl, httpsUrl, true)
-        assertEquals(httpsUrl, testee.url)
-        assertEquals(httpsUrl, testee.siteLiveData.value?.url)
-        assertEquals(httpsUrl, omnibarViewState().omnibarText)
-    }
-
-    @Test
-    fun whenNavigationStateUnchangedButDifferentUrlAndFeatureDisableThenDoNotUpdateUrl() {
-        newStateKillSwitch.self().setEnabled(Toggle.State(false))
-        val httpUrl = "http://example.com/"
-        val httpsUrl = "https://example.com/"
-        loadUrl(httpsUrl, isBrowserShowing = true)
-        assertEquals(httpsUrl, testee.url)
-        assertEquals(httpsUrl, omnibarViewState().omnibarText)
-        testee.siteLiveData.value?.url = httpUrl
-        assertEquals(httpUrl, testee.siteLiveData.value?.url)
-
-        updateUrl(httpsUrl, httpsUrl, true)
-        assertEquals(httpUrl, testee.url)
-        assertEquals(httpUrl, testee.siteLiveData.value?.url)
-        assertEquals(httpsUrl, omnibarViewState().omnibarText)
-    }
-
     private fun aCredential(): LoginCredentials {
         return LoginCredentials(domain = null, username = null, password = null)
     }

app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt

@@ -269,7 +269,6 @@ class BrowserTabViewModel @Inject constructor(
     private val userBrowserProperties: UserBrowserProperties,
     private val history: NavigationHistory,
     private val commandActionMapper: CommandActionMapper,
-    private val newStateKillSwitch: NewStateKillSwitch,
 ) : WebViewClientListener,
     EditSavedSiteListener,
     DeleteBookmarkListener,
@@ -1094,16 +1093,7 @@ class BrowserTabViewModel @Inject constructor(
             is WebNavigationStateChange.PageCleared -> pageCleared()
             is WebNavigationStateChange.UrlUpdated -> urlUpdated(stateChange.url)
             is WebNavigationStateChange.PageNavigationCleared -> disableUserNavigation()
-            is WebNavigationStateChange.Unchanged -> {
-                stateChange.url?.let {
-                    updateWhenInputUrlIsDifferentThanLoadedUrl(it)
-                }
-            }
-            is WebNavigationStateChange.Other -> {
-                stateChange.url?.let {
-                    updateWhenInputUrlIsDifferentThanLoadedUrl(it)
-                }
-            }
+            else -> {}
         }
 
         if ((newWebNavigationState.progress ?: 0) >= SHOW_CONTENT_MIN_PROGRESS) {
@@ -1112,12 +1102,6 @@ class BrowserTabViewModel @Inject constructor(
         navigationAwareLoginDetector.onEvent(NavigationEvent.WebNavigationEvent(stateChange))
     }
 
-    private fun updateWhenInputUrlIsDifferentThanLoadedUrl(loadedUrl: String) {
-        if (newStateKillSwitch.self().isEnabled() && loadedUrl != site?.url) {
-            urlUpdated(loadedUrl)
-        }
-    }
-
     override fun onPageContentStart(url: String) {
         showWebContent()
     }

app/src/main/java/com/duckduckgo/app/browser/NewStateKillSwitch.kt

@@ -41,14 +41,14 @@ sealed class WebNavigationStateChange {
 
     data class UrlUpdated(val url: String) : WebNavigationStateChange()
     object PageCleared : WebNavigationStateChange()
-    data class Unchanged(val url: String?) : WebNavigationStateChange()
+    object Unchanged : WebNavigationStateChange()
     object PageNavigationCleared : WebNavigationStateChange()
-    data class Other(val url: String?) : WebNavigationStateChange()
+    object Other : WebNavigationStateChange()
 }
 
 fun WebNavigationState.compare(previous: WebNavigationState?): WebNavigationStateChange {
     if (this == previous) {
-        return WebNavigationStateChange.Unchanged(currentUrl)
+        return WebNavigationStateChange.Unchanged
     }
 
     if (this is EmptyNavigationState) {
@@ -59,7 +59,7 @@ fun WebNavigationState.compare(previous: WebNavigationState?): WebNavigationStat
         return WebNavigationStateChange.PageCleared
     }
 
-    val latestUrl = currentUrl ?: return WebNavigationStateChange.Other(null)
+    val latestUrl = currentUrl ?: return WebNavigationStateChange.Other
 
     // A new page load is identified by the original url changing
     if (originalUrl != previous?.originalUrl) {
@@ -76,7 +76,7 @@ fun WebNavigationState.compare(previous: WebNavigationState?): WebNavigationStat
         return WebNavigationStateChange.UrlUpdated(latestUrl)
     }
 
-    return WebNavigationStateChange.Other(currentUrl)
+    return WebNavigationStateChange.Other
 }
 
 data class WebViewNavigationState(

app/src/main/java/com/duckduckgo/app/browser/WebNavigationState.kt

@@ -33,14 +33,14 @@ class WebNavigationStateComparisonTest {
     @Test
     fun whenPreviousStateAndLatestStateSameThenCompareReturnsUnchanged() {
         val state = buildState("http://foo.com", "http://subdomain.foo.com")
-        assertEquals(Unchanged("http://subdomain.foo.com"), state.compare(state))
+        assertEquals(Unchanged, state.compare(state))
     }
 
     @Test
     fun whenPreviousStateAndLatestStateEqualThenCompareReturnsUnchanged() {
         val previousState = buildState("http://foo.com", "http://subdomain.foo.com")
         val latestState = buildState("http://foo.com", "http://subdomain.foo.com")
-        assertEquals(Unchanged("http://subdomain.foo.com"), latestState.compare(previousState))
+        assertEquals(Unchanged, latestState.compare(previousState))
     }
 
     @Test
@@ -124,14 +124,14 @@ class WebNavigationStateComparisonTest {
     fun whenPreviousContainsAnOriginalUrlAndCurrentUrlAndLatestContainsSameOriginalUrlAndNoCurrentUrlThenCompareReturnsOther() {
         val previousState = buildState("http://same.com", "http://subdomain.previous.com")
         val latestState = buildState("http://same.com", null)
-        assertEquals(Other(null), latestState.compare(previousState))
+        assertEquals(Other, latestState.compare(previousState))
     }
 
     @Test
     fun whenPreviousContainsAnOriginalUrlAndCurrentUrlAndLatestStateContainsDifferentOriginalUrlAndNoCurrentUrlThenCompareReturnsOther() {
         val previousState = buildState("http://previous.com", "http://subdomain.previous.com")
         val latestState = buildState("http://latest.com", null)
-        assertEquals(Other(null), latestState.compare(previousState))
+        assertEquals(Other, latestState.compare(previousState))
     }
 
     private fun buildState(

app/src/test/java/com/duckduckgo/app/browser/WebNavigationStateComparisonTest.kt

@@ -1 +1 @@
-VERSION=5.207.0
+VERSION=5.207.1