redirect bug fix

solution [issue 1884](#1884)

Author: lyb5834

flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/in_app_webview/InAppWebViewClient.java

@@ -56,6 +56,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 public class InAppWebViewClient extends WebViewClient {
 
@@ -74,6 +75,12 @@ public InAppWebViewClient(InAppBrowserDelegate inAppBrowserDelegate) {
   public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) {
     InAppWebView webView = (InAppWebView) view;
     if (webView.customSettings.useShouldOverrideUrlLoading) {
+      if (webView.customSettings.regexToCancelOverrideUrlLoading != null) {
+        Pattern pattern = Pattern.compile(webView.customSettings.regexToCancelOverrideUrlLoading);
+        Matcher m = pattern.matcher(request.getUrl().toString());
+        Log.i(LOG_TAG, request.getUrl().toString() + " isMatch " + m.matches());
+        if (m.matches() == false) return false;
+      }
       boolean isRedirect = false;
       if (WebViewFeature.isFeatureSupported(WebViewFeature.WEB_RESOURCE_REQUEST_IS_REDIRECT)) {
         isRedirect = WebResourceRequestCompat.isRedirect(request);
@@ -108,6 +115,12 @@ public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request
   public boolean shouldOverrideUrlLoading(WebView webView, String url) {
     InAppWebView inAppWebView = (InAppWebView) webView;
     if (inAppWebView.customSettings.useShouldOverrideUrlLoading) {
+      if (inAppWebView.customSettings.regexToCancelOverrideUrlLoading != null) {
+        Pattern pattern = Pattern.compile(inAppWebView.customSettings.regexToCancelOverrideUrlLoading);
+        Matcher m = pattern.matcher(url);
+        Log.i(LOG_TAG, url + " isMatch " + m.matches());
+        if (m.matches() == false) return false;
+      }
       onShouldOverrideUrlLoading(inAppWebView, url, "GET", null,true, false, false);
       return true;
     }
@@ -164,7 +177,7 @@ public void error(String errorCode, @Nullable String errorMessage, @Nullable Obj
         defaultBehaviour(null);
       }
     };
-    
+
     if (webView.channelDelegate != null) {
       webView.channelDelegate.shouldOverrideUrlLoading(navigationAction, callback);
     } else {
@@ -216,7 +229,7 @@ public void onPageStarted(WebView view, String url, Bitmap favicon) {
       webView.channelDelegate.onLoadStart(url);
     }
   }
-  
+
   public void onPageFinished(WebView view, String url) {
     final InAppWebView webView = (InAppWebView) view;
     webView.isLoading = false;
@@ -260,13 +273,13 @@ public void doUpdateVisitedHistory(WebView view, String url, boolean isReload) {
     if (inAppBrowserDelegate != null) {
       inAppBrowserDelegate.didUpdateVisitedHistory(url);
     }
-    
+
     final InAppWebView webView = (InAppWebView) view;
     if (webView.channelDelegate != null) {
       webView.channelDelegate.onUpdateVisitedHistory(url, isReload);
     }
   }
-  
+
   @RequiresApi(api = Build.VERSION_CODES.M)
   @Override
   public void onReceivedError(WebView view, @NonNull WebResourceRequest request, @NonNull WebResourceError error) {
@@ -430,7 +443,7 @@ public void error(String errorCode, @Nullable String errorMessage, @Nullable Obj
         defaultBehaviour(null);
       }
     };
-    
+
     if (webView.channelDelegate != null) {
       webView.channelDelegate.onReceivedHttpAuthRequest(challenge, callback);
     } else {
@@ -489,7 +502,7 @@ public void error(String errorCode, @Nullable String errorMessage, @Nullable Obj
         defaultBehaviour(null);
       }
     };
-    
+
     if (webView.channelDelegate != null) {
       webView.channelDelegate.onReceivedServerTrustAuthRequest(challenge, callback);
     } else {
@@ -525,19 +538,19 @@ public boolean nonNullSuccess(@NonNull ClientCertResponse response) {
         if (action != null && webView.plugin != null) {
           switch (action) {
             case 1:
-              {
-                String certificatePath = (String) response.getCertificatePath();
-                String certificatePassword = (String) response.getCertificatePassword();
-                String keyStoreType = (String) response.getKeyStoreType();
-                Util.PrivateKeyAndCertificates privateKeyAndCertificates = 
-                        Util.loadPrivateKeyAndCertificate(webView.plugin, certificatePath, certificatePassword, keyStoreType);
-                if (privateKeyAndCertificates != null) {
-                  request.proceed(privateKeyAndCertificates.privateKey, privateKeyAndCertificates.certificates);
-                } else {
-                  request.cancel();
-                }
+            {
+              String certificatePath = (String) response.getCertificatePath();
+              String certificatePassword = (String) response.getCertificatePassword();
+              String keyStoreType = (String) response.getKeyStoreType();
+              Util.PrivateKeyAndCertificates privateKeyAndCertificates =
+                      Util.loadPrivateKeyAndCertificate(webView.plugin, certificatePath, certificatePassword, keyStoreType);
+              if (privateKeyAndCertificates != null) {
+                request.proceed(privateKeyAndCertificates.privateKey, privateKeyAndCertificates.certificates);
+              } else {
+                request.cancel();
               }
-              break;
+            }
+            break;
             case 2:
               request.ignore();
               break;

flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/in_app_webview/InAppWebViewSettings.java

@@ -104,6 +104,7 @@ public class InAppWebViewSettings implements ISettings<InAppWebViewInterface> {
   public Boolean hardwareAcceleration = true;
   public Boolean supportMultipleWindows = false;
   public String regexToCancelSubFramesLoading;
+  public String regexToCancelOverrideUrlLoading;
   public Integer overScrollMode = View.OVER_SCROLL_IF_CONTENT_SCROLLS;
   public Boolean networkAvailable = null;
   public Integer scrollBarStyle = View.SCROLLBARS_INSIDE_OVERLAY;
@@ -346,6 +347,9 @@ public InAppWebViewSettings parse(@NonNull Map<String, Object> settings) {
         case "regexToCancelSubFramesLoading":
           regexToCancelSubFramesLoading = (String) value;
           break;
+        case "regexToCancelOverrideUrlLoading":
+          regexToCancelOverrideUrlLoading = (String) value;
+          break;
         case "overScrollMode":
           overScrollMode = (Integer) value;
           break;
@@ -489,6 +493,7 @@ public Map<String, Object> toMap() {
     settings.put("hardwareAcceleration", hardwareAcceleration);
     settings.put("supportMultipleWindows", supportMultipleWindows);
     settings.put("regexToCancelSubFramesLoading", regexToCancelSubFramesLoading);
+    settings.put("regexToCancelOverrideUrlLoading", regexToCancelOverrideUrlLoading);
     settings.put("overScrollMode", overScrollMode);
     settings.put("networkAvailable", networkAvailable);
     settings.put("scrollBarStyle", scrollBarStyle);

flutter_inappwebview_platform_interface/lib/src/in_app_webview/in_app_webview_settings.dart

@@ -1,15 +1,23 @@
+import 'dart:typed_data';
+
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_inappwebview_internal_annotations/flutter_inappwebview_internal_annotations.dart';
-import 'dart:typed_data';
 
+import '../content_blocker.dart';
+import '../context_menu/context_menu.dart';
+import '../in_app_browser/in_app_browser_settings.dart';
+import '../in_app_browser/platform_in_app_browser.dart';
+import '../in_app_webview/platform_inappwebview_controller.dart';
 import '../platform_webview_asset_loader.dart';
+import '../platform_webview_feature.dart';
 import '../types/action_mode_menu_item.dart';
 import '../types/cache_mode.dart';
 import '../types/data_detector_types.dart';
 import '../types/force_dark.dart';
 import '../types/force_dark_strategy.dart';
 import '../types/layout_algorithm.dart';
+import '../types/main.dart';
 import '../types/mixed_content_mode.dart';
 import '../types/over_scroll_mode.dart';
 import '../types/referrer_policy.dart';
@@ -21,17 +29,10 @@ import '../types/scrollview_deceleration_rate.dart';
 import '../types/selection_granularity.dart';
 import '../types/user_preferred_content_mode.dart';
 import '../types/vertical_scrollbar_position.dart';
+import '../util.dart';
 import '../web_uri.dart';
 import 'android/in_app_webview_options.dart';
 import 'apple/in_app_webview_options.dart';
-import '../content_blocker.dart';
-import '../types/main.dart';
-import '../util.dart';
-import '../in_app_browser/in_app_browser_settings.dart';
-import '../platform_webview_feature.dart';
-import '../in_app_webview/platform_inappwebview_controller.dart';
-import '../context_menu/context_menu.dart';
-import '../in_app_browser/platform_in_app_browser.dart';
 import 'platform_webview.dart';
 
 part 'in_app_webview_settings.g.dart';
@@ -57,12 +58,8 @@ class InAppWebViewSettings_ {
   ///If the [PlatformWebViewCreationParams.shouldOverrideUrlLoading] event is implemented and this value is `null`,
   ///it will be automatically inferred as `true`, otherwise, the default value is `false`.
   ///This logic will not be applied for [PlatformInAppBrowser], where you must set the value manually.
-  @SupportedPlatforms(platforms: [
-    AndroidPlatform(),
-    IOSPlatform(),
-    MacOSPlatform(),
-    WindowsPlatform()
-  ])
+  @SupportedPlatforms(
+      platforms: [AndroidPlatform(), IOSPlatform(), MacOSPlatform()])
   bool? useShouldOverrideUrlLoading;
 
   ///Set to `true` to be able to listen at the [PlatformWebViewCreationParams.onLoadResource] event.
@@ -102,11 +99,7 @@ class InAppWebViewSettings_ {
     MacOSPlatform(
         apiName: "WKWebView.customUserAgent",
         apiUrl:
-            "https://developer.apple.com/documentation/webkit/wkwebview/1414950-customuseragent"),
-    WindowsPlatform(
-        apiName: 'ICoreWebView2Settings2.put_UserAgent',
-        apiUrl:
-            'https://learn.microsoft.com/en-us/microsoft-edge/webview2/reference/win32/icorewebview2settings2?view=webview2-1.0.2210.55#put_useragent')
+            "https://developer.apple.com/documentation/webkit/wkwebview/1414950-customuseragent")
   ])
   String? userAgent;
 
@@ -138,11 +131,7 @@ class InAppWebViewSettings_ {
         apiName: "WKWebpagePreferences.allowsContentJavaScript",
         apiUrl:
             "https://developer.apple.com/documentation/webkit/wkwebpagepreferences/3552422-allowscontentjavascript/"),
-    WebPlatform(requiresSameOrigin: false),
-    WindowsPlatform(
-        apiName: "ICoreWebView2Settings.put_IsScriptEnabled",
-        apiUrl:
-            "https://learn.microsoft.com/en-us/microsoft-edge/webview2/reference/win32/icorewebview2settings?view=webview2-1.0.2210.55#put_isscriptenabled")
+    WebPlatform(requiresSameOrigin: false)
   ])
   bool? javaScriptEnabled;
 
@@ -319,12 +308,7 @@ because there isn't any way to make the website data store non-persistent for th
   @SupportedPlatforms(platforms: [
     AndroidPlatform(),
     IOSPlatform(),
-    MacOSPlatform(available: "12.0"),
-    WindowsPlatform(
-        available: '1.0.774.44',
-        apiName: 'ICoreWebView2Controller2.put_DefaultBackgroundColor',
-        apiUrl:
-            'https://learn.microsoft.com/en-us/microsoft-edge/webview2/reference/win32/icorewebview2controller2?view=webview2-1.0.2210.55#put_defaultbackgroundcolor')
+    MacOSPlatform(available: "12.0")
   ])
   bool? transparentBackground;
 
@@ -339,15 +323,8 @@ because there isn't any way to make the website data store non-persistent for th
   bool? disableHorizontalScroll;
 
   ///Set to `true` to disable context menu. The default value is `false`.
-  @SupportedPlatforms(platforms: [
-    AndroidPlatform(),
-    IOSPlatform(),
-    WebPlatform(),
-    WindowsPlatform(
-        apiName: "ICoreWebView2Settings.put_AreDefaultContextMenusEnabled",
-        apiUrl:
-            "https://learn.microsoft.com/en-us/microsoft-edge/webview2/reference/win32/icorewebview2settings?view=webview2-1.0.2210.55#put_aredefaultcontextmenusenabled")
-  ])
+  @SupportedPlatforms(
+      platforms: [AndroidPlatform(), IOSPlatform(), WebPlatform()])
   bool? disableContextMenu;
 
   ///Set to `false` if the WebView should not support zooming using its on-screen zoom controls and gestures. The default value is `true`.
@@ -357,11 +334,7 @@ because there isn't any way to make the website data store non-persistent for th
         apiUrl:
             "https://developer.android.com/reference/android/webkit/WebSettings?hl=en#setSupportZoom(boolean)"),
     IOSPlatform(),
-    MacOSPlatform(),
-    WindowsPlatform(
-        apiName: "ICoreWebView2Settings.put_IsZoomControlEnabled",
-        apiUrl:
-            "https://learn.microsoft.com/en-us/microsoft-edge/webview2/reference/win32/icorewebview2settings?view=webview2-1.0.2210.55#put_iszoomcontrolenabled")
+    MacOSPlatform()
   ])
   bool? supportZoom;
 
@@ -805,6 +778,11 @@ because there isn't any way to make the website data store non-persistent for th
   @SupportedPlatforms(platforms: [AndroidPlatform()])
   String? regexToCancelSubFramesLoading;
 
+  ///Regular expression used by [PlatformWebViewCreationParams.shouldOverrideUrlLoading] event to cancel navigation requests
+  ///If the url request not matches the regular expression, then the shouldOverrideUrlLoading is return false.
+  @SupportedPlatforms(platforms: [AndroidPlatform()])
+  String? regexToCancelOverrideUrlLoading;
+
   ///Set to `false` to disable Flutter Hybrid Composition. The default value is `true`.
   ///Hybrid Composition is supported starting with Flutter v1.20+.
   @SupportedPlatforms(platforms: [
@@ -1565,11 +1543,7 @@ as it can cause framerate drops on animations in Android 9 and lower (see [Hybri
         available: "13.3",
         apiName: "WKWebView.isInspectable",
         apiUrl:
-            "https://developer.apple.com/documentation/webkit/wkwebview/4111163-isinspectable"),
-    WindowsPlatform(
-        apiName: "ICoreWebView2Settings.put_AreDevToolsEnabled",
-        apiUrl:
-            "https://learn.microsoft.com/en-us/microsoft-edge/webview2/reference/win32/icorewebview2settings?view=webview2-1.0.2210.55#put_aredevtoolsenabled")
+            "https://developer.apple.com/documentation/webkit/wkwebview/4111163-isinspectable")
   ])
   bool? isInspectable;
 
@@ -1722,6 +1696,7 @@ as it can cause framerate drops on animations in Android 9 and lower (see [Hybri
     this.initialScale = 0,
     this.supportMultipleWindows = false,
     this.regexToCancelSubFramesLoading,
+    this.regexToCancelOverrideUrlLoading,
     this.useHybridComposition = true,
     this.useShouldInterceptRequest,
     this.useOnRenderProcessGone,