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