Merge branch 'master' of git@github.com:phonegap/phonegap-android int…

…o accel_hack
alunny · May 31, 2010 · cd5788c · cd5788c
2 parents 6467118 + 5c8e029
commit cd5788c
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 11 deletions.
diff --git 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/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();
   }
 });
 
diff --git 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=
diff --git a/framework/src/com/phonegap/DroidGap.java b/framework/src/com/phonegap/DroidGap.java
@@ -275,7 +275,7 @@ public void onClick(DialogInterface dialog, int which) {
 	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,25 +285,34 @@ public EclairClient(Context ctx) {
 		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
 		    	{
 		    		// 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
 		public void addMessageToConsole(String message, int lineNumber, String sourceID)
 		{
 			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);              
+    }
 
 	}
 

diff --git a/framework/src/com/phonegap/GeoListener.java b/framework/src/com/phonegap/GeoListener.java
@@ -78,7 +78,7 @@ public Location getCurrentLocation() {
 			loc = mGps.getLocation();
 		if (loc == null && mNetwork != null)
 			loc = mNetwork.getLocation();
-		else
+		if(loc == null)
 			loc = new Location(LocationManager.NETWORK_PROVIDER);
 		return loc;
 	}

diff --git a/framework/src/com/phonegap/PhoneGap.java b/framework/src/com/phonegap/PhoneGap.java
@@ -86,7 +86,23 @@ public String getUuid()
 		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()
 	{