CB-8429 Updated version and RELEASENOTES.md for release 0.6.0

Just updating to the new name would make the plugin incompatible with
previous cordova-ios versions.

RELEASENOTES.md

@@ -158,3 +158,9 @@
 * CB-7850 clarify role of whitelist
 * CB-7720 check if event is null since OK string from success callback was removed
 * CB-7471 cordova-plugin-inappbrowser documentation translation: cordova-plugin-inappbrowser
+
+### 0.6.0 (Feb 04, 2015)
+* CB-8270 ios: Remove usage of `[arr JSONString]`, since it's been renamed to `cdv_JSONString`
+* ubuntu: implement inject* functions
+* ubuntu: port to oxide
+* CB-7897 ios, android: Update to work with whilelist plugins in Cordova 4.x

plugin.xml

@@ -20,7 +20,7 @@
 
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
            id="org.apache.cordova.inappbrowser"
-      version="0.5.4">
+      version="0.6.0">
 
     <name>InAppBrowser</name>
     <description>Cordova InAppBrowser Plugin</description>
@@ -106,6 +106,7 @@
         <header-file src="src/ubuntu/inappbrowser.h" />
         <source-file src="src/ubuntu/inappbrowser.cpp" />
         <resource-file src="src/ubuntu/InAppBrowser.qml" />
+        <resource-file src="src/ubuntu/InAppBrowser_escapeScript.js" />
         <resource-file src="src/ubuntu/close.png" />
     </platform>
 

src/android/InAppBrowser.java

@@ -54,10 +54,13 @@ import org.apache.cordova.CordovaArgs;
 import org.apache.cordova.CordovaPlugin;
 import org.apache.cordova.CordovaWebView;
 import org.apache.cordova.LOG;
+import org.apache.cordova.PluginManager;
 import org.apache.cordova.PluginResult;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.StringTokenizer;
 
