From c2514bc42e3ebb8856122e092adf4831e54040be Mon Sep 17 00:00:00 2001 From: Cris Barreiro Date: Thu, 10 Oct 2024 11:53:23 +0200 Subject: [PATCH] Correctly load intercepted URLs (#5107) Task/Issue URL: https://app.asana.com/0/1207252092703676/1208500665899984/f ### Description ### Steps to test this PR _Feature 1_ - [x] Set Duck Player settings to Always enabled - [x] Open https://clicks.aweber.com/y/ct/?l=pbFxrn&m=gzpbMhiix7McQMQ&b=cIoUrwlB2qpdga9S7Y8fWQ - [x] Check Duck Player is launched - [x] Navigate back - [x] Check you're taken to the previous page (or the customtab is closed if the navigation was initiated from an external link) ### UI changes | Before | After | | ------ | ----- | !(Upload before screenshot)|(Upload after screenshot)| --- .../java/com/duckduckgo/app/browser/BrowserWebViewClient.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/duckduckgo/app/browser/BrowserWebViewClient.kt b/app/src/main/java/com/duckduckgo/app/browser/BrowserWebViewClient.kt index f6a4f14b482d..a647a27fa58f 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/BrowserWebViewClient.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/BrowserWebViewClient.kt @@ -184,7 +184,9 @@ class BrowserWebViewClient @Inject constructor( This forces shouldInterceptRequest to be called with the YouTube URL, otherwise that method is never executed and therefore the Duck Player page is never launched if YouTube comes from a redirect. */ - webView.loadUrl(url.toString()) + webViewClientListener?.let { + loadUrl(it, webView, url.toString()) + } return true } else { shouldOverrideWebRequest(url, webView, isForMainFrame)