github/cordova-android
4
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2026-04-23 00:00:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git@github.com:phonegap/phonegap-android into accel_hack

Browse Source
This commit is contained in:
Joe Bowser
2010-05-31 11:37:41 -07:00
parent 64671184a6 5c8e029da1
commit cd5788c3ce
6 changed files with 40 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/src/com/phonegap/DroidGap.java
+14 -5
View File
@@ -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
@@ -304,6 +307,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);
}
}
framework/src/com/phonegap/GeoListener.java
+1 -1
View File
@@ -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;
}
framework/src/com/phonegap/PhoneGap.java
+17 -1
View File
@@ -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()
{