Remove crosswalk

config.xml

@@ -9,23 +9,23 @@
     </author>
     <content src="index.html" />
     <plugin name="cordova-plugin-whitelist" version="1" />
-    <plugin name="nl.x-services.plugins.socialsharing" version="4.3.16" />	
+    <plugin name="nl.x-services.plugins.socialsharing" version="4.3.16" />
     <access origin="*" />
     <allow-intent href="http://*/*" />
     <allow-intent href="https://*/*" />
-    <allow-intent href="*" />	
+    <allow-intent href="*" />
     <allow-intent href="tel:*" />
     <allow-intent href="sms:*" />
     <allow-intent href="mailto:*" />
     <allow-intent href="geo:*" />
     <platform name="android">
-		<hook src="plugins/install_plugins.js" type="after_platform_add" />
-        <icon src="www/app/assets/img/icon.PNG" density="ldpi" />
-        <icon src="www/app/assets/img/icon.PNG" density="mdpi" />
-        <icon src="www/app/assets/img/icon.PNG" density="hdpi" />
-        <icon src="www/app/assets/img/icon.PNG" density="xhdpi" />
-        <icon src="www/app/assets/img/icon.PNG" density="xxhdpi" />
-        <icon src="www/app/assets/img/icon.PNG" density="xxxhdpi" />
+        <hook src="plugins/install_plugins.js" type="after_platform_add" />
+        <icon density="ldpi" src="www/app/assets/img/icon.PNG" />
+        <icon density="mdpi" src="www/app/assets/img/icon.PNG" />
+        <icon density="hdpi" src="www/app/assets/img/icon.PNG" />
+        <icon density="xhdpi" src="www/app/assets/img/icon.PNG" />
+        <icon density="xxhdpi" src="www/app/assets/img/icon.PNG" />
+        <icon density="xxxhdpi" src="www/app/assets/img/icon.PNG" />
         <config-file parent="/*" target="config.xml">
             <feature name="Echo">
                 <param name="android-package" value="org.apache.cordova.plugin.SocialSharing" />
@@ -39,10 +39,10 @@
         <feature name="File">
             <param name="ios-package" value="CDVFile" />
         </feature>
-        <preference name="DisallowOverscroll" value="true"/>
+        <preference name="DisallowOverscroll" value="true" />
         <preference name="UIWebViewBounce" value="false" />
     </platform>
-    <preference name="xwalkVersion" value="16+" />
+    <preference name="xwalkVersion" value="17+" />
     <preference name="xwalkCommandLine" value="--disable-pull-to-refresh-effect" />
     <preference name="xwalkMode" value="embedded" />
     <preference name="xwalkMultipleApk" value="true" />

platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties

@@ -0,0 +1 @@
+#Wed Apr 13 17:43:55 CEST 2016

platforms/android/AndroidManifest.xml

@@ -29,8 +29,6 @@
         </activity>
     </application>
     <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="23" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />

platforms/android/CordovaLib/build.gradle

@@ -23,23 +23,10 @@ buildscript {
         mavenCentral()
     }
 
-    // Switch the Android Gradle plugin version requirement depending on the
-    // installed version of Gradle. This dependency is documented at
-    // http://tools.android.com/tech-docs/new-build-system/version-compatibility
-    // and https://issues.apache.org/jira/browse/CB-8143
-    if (gradle.gradleVersion >= "2.2") {
-        dependencies {
-            classpath 'com.android.tools.build:gradle:1.0.0+'
-        }
-    } else if (gradle.gradleVersion >= "2.1") {
-        dependencies {
-            classpath 'com.android.tools.build:gradle:0.14.0+'
-        }
-    } else {
-        dependencies {
-            classpath 'com.android.tools.build:gradle:0.12.0+'
-        }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:1.5.0'
     }
+
 }
 
 apply plugin: 'android-library'
@@ -71,8 +58,4 @@ android {
             assets.srcDirs = ['assets']
         }
     }
