v0.2.1, fixed InAppBrowser.injectScriptCode() method when there is no…

…t a return value, added InAppBrowser.onConsoleMessage() method to manage console messages #5

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.2.1
+
+- added InAppBrowser.onConsoleMessage() method to manage console messages
+- fixed InAppBrowser.injectScriptCode() method when there is not a return value
+
 ## 0.2.0
 
 - added support of Chrome CustomTabs for Android

README.md

@@ -41,6 +41,11 @@ class MyInAppBrowser extends InAppBrowser {
     print("\n\nStopped $url\n\n");
     // print body html
     print(await this.injectScriptCode("document.body.innerHTML"));
+
+    // console messages
+    await this.injectScriptCode("console.log({'testObject': 5});"); // the message will be: [object Object]
+    await this.injectScriptCode("console.log('testObjectStringify', JSON.stringify({'testObject': 5}));"); // the message will be: testObjectStringify {"testObject": 5}
+    await this.injectScriptCode("console.error('testError', false);"); // the message will be: testError false
     
     // add jquery library and custom javascript
     await this.injectScriptFile("https://code.jquery.com/jquery-3.3.1.min.js");
@@ -73,6 +78,17 @@ class MyInAppBrowser extends InAppBrowser {
     this.loadUrl(url);
   }
 
+  @override
+  void onConsoleMessage(ConsoleMessage consoleMessage) {
+    print("""
+    console output:
+      sourceURL: ${consoleMessage.sourceURL}
+      lineNumber: ${consoleMessage.lineNumber}
+      message: ${consoleMessage.message}
+      messageLevel: ${consoleMessage.messageLevel}
+    """);
+  }
+
 }
 
 MyInAppBrowser inAppBrowser = new MyInAppBrowser();
@@ -228,6 +244,14 @@ Event fires when the `InAppBrowser` window is closed.
   }
 ```
 
+Event fires when the `InAppBrowser` webview receives a `ConsoleMessage`.
+```dart
+  @override
+  void onConsoleMessage(ConsoleMessage consoleMessage) {
+
+  }
+```
+
 Give the host application a chance to take control when a URL is about to be loaded in the current WebView.
 In order to be able to listen this event, you need to set `useShouldOverrideUrlLoading` option to `true`.
 ```dart

android/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

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

