added onReceivedSslError for android and didFailProvisionalNavigation WKNavigation for iOS

.idea/workspace.xml

@@ -11,21 +11,9 @@
   <component name="ChangeListManager">
     <list default="true" id="9b41f7a2-a71e-4923-91fb-249d7815b3e7" name="Default" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change beforePath="$PROJECT_DIR$/android/build.gradle" afterPath="$PROJECT_DIR$/android/build.gradle" />
+      <change beforePath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppBrowserFlutterPlugin.java" afterPath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppBrowserFlutterPlugin.java" />
-      <change beforePath="$PROJECT_DIR$/android/src/main/AndroidManifest.xml" afterPath="$PROJECT_DIR$/android/src/main/AndroidManifest.xml" />
-      <change beforePath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppBrowser.java" afterPath="" />
       <change beforePath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppBrowserWebViewClient.java" afterPath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppBrowserWebViewClient.java" />
-      <change beforePath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/RequestPermissionHandler.java" afterPath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/RequestPermissionHandler.java" />
-      <change beforePath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/WebViewActivity.java" afterPath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/WebViewActivity.java" />
-      <change beforePath="$PROJECT_DIR$/example/ios/Podfile" afterPath="$PROJECT_DIR$/example/ios/Podfile" />
-      <change beforePath="$PROJECT_DIR$/example/lib/main.dart" afterPath="$PROJECT_DIR$/example/lib/main.dart" />
-      <change beforePath="$PROJECT_DIR$/flutter_inappbrowser.iml" afterPath="$PROJECT_DIR$/flutter_inappbrowser.iml" />
-      <change beforePath="$PROJECT_DIR$/ios/Classes/InAppBrowser.h" afterPath="$PROJECT_DIR$/ios/Classes/InAppBrowserFlutterPlugin.h" />
-      <change beforePath="$PROJECT_DIR$/ios/Classes/InAppBrowser.m" afterPath="$PROJECT_DIR$/ios/Classes/InAppBrowserFlutterPlugin.m" />
       <change beforePath="$PROJECT_DIR$/ios/Classes/InAppBrowserWebViewController.swift" afterPath="$PROJECT_DIR$/ios/Classes/InAppBrowserWebViewController.swift" />
-      <change beforePath="$PROJECT_DIR$/ios/Classes/SwiftFlutterPlugin.swift" afterPath="$PROJECT_DIR$/ios/Classes/SwiftFlutterPlugin.swift" />
-      <change beforePath="$PROJECT_DIR$/lib/flutter_inappbrowser.dart" afterPath="$PROJECT_DIR$/lib/flutter_inappbrowser.dart" />
-      <change beforePath="$PROJECT_DIR$/pubspec.yaml" afterPath="$PROJECT_DIR$/pubspec.yaml" />
     </list>
     <ignored path="$PROJECT_DIR$/.dart_tool/" />
     <ignored path="$PROJECT_DIR$/.idea/" />
@@ -57,8 +45,8 @@
       <file leaf-file-name="main.dart" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/example/lib/main.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="495">
+            <state relative-caret-position="141">
-              <caret line="35" column="0" lean-forward="false" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="0" />
+              <caret line="25" column="21" lean-forward="false" selection-start-line="25" selection-start-column="21" selection-end-line="25" selection-end-column="21" />
               <folding />
             </state>
           </provider>
@@ -431,7 +419,6 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="288" y="23" width="1632" height="1057" extended-state="0" />
-    <editor active="true" />
     <layout>
       <window_info id="Android Profiler" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
@@ -449,9 +436,9 @@
       <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.36208734" sideWeight="0.4973545" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.36208734" sideWeight="0.4973545" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3258786" sideWeight="0.4973545" order="10" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3258786" sideWeight="0.4973545" order="10" side_tool="false" content_ui="tabs" />
       <window_info id="Captures" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32936507" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.17798743" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3290735" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
@@ -857,8 +844,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/example/lib/main.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="495">
+        <state relative-caret-position="141">
-          <caret line="35" column="0" lean-forward="false" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="0" />
+          <caret line="25" column="21" lean-forward="false" selection-start-line="25" selection-start-column="21" selection-end-line="25" selection-end-column="21" />
           <folding />
         </state>
       </provider>

android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppBrowserFlutterPlugin.java

@@ -25,6 +25,9 @@ import android.annotation.TargetApi;
 import android.app.Activity;
 import android.annotation.SuppressLint;
 import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.os.Parcelable;
 import android.provider.Browser;
 import android.net.Uri;
 import android.os.Build;
@@ -40,7 +43,9 @@ import android.util.Log;
 
 import java.io.IOException;
 import java.io.StringReader;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import io.flutter.plugin.common.MethodCall;
@@ -308,14 +313,51 @@ public class InAppBrowserFlutterPlugin implements MethodCallHandler {
         intent.setData(uri);
       }
       intent.putExtra(Browser.EXTRA_APPLICATION_ID, activity.getPackageName());
-      activity.startActivity(intent);
+      // CB-10795: Avoid circular loops by preventing it from opening in the current app
+      this.openExternalExcludeCurrentApp(intent);
       // not catching FileUriExposedException explicitly because buildtools<24 doesn't know about it
     } catch (java.lang.RuntimeException e) {
       Log.d(LOG_TAG, "InAppBrowserFlutterPlugin: Error loading url "+url+":"+ e.toString());
     }
   }
 
