CB-9042 reverted changes to cordova.js, should be same as 3.7.1

RELEASENOTES.md

@@ -20,86 +20,39 @@
 -->
 ## Release Notes for Cordova (Android) ##
 
+### Release 3.7.2 (May 2015) ###
+
+* Removed Intent Functionality from Preferences - Preferences can no longer be set by intents
+
+### Release 3.7.1 (January 2015) ###
+* CB-8411 Initialize plugins only after `createViews()` is called (regression in 3.7.0)
+
 ### Release 3.7.0 (January 2015) ###
 
 * CB-8328 Allow plugins to handle certificate challenges (close #150)
 * CB-8201 Add support for auth dialogs into Cordova Android
-* CB-8255 Pass `arch` to gradle regardless of `cdvBuildMultipleApks`
-* CB-8255 Fix `cordova/build --gradleVar=--foo=bar` stripping off `=bar`
 * CB-8017 Add support for `<input type=file>` for Lollipop
+* CB-8143 Loads of gradle improvements (try it with cordova/build --gradle)
 * CB-8329 Cancel outstanding ActivityResult requests when a new startActivityForResult occurs
-* CB-8280 android: Don't apply SplashScreenDelay when .show() is called explicitly
-* CB-4914 Fix build whitespace issue
-* CB-8210 Remove unused onDestroy channel (close #146)
-* CB-8026: Bumping up Android Version and setting it up to allow third-party cookies.  This might change later.
-* CB-8255 Use properties rather than environment variables for gradle settings
-* CB-8210 Drop events from native that occur before start-up
-* CB-8210 Use PluginResult for various events from native (close #144)
+* CB-8026 Bumping up Android Version and setting it up to allow third-party cookies.  This might change later.
+* CB-8210 Use PluginResult for various events from native so that content-security-policy <meta> can be used
 * CB-8168 Add support for `cordova/run --list` (closes #139)
-* CB-8210 Use PluginResult instead of sendJavascript() for keyboard events (close #142)
-* CB-8228 Gradle: Allow plugins to use Maven dependencies
-* CB-8229 Gradle: Add CordovaLib as a dependency to all plugin sub-projects
-* CB-7980 Add --minSdkVersion and --versionCode flags to cordova/build command
-* CB-7980: Add 9 to versionCode for minSdk 20+ if not multiarch
-* CB-8204: Reinstate link tasks to avoid gradle build failures
-* CB-8143 Use gradle 2.2.1 instead of 1.12 to appease Android Studio 1.0 warning-on-startup
-* CB-8143 Use gradle plugin 1.0.0 for Android Studio 1.0.0
-* CB-8202 Fix gradle build signing when passwords provided interactively
-* CB-8176 Update Android SDK search path for Android Studio 1.0
+* CB-8176 Vastly better auto-detection of SDK & JDK locations
 * CB-8079 Use activity class package name, but fallback to application package name when looking for splash screen drawable
 * CB-8147 Have corodva/build warn about unrecognized flags rather than fail
 * CB-7881 Android tooling shouldn't lock application directory
-* CB-3679 Move splashscreen logic into splashscreen plugin
-* CB-8143: Use the correct Android Gradle plugin for the installed Gradle version
-* CB-8119 Restart adb when we detect it's hung
 * CB-8112 Turn off mediaPlaybackRequiresUserGesture
 * CB-6153 Add a preference for controlling hardware button audio stream (DefaultVolumeStream)
-* CB-8081 Allow gradle builds to use Java 6 instead of requiring 7
 * CB-8031 Fix race condition that shows as ConcurrentModificationException
-* CB-7976 Use webView's context rather than Activity's context for intent receiver
 * CB-7974 Cancel timeout timer if view is destroyed
 * CB-7940 Disable exec bridge if bridgeSecret is wrong
-* CB-7758: Allow content-url-hosted pages to access the bridge
-* CB-7726 fix typo in gitignore: ant-built -> ant-build
-* Replacing Math.random() with something a little more random.
+* CB-7758 Allow content-url-hosted pages to access the bridge
 * CB-6511 Fixes build for android when app name contains unicode characters.
-* CB-7707 Added multipart PluginResult (close #125)
-* CB-7714 Teach check_reqs about brew's install location for android SDK
-* Fix --shared flag of create script (broke in recent gradle changes)
-* Update .gitignore to ignore /framework/build and /node_modules
+* CB-7707 Added multipart PluginResult
 * CB-6837 Fix leaked window when hitting back button while alert being rendered
-* CB-7674: Added sleep to avoid null error after most recent change to not break API
-* CB-7674 move preference activation back into onCreate()
-* CB-7634 Detect JAVA_HOME properly on Ubuntu
-* CB-7410 update the docs to match the actual title
-* CB-7512 Use a standard build.gradle for all plugins
-* CB-7512 Make gradle build only a single config for sub-libraries (release vs debug)
-* CB-7579 Fix run script's ability to use non-arch-specific APKs
-* CB-7512 Fix gradle asking for release password when building for debug
-* CB-7493 Adds test-build command to package.json
-* CB-3445: Make minSdkVersion and base versionCode settable through env vars
-* CB-7512 Make key password optional & prompt for it when missing
-* CB-7512 Fix gradle not copying all archs to out/ (broken by prev commit)
-* CB-7512 Use aligned apk rather than unaligned apk when sorting
-* CB-7512 Speed up gradle builds by building debug or release (not both)
-* CB-7512 Add gradle environment vars for signing apks
-* CB-7512 Change gradle android plugins from 0.10 -> 0.12
-* CB-7536 check_reqs: windows tweaks + sdk manager error message
-* CB-7499, support RTL text direction
-* CB-7554 Use x86 apk when deploying to an intel device / emulator
-* CB-7512: Fix logic for detecting SDK directory
-* CB-7536 Tweak Android SDK not installed error message.
-* CB-7536 Tweak error messages for missing JDK / SDK / AVDs
-* CB-7511 Auto-detect android sdk when using stand-alone sdk installer
-* CB-7512: Copy cordova.gradle file to project root on build
+* CB-7674 Move preference activation back into onCreate()
+* CB-7499 Support RTL text direction
 * CB-7330 Don't run check_reqs for bin/create.
-* CB-7512: Read android target from project.properties if possible
-* CB-7512: Determine SDK and build tools version dynamcally at build time
-* CB-7463: Adding licence to project template gradle file
-* CB-7511 Auto-detect Android SDK when Android Studio is installed
-* CB-7463: Looked at the Apache BigTop git, gradle uses C-style comments
-* CB-7463: Adding licences.  I don't know what the gradle syntax is for comments, that still needs to be done.
-* CB-7460: Fixing bug with KitKat where the background colour would override the CSS colours on the application
 
 ### 3.6.4 (Sept 30, 2014) ###
 

VERSION

@@ -1 +1 @@
-3.7.0
+3.7.2

bin/templates/cordova/version

@@ -20,6 +20,6 @@
 */
 
 // Coho updates this line:
-var VERSION = "3.7.0";
+var VERSION = "3.7.2";
 
 console.log(VERSION);

framework/assets/www/cordova.js

@@ -19,7 +19,7 @@
  under the License.
 */
 ;(function() {
-var PLATFORM_VERSION_BUILD_LABEL = '3.7.0';
+var PLATFORM_VERSION_BUILD_LABEL = '3.7.2';
 // file: src/scripts/require.js
 
 /*jshint -W079 */
@@ -1977,4 +1977,4 @@ window.cordova = require('cordova');
 
 require('cordova/init');
 
-})();
+})();

framework/src/org/apache/cordova/Config.java

@@ -37,7 +37,6 @@ public class Config {
         parser = new ConfigXmlParser();
         parser.parse(action);
         parser.getPreferences().setPreferencesBundle(action.getIntent().getExtras());
-        parser.getPreferences().copyIntoIntentExtras(action);
     }
 
     // Intended to be used for testing only; creates an empty configuration.

framework/src/org/apache/cordova/CordovaActivity.java

@@ -232,7 +232,6 @@ public class CordovaActivity extends Activity implements CordovaInterface {
         parser.parse(this);
         preferences = parser.getPreferences();
         preferences.setPreferencesBundle(getIntent().getExtras());
-        preferences.copyIntoIntentExtras(this);
         internalWhitelist = parser.getInternalWhitelist();
         externalWhitelist = parser.getExternalWhitelist();
         launchUrl = parser.getLaunchUrl();
@@ -333,11 +332,6 @@ public class CordovaActivity extends Activity implements CordovaInterface {
         }
 
         appView = webView != null ? webView : makeWebView();
-        if (appView.pluginManager == null) {
-            appView.init(this, webViewClient != null ? webViewClient : makeWebViewClient(appView),
-                    webChromeClient != null ? webChromeClient : makeChromeClient(appView),
-                    pluginEntries, internalWhitelist, externalWhitelist, preferences);
-        }
 
         // TODO: Have the views set this themselves.
         if (preferences.getBoolean("DisallowOverscroll", false)) {
@@ -345,6 +339,13 @@ public class CordovaActivity extends Activity implements CordovaInterface {
         }
         createViews();
 
+        // Init plugins only after creating views
+        if (appView.pluginManager == null) {
+            appView.init(this, webViewClient != null ? webViewClient : makeWebViewClient(appView),
+                    webChromeClient != null ? webChromeClient : makeChromeClient(appView),
+                    pluginEntries, internalWhitelist, externalWhitelist, preferences);
+        }
+
         // Wire the hardware volume controls to control media if desired.
         String volumePref = preferences.getString("DefaultVolumeStream", "");
         if ("media".equals(volumePref.toLowerCase(Locale.ENGLISH))) {

framework/src/org/apache/cordova/CordovaPreferences.java

@@ -61,13 +61,6 @@ public class CordovaPreferences {
         String value = prefs.get(name);
         if (value != null) {
             return Boolean.parseBoolean(value);
-        } else if (preferencesBundleExtras != null) {
-            Object bundleValue = preferencesBundleExtras.get(name);
-            if (bundleValue instanceof String) {
-                return "true".equals(bundleValue);
-            }
-            // Gives a nice warning if type is wrong.
-            return preferencesBundleExtras.getBoolean(name, defaultValue);
         }
         return defaultValue;
     }
@@ -78,13 +71,6 @@ public class CordovaPreferences {
         if (value != null) {
             // Use Integer.decode() can't handle it if the highest bit is set.
             return (int)(long)Long.decode(value);
-        } else if (preferencesBundleExtras != null) {
-            Object bundleValue = preferencesBundleExtras.get(name);
-            if (bundleValue instanceof String) {
-                return Integer.valueOf((String)bundleValue);
-            }
-            // Gives a nice warning if type is wrong.
-            return preferencesBundleExtras.getInt(name, defaultValue);
         }
         return defaultValue;
     }
@@ -94,14 +80,7 @@ public class CordovaPreferences {
         String value = prefs.get(name);
         if (value != null) {
             return Double.valueOf(value);
-        } else if (preferencesBundleExtras != null) {
-            Object bundleValue = preferencesBundleExtras.get(name);
-            if (bundleValue instanceof String) {
-                return Double.valueOf((String)bundleValue);
-            }
-            // Gives a nice warning if type is wrong.
-            return preferencesBundleExtras.getDouble(name, defaultValue);
-        }
+        } 
         return defaultValue;
     }
 
@@ -110,69 +89,8 @@ public class CordovaPreferences {
         String value = prefs.get(name);
         if (value != null) {
             return value;
-        } else if (preferencesBundleExtras != null && !"errorurl".equals(name)) {
-            Object bundleValue = preferencesBundleExtras.get(name);
-            if (bundleValue != null) {
-                return bundleValue.toString();
-            }
-        }
+        } 
         return defaultValue;
     }
 
-    // Plugins should not rely on values within the intent since this does not work
-    // for apps with multiple webviews. Instead, they should retrieve prefs from the
-    // Config object associated with their webview.
-    public void copyIntoIntentExtras(Activity action) {
-        for (String name : prefs.keySet()) {
-            String value = prefs.get(name);
-            if (value == null) {
-                continue;
-            }
-            if (name.equals("loglevel")) {
-                LOG.setLogLevel(value);
-            } else if (name.equals("splashscreen")) {
-                // Note: We should probably pass in the classname for the variable splash on splashscreen!
-                int resource = action.getResources().getIdentifier(value, "drawable", action.getClass().getPackage().getName());
-                if(resource == 0) {
-                    resource = action.getResources().getIdentifier(value, "drawable", action.getPackageName());
-                }
-                action.getIntent().putExtra(name, resource);
-            }
-            else if(name.equals("backgroundcolor")) {
-                int asInt = (int)(long)Long.decode(value);
-                action.getIntent().putExtra(name, asInt);
-            }
-            else if(name.equals("loadurltimeoutvalue")) {
-                int asInt = Integer.decode(value);
-                action.getIntent().putExtra(name, asInt);
-            }
-            else if(name.equals("splashscreendelay")) {
-                int asInt = Integer.decode(value);
-                action.getIntent().putExtra(name, asInt);
-            }
-            else if(name.equals("keeprunning"))
-            {
-                boolean asBool = Boolean.parseBoolean(value);
-                action.getIntent().putExtra(name, asBool);
-            }
-            else if(name.equals("inappbrowserstorageenabled"))
-            {
-                boolean asBool = Boolean.parseBoolean(value);
-                action.getIntent().putExtra(name, asBool);
-            }
-            else if(name.equals("disallowoverscroll"))
-            {
-                boolean asBool = Boolean.parseBoolean(value);
-                action.getIntent().putExtra(name, asBool);
-            }
-            else
-            {
-                action.getIntent().putExtra(name, value);
-            }
-        }
-        // In the normal case, the intent extras are null until the first call to putExtra().
-        if (preferencesBundleExtras == null) {
-            preferencesBundleExtras = action.getIntent().getExtras();
-        }
-    }
 }

framework/src/org/apache/cordova/CordovaWebView.java

@@ -62,7 +62,7 @@ import android.widget.FrameLayout;
 public class CordovaWebView extends WebView {
 
     public static final String TAG = "CordovaWebView";
-    public static final String CORDOVA_VERSION = "3.7.0";
+    public static final String CORDOVA_VERSION = "3.7.2";
 
     private HashSet<Integer> boundKeyCodes = new HashSet<Integer>();
 

package.json

@@ -1,6 +1,6 @@
 {
     "name": "cordova-android",
-    "version": "3.7.0",
+    "version": "3.7.2",
     "description": "cordova-android release",
     "main": "bin/create",
     "repository": {
@@ -26,4 +26,4 @@
         "jasmine-node": "~1",
         "promise-matchers": "~0"
     }
-}
+}