@@ -285,15 +285,20 @@ public void onReceiveValue(String s) {
 
                 try {
                   String msg;
-                  msg = reader.nextString();
+                  if (reader.peek() == JsonToken.STRING) {
+                    msg = reader.nextString();
 
-                  JsonReader reader2 = new JsonReader(new StringReader(msg));
-                  reader2.setLenient(true);
+                    JsonReader reader2 = new JsonReader(new StringReader(msg));
+                    reader2.setLenient(true);
 
-                  if (reader2.peek() == JsonToken.STRING)
-                    msg = reader2.nextString();
+                    if (reader2.peek() == JsonToken.STRING)
+                      msg = reader2.nextString();
 
-                  result.success(msg);
+                    result.success(msg);
+                  }
+                  else {
+                    result.success("");
+                  }
 
                 } catch (IOException e) {
                   Log.e(LOG_TAG, "IOException", e);

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

@@ -4,11 +4,16 @@
 import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Build;
+import android.util.Log;
 import android.view.View;
+import android.webkit.ConsoleMessage;
 import android.webkit.ValueCallback;
 import android.webkit.WebChromeClient;
 import android.webkit.WebView;
 
+import java.util.HashMap;
+import java.util.Map;
+
 public class InAppBrowserWebChromeClient extends WebChromeClient {
 
     protected static final String LOG_TAG = "IABWebChromeClient";
@@ -22,6 +27,18 @@ public InAppBrowserWebChromeClient(WebViewActivity activity) {
         this.activity = activity;
     }
 
+    @Override
+    public boolean onConsoleMessage(ConsoleMessage consoleMessage) {
+        Map<String, Object> obj = new HashMap<>();
+        obj.put("uuid", activity.uuid);
+        obj.put("sourceURL", consoleMessage.sourceId());
+        obj.put("lineNumber", consoleMessage.lineNumber());
+        obj.put("message", consoleMessage.message());
+        obj.put("messageLevel", consoleMessage.messageLevel().toString());
+        InAppBrowserFlutterPlugin.channel.invokeMethod("onConsoleMessage", obj);
+        return true;
+    }
+
     @Override
     public void onProgressChanged(WebView view, int progress) {
         if (activity.progressBar != null) {

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

@@ -4,6 +4,7 @@
 import android.graphics.Bitmap;
 import android.net.Uri;
 import android.net.http.SslError;
+import android.os.Build;
 import android.util.Log;
 import android.webkit.CookieManager;
 import android.webkit.CookieSyncManager;
@@ -124,7 +125,7 @@ public void onPageFinished(WebView view, String url) {
         activity.isLoading = false;
 
         // CB-10395 InAppBrowserFlutterPlugin's WebView not storing cookies reliable to local device storage
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             CookieManager.getInstance().flush();
         } else {
             CookieSyncManager.getInstance().sync();
@@ -134,6 +135,10 @@ public void onPageFinished(WebView view, String url) {
         view.clearFocus();
         view.requestFocus();
 
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            view.evaluateJavascript(activity.jsConsoleLogScript, null);
+        }
+
         Map<String, Object> obj = new HashMap<>();
         obj.put("uuid", activity.uuid);
         obj.put("url", url);

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

@@ -38,6 +38,32 @@ public class WebViewActivity extends AppCompatActivity {
     public boolean isLoading = false;
     public boolean isHidden = false;
 
+    static final String jsConsoleLogScript = "(function() {\n"+
+"   var oldLogs = {\n"+
+"       'log': console.log,\n"+
+"       'debug': console.debug,\n"+
+"       'error': console.error,\n"+
+"       'info': console.info,\n"+
+"       'warn': console.warn\n"+
+"   };\n"+
+"   for (var k in oldLogs) {\n"+
+"       (function(oldLog) {\n"+
+"           console[oldLog] = function() {\n"+
+"               var message = ''\n"+
+"               for (var i in arguments) {\n"+
+"                   if (message == '') {\n"+
+"                       message += arguments[i];\n"+
+"                   }\n"+
+"                   else {\n"+
+"                       message += ' ' + arguments[i];\n"+
+"                   }\n"+
+"               }\n"+
+"               oldLogs[oldLog].call(console, message);\n"+
+"           }\n"+
+"       })(k);\n"+
+"   }\n"+
+"})();";
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);

example/android/build.gradle

@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:3.2.0'
     }
 }
 

example/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Jun 23 08:50:38 CEST 2017
+#Fri Oct 05 14:08:48 CEST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

example/lib/main.dart

@@ -12,7 +12,19 @@ class MyInAppBrowser extends InAppBrowser {
   @override
   Future onLoadStop(String url) async {
     print("\n\nStopped $url\n\n");
+
+//    // javascript error
+//    await this.injectScriptCode("console.log({'testJavaScriptError': 5}));");
+//
+//    await this.injectScriptCode("console.log({'testObject': 5});");
+//    await this.injectScriptCode("console.warn('testWarn',null);");
+//    await this.injectScriptCode("console.log('testObjectStringify', JSON.stringify({'asd': 5}));");
+//    await this.injectScriptCode("console.info('testInfo', 6);");
+//    await this.injectScriptCode("console.error('testError', false);");
+//    await this.injectScriptCode("console.debug('testDebug', true);");
 //    print(await this.injectScriptCode("document.body.innerHTML"));
+//    print(await this.injectScriptCode("null"));
+//    print(await this.injectScriptCode("undefined"));
 //    print(await this.injectScriptCode("3"));
 //    print(await this.injectScriptCode("""
 //      function asd (a,b) {
@@ -58,6 +70,17 @@ class MyInAppBrowser extends InAppBrowser {
     print("\n\n override $url\n\n");
     this.loadUrl(url);
   }
+
+  @override
+  void onConsoleMessage(ConsoleMessage consoleMessage) {
+    print("""
+    console output: 
+      sourceURL: ${consoleMessage.sourceURL}
+      lineNumber: ${consoleMessage.lineNumber}
+      message: ${consoleMessage.message}
+      messageLevel: ${consoleMessage.messageLevel}
+    """);
+  }
 }
 
 MyInAppBrowser inAppBrowserFallback = new MyInAppBrowser();
@@ -107,15 +130,15 @@ class _MyAppState extends State<MyApp> {
         ),
         body: new Center(
           child: new RaisedButton(onPressed: () {
-            chromeSafariBrowser.open("https://flutter.io/");
-//              inAppBrowserFallback.open("https://flutter.io/", options: {
-//                //"hidden": true,
-//                //"toolbarTopFixedTitle": "Fixed title",
-//                //"useShouldOverrideUrlLoading": true
-//                //"hideUrlBar": true,
-//                //"toolbarTop": false,
-//                //"toolbarBottom": false
-//              });
+            //chromeSafariBrowser.open("https://flutter.io/");
+            inAppBrowserFallback.open("https://flutter.io/", options: {
+              //"hidden": true,
+              //"toolbarTopFixedTitle": "Fixed title",
+              //"useShouldOverrideUrlLoading": true
+              //"hideUrlBar": true,
+              //"toolbarTop": false,
+              //"toolbarBottom": false
+            });
 
           },
           child: Text("Open InAppBrowser")