-  @TargetApi(8)
+  /**
+   * Opens the intent, providing a chooser that excludes the current app to avoid
+   * circular loops.
+   */
+  private void openExternalExcludeCurrentApp(Intent intent) {
+    String currentPackage = activity.getPackageName();
+    boolean hasCurrentPackage = false;
+    PackageManager pm = activity.getPackageManager();
+    List<ResolveInfo> activities = pm.queryIntentActivities(intent, 0);
+    ArrayList<Intent> targetIntents = new ArrayList<Intent>();
+    for (ResolveInfo ri : activities) {
+      if (!currentPackage.equals(ri.activityInfo.packageName)) {
+        Intent targetIntent = (Intent)intent.clone();
+        targetIntent.setPackage(ri.activityInfo.packageName);
+        targetIntents.add(targetIntent);
+      }
+      else {
+        hasCurrentPackage = true;
+      }
+    }
+    // If the current app package isn't a target for this URL, then use
+    // the normal launch behavior
+    if (hasCurrentPackage == false || targetIntents.size() == 0) {
+      activity.startActivity(intent);
+    }
+    // If there's only one possible intent, launch it directly
+    else if (targetIntents.size() == 1) {
+      activity.startActivity(targetIntents.get(0));
+    }
+    // Otherwise, show a custom chooser without the current app listed
+    else if (targetIntents.size() > 0) {
+      Intent chooser = Intent.createChooser(targetIntents.remove(targetIntents.size()-1), null);
+      chooser.putExtra(Intent.EXTRA_INITIAL_INTENTS, targetIntents.toArray(new Parcelable[] {}));
+      activity.startActivity(chooser);
+    }
+  }
+
   private void open(final String url, InAppBrowserOptions options) {
     Intent intent = new Intent(activity, WebViewActivity.class);
 

android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppBrowserWebViewClient.java

@@ -3,10 +3,12 @@ package com.pichillilorenzo.flutter_inappbrowser;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.net.Uri;
+import android.net.http.SslError;
 import android.util.Log;
 import android.webkit.CookieManager;
 import android.webkit.CookieSyncManager;
 import android.webkit.HttpAuthHandler;
+import android.webkit.SslErrorHandler;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 
@@ -142,6 +144,41 @@ public class InAppBrowserWebViewClient extends WebViewClient {
         InAppBrowserFlutterPlugin.channel.invokeMethod("loaderror", obj);
     }
 
+    public void onReceivedSslError (WebView view, SslErrorHandler handler, SslError error) {
+        super.onReceivedSslError(view, handler, error);
+
+        Map<String, Object> obj = new HashMap<>();
+        obj.put("url", error.getUrl());
+        obj.put("code", 0);
+        obj.put("sslerror", error.getPrimaryError());
+        String message;
+        switch (error.getPrimaryError()) {
+            case SslError.SSL_DATE_INVALID:
+                message = "The date of the certificate is invalid";
+                break;
+            case SslError.SSL_EXPIRED:
+                message = "The certificate has expired";
+                break;
+            case SslError.SSL_IDMISMATCH:
+                message = "Hostname mismatch";
+                break;
+            default:
+            case SslError.SSL_INVALID:
+                message = "A generic error occurred";
+                break;
+            case SslError.SSL_NOTYETVALID:
+                message = "The certificate is not yet valid";
+                break;
+            case SslError.SSL_UNTRUSTED:
+                message = "The certificate authority is not trusted";
+                break;
+        }
+        obj.put("message", message);
+        InAppBrowserFlutterPlugin.channel.invokeMethod("loaderror", obj);
+
+        handler.cancel();
+    }
+
     /**
      * On received http auth request.
      */

ios/Classes/InAppBrowserWebViewController.swift

@@ -480,7 +480,6 @@ class InAppBrowserWebViewController: UIViewController, WKUIDelegate, WKNavigatio
     }
     
     func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
-        //func webViewDidFinishLoad(_ theWebView: WKWebView) {
         // update url, stop spinner, update back/forward
         currentURL = webView.url
         updateUrlTextField(url: (currentURL?.absoluteString)!)
@@ -490,10 +489,18 @@ class InAppBrowserWebViewController: UIViewController, WKUIDelegate, WKNavigatio
         navigationDelegate?.webViewDidFinishLoad(webView)
     }
     
+    func webView(_ webView: WKWebView,
+                 didFailProvisionalNavigation navigation: WKNavigation!,
+                 withError error: Error) {
+        print("webView:didFailProvisionalNavigationWithError - \(Int(error._code)): \(error.localizedDescription)")
+        backButton.isEnabled = webView.canGoBack
+        forwardButton.isEnabled = webView.canGoForward
+        spinner.stopAnimating()
+        navigationDelegate?.webView(webView, didFailLoadWithError: error)
+    }
+    
     func webView(_ webView: WKWebView, didFail navigation: WKNavigation!, withError error: Error) {
-        //func webView(_ theWebView: WKWebView, didFailLoadWithError error: Error) {
+        print("webView:didFailNavigationWithError - \(Int(error._code)): \(error.localizedDescription)")
-        // log fail message, stop spinner, update back/forward
-        print("webView:didFailLoadWithError - \(Int(error._code)): \(error.localizedDescription)")
         backButton.isEnabled = webView.canGoBack
         forwardButton.isEnabled = webView.canGoForward
         spinner.stopAnimating()