@@ -115,9 +118,37 @@ public class InAppBrowser extends CordovaPlugin {
                     // SELF
                     if (SELF.equals(target)) {
                         Log.d(LOG_TAG, "in self");
+                        /* This code exists for compatibility between 3.x and 4.x versions of Cordova.
+                         * Previously the Config class had a static method, isUrlWhitelisted(). That
+                         * responsibility has been moved to the plugins, with an aggregating method in
+                         * PluginManager.
+                         */
+                        Boolean shouldAllowNavigation = null;
+                        if (url.startsWith("javascript:")) {
+                            shouldAllowNavigation = true;
+                        }
+                        if (shouldAllowNavigation == null) {
+                            try {
+                                Method iuw = Config.class.getMethod("isUrlWhiteListed", String.class);
+                                shouldAllowNavigation = (Boolean)iuw.invoke(null, url);
+                            } catch (NoSuchMethodException e) {
+                            } catch (IllegalAccessException e) {
+                            } catch (InvocationTargetException e) {
+                            }
+                        }
+                        if (shouldAllowNavigation == null) {
+                            try {
+                                Method gpm = webView.getClass().getMethod("getPluginManager");
+                                PluginManager pm = (PluginManager)gpm.invoke(webView);
+                                Method san = pm.getClass().getMethod("shouldAllowNavigation", String.class);
+                                shouldAllowNavigation = (Boolean)san.invoke(pm, url);
+                            } catch (NoSuchMethodException e) {
+                            } catch (IllegalAccessException e) {
+                            } catch (InvocationTargetException e) {
+                            }
+                        }
                         // load in webview
-                        if (url.startsWith("file://") || url.startsWith("javascript:") 
-                                || Config.isUrlWhiteListed(url)) {
+                        if (Boolean.TRUE.equals(shouldAllowNavigation)) {
                             Log.d(LOG_TAG, "loading in webview");
                             webView.loadUrl(url);
                         }

src/ios/CDVInAppBrowser.m

@@ -20,7 +20,6 @@
 #import "CDVInAppBrowser.h"
 #import <Cordova/CDVPluginResult.h>
 #import <Cordova/CDVUserAgentUtil.h>
-#import <Cordova/CDVJSON.h>
 
 #define    kInAppBrowserTargetSelf @"_self"
 #define    kInAppBrowserTargetSystem @"_system"
@@ -265,7 +264,8 @@
     }
 
     if (jsWrapper != nil) {
-        NSString* sourceArrayString = [@[source] JSONString];
+        NSData* jsonData = [NSJSONSerialization dataWithJSONObject:@[source] options:0 error:nil];
+        NSString* sourceArrayString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
         if (sourceArrayString) {
             NSString* sourceString = [sourceArrayString substringWithRange:NSMakeRange(1, [sourceArrayString length] - 2)];
             NSString* jsToInject = [NSString stringWithFormat:jsWrapper, sourceString];

src/ubuntu/InAppBrowser.qml

@@ -21,9 +21,9 @@
  *
 */
 import QtQuick 2.0
-import QtWebKit 3.0
 import Ubuntu.Components.Popups 0.1
 import Ubuntu.Components 0.1
+import com.canonical.Oxide 1.0
 
 Rectangle {
     anchors.fill: parent
@@ -55,15 +55,38 @@ Rectangle {
         }
     }
 
+    property string usContext: "oxide://main-world/2"
+
+    function executeJS(scId, code) {
+        var req = _view.rootFrame.sendMessage(usContext, "EXECUTE", {code: code});
+
+        req.onreply = function(response) {
+            var code = 'cordova.callback(' + scId + ', JSON.parse(\'' + JSON.stringify(response.result) + '\'))';
+            console.warn(code);
+            cordova.javaScriptExecNeeded(code);
+        console.warn("RESP:" + JSON.stringify(response));
+        };
+    }
+
     WebView {
         width: parent.width
         y: urlEntry.height
         height: parent.height - y
         url: url1
-        onLoadingChanged: {
-            if (loadRequest.status) {
-                root.exec("InAppBrowser", "loadFinished", [loadRequest.status])
-            }
+        id: _view
+        onLoadingStateChanged: {
+            root.exec("InAppBrowser", "loadFinished", [_view.loading])
+        }
+        context: WebContext {
+            id: webcontext
+
+            userScripts: [
+                UserScript {
+                    context: usContext
+                    emulateGreasemonkey: true
+                    url: "InAppBrowser_escapeScript.js"
+                }
+            ]
         }
     }
 }

src/ubuntu/InAppBrowser_escapeScript.js

@@ -0,0 +1,29 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+*/
+
+oxide.addMessageHandler("EXECUTE", function(msg) {
+    var code = msg.args.code;
+    try {
+        msg.reply({result: eval(code)});
+    } catch(e) {
+        msg.error("Code threw exception: \"" + e + "\"");
+    }
+});

src/ubuntu/inappbrowser.cpp

@@ -45,10 +45,10 @@ function finishCreation() {                                             \
 }                                                                       \
 createObject()";
 
-const char EXIT_EVENT[] = "'exit'";
-const char LOADSTART_EVENT[] = "'loadstart'";
-const char LOADSTOP_EVENT[] = "'loadstop'";
-const char LOADERROR_EVENT[] = "'loaderror'";
+const char EXIT_EVENT[] = "{type: 'exit'}";
+const char LOADSTART_EVENT[] = "{type: 'loadstart'}";
+const char LOADSTOP_EVENT[] = "{type: 'loadstop'}";
+const char LOADERROR_EVENT[] = "{type: 'loaderror'}";
 
 void Inappbrowser::open(int cb, int, const QString &url, const QString &, const QString &) {
     assert(_eventCb == 0);
@@ -71,34 +71,35 @@ void Inappbrowser::close(int, int) {
     _eventCb = 0;
 }
 
-void Inappbrowser::injectStyleFile(int, int, const QString&, bool) {
-    // TODO:
-    qCritical() << "unimplemented " << __PRETTY_FUNCTION__;
+void Inappbrowser::injectStyleFile(int scId, int ecId, const QString& src, bool b) {
+    QString code("(function(d) { var c = d.createElement('link'); c.rel='stylesheet'; c.type='text/css'; c.href = %1; d.head.appendChild(c);})(document)");
+    code = code.arg(CordovaInternal::format(src));
+
+    injectScriptCode(scId, ecId, code, b);
 }
 
-void Inappbrowser::injectStyleCode(int, int, const QString&, bool) {
-    // TODO:
-    qCritical() << "unimplemented " << __PRETTY_FUNCTION__;
+void Inappbrowser::injectStyleCode(int scId, int ecId, const QString& src, bool b) {
+    QString code("(function(d) { var c = d.createElement('style'); c.innerHTML = %1; d.body.appendChild(c); })(document)");
+    code = code.arg(CordovaInternal::format(src));
+
+    injectScriptCode(scId, ecId, code, b);
 }
 
-void Inappbrowser::injectScriptFile(int, int, const QString&, bool) {
-    // TODO:
-    qCritical() << "unimplemented " << __PRETTY_FUNCTION__;
+void Inappbrowser::injectScriptFile(int scId, int ecId, const QString& src, bool b) {
+    QString code("(function(d) { var c = d.createElement('script'); c.src = %1; d.body.appendChild(c);})(document)");
+    code = code.arg(CordovaInternal::format(src));
+
+    injectScriptCode(scId, ecId, code, b);
 }
 
-void Inappbrowser::injectScriptCode(int, int, const QString&, bool) {
-    // TODO:
-    qCritical() << "unimplemented " << __PRETTY_FUNCTION__;
+void Inappbrowser::injectScriptCode(int scId, int, const QString& code, bool) {
+    m_cordova->execQML(QString("CordovaWrapper.global.inappbrowser.executeJS(%2, %1)").arg(CordovaInternal::format(code)).arg(scId));
 }
 
-void Inappbrowser::loadFinished(int status) {
-    if (status == 2) {
-        this->callbackWithoutRemove(_eventCb, LOADERROR_EVENT);
-    }
-    if (status == 0) {
+void Inappbrowser::loadFinished(bool status) {
+    if (!status) {
+        this->callbackWithoutRemove(_eventCb, LOADSTOP_EVENT);
+    } else {
         this->callbackWithoutRemove(_eventCb, LOADSTART_EVENT);
     }
-    if (status == 3) {
-        this->callbackWithoutRemove(_eventCb, LOADSTOP_EVENT);
-    }
 }

src/ubuntu/inappbrowser.h

@@ -52,7 +52,7 @@ public slots:
     void injectScriptFile(int cb, int, const QString&, bool);
     void injectScriptCode(int cb, int, const QString&, bool);
 
-    void loadFinished(int status);
+    void loadFinished(bool status);
 
 private:
     int _eventCb;

tests/plugin.xml

@@ -20,7 +20,7 @@
 
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
     id="org.apache.cordova.inappbrowser.tests"
-    version="0.5.4">
+    version="0.6.0">
     <name>Cordova InAppBrowser Plugin Tests</name>
     <license>Apache 2.0</license>