From 4ff406f9dfccccef6e4ad40c31e856dabd2f3119 Mon Sep 17 00:00:00 2001 From: Steven Gill Date: Thu, 6 May 2010 15:43:56 -0700 Subject: [PATCH 1/6] fixed geolocation null bug --- framework/src/com/phonegap/GeoListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/src/com/phonegap/GeoListener.java b/framework/src/com/phonegap/GeoListener.java index 613cbc15..3fb8fe96 100644 --- a/framework/src/com/phonegap/GeoListener.java +++ b/framework/src/com/phonegap/GeoListener.java @@ -78,7 +78,7 @@ public class GeoListener { loc = mGps.getLocation(); if (loc == null && mNetwork != null) loc = mNetwork.getLocation(); - else + if(loc == null) loc = new Location(LocationManager.NETWORK_PROVIDER); return loc; } From a179fbd09593c7705d5bdb404e2f0e83662cfc22 Mon Sep 17 00:00:00 2001 From: Joe Bowser Date: Fri, 14 May 2010 15:49:14 -0700 Subject: [PATCH 2/6] Attempt to fix the HTML 5 storage --- framework/assets/js/storage.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/framework/assets/js/storage.js b/framework/assets/js/storage.js index 24a406cb..6b5fb305 100644 --- a/framework/assets/js/storage.js +++ b/framework/assets/js/storage.js @@ -80,10 +80,10 @@ var dbSetup = function(name, version, display_name, size) } PhoneGap.addConstructor(function() { - if (typeof navigator.openDatabase == "undefined") + if (typeof window.openDatabase == "undefined") { navigator.openDatabase = window.openDatabase = dbSetup; - window.droiddb = new DroidDB(); + window.droiddb = new DroidDB(); } }); From dfe0b6ff27ea9374526190db69ad8a5d058dfd8a Mon Sep 17 00:00:00 2001 From: Igor Anic Date: Fri, 23 Apr 2010 10:38:02 +0200 Subject: [PATCH 3/6] console.log for api level 7 (cherry picked from commit a2b08f305b33de38c1ffa93f2a13ed4636482bc1) --- framework/src/com/phonegap/DroidGap.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/framework/src/com/phonegap/DroidGap.java b/framework/src/com/phonegap/DroidGap.java index 6c46ac3b..e51a6ed3 100644 --- a/framework/src/com/phonegap/DroidGap.java +++ b/framework/src/com/phonegap/DroidGap.java @@ -304,6 +304,12 @@ public class DroidGap extends Activity { { Log.d(TAG, sourceID + ": Line " + Integer.toString(lineNumber) + " : " + message); } + + // console.log in api level 7: http://developer.android.com/guide/developing/debug-tasks.html + public void onConsoleMessage(String message, int lineNumber, String sourceID) + { + Log.d(TAG, sourceID + ": Line " + Integer.toString(lineNumber) + " : " + message); + } } From 7506548ae2f34b084c7ceb1c86a3509dab5fa8f0 Mon Sep 17 00:00:00 2001 From: Igor Anic Date: Fri, 23 Apr 2010 12:12:40 +0200 Subject: [PATCH 4/6] little better database quota management, increse db size in steps of 1Mb (cherry picked from commit f5cd1fe73d6cd24ad48b36def86ead5a1f5141ea) --- framework/src/com/phonegap/DroidGap.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/framework/src/com/phonegap/DroidGap.java b/framework/src/com/phonegap/DroidGap.java index e51a6ed3..34de7c46 100644 --- a/framework/src/com/phonegap/DroidGap.java +++ b/framework/src/com/phonegap/DroidGap.java @@ -275,7 +275,7 @@ public class DroidGap extends Activity { public final class EclairClient extends GapClient { private String TAG = "PhoneGapLog"; - private long MAX_QUOTA = 2000000; + private long MAX_QUOTA = 100 * 1024 * 1024; public EclairClient(Context ctx) { super(ctx); @@ -285,10 +285,13 @@ public class DroidGap extends Activity { public void onExceededDatabaseQuota(String url, String databaseIdentifier, long currentQuota, long estimatedSize, long totalUsedQuota, WebStorage.QuotaUpdater quotaUpdater) { - + Log.d(TAG, "event raised onExceededDatabaseQuota estimatedSize: " + Long.toString(estimatedSize) + " currentQuota: " + Long.toString(currentQuota) + " totalUsedQuota: " + Long.toString(totalUsedQuota)); + if( estimatedSize < MAX_QUOTA) - { - long newQuota = estimatedSize; + { + //increase for 1Mb + long newQuota = currentQuota + 1024*1024; + Log.d(TAG, "calling quotaUpdater.updateQuota newQuota: " + Long.toString(newQuota) ); quotaUpdater.updateQuota(newQuota); } else @@ -296,7 +299,7 @@ public class DroidGap extends Activity { // Set the quota to whatever it is and force an error // TODO: get docs on how to handle this properly quotaUpdater.updateQuota(currentQuota); - } + } } // This is a test of console.log, because we don't have this in Android 2.01 From a65b5784492044324b49d8b9d078a54ba8876ac1 Mon Sep 17 00:00:00 2001 From: Igor Anic Date: Fri, 23 Apr 2010 10:49:47 +0200 Subject: [PATCH 5/6] adding useful telephony information to Device; sim serial number and some oters (cherry picked from commit da8c4f4a7539b2e6165d48ad6859f65c3133fc59) --- framework/assets/js/device.js | 6 +++++- framework/src/com/phonegap/PhoneGap.java | 18 +++++++++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/framework/assets/js/device.js b/framework/assets/js/device.js index c23f2b18..d6be6016 100644 --- a/framework/assets/js/device.js +++ b/framework/assets/js/device.js @@ -17,7 +17,11 @@ function Device() { this.version = window.DroidGap.getOSVersion(); this.gapVersion = window.DroidGap.getVersion(); this.platform = window.DroidGap.getPlatform(); - this.name = window.DroidGap.getProductName(); + this.name = window.DroidGap.getProductName(); + this.line1Number = window.DroidGap.getLine1Number(); + this.deviceId = window.DroidGap.getDeviceId(); + this.simSerialNumber = window.DroidGap.getSimSerialNumber(); + this.subscriberId = window.DroidGap.getSubscriberId(); } } catch(e) { this.available = false; diff --git a/framework/src/com/phonegap/PhoneGap.java b/framework/src/com/phonegap/PhoneGap.java index 262380b4..6dc00a8d 100644 --- a/framework/src/com/phonegap/PhoneGap.java +++ b/framework/src/com/phonegap/PhoneGap.java @@ -86,7 +86,23 @@ public class PhoneGap{ String uuid = Settings.Secure.getString(mCtx.getContentResolver(), android.provider.Settings.Secure.ANDROID_ID); return uuid; } - + + public String getLine1Number(){ + TelephonyManager operator = (TelephonyManager)mCtx.getSystemService(Context.TELEPHONY_SERVICE); + return operator.getLine1Number(); + } + public String getDeviceId(){ + TelephonyManager operator = (TelephonyManager)mCtx.getSystemService(Context.TELEPHONY_SERVICE); + return operator.getDeviceId(); + } + public String getSimSerialNumber(){ + TelephonyManager operator = (TelephonyManager)mCtx.getSystemService(Context.TELEPHONY_SERVICE); + return operator.getSimSerialNumber(); + } + public String getSubscriberId(){ + TelephonyManager operator = (TelephonyManager)mCtx.getSystemService(Context.TELEPHONY_SERVICE); + return operator.getSubscriberId(); + } public String getModel() { From 5c8e029da1d5bad042a8d0b90cb0e07e7b8fe949 Mon Sep 17 00:00:00 2001 From: Joe Bowser Date: Mon, 31 May 2010 10:59:44 -0700 Subject: [PATCH 6/6] Updating to 2.2 --- framework/default.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/default.properties b/framework/default.properties index 694331ea..c5d5335e 100644 --- a/framework/default.properties +++ b/framework/default.properties @@ -10,5 +10,5 @@ # Indicates whether an apk should be generated for each density. split.density=false # Project target. -target=android-7 +target=android-8 apk-configurations=