-
-    lintOptions {
-        abortOnError false
-    }
 }

platforms/android/CordovaLib/build/generated/source/buildConfig/debug/org/apache/cordova/BuildConfig.java

@@ -0,0 +1,13 @@
+/**
+ * Automatically generated file. DO NOT MODIFY
+ */
+package org.apache.cordova;
+
+public final class BuildConfig {
+  public static final boolean DEBUG = Boolean.parseBoolean("true");
+  public static final String APPLICATION_ID = "org.apache.cordova";
+  public static final String BUILD_TYPE = "debug";
+  public static final String FLAVOR = "";
+  public static final int VERSION_CODE = 1;
+  public static final String VERSION_NAME = "1.0";
+}

platforms/android/src/io/cordova/hellocordova/MainActivity.java → platforms/android/CordovaLib/build/intermediates/bundles/debug/AndroidManifest.xml

@@ -1,4 +1,5 @@
-/*
+<?xml version="1.0" encoding="utf-8"?>
+<!--
        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
@@ -15,20 +16,12 @@ Licensed to the Apache Software Foundation (ASF) under one
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
- */
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.apache.cordova"
+    android:versionCode="1"
+    android:versionName="1.0" >
 
-package io.cordova.hellocordova;
+    <uses-sdk android:minSdkVersion="14" />
 
-import android.os.Bundle;
-import org.apache.cordova.*;
-
-public class MainActivity extends CordovaActivity
-{
-    @Override
-    public void onCreate(Bundle savedInstanceState)
-    {
-        super.onCreate(savedInstanceState);
-        // Set by <content src="index.html" /> in config.xml
-        loadUrl(launchUrl);
-    }
-}
+</manifest>

platforms/android/src/org/crosswalk/engine/XWalkCordovaCookieManager.java → platforms/android/CordovaLib/build/intermediates/bundles/debug/aapt/AndroidManifest.xml

@@ -1,4 +1,5 @@
-/*
+<?xml version="1.0" encoding="utf-8"?>
+<!--
        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
@@ -15,39 +16,12 @@ Licensed to the Apache Software Foundation (ASF) under one
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-*/
-package org.crosswalk.engine;
-
-import org.apache.cordova.ICordovaCookieManager;
-import org.xwalk.core.XWalkCookieManager;
-
-class XWalkCordovaCookieManager implements ICordovaCookieManager {
-
-    protected XWalkCookieManager cookieManager = null;
-
-    public XWalkCordovaCookieManager() {
-        cookieManager = new XWalkCookieManager();
-    }
-
-    public void setCookiesEnabled(boolean accept) {
-        cookieManager.setAcceptCookie(accept);
-    }
-
-    public void setCookie(final String url, final String value) {
-        cookieManager.setCookie(url, value);
-    }
-
-    public String getCookie(final String url) {
-        return cookieManager.getCookie(url);
-    }
-
-    public void clearCookies() {
-        cookieManager.removeAllCookie();
-    }
-
-    public void flush() {
-        cookieManager.flushCookieStore();
-    }
-};
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.apache.cordova"
+    android:versionCode="1"
+    android:versionName="1.0" >
 
+    <uses-sdk android:minSdkVersion="14" />
 
+</manifest>

platforms/android/CordovaLib/build/intermediates/incremental/mergeDebugAssets/merger.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merger version="3"><dataSet config="main"><source path="/home/tomas/bitshares-wallet/platforms/android/CordovaLib/assets"/></dataSet><dataSet config="debug"><source path="/home/tomas/bitshares-wallet/platforms/android/CordovaLib/src/debug/assets"/></dataSet></merger>

platforms/android/CordovaLib/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merger version="3"><dataSet config="main"><source path="/home/tomas/bitshares-wallet/platforms/android/CordovaLib/src/main/jniLibs"/></dataSet><dataSet config="debug"><source path="/home/tomas/bitshares-wallet/platforms/android/CordovaLib/src/debug/jniLibs"/></dataSet></merger>

