Merge pull request #17425 from brave/resolve_rewards_anr

Resolve rewards ANR with external wallet provider
brave · Mar 1, 2023 · 6f0d206 · 6f0d206
2 parents 943accb + 10f38fe
commit 6f0d206
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/android/java/org/chromium/chrome/browser/externalnav/BraveExternalNavigationHandler.java b/android/java/org/chromium/chrome/browser/externalnav/BraveExternalNavigationHandler.java
@@ -24,8 +24,13 @@ public BraveExternalNavigationHandler(ExternalNavigationDelegate delegate) {
     @Override
     public OverrideUrlLoadingResult shouldOverrideUrlLoading(ExternalNavigationParams params) {
         if (isWalletProviderOverride(params)) {
-            completeWalletProviderVerification(params);
-            return OverrideUrlLoadingResult.forNavigateTab(params.getUrl(), params);
+            String originalUrl = params.getUrl().getSpec();
+            String url = originalUrl.replaceFirst("^rewards://", "brave://rewards/");
+            GURL browserFallbackGURL = new GURL(url);
+            if (params.getRedirectHandler() != null) {
+                params.getRedirectHandler().setShouldNotOverrideUrlLoadingOnCurrentRedirectChain();
+            }
+            return OverrideUrlLoadingResult.forNavigateTab(browserFallbackGURL, params);
         }
         return super.shouldOverrideUrlLoading(params);
     }