fix ios open system browser crash

ios webview scroll problem add context menu etc. for more see changelog.
larryluo1212 · May 25, 2020 · b5dd58f · b5dd58f
1 parent 3cd086c
commit b5dd58f
Show file tree

Hide file tree

Showing 44 changed files with 2,715 additions and 1,223 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,35 @@
+## 3.3.0
+
+- Updated Android context menu workaround
+- Calling `onCreateContextMenu` event on iOS also when the context menu is disabled in order to have the same effect as Android
+- Added Android keyboard workaround to hide the keyboard when clicking other HTML elements, losing the focus on the previous input
+- Added `onEnterFullscreen`, `onExitFullscreen` webview events [#275](https://github.com/pichillilorenzo/flutter_inappwebview/issues/275)
+- Added Android support to use camera on HTML inputs that requires it, such as `<input type="file" accept="image/*" capture>` [#353](https://github.com/pichillilorenzo/flutter_inappwebview/issues/353)
+- Fixed `Print preview is not working? java.lang.IllegalStateException: Can print only from an activity` [#128](https://github.com/pichillilorenzo/flutter_inappwebview/issues/128)
+- Fixed `onJsAlert`, `onJsConfirm`, `onJsPrompt` for `InAppBrowser` on Android
+- Fixed `InAppBrowser.openWithSystemBrowser crash on iOS` [#358](https://github.com/pichillilorenzo/flutter_inappwebview/issues/358)
+
+## 3.2.0
+
+- Added `ContextMenu` and `ContextMenuItem` classes [#235](https://github.com/pichillilorenzo/flutter_inappwebview/issues/235)
+- Added `onCreateContextMenu`, `onHideContextMenu`, `onContextMenuActionItemClicked` context menu events
+- Added `contextMenu` to WebView
+- Added `disableContextMenu` WebView option
+- Added `getSelectedText`, `getHitTestResult` methods to WebView Controller
+- Fixed `Confirmation dialog (onbeforeunload) displayed after popped from webview page` [#337](https://github.com/pichillilorenzo/flutter_inappwebview/issues/337)
+- Fixed `CookieManager.setCookie` `expiresDate` option
+- Fixed `Scrolling not smooth on iOS` [#341](https://github.com/pichillilorenzo/flutter_inappwebview/issues/341)
+
+### BREAKING CHANGES
+
+- Renamed `LongPressHitTestResult` to `InAppWebViewHitTestResult`.
+- Renamed `LongPressHitTestResultType` to `InAppWebViewHitTestResultType`.
+
 ## 3.1.0
 
 - Added `HeadlessInAppWebView` class to be able to use WebView in headless mode
 - Added `close`, `addMenuItem`, `addMenuItems` methods to `ChromeSafariBrowser`
-- Added `ChromeSafariBrowserMenuItem` class in order to create custom menu item for `ChromeSafariBrowser`.
+- Added `ChromeSafariBrowserMenuItem` class in order to create custom menu item for `ChromeSafariBrowser`
 - Fixed `InAppWebView.channel` null when used by `InAppBrowserActivity` on android
 - Fixed iOS presentationStyle affecting only dismiss animation [#305](https://github.com/pichillilorenzo/flutter_inappwebview/issues/305)
 

diff --git a/README.md b/README.md
diff --git a/...va/com/pichillilorenzo/flutter_inappwebview/ChromeCustomTabs/ActionBroadcastReceiver.java b/...va/com/pichillilorenzo/flutter_inappwebview/ChromeCustomTabs/ActionBroadcastReceiver.java
diff --git a/...a/com/pichillilorenzo/flutter_inappwebview/ChromeCustomTabs/ChromeCustomTabsActivity.java b/...a/com/pichillilorenzo/flutter_inappwebview/ChromeCustomTabs/ChromeCustomTabsActivity.java
@@ -136,6 +136,7 @@ public void onMethodCall(final MethodCall call, final MethodChannel.Result resul
         myIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
         myIntent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
         Shared.activity.startActivity(myIntent);
+        result.success(true);
         break;
       default:
         result.notImplemented();

diff --git a/...id/src/main/java/com/pichillilorenzo/flutter_inappwebview/ChromeSafariBrowserManager.java b/...id/src/main/java/com/pichillilorenzo/flutter_inappwebview/ChromeSafariBrowserManager.java
@@ -40,20 +40,21 @@ public void onMethodCall(final MethodCall call, final MethodChannel.Result resul
         {
           String url = (String) call.argument("url");
           HashMap<String, Object> options = (HashMap<String, Object>) call.argument("options");
+          List<HashMap<String, Object>> menuItemList = (List<HashMap<String, Object>>) call.argument("menuItemList");
           String uuidFallback = (String) call.argument("uuidFallback");
           Map<String, String> headersFallback = (Map<String, String>) call.argument("headersFallback");
           HashMap<String, Object> optionsFallback = (HashMap<String, Object>) call.argument("optionsFallback");
-          List<HashMap<String, Object>> menuItemList = (List<HashMap<String, Object>>) call.argument("menuItemList");
-          open(activity, uuid, url, options, uuidFallback, headersFallback, optionsFallback, menuItemList, result);
+          HashMap<String, Object> contextMenuFallback = (HashMap<String, Object>) call.argument("contextMenuFallback");
+          open(activity, uuid, url, options, menuItemList, uuidFallback, headersFallback, optionsFallback, contextMenuFallback, result);
         }
         break;
       default:
         result.notImplemented();
     }
   }
 
-  public void open(Activity activity, String uuid, String url, HashMap<String, Object> options, String uuidFallback,
-                   Map<String, String> headersFallback, HashMap<String, Object> optionsFallback, List<HashMap<String, Object>> menuItemList, MethodChannel.Result result) {
+  public void open(Activity activity, String uuid, String url, HashMap<String, Object> options, List<HashMap<String, Object>> menuItemList, String uuidFallback,
+                   Map<String, String> headersFallback, HashMap<String, Object> optionsFallback, HashMap<String, Object> contextMenuFallback, MethodChannel.Result result) {
 
     Intent intent = null;
     Bundle extras = new Bundle();
@@ -62,9 +63,11 @@ public void open(Activity activity, String uuid, String url, HashMap<String, Obj
     extras.putBoolean("isData", false);
     extras.putString("uuid", uuid);
     extras.putSerializable("options", options);
-    extras.putSerializable("headers", (Serializable) headersFallback);
     extras.putSerializable("menuItemList", (Serializable) menuItemList);
 
+    extras.putSerializable("headers", (Serializable) headersFallback);
+    extras.putSerializable("contextMenu", (Serializable) contextMenuFallback);
+
     if (CustomTabActivityHelper.isAvailable(activity)) {
       intent = new Intent(activity, ChromeCustomTabsActivity.class);
     }

diff --git a/...main/java/com/pichillilorenzo/flutter_inappwebview/InAppBrowser/InAppBrowserActivity.java b/...main/java/com/pichillilorenzo/flutter_inappwebview/InAppBrowser/InAppBrowserActivity.java
@@ -57,6 +57,10 @@ public class InAppBrowserActivity extends AppCompatActivity implements MethodCha
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
 
+    if (savedInstanceState != null) {
+      return;
+    }
+
     Bundle b = getIntent().getExtras();
     uuid = b.getString("uuid");
 
@@ -72,13 +76,15 @@ protected void onCreate(Bundle savedInstanceState) {
     fromActivity = b.getString("fromActivity");
 
     HashMap<String, Object> optionsMap = (HashMap<String, Object>) b.getSerializable("options");
+    HashMap<String, Object> contextMenu = (HashMap<String, Object>) b.getSerializable("contextMenu");
 
     options = new InAppBrowserOptions();
     options.parse(optionsMap);
 
     InAppWebViewOptions webViewOptions = new InAppWebViewOptions();
     webViewOptions.parse(optionsMap);
     webView.options = webViewOptions;
+    webView.contextMenu = contextMenu;
 
     actionBar = getSupportActionBar();
 
@@ -223,7 +229,7 @@ public void onMethodCall(final MethodCall call, final MethodChannel.Result resul
         result.success(isHidden);
         break;
       case "takeScreenshot":
-        result.success(takeScreenshot());
+        takeScreenshot(result);
         break;
       case "setOptions":
         {
@@ -330,6 +336,16 @@ public void onMethodCall(final MethodCall call, final MethodChannel.Result resul
       case "getScale":
         result.success(getScale());
         break;
+      case "getSelectedText":
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+          getSelectedText(result);
+        } else {
+          result.success(null);
+        }
+        break;
+      case "getHitTestResult":
+        result.success(getHitTestResult());
+        break;
       default:
         result.notImplemented();
     }
@@ -619,24 +635,11 @@ public void closeButtonClicked(MenuItem item) {
     close(null);
   }
 
-  public byte[] takeScreenshot() {
-    if (webView != null) {
-      Picture picture = webView.capturePicture();
-      Bitmap b = Bitmap.createBitmap( webView.getWidth(),
-              webView.getHeight(), Bitmap.Config.ARGB_8888);
-      Canvas c = new Canvas(b);
-
-      picture.draw(c);
-      ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-      b.compress(Bitmap.CompressFormat.PNG, 100, byteArrayOutputStream);
-      try {
-        byteArrayOutputStream.close();
-      } catch (IOException e) {
-        e.printStackTrace();
-      }
-      return byteArrayOutputStream.toByteArray();
-    }
-    return null;
+  public void takeScreenshot(MethodChannel.Result result) {
+    if (webView != null)
+      webView.takeScreenshot(result);
+    else
+      result.success(null);
   }
 
   public void setOptions(InAppBrowserOptions newOptions, HashMap<String, Object> newOptionsMap) {
@@ -843,6 +846,25 @@ public Float getScale() {
     return null;
   }
 
+  @RequiresApi(api = Build.VERSION_CODES.KITKAT)
+  public void getSelectedText(MethodChannel.Result result) {
+    if (webView != null)
+      webView.getSelectedText(result);
+    else
+      result.success(null);
+  }
+
+  public Map<String, Object> getHitTestResult() {
+    if (webView != null) {
+      WebView.HitTestResult hitTestResult = webView.getHitTestResult();
+      Map<String, Object> obj = new HashMap<>();
+      obj.put("type", hitTestResult.getType());
+      obj.put("extra", hitTestResult.getExtra());
+      return obj;
+    }
+    return null;
+  }
+
   public void dispose() {
     channel.setMethodCallHandler(null);
     if (webView != null) {

diff --git a/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppBrowserManager.java b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppBrowserManager.java
@@ -70,7 +70,8 @@ public void onMethodCall(final MethodCall call, final Result result) {
           String url = (String) call.argument("url");
           HashMap<String, Object> options = (HashMap<String, Object>) call.argument("options");
           Map<String, String> headers = (Map<String, String>) call.argument("headers");
-          openUrl(activity, uuid, url, options, headers);
+          HashMap<String, Object> contextMenu = (HashMap<String, Object>) call.argument("contextMenu");
+          openUrl(activity, uuid, url, options, headers, contextMenu);
         }
         result.success(true);
         break;
@@ -86,7 +87,8 @@ public void onMethodCall(final MethodCall call, final Result result) {
           }
           HashMap<String, Object> options = (HashMap<String, Object>) call.argument("options");
           Map<String, String> headers = (Map<String, String>) call.argument("headers");
-          openUrl(activity, uuid, url, options, headers);
+          HashMap<String, Object> contextMenu = (HashMap<String, Object>) call.argument("contextMenu");
+          openUrl(activity, uuid, url, options, headers, contextMenu);
         }
         result.success(true);
         break;
@@ -98,7 +100,8 @@ public void onMethodCall(final MethodCall call, final Result result) {
           String encoding = (String) call.argument("encoding");
           String baseUrl = (String) call.argument("baseUrl");
           String historyUrl = (String) call.argument("historyUrl");
-          openData(activity, uuid, options, data, mimeType, encoding, baseUrl, historyUrl);
+          HashMap<String, Object> contextMenu = (HashMap<String, Object>) call.argument("contextMenu");
+          openData(activity, uuid, options, data, mimeType, encoding, baseUrl, historyUrl, contextMenu);
         }
         result.success(true);
         break;
@@ -189,18 +192,19 @@ else if (targetIntents.size() > 0) {
     }
   }
 
-  public void openUrl(Activity activity, String uuid, String url, HashMap<String, Object> options, Map<String, String> headers) {
+  public void openUrl(Activity activity, String uuid, String url, HashMap<String, Object> options, Map<String, String> headers, HashMap<String, Object> contextMenu) {
     Bundle extras = new Bundle();
     extras.putString("fromActivity", activity.getClass().getName());
     extras.putString("url", url);
     extras.putBoolean("isData", false);
     extras.putString("uuid", uuid);
     extras.putSerializable("options", options);
     extras.putSerializable("headers", (Serializable) headers);
+    extras.putSerializable("contextMenu", (Serializable) contextMenu);
     startInAppBrowserActivity(activity, extras);
   }
 
-  public void openData(Activity activity, String uuid, HashMap<String, Object> options, String data, String mimeType, String encoding, String baseUrl, String historyUrl) {
+  public void openData(Activity activity, String uuid, HashMap<String, Object> options, String data, String mimeType, String encoding, String baseUrl, String historyUrl, HashMap<String, Object> contextMenu) {
     Bundle extras = new Bundle();
     extras.putBoolean("isData", true);
     extras.putString("uuid", uuid);
@@ -210,6 +214,7 @@ public void openData(Activity activity, String uuid, HashMap<String, Object> opt
     extras.putString("encoding", encoding);
     extras.putString("baseUrl", baseUrl);
     extras.putString("historyUrl", historyUrl);
+    extras.putSerializable("contextMenu", (Serializable) contextMenu);
     startInAppBrowserActivity(activity, extras);
   }
 

diff --git a/...d/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppWebView/FlutterWebView.java b/...d/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppWebView/FlutterWebView.java
@@ -1,19 +1,17 @@
 package com.pichillilorenzo.flutter_inappwebview.InAppWebView;
 
-import android.app.Activity;
 import android.content.Context;
 import android.hardware.display.DisplayManager;
 import android.os.Build;
+import android.os.Handler;
+import android.os.Looper;
 import android.util.Log;
-import android.view.ContextThemeWrapper;
 import android.view.View;
 import android.webkit.WebChromeClient;
+import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 
-import com.pichillilorenzo.flutter_inappwebview.InAppWebView.DisplayListenerProxy;
-import com.pichillilorenzo.flutter_inappwebview.InAppWebView.InAppWebView;
-import com.pichillilorenzo.flutter_inappwebview.InAppWebView.InAppWebViewOptions;
 import com.pichillilorenzo.flutter_inappwebview.Shared;
 import com.pichillilorenzo.flutter_inappwebview.Util;
 
@@ -26,7 +24,6 @@
 import io.flutter.plugin.common.BinaryMessenger;
 import io.flutter.plugin.common.MethodCall;
 import io.flutter.plugin.common.MethodChannel;
-import io.flutter.plugin.common.PluginRegistry.Registrar;
 import io.flutter.plugin.platform.PlatformView;
 
 import static io.flutter.plugin.common.MethodChannel.MethodCallHandler;
@@ -48,15 +45,23 @@ public FlutterWebView(BinaryMessenger messenger, final Context context, Object i
     displayListenerProxy.onPreWebViewInitialization(displayManager);
 
     String initialUrl = (String) params.get("initialUrl");
-    String initialFile = (String) params.get("initialFile");
-    Map<String, String> initialData = (Map<String, String>) params.get("initialData");
-    Map<String, String> initialHeaders = (Map<String, String>) params.get("initialHeaders");
+    final String initialFile = (String) params.get("initialFile");
+    final Map<String, String> initialData = (Map<String, String>) params.get("initialData");
+    final Map<String, String> initialHeaders = (Map<String, String>) params.get("initialHeaders");
     HashMap<String, Object> initialOptions = (HashMap<String, Object>) params.get("initialOptions");
+    HashMap<String, Object> contextMenu = (HashMap<String, Object>) params.get("contextMenu");
 
     InAppWebViewOptions options = new InAppWebViewOptions();
     options.parse(initialOptions);
 
-    webView = new InAppWebView(Shared.activity, this, id, options, containerView);
+    if (Shared.activity == null) {
+      Log.e(LOG_TAG, "\n\n\nERROR: Shared.activity is null!!!\n\n" +
+              "You need to upgrade your Flutter project to use the new Java Embedding API:\n\n" +
+              "- Take a look at the \"IMPORTANT Note for Android\" section here: https://github.com/pichillilorenzo/flutter_inappwebview#important-note-for-android\n" +
+              "- See the official wiki here: https://github.com/flutter/flutter/wiki/Upgrading-pre-1.12-Android-projects\n\n\n");
+    }
+
+    webView = new InAppWebView(Shared.activity, this, id, options, contextMenu, containerView);
     displayListenerProxy.onPostWebViewInitialization(displayManager);
 
     // fix https://github.com/pichillilorenzo/flutter_inappwebview/issues/182
@@ -85,16 +90,23 @@ public FlutterWebView(BinaryMessenger messenger, final Context context, Object i
       }
     }
 
-    if (initialData != null) {
-      String data = initialData.get("data");
-      String mimeType = initialData.get("mimeType");
-      String encoding = initialData.get("encoding");
-      String baseUrl = initialData.get("baseUrl");
-      String historyUrl = initialData.get("historyUrl");
-      webView.loadDataWithBaseURL(baseUrl, data, mimeType, encoding, historyUrl);
-    }
-    else
-      webView.loadUrl(initialUrl, initialHeaders);
+    final String finalInitialUrl = initialUrl;
+    Handler handler = new Handler(Looper.getMainLooper());
+    handler.post(new Runnable() {
+      @Override
+      public void run() {
+        if (initialData != null) {
+          String data = initialData.get("data");
+          String mimeType = initialData.get("mimeType");
+          String encoding = initialData.get("encoding");
+          String baseUrl = initialData.get("baseUrl");
+          String historyUrl = initialData.get("historyUrl");
+          webView.loadDataWithBaseURL(baseUrl, data, mimeType, encoding, historyUrl);
+        }
+        else
+          webView.loadUrl(finalInitialUrl, initialHeaders);
+      }
+    });
 
     if (containerView == null && id instanceof String) {
       Map<String, Object> obj = new HashMap<>();
@@ -380,6 +392,24 @@ public void run() {
       case "getScale":
         result.success((webView != null) ? webView.getUpdatedScale() : null);
         break;
+      case "getSelectedText":
+        if (webView != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+          webView.getSelectedText(result);
+        } else {
+          result.success(null);
+        }
+        break;
+      case "getHitTestResult":
+        if (webView != null) {
+          WebView.HitTestResult hitTestResult = webView.getHitTestResult();
+          Map<String, Object> obj = new HashMap<>();
+          obj.put("type", hitTestResult.getType());
+          obj.put("extra", hitTestResult.getExtra());
+          result.success(obj);
+        } else {
+          result.success(null);
+        }
+        break;
       default:
         result.notImplemented();
     }
@@ -397,6 +427,8 @@ public void onPageFinished(WebView view, String url) {
           webView = null;
         }
       });
+      WebSettings settings = webView.getSettings();
+      settings.setJavaScriptEnabled(false);
       webView.loadUrl("about:blank");
     }
   }