github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-02-26 20:33:07 +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
commit cd5788c3ce
6 changed files with 40 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
framework/assets/js/device.js
View File

@ -18,6 +18,10 @@ function Device() {
this.gapVersion = window.DroidGap.getVersion(); this.gapVersion = window.DroidGap.getVersion();
this.platform = window.DroidGap.getPlatform(); 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) { } catch(e) {
this.available = false; this.available = false;

2
framework/assets/js/storage.js
View File

@ -80,7 +80,7 @@ var dbSetup = function(name, version, display_name, size)
} }
PhoneGap.addConstructor(function() { PhoneGap.addConstructor(function() {
if (typeof navigator.openDatabase == "undefined") if (typeof window.openDatabase == "undefined")
{ {
navigator.openDatabase = window.openDatabase = dbSetup; navigator.openDatabase = window.openDatabase = dbSetup;
window.droiddb = new DroidDB(); window.droiddb = new DroidDB();

2
framework/default.properties
View File

@ -10,5 +10,5 @@
# Indicates whether an apk should be generated for each density. # Indicates whether an apk should be generated for each density.
split.density=false split.density=false
# Project target. # Project target.
target=android-7 target=android-8
apk-configurations= apk-configurations=

13
framework/src/com/phonegap/DroidGap.java
View File

@ -275,7 +275,7 @@ public class DroidGap extends Activity {
public final class EclairClient extends GapClient public final class EclairClient extends GapClient
{ {
private String TAG = "PhoneGapLog"; private String TAG = "PhoneGapLog";
private long MAX_QUOTA = 2000000; private long MAX_QUOTA = 100 * 1024 * 1024;
public EclairClient(Context ctx) { public EclairClient(Context ctx) {
super(ctx); super(ctx);
@ -285,10 +285,13 @@ public class DroidGap extends Activity {
public void onExceededDatabaseQuota(String url, String databaseIdentifier, long currentQuota, long estimatedSize, public void onExceededDatabaseQuota(String url, String databaseIdentifier, long currentQuota, long estimatedSize,
long totalUsedQuota, WebStorage.QuotaUpdater quotaUpdater) 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) 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); quotaUpdater.updateQuota(newQuota);
} }
else else
@ -301,6 +304,12 @@ public class DroidGap extends Activity {
// This is a test of console.log, because we don't have this in Android 2.01 // 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) 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); Log.d(TAG, sourceID + ": Line " + Integer.toString(lineNumber) + " : " + message);
} }

2
framework/src/com/phonegap/GeoListener.java
View File

@ -78,7 +78,7 @@ public class GeoListener {
loc = mGps.getLocation(); loc = mGps.getLocation();
if (loc == null && mNetwork != null) if (loc == null && mNetwork != null)
loc = mNetwork.getLocation(); loc = mNetwork.getLocation();
else if(loc == null)
loc = new Location(LocationManager.NETWORK_PROVIDER); loc = new Location(LocationManager.NETWORK_PROVIDER);
return loc; return loc;
} }

16
framework/src/com/phonegap/PhoneGap.java
View File

@ -87,6 +87,22 @@ public class PhoneGap{
return uuid; 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() public String getModel()
{ {