Merge branch 'master' into master

Author: pichillilorenzo

.idea/runConfigurations/example_lib_main_dart.xml

@@ -13,9 +13,9 @@
 - Added `onLoadResourceCustomScheme` event and `resourceCustomSchemes` option to set custom schemes that WebView must handle to load resources
 - Added `onTargetBlank` event and `useOnTargetBlank` option to manage links with `target="_blank"`
 - Added `ContentBlocker`, `ContentBlockerTrigger` and `ContentBlockerAction` classes and the `contentBlockers` option that allows to define a set of rules to use to block content in the WebView
-- Added new WebView options: `minimumFontSize`, `debuggingEnabled`, `preferredContentMode`
-- Added new Android WebView options: `allowContentAccess`, `allowFileAccess`, `allowFileAccessFromFileURLs`, `allowUniversalAccessFromFileURLs`, `appCacheEnabled`, `appCachePath`, `blockNetworkImage`, `blockNetworkLoads`, `cacheMode`, `cursiveFontFamily`, `defaultFixedFontSize`, `defaultFontSize`, `defaultTextEncodingName`, `disabledActionModeMenuItems`, `fantasyFontFamily`, `fixedFontFamily`, `forceDark`, `geolocationEnabled`, `layoutAlgorithm`, `loadWithOverviewMode`, `loadsImagesAutomatically`, `minimumLogicalFontSize`, `needInitialFocus`, `offscreenPreRaster`, `sansSerifFontFamily`, `serifFontFamily`, `standardFontFamily`
-- Added new iOS WebView options: `applicationNameForUserAgent`, `isFraudulentWebsiteWarningEnabled`, `selectionGranularity`, `dataDetectorTypes`
+- Added new WebView options: `minimumFontSize`, `debuggingEnabled`, `preferredContentMode`, `applicationNameForUserAgent`, `incognito`, `cacheEnabled`
+- Added new Android WebView options: `allowContentAccess`, `allowFileAccess`, `allowFileAccessFromFileURLs`, `allowUniversalAccessFromFileURLs`, `appCachePath`, `blockNetworkImage`, `blockNetworkLoads`, `cacheMode`, `cursiveFontFamily`, `defaultFixedFontSize`, `defaultFontSize`, `defaultTextEncodingName`, `disabledActionModeMenuItems`, `fantasyFontFamily`, `fixedFontFamily`, `forceDark`, `geolocationEnabled`, `layoutAlgorithm`, `loadWithOverviewMode`, `loadsImagesAutomatically`, `minimumLogicalFontSize`, `needInitialFocus`, `offscreenPreRaster`, `sansSerifFontFamily`, `serifFontFamily`, `standardFontFamily`, `saveFormData`, `thirdPartyCookiesEnabled`, `hardwareAcceleration`
+- Added new iOS WebView options: `isFraudulentWebsiteWarningEnabled`, `selectionGranularity`, `dataDetectorTypes`, `sharedCookiesEnabled`
 - Added `onGeolocationPermissionsShowPrompt` event and `GeolocationPermissionShowPromptResponse` class (available only for Android)
 - Added `startSafeBrowsing`, `setSafeBrowsingWhitelist` and `getSafeBrowsingPrivacyPolicyUrl` methods (available only for Android)
 - Added `clearSslPreferences` and `clearClientCertPreferences` methods (available only for Android)
@@ -26,7 +26,9 @@
 - Added `HttpAuthCredentialDatabase` class
 - Added `onReceivedServerTrustAuthRequest` and `onReceivedClientCertRequest` events to manage SSL requests
 - Added `onFindResultReceived` event, `findAllAsync`, `findNext` and `clearMatches` methods 
-- Added `getHtml` method
+- Added `getHtml`, `injectJavascriptFileFromAsset` and `injectCSSFileFromAsset` methods
+- Added `shouldInterceptAjaxRequest`, `onAjaxReadyStateChange`, `onAjaxProgress` and `shouldInterceptFetchRequest` events with `useShouldInterceptAjaxRequest` and `useShouldInterceptFetchRequest` webview options
+- Added `onNavigationStateChange` event
 - Fun: added `getTRexRunnerHtml` and `getTRexRunnerCss` methods to get html (with javascript) and css to recreate the Chromium's t-rex runner game 
 
 ### BREAKING CHANGES
