github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-02-07 23:03:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cordova-android

Browse Source
This commit is contained in:
Joe Bowser 2012-04-19 16:48:32 -07:00
commit bdf452b02a
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
framework/src/org/apache/cordova/NetworkManager.java
View File

@ -58,7 +58,7 @@ public class NetworkManager extends Plugin {
public static final String LTE = "lte"; public static final String LTE = "lte";
public static final String UMB = "umb"; public static final String UMB = "umb";
public static final String HSPA_PLUS = "hspa+"; public static final String HSPA_PLUS = "hspa+";
// return types // return type
public static final String TYPE_UNKNOWN = "unknown"; public static final String TYPE_UNKNOWN = "unknown";
public static final String TYPE_ETHERNET = "ethernet"; public static final String TYPE_ETHERNET = "ethernet";
public static final String TYPE_WIFI = "wifi"; public static final String TYPE_WIFI = "wifi";
@ -89,7 +89,7 @@ public class NetworkManager extends Plugin {
*/ */
public void setContext(CordovaInterface ctx) { public void setContext(CordovaInterface ctx) {
super.setContext(ctx); super.setContext(ctx);
this.sockMan = (ConnectivityManager) ctx.getSystemService(Context.CONNECTIVITY_SERVICE); this.sockMan = (ConnectivityManager) ctx.getSystemService(Context.CONNECTIVITY_SERVICE);
this.connectionCallbackId = null; this.connectionCallbackId = null;
// We need to listen to connectivity events to update navigator.connection // We need to listen to connectivity events to update navigator.connection
@ -98,7 +98,7 @@ public class NetworkManager extends Plugin {
if (this.receiver == null) { if (this.receiver == null) {
this.receiver = new BroadcastReceiver() { this.receiver = new BroadcastReceiver() {
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
updateConnectionInfo((NetworkInfo) intent.getParcelableExtra(ConnectivityManager.EXTRA_NETWORK_INFO)); updateConnectionInfo((NetworkInfo) intent.getParcelableExtra(ConnectivityManager.EXTRA_NETWORK_INFO));
} }
}; };
@ -117,7 +117,7 @@ public class NetworkManager extends Plugin {
*/ */
public PluginResult execute(String action, JSONArray args, String callbackId) { public PluginResult execute(String action, JSONArray args, String callbackId) {
PluginResult.Status status = PluginResult.Status.INVALID_ACTION; PluginResult.Status status = PluginResult.Status.INVALID_ACTION;
String result = "Unsupported Operation: " + action; String result = "Unsupported Operation: " + action;
if (action.equals("getConnectionInfo")) { if (action.equals("getConnectionInfo")) {
this.connectionCallbackId = callbackId; this.connectionCallbackId = callbackId;
@ -137,8 +137,7 @@ public class NetworkManager extends Plugin {
* @return T=returns value * @return T=returns value
*/ */
public boolean isSynch(String action) { public boolean isSynch(String action) {
// All methods take a while, so always use async return true;
return false;
} }
/** /**
@ -182,7 +181,7 @@ public class NetworkManager extends Plugin {
// If we are not connected to any network set type to none // If we are not connected to any network set type to none
if (!info.isConnected()) { if (!info.isConnected()) {
type = TYPE_NONE; type = TYPE_NONE;
} }
else { else {
type = getType(info); type = getType(info);
} }
@ -212,7 +211,7 @@ public class NetworkManager extends Plugin {
*/ */
private String getType(NetworkInfo info) { private String getType(NetworkInfo info) {
if (info != null) { if (info != null) {
String type = info.getTypeName(); String type = info.getTypeName();
if (type.toLowerCase().equals(WIFI)) { if (type.toLowerCase().equals(WIFI)) {
return TYPE_WIFI; return TYPE_WIFI;