Remove MobileUrlRewriter

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

@@ -3083,33 +3083,6 @@ class BrowserTabViewModelTest {
         assertCommandIssued<Command.RefreshUserAgent>()
     }
 
-    @Test
-    fun whenPageChangesAndNewPageCanChangeBrowsingModeThenCanChangeBrowsingModeIsTrue() {
-        givenCurrentSite("https://www.example.com/")
-
-        loadUrl("https://www.example2.com", isBrowserShowing = true)
-
-        assertTrue(browserViewState().canChangeBrowsingMode)
-    }
-
-    @Test
-    fun whenPageChangesAndNewPageCannotChangeBrowsingModeThenCanChangeBrowsingModeIsFalse() {
-        givenCurrentSite("https://www.example.com/")
-
-        loadUrl("https://www.facebook.com", isBrowserShowing = true)
-
-        assertFalse(browserViewState().canChangeBrowsingMode)
-    }
-
-    @Test
-    fun whenPageChangesAndNewPageCanChangeBrowsingModeButContainsExcludedPathThenCanChangeBrowsingModeIsFalse() {
-        givenCurrentSite("https://www.example.com/")
-
-        loadUrl("https://www.facebook.com/dialog", isBrowserShowing = true)
-
-        assertFalse(browserViewState().canChangeBrowsingMode)
-    }
-
     @Test
     fun whenRequestFileDownloadAndUrlIsBlobThenConvertBlobToDataUriCommandSent() {
         val blobUrl = "blob:https://example.com/283nasdho23jkasdAjd"

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

@@ -24,7 +24,6 @@ import androidx.test.annotation.UiThreadTest
 import com.duckduckgo.app.CoroutineTestRule
 import com.duckduckgo.app.globalprivacycontrol.GlobalPrivacyControl
 import com.duckduckgo.app.globalprivacycontrol.GlobalPrivacyControlManager
-import com.duckduckgo.app.browser.useragent.MobileUrlReWriter
 import com.duckduckgo.app.browser.useragent.UserAgentProvider
 import com.duckduckgo.app.httpsupgrade.HttpsUpgrader
 import com.duckduckgo.app.privacy.db.PrivacyProtectionCountDao
@@ -58,7 +57,6 @@ class WebViewRequestInterceptorTest {
     private val mockGlobalPrivacyControl: GlobalPrivacyControl = mock()
     private val mockWebBackForwardList: WebBackForwardList = mock()
     private val userAgentProvider: UserAgentProvider = UserAgentProvider(DEFAULT, mock())
-    private val mobileUrlReWriter = MobileUrlReWriter()
 
     private var webView: WebView = mock()
 
@@ -75,8 +73,7 @@ class WebViewRequestInterceptorTest {
             resourceSurrogates = mockResourceSurrogates,
             privacyProtectionCountDao = mockPrivacyProtectionCountDao,
             globalPrivacyControl = mockGlobalPrivacyControl,
-            userAgentProvider = userAgentProvider,
-            mobileUrlReWriter = mobileUrlReWriter
+            userAgentProvider = userAgentProvider
         )
     }
 
@@ -444,21 +441,6 @@ class WebViewRequestInterceptorTest {
         verify(webView, never()).loadUrl(any(), any())
     }
 
-    @Test
-    fun whenUrlShouldChangeToMobileUrlThenLoadUrlWithMobileSubDomain() = runBlocking<Unit> {
-        configureShouldChangeToMobileUrl()
-
-        val mockWebViewClientListener: WebViewClientListener = mock()
-        testee.shouldIntercept(
-            request = mockRequest,
-            documentUrl = null,
-            webView = webView,
-            webViewClientListener = mockWebViewClientListener
-        )
-
-        verify(webView).loadUrl("https://m.facebook.com", emptyMap())
-    }
-
     @Test
     fun whenUserAgentShouldChangeThenReloadUrl() = runBlocking<Unit> {
         configureUserAgentShouldChange()

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

@@ -61,7 +61,6 @@ import com.duckduckgo.app.browser.model.LongPressTarget
 import com.duckduckgo.app.browser.omnibar.OmnibarEntryConverter
 import com.duckduckgo.app.browser.session.WebViewSessionStorage
 import com.duckduckgo.app.browser.ui.HttpAuthenticationDialogFragment.HttpAuthenticationListener
-import com.duckduckgo.app.browser.useragent.MobileUrlReWriter
 import com.duckduckgo.app.cta.ui.*
 import com.duckduckgo.app.fire.fireproofwebsite.data.FireproofWebsiteEntity
 import com.duckduckgo.app.fire.fireproofwebsite.data.FireproofWebsiteRepository
@@ -771,7 +770,6 @@ class BrowserTabViewModel(
             browserShowing = true,
             canAddBookmarks = true,
             addToHomeEnabled = true,
-            canChangeBrowsingMode = canChangeBrowsingMode(site?.domain),
             addToHomeVisible = addToHomeCapabilityDetector.isAddToHomeSupported(),
             canSharePage = true,
             showPrivacyGrade = true,
@@ -800,10 +798,6 @@ class BrowserTabViewModel(
         registerSiteVisit()
     }
 
-    private fun canChangeBrowsingMode(domain: String?): Boolean {
-        return !MobileUrlReWriter.strictlyMobileSiteHosts.any { domain?.contains(it.host) == true }
-    }
-
     private fun sendPixelIfUseOurAppSiteVisitedFirstTime(url: String) {
         if (useOurAppDetector.isUseOurAppUrl(url)) {
             viewModelScope.launch { sendUseOurAppSiteVisitedPixel() }

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

@@ -22,7 +22,6 @@ import android.webkit.WebResourceResponse
 import android.webkit.WebView
 import androidx.annotation.WorkerThread
 import com.duckduckgo.app.browser.useragent.UserAgentProvider
-import com.duckduckgo.app.browser.useragent.MobileUrlReWriter
 import com.duckduckgo.app.global.isHttp
 import com.duckduckgo.app.globalprivacycontrol.GlobalPrivacyControl
 import com.duckduckgo.app.globalprivacycontrol.GlobalPrivacyControlManager
@@ -52,8 +51,7 @@ class WebViewRequestInterceptor(
     private val httpsUpgrader: HttpsUpgrader,
     private val privacyProtectionCountDao: PrivacyProtectionCountDao,
     private val globalPrivacyControl: GlobalPrivacyControl,
-    private val userAgentProvider: UserAgentProvider,
-    private val mobileUrlReWriter: MobileUrlReWriter
+    private val userAgentProvider: UserAgentProvider
 ) : RequestInterceptor {
 
     /**
@@ -75,13 +73,6 @@ class WebViewRequestInterceptor(
 
         val url = request.url
 
-        shouldChangeToMobileUrl(request)?.let { newUrl ->
-            withContext(Dispatchers.Main) {
-                webView.loadUrl(newUrl, getHeaders(request))
-            }
-            return WebResourceResponse(null, null, null)
-        }
-
         newUserAgent(request, webView, webViewClientListener)?.let {
             withContext(Dispatchers.Main) {
                 webView.settings?.userAgentString = it
@@ -181,14 +172,6 @@ class WebViewRequestInterceptor(
         }
     }
 
-    private fun shouldChangeToMobileUrl(request: WebResourceRequest): String? {
-        return if (request.isForMainFrame && request.url != null && request.method == "GET") {
-            return mobileUrlReWriter.mobileSiteOnlyForUri(request.url)
-        } else {
-            null
-        }
-    }
-
     private fun shouldUpgrade(request: WebResourceRequest) =
         request.isForMainFrame && request.url != null && httpsUpgrader.shouldUpgrade(request.url)
 

app/src/main/java/com/duckduckgo/app/browser/di/BrowserModule.kt

@@ -47,7 +47,6 @@ import com.duckduckgo.app.browser.tabpreview.FileBasedWebViewPreviewPersister
 import com.duckduckgo.app.browser.tabpreview.WebViewPreviewGenerator
 import com.duckduckgo.app.browser.tabpreview.WebViewPreviewPersister
 import com.duckduckgo.app.browser.useragent.UserAgentProvider
-import com.duckduckgo.app.browser.useragent.MobileUrlReWriter
 import com.duckduckgo.app.fire.*
 import com.duckduckgo.app.fire.fireproofwebsite.data.FireproofWebsiteDao
 import com.duckduckgo.app.global.AppUrl
@@ -100,8 +99,7 @@ class BrowserModule {
         cookieManager: CookieManager,
         loginDetector: DOMLoginDetector,
         dosDetector: DosDetector,
-        globalPrivacyControl: GlobalPrivacyControl,
-        pixel: Pixel
+        globalPrivacyControl: GlobalPrivacyControl
     ): BrowserWebViewClient {
         return BrowserWebViewClient(
             webViewHttpAuthStore,
@@ -178,9 +176,8 @@ class BrowserModule {
         httpsUpgrader: HttpsUpgrader,
         privacyProtectionCountDao: PrivacyProtectionCountDao,
         globalPrivacyControl: GlobalPrivacyControl,
-        userAgentProvider: UserAgentProvider,
-        mobileUrlReWriter: MobileUrlReWriter
-    ): RequestInterceptor = WebViewRequestInterceptor(resourceSurrogates, trackerDetector, httpsUpgrader, privacyProtectionCountDao, globalPrivacyControl, userAgentProvider, mobileUrlReWriter)
+        userAgentProvider: UserAgentProvider
+    ): RequestInterceptor = WebViewRequestInterceptor(resourceSurrogates, trackerDetector, httpsUpgrader, privacyProtectionCountDao, globalPrivacyControl, userAgentProvider)
 
     @Provides
     fun cookieManager(