platforms/android/CordovaLib/build/intermediates/incremental/packageDebugResources/merger.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merger version="3"><dataSet config="main$Generated" generated="true"><source path="/home/tomas/bitshares-wallet/platforms/android/CordovaLib/res"/><source path="/home/tomas/bitshares-wallet/platforms/android/CordovaLib/build/generated/res/rs/debug"/><source path="/home/tomas/bitshares-wallet/platforms/android/CordovaLib/build/generated/res/resValues/debug"/></dataSet><dataSet config="debug$Generated" generated="true"><source path="/home/tomas/bitshares-wallet/platforms/android/CordovaLib/src/debug/res"/></dataSet><dataSet config="main" generated-set="main$Generated"><source path="/home/tomas/bitshares-wallet/platforms/android/CordovaLib/res"/><source path="/home/tomas/bitshares-wallet/platforms/android/CordovaLib/build/generated/res/rs/debug"/><source path="/home/tomas/bitshares-wallet/platforms/android/CordovaLib/build/generated/res/resValues/debug"/></dataSet><dataSet config="debug" generated-set="debug$Generated"><source path="/home/tomas/bitshares-wallet/platforms/android/CordovaLib/src/debug/res"/></dataSet><mergedItems/></merger>

platforms/android/android.json

@@ -8,26 +8,6 @@
             "res/xml/config.xml": {
                 "parents": {
                     "/*": [
-                        {
-                            "xml": "<preference name=\"webView\" value=\"org.crosswalk.engine.XWalkWebViewEngine\" />",
-                            "count": 1
-                        },
-                        {
-                            "xml": "<preference default=\"16+\" name=\"xwalkVersion\" />",
-                            "count": 1
-                        },
-                        {
-                            "xml": "<preference default=\"--disable-pull-to-refresh-effect\" name=\"xwalkCommandLine\" />",
-                            "count": 1
-                        },
-                        {
-                            "xml": "<preference default=\"embedded\" name=\"xwalkMode\" />",
-                            "count": 1
-                        },
-                        {
-                            "xml": "<preference default=\"true\" name=\"xwalkMultipleApk\" />",
-                            "count": 1
-                        },
                         {
                             "xml": "<feature name=\"Device\"><param name=\"android-package\" value=\"org.apache.cordova.device.Device\" /></feature>",
                             "count": 1
@@ -62,14 +42,6 @@
             "AndroidManifest.xml": {
                 "parents": {
                     "/*": [
-                        {
-                            "xml": "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\" />",
-                            "count": 1
-                        },
-                        {
-                            "xml": "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\" />",
-                            "count": 1
-                        },
                         {
                             "xml": "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\" />",
                             "count": 4
@@ -602,7 +574,7 @@
         }
     },
     "installed_plugins": {
-        "cordova-plugin-crosswalk-webview": {
+        "cordova-plugin-compat": {
             "PACKAGE_NAME": "de.bitsharesmunich.wallet"
         },
         "cordova-plugin-device": {
@@ -614,6 +586,9 @@
         "cordova-plugin-indexedDB": {
             "PACKAGE_NAME": "de.bitsharesmunich.wallet"
         },
+        "cordova-plugin-indexeddb-async": {
+            "PACKAGE_NAME": "de.bitsharesmunich.wallet"
+        },
         "cordova-plugin-media": {
             "PACKAGE_NAME": "de.bitsharesmunich.wallet"
         },
@@ -626,9 +601,6 @@
         "cordova-plugin-x-socialsharing": {
             "PACKAGE_NAME": "de.bitsharesmunich.wallet"
         },
-        "cordova-plugin-indexeddb-async": {
-            "PACKAGE_NAME": "de.bitsharesmunich.wallet"
-        },
         "phonegap-plugin-barcodescanner": {
             "PACKAGE_NAME": "de.bitsharesmunich.wallet"
         }
@@ -798,6 +770,11 @@
             "id": "cordova-plugin-indexedDB.IndexedDBShim",
             "runs": true
         },
+        {
+            "file": "plugins/cordova-plugin-indexeddb-async/www/indexeddbshim.min.js",
+            "id": "cordova-plugin-indexeddb-async.IndexedDBShim",
+            "runs": true
+        },
         {
             "file": "plugins/cordova-plugin-media/www/MediaError.js",
             "id": "cordova-plugin-media.MediaError",
@@ -831,17 +808,24 @@
                 "window.plugins.socialsharing"
             ]
         },
-        {
-            "file": "plugins/cordova-plugin-indexeddb-async/www/indexeddbshim.min.js",
-            "id": "cordova-plugin-indexeddb-async.IndexedDBShim",
-            "runs": true
-        },
         {
             "file": "plugins/phonegap-plugin-barcodescanner/www/barcodescanner.js",
             "id": "phonegap-plugin-barcodescanner.BarcodeScanner",
             "clobbers": [
                 "cordova.plugins.barcodeScanner"
             ]
         }
-    ]
+    ],
+    "plugin_metadata": {
+        "cordova-plugin-compat": "1.0.0",
+        "cordova-plugin-device": "1.1.2-dev",
+        "cordova-plugin-file": "4.1.1",
+        "cordova-plugin-indexedDB": "0.1.4",
+        "cordova-plugin-indexeddb-async": "0.0.1",
+        "cordova-plugin-media": "2.2.0",
+        "cordova-plugin-social-message": "0.4.0",
+        "cordova-plugin-whitelist": "1.2.1",
+        "cordova-plugin-x-socialsharing": "5.0.10",
+        "phonegap-plugin-barcodescanner": "4.0.1"
+    }
 }

platforms/android/assets/www/cordova-js-src/platform.js

@@ -19,6 +19,9 @@
  *
 */
 
+// The last resume event that was received that had the result of a plugin call.
+var lastResumeEvent = null;
+
 module.exports = {
     id: 'android',
     bootstrap: function() {
@@ -58,6 +61,19 @@ module.exports = {
         bindButtonChannel('volumeup');
         bindButtonChannel('volumedown');
 
+        // The resume event is not "sticky", but it is possible that the event
+        // will contain the result of a plugin call. We need to ensure that the
+        // plugin result is delivered even after the event is fired (CB-10498)
+        var cordovaAddEventListener = document.addEventListener;
+
+        document.addEventListener = function(evt, handler, capture) {
+            cordovaAddEventListener(evt, handler, capture);
+
+            if (evt === 'resume' && lastResumeEvent) {
+                handler(lastResumeEvent);
+            }
+        };
+
         // Let native code know we are all done on the JS side.
         // Native code will then un-hide the WebView.
         channel.onCordovaReady.subscribe(function() {
@@ -79,12 +95,30 @@ function onMessageFromNative(msg) {
         case 'searchbutton':
         // App life cycle events
         case 'pause':
-        case 'resume':
         // Volume events
         case 'volumedownbutton':
         case 'volumeupbutton':
             cordova.fireDocumentEvent(action);
             break;
+        case 'resume':
+            if(arguments.length > 1 && msg.pendingResult) {
+                if(arguments.length === 2) {
+                    msg.pendingResult.result = arguments[1];
+                } else {
+                    // The plugin returned a multipart message
+                    var res = [];
+                    for(var i = 1; i < arguments.length; i++) {
+                        res.push(arguments[i]);
+                    }
+                    msg.pendingResult.result = res;
+                }
+
+                // Save the plugin result so that it can be delivered to the js
+                // even if they miss the initial firing of the event
+                lastResumeEvent = msg;
+            }
+            cordova.fireDocumentEvent(action, msg);
+            break;
         default:
             throw new Error('Unknown event action ' + action);
     }