8000 Remove MobileUrlRewriter (#1098) · libandroid/Android@16baef0 · GitHub
[go: up one dir, main page]
Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 16baef0

Browse files
marcosholgadomarcosholgado
authored
Remove MobileUrlRewriter (duckduckgo#1098)
1 parent 49a3693 commit 16baef0

File tree

7 files changed

+5
-178
lines changed

7 files changed

+5
-178
lines changed

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

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -3094,33 +3094,6 @@ class BrowserTabViewModelTest {
30943094
assertCommandIssued<Command.RefreshUserAgent>()
30953095
}
30963096

3097-
@Test
3098-
fun whenPageChangesAndNewPageCanChangeBrowsingModeThenCanChangeBrowsingModeIsTrue() {
3099-
givenCurrentSite("https://www.example.com/")
3100-
3101-
loadUrl("https://www.example2.com", isBrowserShowing = true)
3102-
3103-
assertTrue(browserViewState().canChangeBrowsingMode)
3104-
}
3105-
3106-
@Test
3107-
fun whenPageChangesAndNewPageCannotChangeBrowsingModeThenCanChangeBrowsingModeIsFalse() {
3108-
givenCurrentSite("https://www.example.com/")
3109-
3110-
loadUrl("https://www.facebook.com", isBrowserShowing = true)
3111-
3112-
assertFalse(browserViewState().canChangeBrowsingMode)
3113-
}
3114-
3115-
@Test
3116-
fun whenPageChangesAndNewPageCanChangeBrowsingModeButContainsExcludedPathThenCanChangeBrowsingModeIsFalse() {
3117-
givenCurrentSite("https://www.example.com/")
3118-
3119-
loadUrl("https://www.facebook.com/dialog", isBrowserShowing = true)
3120-
3121-
assertFalse(browserViewState().canChangeBrowsingMode)
3122-
}
3123-
31243097
@Test
31253098
fun whenRequestFileDownloadAndUrlIsBlobThenConvertBlobToDataUriCommandSent() {
31263099
val blobUrl = "blob:https://example.com/283nasdho23jkasdAjd"

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

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import androidx.test.annotation.UiThreadTest
2424
import com.duckduckgo.app.CoroutineTestRule
2525
import com.duckduckgo.app.globalprivacycontrol.GlobalPrivacyControl
2626
import com.duckduckgo.app.globalprivacycontrol.GlobalPrivacyControlManager
27-
import com.duckduckgo.app.browser.useragent.MobileUrlReWriter
2827
import com.duckduckgo.app.browser.useragent.UserAgentProvider
2928
import com.duckduckgo.app.httpsupgrade.HttpsUpgrader
3029
import com.duckduckgo.app.privacy.db.PrivacyProtectionCountDao
@@ -58,7 +57,6 @@ class WebViewRequestInterceptorTest {
5857
private val mockGlobalPrivacyControl: GlobalPrivacyControl = mock()
5958
private val mockWebBackForwardList: WebBackForwardList = mock()
6059
private val userAgentProvider: UserAgentProvider = UserAgentProvider(DEFAULT, mock())
61-
private val mobileUrlReWriter = MobileUrlReWriter()
6260

6361
private var webView: WebView = mock()
6462

@@ -75,8 +73,7 @@ class WebViewRequestInterceptorTest {
7573
resourceSurrogates = mockResourceSurrogates,
7674
privacyProtectionCountDao = mockPrivacyProtectionCountDao,
7775
globalPrivacyControl = mockGlobalPrivacyControl,
78-
userAgentProvider = userAgentProvider,
79-
mobileUrlReWriter = mobileUrlReWriter
76+
userAgentProvider = userAgentProvider
8077
)
8178
}
8279

@@ -444,21 +441,6 @@ class WebViewRequestInterceptorTest {
444441
verify(webView, never()).loadUrl(any(), any())
445442
}
446443

447-
@Test
448-
fun whenUrlShouldChangeToMobileUrlThenLoadUrlWithMobileSubDomain() = runBlocking<Unit> {
449-
configureShouldChangeToMobileUrl()
450-
451-
val mockWebViewClientListener: WebViewClientListener = mock()
452-
testee.shouldIntercept(
453-
request = mockRequest,
454-
documentUrl = null,
455-
webView = webView,
456-
webViewClientListener = mockWebViewClientListener
457-
)
458-
459-
verify(webView).loadUrl("https://m.facebook.com", emptyMap())
460-
}
461-
462444
@Test
463445
fun whenUserAgentShouldChangeThenReloadUrl() = runBlocking<Unit> {
464446
configureUserAgentShouldChange()

‎app/src/androidTest/java/com/duckduckgo/app/browser/useragent/MobileUrlReWriterTest.kt

Lines changed: 0 additions & 48 deletions
This file was deleted.

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ import com.duckduckgo.app.browser.model.LongPressTarget
6161
import com.duckduckgo.app.browser.omnibar.OmnibarEntryConverter
6262
import com.duckduckgo.app.browser.session.WebViewSessionStorage
6363
import com.duckduckgo.app.browser.ui.HttpAuthenticationDialogFragment.HttpAuthenticationListener
64-
import com.duckduckgo.app.browser.useragent.MobileUrlReWriter
6564
import com.duckduckgo.app.cta.ui.*
6665
import com.duckduckgo.app.fire.fireproofwebsite.data.FireproofWebsiteEntity
6766
import com.duckduckgo.app.fire.fireproofwebsite.data.FireproofWebsiteRepository
@@ -773,7 +772,6 @@ class BrowserTabViewModel(
773772
browserShowing = true,
774773
canAddBookmarks = true,
775774
addToHomeEnabled = true,
776-
canChangeBrowsingMode = canChangeBrowsingMode(site?.domain),
777775
addToHomeVisible = addToHomeCapabilityDetector.isAddToHomeSupported(),
778776
canSharePage = true,
779777
showPrivacyGrade = true,
@@ -802,10 +800,6 @@ class BrowserTabViewModel(
802800
registerSiteVisit()
803801
}
804802

805-
private fun canChangeBrowsingMode(domain: String?): Boolean {
806-
return !MobileUrlReWriter.strictlyMobileSiteHosts.any { domain?.contains(it.host) == true }
807-
}
808-
809803
private fun sendPixelIfUseOurAppSiteVisitedFirstTime(url: String) {
810804
if (useOurAppDetector.isUseOurAppUrl(url)) {
811805
viewModelScope.launch { sendUseOurAppSiteVisitedPixel() }

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

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import android.webkit.WebResourceResponse
2222
import android.webkit.WebView
2323
import androidx.annotation.WorkerThread
2424
import com.duckduckgo.app.browser.useragent.UserAgentProvider
25-
import com.duckduckgo.app.browser.useragent.MobileUrlReWriter
2625
import com.duckduckgo.app.global.isHttp
2726
import com.duckduckgo.app.globalprivacycontrol.GlobalPrivacyControl
2827
import com.duckduckgo.app.globalprivacycontrol.GlobalPrivacyControlManager
@@ -52,8 +51,7 @@ class WebViewRequestInterceptor(
5251
private val httpsUpgrader: HttpsUpgrader,
5352
private val privacyProtectionCountDao: PrivacyProtectionCountDao,
5453
private val globalPrivacyControl: GlobalPrivacyControl,
55-
private val userAgentProvider: UserAgentProvider,
56-
private val mobileUrlReWriter: MobileUrlReWriter
54+
private val userAgentProvider: UserAgentProvider
5755
) : RequestInterceptor {
5856

5957
/**
@@ -75,13 +73,6 @@ class WebViewRequestInterceptor(
7573

7674
val url = request.url
7775

78-
shouldChangeToMobileUrl(request)?.let { newUrl ->
79-
withContext(Dispatchers.Main) {
80-
webView.loadUrl(newUrl, getHeaders(request))
81-
}
82-
return WebResourceResponse(null, null, null)
83-
}
84-
8576
newUserAgent(request, webView, webViewClientListener)?.let {
8677
withContext(Dispatchers.Main) {
8778
webView.settings?.userAgentString = it
@@ -181,14 +172,6 @@ class WebViewRequestInterceptor(
181172
}
182173
}
183174

184-
private fun shouldChangeToMobileUrl(request: WebResourceRequest): String? {
185-
return if (request.isForMainFrame && request.url != null && request.method == "GET") {
186-
return mobileUrlReWriter.mobileSiteOnlyForUri(request.url)
187-
} else {
188-
null
189-
}
190-
}
191-
192175
private fun shouldUpgra 10000 de(request: WebResourceRequest) =
193176
request.isForMainFrame && request.url != null && httpsUpgrader.shouldUpgrade(request.url)
194177

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ import com.duckduckgo.app.browser.tabpreview.FileBasedWebViewPreviewPersister
4747
import com.duckduckgo.app.browser.tabpreview.WebViewPreviewGenerator
4848
import com.duckduckgo.app.browser.tabpreview.WebViewPreviewPersister
4949
import com.duckduckgo.app.browser.useragent.UserAgentProvider
50-
import com.duckduckgo.app.browser.useragent.MobileUrlReWriter
5150
import com.duckduckgo.app.fire.*
5251
import com.duckduckgo.app.fire.fireproofwebsite.data.FireproofWebsiteDao
5352
import com.duckduckgo.app.global.AppUrl
@@ -100,8 +99,7 @@ class BrowserModule {
10099
cookieManager: CookieManager,
101100
loginDetector: DOMLoginDetector,
102101
dosDetector: DosDetector,
103-
globalPrivacyControl: GlobalPrivacyControl,
104-
pixel: Pixel
102+
globalPrivacyControl: GlobalPrivacyControl
105103
): BrowserWebViewClient {
106104
return BrowserWebViewClient(
107105
webViewHttpAuthStore,
@@ -178,9 +176,8 @@ class BrowserModule {
178176
httpsUpgrader: HttpsUpgrader,
179177
privacyProtectionCountDao: PrivacyProtectionCountDao,
180178
globalPrivacyControl: GlobalPrivacyControl,
181-
userAgentProvider: UserAgentProvider,
182-
mobileUrlReWriter: MobileUrlReWriter
183-
): RequestInterceptor = WebViewRequestInterceptor(resourceSurrogates, trackerDetector, httpsUpgrader, privacyProtectionCountDao, globalPrivacyControl, userAgentProvider, mobileUrlReWriter)
179+
userAgentProvider: UserAgentProvider
180+
): RequestInterceptor = WebViewRequestInterceptor(resourceSurrogates, trackerDetector, httpsUpgrader, privacyProtectionCountDao, globalPrivacyControl, userAgentProvider)
184181

185182
@Provides
186183
fun cookieManager(

‎app/src/main/java/com/duckduckgo/app/browser/useragent/MobileUrlRewriter.kt

Lines changed: 0 additions & 54 deletions
This file was deleted.

0 commit comments

Comments
 (0)
0