You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by fi...@apache.org on 2013/02/06 20:06:16 UTC
[2/6] updating to cordova-android 2.4.0
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/f6dc3ad1/lib/cordova-android/framework/bin/classes/org/apache/cordova/Notification$2$4.class
----------------------------------------------------------------------
diff --git a/lib/cordova-android/framework/bin/classes/org/apache/cordova/Notification$2$4.class b/lib/cordova-android/framework/bin/classes/org/apache/cordova/Notification$2$4.class
deleted file mode 100644
index 13aceb0..0000000
Binary files a/lib/cordova-android/framework/bin/classes/org/apache/cordova/Notification$2$4.class and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/f6dc3ad1/lib/cordova-android/framework/bin/classes/org/apache/cordova/Notification$2.class
----------------------------------------------------------------------
diff --git a/lib/cordova-android/framework/bin/classes/org/apache/cordova/Notification$2.class b/lib/cordova-android/framework/bin/classes/org/apache/cordova/Notification$2.class
deleted file mode 100644
index 6838e0e..0000000
Binary files a/lib/cordova-android/framework/bin/classes/org/apache/cordova/Notification$2.class and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/f6dc3ad1/lib/cordova-android/framework/bin/classes/org/apache/cordova/Notification$3$1.class
----------------------------------------------------------------------
diff --git a/lib/cordova-android/framework/bin/classes/org/apache/cordova/Notification$3$1.class b/lib/cordova-android/framework/bin/classes/org/apache/cordova/Notification$3$1.class
deleted file mode 100644
index fb42e5a..0000000
Binary files a/lib/cordova-android/framework/bin/classes/org/apache/cordova/Notification$3$1.class and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/f6dc3ad1/lib/cordova-android/framework/bin/classes/org/apache/cordova/Notification$3.class
----------------------------------------------------------------------
diff --git a/lib/cordova-android/framework/bin/classes/org/apache/cordova/Notification$3.class b/lib/cordova-android/framework/bin/classes/org/apache/cordova/Notification$3.class
deleted file mode 100644
index 1070698..0000000
Binary files a/lib/cordova-android/framework/bin/classes/org/apache/cordova/Notification$3.class and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/f6dc3ad1/lib/cordova-android/framework/bin/classes/org/apache/cordova/Notification$4$1.class
----------------------------------------------------------------------
diff --git a/lib/cordova-android/framework/bin/classes/org/apache/cordova/Notification$4$1.class b/lib/cordova-android/framework/bin/classes/org/apache/cordova/Notification$4$1.class
deleted file mode 100644
index 0dd88bd..0000000
Binary files a/lib/cordova-android/framework/bin/classes/org/apache/cordova/Notification$4$1.class and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/f6dc3ad1/lib/cordova-android/framework/bin/classes/org/apache/cordova/Notification$4.class
----------------------------------------------------------------------
diff --git a/lib/cordova-android/framework/bin/classes/org/apache/cordova/Notification$4.class b/lib/cordova-android/framework/bin/classes/org/apache/cordova/Notification$4.class
deleted file mode 100644
index 11e1492..0000000
Binary files a/lib/cordova-android/framework/bin/classes/org/apache/cordova/Notification$4.class and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/f6dc3ad1/lib/cordova-android/framework/bin/classes/org/apache/cordova/Notification.class
----------------------------------------------------------------------
diff --git a/lib/cordova-android/framework/bin/classes/org/apache/cordova/Notification.class b/lib/cordova-android/framework/bin/classes/org/apache/cordova/Notification.class
deleted file mode 100644
index dd6d2af..0000000
Binary files a/lib/cordova-android/framework/bin/classes/org/apache/cordova/Notification.class and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/f6dc3ad1/lib/cordova-android/framework/bin/classes/org/apache/cordova/R$attr.class
----------------------------------------------------------------------
diff --git a/lib/cordova-android/framework/bin/classes/org/apache/cordova/R$attr.class b/lib/cordova-android/framework/bin/classes/org/apache/cordova/R$attr.class
deleted file mode 100644
index 1faae54..0000000
Binary files a/lib/cordova-android/framework/bin/classes/org/apache/cordova/R$attr.class and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/f6dc3ad1/lib/cordova-android/framework/bin/classes/org/apache/cordova/R$drawable.class
----------------------------------------------------------------------
diff --git a/lib/cordova-android/framework/bin/classes/org/apache/cordova/R$drawable.class b/lib/cordova-android/framework/bin/classes/org/apache/cordova/R$drawable.class
deleted file mode 100644
index 808f711..0000000
Binary files a/lib/cordova-android/framework/bin/classes/org/apache/cordova/R$drawable.class and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/f6dc3ad1/lib/cordova-android/framework/bin/classes/org/apache/cordova/R$id.class
----------------------------------------------------------------------
diff --git a/lib/cordova-android/framework/bin/classes/org/apache/cordova/R$id.class b/lib/cordova-android/framework/bin/classes/org/apache/cordova/R$id.class
deleted file mode 100644
index cc8a5fb..0000000
Binary files a/lib/cordova-android/framework/bin/classes/org/apache/cordova/R$id.class and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/f6dc3ad1/lib/cordova-android/framework/bin/classes/org/apache/cordova/R$layout.class
----------------------------------------------------------------------
diff --git a/lib/cordova-android/framework/bin/classes/org/apache/cordova/R$layout.class b/lib/cordova-android/framework/bin/classes/org/apache/cordova/R$layout.class
deleted file mode 100644
index c9451a8..0000000
Binary files a/lib/cordova-android/framework/bin/classes/org/apache/cordova/R$layout.class and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/f6dc3ad1/lib/cordova-android/framework/bin/classes/org/apache/cordova/R$string.class
----------------------------------------------------------------------
diff --git a/lib/cordova-android/framework/bin/classes/org/apache/cordova/R$string.class b/lib/cordova-android/framework/bin/classes/org/apache/cordova/R$string.class
deleted file mode 100644
index 404c81b..0000000
Binary files a/lib/cordova-android/framework/bin/classes/org/apache/cordova/R$string.class and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/f6dc3ad1/lib/cordova-android/framework/bin/classes/org/apache/cordova/R$xml.class
----------------------------------------------------------------------
diff --git a/lib/cordova-android/framework/bin/classes/org/apache/cordova/R$xml.class b/lib/cordova-android/framework/bin/classes/org/apache/cordova/R$xml.class
deleted file mode 100644
index e0ecf46..0000000
Binary files a/lib/cordova-android/framework/bin/classes/org/apache/cordova/R$xml.class and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/f6dc3ad1/lib/cordova-android/framework/bin/classes/org/apache/cordova/R.class
----------------------------------------------------------------------
diff --git a/lib/cordova-android/framework/bin/classes/org/apache/cordova/R.class b/lib/cordova-android/framework/bin/classes/org/apache/cordova/R.class
deleted file mode 100644
index ccaba23..0000000
Binary files a/lib/cordova-android/framework/bin/classes/org/apache/cordova/R.class and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/f6dc3ad1/lib/cordova-android/framework/bin/classes/org/apache/cordova/SplashScreen.class
----------------------------------------------------------------------
diff --git a/lib/cordova-android/framework/bin/classes/org/apache/cordova/SplashScreen.class b/lib/cordova-android/framework/bin/classes/org/apache/cordova/SplashScreen.class
deleted file mode 100644
index d425667..0000000
Binary files a/lib/cordova-android/framework/bin/classes/org/apache/cordova/SplashScreen.class and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/f6dc3ad1/lib/cordova-android/framework/bin/classes/org/apache/cordova/StandAlone.class
----------------------------------------------------------------------
diff --git a/lib/cordova-android/framework/bin/classes/org/apache/cordova/StandAlone.class b/lib/cordova-android/framework/bin/classes/org/apache/cordova/StandAlone.class
deleted file mode 100644
index 91c0d99..0000000
Binary files a/lib/cordova-android/framework/bin/classes/org/apache/cordova/StandAlone.class and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/f6dc3ad1/lib/cordova-android/framework/bin/classes/org/apache/cordova/Storage.class
----------------------------------------------------------------------
diff --git a/lib/cordova-android/framework/bin/classes/org/apache/cordova/Storage.class b/lib/cordova-android/framework/bin/classes/org/apache/cordova/Storage.class
deleted file mode 100644
index bf4665e..0000000
Binary files a/lib/cordova-android/framework/bin/classes/org/apache/cordova/Storage.class and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/f6dc3ad1/lib/cordova-android/framework/bin/classes/org/apache/cordova/api/CallbackContext.class
----------------------------------------------------------------------
diff --git a/lib/cordova-android/framework/bin/classes/org/apache/cordova/api/CallbackContext.class b/lib/cordova-android/framework/bin/classes/org/apache/cordova/api/CallbackContext.class
deleted file mode 100644
index c188f73..0000000
Binary files a/lib/cordova-android/framework/bin/classes/org/apache/cordova/api/CallbackContext.class and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/f6dc3ad1/lib/cordova-android/framework/bin/classes/org/apache/cordova/api/CordovaInterface.class
----------------------------------------------------------------------
diff --git a/lib/cordova-android/framework/bin/classes/org/apache/cordova/api/CordovaInterface.class b/lib/cordova-android/framework/bin/classes/org/apache/cordova/api/CordovaInterface.class
deleted file mode 100644
index d35bf25..0000000
Binary files a/lib/cordova-android/framework/bin/classes/org/apache/cordova/api/CordovaInterface.class and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/f6dc3ad1/lib/cordova-android/framework/bin/classes/org/apache/cordova/api/CordovaPlugin.class
----------------------------------------------------------------------
diff --git a/lib/cordova-android/framework/bin/classes/org/apache/cordova/api/CordovaPlugin.class b/lib/cordova-android/framework/bin/classes/org/apache/cordova/api/CordovaPlugin.class
deleted file mode 100644
index 8b9d0f0..0000000
Binary files a/lib/cordova-android/framework/bin/classes/org/apache/cordova/api/CordovaPlugin.class and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/f6dc3ad1/lib/cordova-android/framework/bin/classes/org/apache/cordova/api/LOG.class
----------------------------------------------------------------------
diff --git a/lib/cordova-android/framework/bin/classes/org/apache/cordova/api/LOG.class b/lib/cordova-android/framework/bin/classes/org/apache/cordova/api/LOG.class
deleted file mode 100644
index 7be0148..0000000
Binary files a/lib/cordova-android/framework/bin/classes/org/apache/cordova/api/LOG.class and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/f6dc3ad1/lib/cordova-android/framework/bin/classes/org/apache/cordova/api/LegacyContext.class
----------------------------------------------------------------------
diff --git a/lib/cordova-android/framework/bin/classes/org/apache/cordova/api/LegacyContext.class b/lib/cordova-android/framework/bin/classes/org/apache/cordova/api/LegacyContext.class
deleted file mode 100644
index 3b1dafb..0000000
Binary files a/lib/cordova-android/framework/bin/classes/org/apache/cordova/api/LegacyContext.class and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/f6dc3ad1/lib/cordova-android/framework/bin/classes/org/apache/cordova/api/Plugin$1.class
----------------------------------------------------------------------
diff --git a/lib/cordova-android/framework/bin/classes/org/apache/cordova/api/Plugin$1.class b/lib/cordova-android/framework/bin/classes/org/apache/cordova/api/Plugin$1.class
deleted file mode 100644
index a31c62c..0000000
Binary files a/lib/cordova-android/framework/bin/classes/org/apache/cordova/api/Plugin$1.class and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/f6dc3ad1/lib/cordova-android/framework/bin/classes/org/apache/cordova/api/Plugin.class
----------------------------------------------------------------------
diff --git a/lib/cordova-android/framework/bin/classes/org/apache/cordova/api/Plugin.class b/lib/cordova-android/framework/bin/classes/org/apache/cordova/api/Plugin.class
deleted file mode 100644
index b525d94..0000000
Binary files a/lib/cordova-android/framework/bin/classes/org/apache/cordova/api/Plugin.class and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/f6dc3ad1/lib/cordova-android/framework/bin/classes/org/apache/cordova/api/PluginEntry.class
----------------------------------------------------------------------
diff --git a/lib/cordova-android/framework/bin/classes/org/apache/cordova/api/PluginEntry.class b/lib/cordova-android/framework/bin/classes/org/apache/cordova/api/PluginEntry.class
deleted file mode 100644
index 35c74da..0000000
Binary files a/lib/cordova-android/framework/bin/classes/org/apache/cordova/api/PluginEntry.class and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/f6dc3ad1/lib/cordova-android/framework/bin/classes/org/apache/cordova/api/PluginManager.class
----------------------------------------------------------------------
diff --git a/lib/cordova-android/framework/bin/classes/org/apache/cordova/api/PluginManager.class b/lib/cordova-android/framework/bin/classes/org/apache/cordova/api/PluginManager.class
deleted file mode 100644
index 4a39b7b..0000000
Binary files a/lib/cordova-android/framework/bin/classes/org/apache/cordova/api/PluginManager.class and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/f6dc3ad1/lib/cordova-android/framework/bin/classes/org/apache/cordova/api/PluginResult$Status.class
----------------------------------------------------------------------
diff --git a/lib/cordova-android/framework/bin/classes/org/apache/cordova/api/PluginResult$Status.class b/lib/cordova-android/framework/bin/classes/org/apache/cordova/api/PluginResult$Status.class
deleted file mode 100644
index d9da2c3..0000000
Binary files a/lib/cordova-android/framework/bin/classes/org/apache/cordova/api/PluginResult$Status.class and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/f6dc3ad1/lib/cordova-android/framework/bin/classes/org/apache/cordova/api/PluginResult.class
----------------------------------------------------------------------
diff --git a/lib/cordova-android/framework/bin/classes/org/apache/cordova/api/PluginResult.class b/lib/cordova-android/framework/bin/classes/org/apache/cordova/api/PluginResult.class
deleted file mode 100644
index ec983db..0000000
Binary files a/lib/cordova-android/framework/bin/classes/org/apache/cordova/api/PluginResult.class and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/f6dc3ad1/lib/cordova-android/framework/bin/classes/org/apache/cordova/file/EncodingException.class
----------------------------------------------------------------------
diff --git a/lib/cordova-android/framework/bin/classes/org/apache/cordova/file/EncodingException.class b/lib/cordova-android/framework/bin/classes/org/apache/cordova/file/EncodingException.class
deleted file mode 100644
index 859b4ba..0000000
Binary files a/lib/cordova-android/framework/bin/classes/org/apache/cordova/file/EncodingException.class and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/f6dc3ad1/lib/cordova-android/framework/bin/classes/org/apache/cordova/file/FileExistsException.class
----------------------------------------------------------------------
diff --git a/lib/cordova-android/framework/bin/classes/org/apache/cordova/file/FileExistsException.class b/lib/cordova-android/framework/bin/classes/org/apache/cordova/file/FileExistsException.class
deleted file mode 100644
index 77ac00b..0000000
Binary files a/lib/cordova-android/framework/bin/classes/org/apache/cordova/file/FileExistsException.class and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/f6dc3ad1/lib/cordova-android/framework/bin/classes/org/apache/cordova/file/InvalidModificationException.class
----------------------------------------------------------------------
diff --git a/lib/cordova-android/framework/bin/classes/org/apache/cordova/file/InvalidModificationException.class b/lib/cordova-android/framework/bin/classes/org/apache/cordova/file/InvalidModificationException.class
deleted file mode 100644
index f3b3ccc..0000000
Binary files a/lib/cordova-android/framework/bin/classes/org/apache/cordova/file/InvalidModificationException.class and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/f6dc3ad1/lib/cordova-android/framework/bin/classes/org/apache/cordova/file/NoModificationAllowedException.class
----------------------------------------------------------------------
diff --git a/lib/cordova-android/framework/bin/classes/org/apache/cordova/file/NoModificationAllowedException.class b/lib/cordova-android/framework/bin/classes/org/apache/cordova/file/NoModificationAllowedException.class
deleted file mode 100644
index 746ea8b..0000000
Binary files a/lib/cordova-android/framework/bin/classes/org/apache/cordova/file/NoModificationAllowedException.class and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/f6dc3ad1/lib/cordova-android/framework/bin/classes/org/apache/cordova/file/TypeMismatchException.class
----------------------------------------------------------------------
diff --git a/lib/cordova-android/framework/bin/classes/org/apache/cordova/file/TypeMismatchException.class b/lib/cordova-android/framework/bin/classes/org/apache/cordova/file/TypeMismatchException.class
deleted file mode 100644
index 6f44f84..0000000
Binary files a/lib/cordova-android/framework/bin/classes/org/apache/cordova/file/TypeMismatchException.class and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/f6dc3ad1/lib/cordova-android/framework/bin/jarlist.cache
----------------------------------------------------------------------
diff --git a/lib/cordova-android/framework/bin/jarlist.cache b/lib/cordova-android/framework/bin/jarlist.cache
deleted file mode 100644
index 1b5ec3f..0000000
--- a/lib/cordova-android/framework/bin/jarlist.cache
+++ /dev/null
@@ -1,3 +0,0 @@
-# cache for current jar dependecy. DO NOT EDIT.
-# format is <lastModified> <length> <SHA-1> <path>
-# Encoding is UTF-8
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/f6dc3ad1/lib/cordova-android/framework/bin/proguard.txt
----------------------------------------------------------------------
diff --git a/lib/cordova-android/framework/bin/proguard.txt b/lib/cordova-android/framework/bin/proguard.txt
deleted file mode 100644
index 862a8c5..0000000
--- a/lib/cordova-android/framework/bin/proguard.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-# view AndroidManifest.xml #generated:60
--keep class org.apache.cordova.DroidGap { <init>(...); }
-
-# view AndroidManifest.xml #generated:53
--keep class org.apache.cordova.StandAlone { <init>(...); }
-
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/f6dc3ad1/lib/cordova-android/framework/gen/R.java.d
----------------------------------------------------------------------
diff --git a/lib/cordova-android/framework/gen/R.java.d b/lib/cordova-android/framework/gen/R.java.d
deleted file mode 100644
index c1939d1..0000000
--- a/lib/cordova-android/framework/gen/R.java.d
+++ /dev/null
@@ -1,9 +0,0 @@
-/Users/fil/src/cordova-cli/lib/cordova-android/framework/gen/org/apache/cordova/R.java \
- : /Users/fil/src/cordova-cli/lib/cordova-android/framework/res/drawable/splash.png \
-/Users/fil/src/cordova-cli/lib/cordova-android/framework/res/drawable-hdpi/icon.png \
-/Users/fil/src/cordova-cli/lib/cordova-android/framework/res/drawable-ldpi/icon.png \
-/Users/fil/src/cordova-cli/lib/cordova-android/framework/res/drawable-mdpi/icon.png \
-/Users/fil/src/cordova-cli/lib/cordova-android/framework/res/layout/main.xml \
-/Users/fil/src/cordova-cli/lib/cordova-android/framework/res/values/strings.xml \
-/Users/fil/src/cordova-cli/lib/cordova-android/framework/res/xml/config.xml \
-/Users/fil/src/cordova-cli/lib/cordova-android/framework/bin/AndroidManifest.xml \
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/f6dc3ad1/lib/cordova-android/framework/gen/org/apache/cordova/BuildConfig.java
----------------------------------------------------------------------
diff --git a/lib/cordova-android/framework/gen/org/apache/cordova/BuildConfig.java b/lib/cordova-android/framework/gen/org/apache/cordova/BuildConfig.java
deleted file mode 100644
index bba60a1..0000000
--- a/lib/cordova-android/framework/gen/org/apache/cordova/BuildConfig.java
+++ /dev/null
@@ -1,6 +0,0 @@
-/** Automatically generated file. DO NOT MODIFY */
-package org.apache.cordova;
-
-public final class BuildConfig {
- public final static boolean DEBUG = false;
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/f6dc3ad1/lib/cordova-android/framework/gen/org/apache/cordova/R.java
----------------------------------------------------------------------
diff --git a/lib/cordova-android/framework/gen/org/apache/cordova/R.java b/lib/cordova-android/framework/gen/org/apache/cordova/R.java
deleted file mode 100644
index f2cbb9e..0000000
--- a/lib/cordova-android/framework/gen/org/apache/cordova/R.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/* AUTO-GENERATED FILE. DO NOT MODIFY.
- *
- * This class was automatically generated by the
- * aapt tool from the resource data it found. It
- * should not be modified by hand.
- */
-
-package org.apache.cordova;
-
-public final class R {
- public static final class attr {
- }
- public static final class drawable {
- public static int icon=0x7f020000;
- public static int splash=0x7f020001;
- }
- public static final class id {
- public static int appView=0x7f060000;
- }
- public static final class layout {
- public static int main=0x7f030000;
- }
- public static final class string {
- public static int app_name=0x7f050000;
- public static int go=0x7f050001;
- }
- public static final class xml {
- public static int config=0x7f040000;
- }
-}
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/f6dc3ad1/lib/cordova-android/framework/local.properties
----------------------------------------------------------------------
diff --git a/lib/cordova-android/framework/local.properties b/lib/cordova-android/framework/local.properties
new file mode 100644
index 0000000..793d18c
--- /dev/null
+++ b/lib/cordova-android/framework/local.properties
@@ -0,0 +1,10 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+
+# location of the SDK. This is only used by Ant
+# For customization when using a Version Control System, please read the
+# header note.
+sdk.dir=/Users/fil/SDKs/android-sdk-macosx
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/f6dc3ad1/lib/cordova-android/framework/src/org/apache/cordova/CameraLauncher.java
----------------------------------------------------------------------
diff --git a/lib/cordova-android/framework/src/org/apache/cordova/CameraLauncher.java b/lib/cordova-android/framework/src/org/apache/cordova/CameraLauncher.java
index f9edd10..3012ee3 100755
--- a/lib/cordova-android/framework/src/org/apache/cordova/CameraLauncher.java
+++ b/lib/cordova-android/framework/src/org/apache/cordova/CameraLauncher.java
@@ -571,7 +571,13 @@ public class CameraLauncher extends CordovaPlugin implements MediaScannerConnect
BitmapFactory.Options options = new BitmapFactory.Options();
options.inJustDecodeBounds = true;
BitmapFactory.decodeFile(imagePath, options);
-
+
+ //CB-2292: WTF? Why is the width null?
+ if(options.outWidth == 0 || options.outHeight == 0)
+ {
+ return null;
+ }
+
// determine the correct aspect ratio
int[] widthHeight = calculateAspectRatio(options.outWidth, options.outHeight);
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/f6dc3ad1/lib/cordova-android/framework/src/org/apache/cordova/Config.java
----------------------------------------------------------------------
diff --git a/lib/cordova-android/framework/src/org/apache/cordova/Config.java b/lib/cordova-android/framework/src/org/apache/cordova/Config.java
index 8353668..01eb2bb 100644
--- a/lib/cordova-android/framework/src/org/apache/cordova/Config.java
+++ b/lib/cordova-android/framework/src/org/apache/cordova/Config.java
@@ -35,6 +35,7 @@ import org.xmlpull.v1.XmlPullParserException;
import android.app.Activity;
import android.content.res.XmlResourceParser;
+import android.graphics.Color;
import android.util.Log;
@@ -103,12 +104,56 @@ public class Config {
}
else if (strNode.equals("preference")) {
String name = xml.getAttributeValue(null, "name");
- String value = xml.getAttributeValue(null, "value");
-
+ /* Java 1.6 does not support switch-based strings
+ Java 7 does, but we're using Dalvik, which is apparently not Java.
+ Since we're reading XML, this has to be an ugly if/else.
+
+ Also, due to cast issues, each of them has to call their separate putExtra!
+ Wheee!!! Isn't Java FUN!?!?!?
+
+ Note: We should probably pass in the classname for the variable splash on splashscreen!
+ */
+ if(name.equals("splashscreen")) {
+ String value = xml.getAttributeValue(null, "value");
+ int resource = 0;
+ if (value != null)
+ {
+ value = "splash";
+ }
+ resource = action.getResources().getIdentifier(value, "drawable", action.getPackageName());
+
+ action.getIntent().putExtra(name, resource);
+ LOG.i("CordovaLog", "Found preference for %s=%s", name, value);
+ Log.d("CordovaLog", "Found preference for " + name + "=" + value);
+ }
+ else if(name.equals("backgroundColor")) {
+ int value = xml.getAttributeIntValue(null, "value", Color.BLACK);
+ action.getIntent().putExtra(name, value);
+ LOG.i("CordovaLog", "Found preference for %s=%d", name, value);
+ Log.d("CordovaLog", "Found preference for " + name + "=" + Integer.toString(value));
+ }
+ else if(name.equals("loadUrlTimeoutValue")) {
+ int value = xml.getAttributeIntValue(null, "value", 20000);
+ action.getIntent().putExtra(name, value);
+ LOG.i("CordovaLog", "Found preference for %s=%d", name, value);
+ Log.d("CordovaLog", "Found preference for " + name + "=" + Integer.toString(value));
+ }
+ else if(name.equals("keepRunning"))
+ {
+ boolean value = xml.getAttributeValue(null, "value").equals("true");
+ action.getIntent().putExtra(name, value);
+ }
+ else
+ {
+ String value = xml.getAttributeValue(null, "value");
+ action.getIntent().putExtra(name, value);
+ LOG.i("CordovaLog", "Found preference for %s=%s", name, value);
+ Log.d("CordovaLog", "Found preference for " + name + "=" + value);
+ }
+ /*
LOG.i("CordovaLog", "Found preference for %s=%s", name, value);
Log.d("CordovaLog", "Found preference for " + name + "=" + value);
-
- action.getIntent().putExtra(name, value);
+ */
}
else if (strNode.equals("content")) {
String src = xml.getAttributeValue(null, "src");
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/f6dc3ad1/lib/cordova-android/framework/src/org/apache/cordova/CordovaWebViewClient.java
----------------------------------------------------------------------
diff --git a/lib/cordova-android/framework/src/org/apache/cordova/CordovaWebViewClient.java b/lib/cordova-android/framework/src/org/apache/cordova/CordovaWebViewClient.java
index 7a7e6ed..8b023eb 100755
--- a/lib/cordova-android/framework/src/org/apache/cordova/CordovaWebViewClient.java
+++ b/lib/cordova-android/framework/src/org/apache/cordova/CordovaWebViewClient.java
@@ -230,6 +230,10 @@ public class CordovaWebViewClient extends WebViewClient {
AuthenticationToken token = this.getAuthenticationToken(host, realm);
if (token != null) {
handler.proceed(token.getUserName(), token.getPassword());
+ }
+ else {
+ // Handle 401 like we'd normally do!
+ super.onReceivedHttpAuthRequest(view, handler, host, realm);
}
}
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/f6dc3ad1/lib/cordova-android/framework/src/org/apache/cordova/Device.java
----------------------------------------------------------------------
diff --git a/lib/cordova-android/framework/src/org/apache/cordova/Device.java b/lib/cordova-android/framework/src/org/apache/cordova/Device.java
index a833a1f..883fc55 100644
--- a/lib/cordova-android/framework/src/org/apache/cordova/Device.java
+++ b/lib/cordova-android/framework/src/org/apache/cordova/Device.java
@@ -39,7 +39,7 @@ import android.telephony.TelephonyManager;
public class Device extends CordovaPlugin {
public static final String TAG = "Device";
- public static String cordovaVersion = "2.4.0rc1"; // Cordova version
+ public static String cordovaVersion = "2.4.0"; // Cordova version
public static String platform = "Android"; // Device OS
public static String uuid; // Device UUID
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/f6dc3ad1/lib/cordova-android/framework/src/org/apache/cordova/DroidGap.java
----------------------------------------------------------------------
diff --git a/lib/cordova-android/framework/src/org/apache/cordova/DroidGap.java b/lib/cordova-android/framework/src/org/apache/cordova/DroidGap.java
index 69a7650..ee21eb8 100755
--- a/lib/cordova-android/framework/src/org/apache/cordova/DroidGap.java
+++ b/lib/cordova-android/framework/src/org/apache/cordova/DroidGap.java
@@ -591,6 +591,7 @@ public class DroidGap extends Activity implements CordovaInterface {
* @param value
*/
public void setBooleanProperty(String name, boolean value) {
+ Log.d(TAG, "Setting boolean properties in DroidGap will be deprecated in 3.0 on July 2013, please use config.xml");
this.getIntent().putExtra(name, value);
}
@@ -601,6 +602,7 @@ public class DroidGap extends Activity implements CordovaInterface {
* @param value
*/
public void setIntegerProperty(String name, int value) {
+ Log.d(TAG, "Setting integer properties in DroidGap will be deprecated in 3.1 on August 2013, please use config.xml");
this.getIntent().putExtra(name, value);
}
@@ -611,6 +613,7 @@ public class DroidGap extends Activity implements CordovaInterface {
* @param value
*/
public void setStringProperty(String name, String value) {
+ Log.d(TAG, "Setting string properties in DroidGap will be deprecated in 3.0 on July 2013, please use config.xml");
this.getIntent().putExtra(name, value);
}
@@ -621,6 +624,7 @@ public class DroidGap extends Activity implements CordovaInterface {
* @param value
*/
public void setDoubleProperty(String name, double value) {
+ Log.d(TAG, "Setting double properties in DroidGap will be deprecated in 3.0 on July 2013, please use config.xml");
this.getIntent().putExtra(name, value);
}
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/f6dc3ad1/lib/cordova-android/framework/src/org/apache/cordova/FileTransfer.java
----------------------------------------------------------------------
diff --git a/lib/cordova-android/framework/src/org/apache/cordova/FileTransfer.java b/lib/cordova-android/framework/src/org/apache/cordova/FileTransfer.java
index c0bd1bd..783a71b 100644
--- a/lib/cordova-android/framework/src/org/apache/cordova/FileTransfer.java
+++ b/lib/cordova-android/framework/src/org/apache/cordova/FileTransfer.java
@@ -215,6 +215,8 @@ public class FileTransfer extends CordovaPlugin {
HttpURLConnection conn = null;
HostnameVerifier oldHostnameVerifier = null;
SSLSocketFactory oldSocketFactory = null;
+ int totalBytes = 0;
+ int fixedLength = -1;
try {
// Create return object
FileUploadResult result = new FileUploadResult();
@@ -320,7 +322,6 @@ public class FileTransfer extends CordovaPlugin {
int stringLength = extraBytes.length + midParams.length() + tailParams.length() + fileNameBytes.length;
Log.d(LOG_TAG, "String Length: " + stringLength);
- int fixedLength = -1;
if (sourceInputStream instanceof FileInputStream) {
fixedLength = (int) ((FileInputStream)sourceInputStream).getChannel().size() + stringLength;
progress.setLengthComputable(true);
@@ -363,13 +364,12 @@ public class FileTransfer extends CordovaPlugin {
// read file and write it into form...
int bytesRead = sourceInputStream.read(buffer, 0, bufferSize);
- long totalBytes = 0;
long prevBytesRead = 0;
while (bytesRead > 0) {
totalBytes += bytesRead;
result.setBytesSent(totalBytes);
- dos.write(buffer, 0, bufferSize);
+ dos.write(buffer, 0, bytesRead);
if (totalBytes > prevBytesRead + 102400) {
prevBytesRead = totalBytes;
Log.d(LOG_TAG, "Uploaded " + totalBytes + " of " + fixedLength + " bytes");
@@ -436,6 +436,7 @@ public class FileTransfer extends CordovaPlugin {
} catch (IOException e) {
JSONObject error = createFileTransferError(CONNECTION_ERR, source, target, conn);
Log.e(LOG_TAG, error.toString(), e);
+ Log.e(LOG_TAG, "Failed after uploading " + totalBytes + " of " + fixedLength + " bytes.");
context.sendPluginResult(new PluginResult(PluginResult.Status.IO_EXCEPTION, error));
} catch (JSONException e) {
Log.e(LOG_TAG, e.getMessage(), e);
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/f6dc3ad1/lib/cordova-android/test/AndroidManifest.xml
----------------------------------------------------------------------
diff --git a/lib/cordova-android/test/AndroidManifest.xml b/lib/cordova-android/test/AndroidManifest.xml
index aee2e04..f6c840e 100755
--- a/lib/cordova-android/test/AndroidManifest.xml
+++ b/lib/cordova-android/test/AndroidManifest.xml
@@ -18,7 +18,7 @@
under the License.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:windowSoftInputMode="adjustPan"
- package="org.apache.cordova.test" android:versionName="1.1" android:versionCode="5">
+ package="org.apache.cordova.test" android:versionName="1.0" android:versionCode="1">
<supports-screens
android:largeScreens="true"
android:normalScreens="true"