@@ -37,6 +39,10 @@
 - Updated `CookieManager` class
 - WebView options are now available with the new corresponding classes: `InAppWebViewOptions`, `AndroidInAppWebViewOptions`, `iOSInAppWebViewOptions`, `InAppBrowserOptions`, `AndroidInAppBrowserOptions`, `iOSInAppBrowserOptions`, `AndroidChromeCustomTabsOptions` and `iOSSafariOptions`
 - Renamed `getFavicon` to `getFavicons`, now it returns a list of all favicons (`List<Favicon>`) found
+- Renamed `injectScriptFile` to `injectJavascriptFileFromUrl`
+- Renamed `injectScriptCode` to `evaluateJavascript`
+- Renamed `injectStyleCode` to `injectCSSCode`
+- Renamed `injectStyleFile` to `injectCSSFileFromUrl`
 
 ## 1.2.1
 

.idea/workspace.xml

@@ -21,6 +21,7 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.regex.Matcher;
 
+import io.flutter.plugin.common.MethodChannel;
 import okhttp3.Request;
 import okhttp3.Response;
 
@@ -145,7 +146,7 @@ public void run() {
                             @Override
                             public void run() {
                                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-                                    webView.evaluateJavascript(jsScript, null);
+                                    webView.evaluateJavascript(jsScript, (MethodChannel.Result) null);
                                 } else {
                                     webView.loadUrl("javascript:" + jsScript);
                                 }

CHANGELOG.md

@@ -1,11 +1,9 @@
 package com.pichillilorenzo.flutter_inappbrowser;
 
-import android.Manifest;
 import android.app.Activity;
 import android.content.Context;
 import android.hardware.display.DisplayManager;
 import android.os.Build;
-import android.os.Handler;
 import android.util.Log;
 import android.view.View;
 import android.webkit.WebChromeClient;
@@ -15,21 +13,20 @@
 import com.pichillilorenzo.flutter_inappbrowser.InAppWebView.DisplayListenerProxy;
 import com.pichillilorenzo.flutter_inappbrowser.InAppWebView.InAppWebView;
 import com.pichillilorenzo.flutter_inappbrowser.InAppWebView.InAppWebViewOptions;
-import com.pichillilorenzo.flutter_inappbrowser.InAppWebView.InputAwareWebView;
 
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import io.flutter.plugin.common.BinaryMessenger;
 import io.flutter.plugin.common.MethodCall;
 import io.flutter.plugin.common.MethodChannel;
-import static io.flutter.plugin.common.MethodChannel.MethodCallHandler;
-import static io.flutter.plugin.common.MethodChannel.Result;
 import io.flutter.plugin.common.PluginRegistry.Registrar;
 import io.flutter.plugin.platform.PlatformView;
 
+import static io.flutter.plugin.common.MethodChannel.MethodCallHandler;
+import static io.flutter.plugin.common.MethodChannel.Result;
+
 public class FlutterWebView implements PlatformView, MethodCallHandler  {
 
   static final String LOG_TAG = "FlutterWebView";
@@ -135,33 +132,33 @@ public void onMethodCall(MethodCall call, final Result result) {
         else
           result.success(false);
         break;
-      case "injectScriptCode":
+      case "evaluateJavascript":
         if (webView != null) {
           String source = (String) call.argument("source");
-          webView.injectScriptCode(source, result);
+          webView.evaluateJavascript(source, result);
         }
         else {
           result.success("");
         }
         break;
-      case "injectScriptFile":
+      case "injectJavascriptFileFromUrl":
         if (webView != null) {
           String urlFile = (String) call.argument("urlFile");
-          webView.injectScriptFile(urlFile);
+          webView.injectJavascriptFileFromUrl(urlFile);
         }
         result.success(true);
         break;
-      case "injectStyleCode":
+      case "injectCSSCode":
         if (webView != null) {
           String source = (String) call.argument("source");
-          webView.injectStyleCode(source);
+          webView.injectCSSCode(source);
         }
         result.success(true);
         break;
-      case "injectStyleFile":
+      case "injectCSSFileFromUrl":
         if (webView != null) {
           String urlFile = (String) call.argument("urlFile");
-          webView.injectStyleFile(urlFile);
+          webView.injectCSSFileFromUrl(urlFile);
         }
         result.success(true);
         break;
@@ -312,13 +309,13 @@ public void onPageFinished(WebView view, String url) {
 
   @Override
   public void onInputConnectionLocked() {
-    if (webView.inAppBrowserActivity == null)
+    if (webView != null && webView.inAppBrowserActivity == null)
       webView.lockInputConnection();
   }
 
   @Override
   public void onInputConnectionUnlocked() {
-    if (webView.inAppBrowserActivity == null)
+    if (webView != null && webView.inAppBrowserActivity == null)
       webView.unlockInputConnection();
   }
 

android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ContentBlocker/ContentBlockerHandler.java

@@ -192,23 +192,23 @@ public void run() {
       case "close":
         close(activity, uuid, result);
         break;
-      case "injectScriptCode":
+      case "evaluateJavascript":
         source = (String) call.argument("source");
-        injectScriptCode(uuid, source, result);
+        evaluateJavascript(uuid, source, result);
         break;
-      case "injectScriptFile":
+      case "injectJavascriptFileFromUrl":
         urlFile = (String) call.argument("urlFile");
-        injectScriptFile(uuid, urlFile);
+        injectJavascriptFileFromUrl(uuid, urlFile);
         result.success(true);
         break;
-      case "injectStyleCode":
+      case "injectCSSCode":
         source = (String) call.argument("source");
-        injectStyleCode(uuid, source);
+        injectCSSCode(uuid, source);
         result.success(true);
         break;
-      case "injectStyleFile":
+      case "injectCSSFileFromUrl":
         urlFile = (String) call.argument("urlFile");
-        injectStyleFile(uuid, urlFile);
+        injectCSSFileFromUrl(uuid, urlFile);
         result.success(true);
         break;
       case "show":
@@ -314,33 +314,33 @@ public void run() {
 
   }
 
-  private void injectScriptCode(String uuid, String source, final Result result) {
+  private void evaluateJavascript(String uuid, String source, final Result result) {
     final InAppBrowserActivity inAppBrowserActivity = webViewActivities.get(uuid);
     if (inAppBrowserActivity != null) {
-      inAppBrowserActivity.injectScriptCode(source, result);
+      inAppBrowserActivity.evaluateJavascript(source, result);
     } else {
       Log.d(LOG_TAG, "webView is null");
     }
   }
 
-  private void injectScriptFile(String uuid, String urlFile) {
+  private void injectJavascriptFileFromUrl(String uuid, String urlFile) {
     final InAppBrowserActivity inAppBrowserActivity = webViewActivities.get(uuid);
     if (inAppBrowserActivity != null) {
-      inAppBrowserActivity.injectScriptFile(urlFile);
+      inAppBrowserActivity.injectJavascriptFileFromUrl(urlFile);
     }
   }
 
-  private void injectStyleCode(String uuid, String source) {
+  private void injectCSSCode(String uuid, String source) {
     final InAppBrowserActivity inAppBrowserActivity = webViewActivities.get(uuid);
     if (inAppBrowserActivity != null) {
-      inAppBrowserActivity.injectStyleCode(source);
+      inAppBrowserActivity.injectCSSCode(source);
     }
   }
 
-  private void injectStyleFile(String uuid, String urlFile) {
+  private void injectCSSFileFromUrl(String uuid, String urlFile) {
     final InAppBrowserActivity inAppBrowserActivity = webViewActivities.get(uuid);
     if (inAppBrowserActivity != null) {
-      inAppBrowserActivity.injectStyleFile(urlFile);
+      inAppBrowserActivity.injectCSSFileFromUrl(urlFile);
     }
   }
 

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

@@ -434,26 +434,26 @@ public HashMap<String, Object> getOptions() {
     return optionsMap;
   }
 
-  public void injectScriptCode(String source, MethodChannel.Result result) {
+  public void evaluateJavascript(String source, MethodChannel.Result result) {
     if (webView != null)
-      webView.injectScriptCode(source, result);
+      webView.evaluateJavascript(source, result);
     else
       result.success("");
   }
 
-  public void injectScriptFile(String urlFile) {
+  public void injectJavascriptFileFromUrl(String urlFile) {
     if (webView != null)
-      webView.injectScriptFile(urlFile);
+      webView.injectJavascriptFileFromUrl(urlFile);
   }
 
-  public void injectStyleCode(String source) {
+  public void injectCSSCode(String source) {
     if (webView != null)
-      webView.injectStyleCode(source);
+      webView.injectCSSCode(source);
   }
 
-  public void injectStyleFile(String urlFile) {
+  public void injectCSSFileFromUrl(String urlFile) {
     if (webView != null)
-      webView.injectStyleFile(urlFile);
+      webView.injectCSSFileFromUrl(urlFile);
   }
 
   public HashMap<String, Object> getCopyBackForwardList() {