From d72c77d6f3831229af48929edb514ad0c91143a3 Mon Sep 17 00:00:00 2001
From: Bryce Curtis <curtis.bryce@gmail.com>
Date: Fri, 10 Sep 2010 14:20:34 -0500
Subject: [PATCH] Modify network queries to use async plugin.

---
 framework/assets/js/network.js                | 67 +++++++++++--------
 .../src/com/phonegap/NetworkManager.java      |  7 ++
 2 files changed, 45 insertions(+), 29 deletions(-)
 mode change 100644 => 100755 framework/src/com/phonegap/NetworkManager.java

diff --git a/framework/assets/js/network.js b/framework/assets/js/network.js
index 7328b9b0..720b8529 100755
--- a/framework/assets/js/network.js
+++ b/framework/assets/js/network.js
@@ -1,16 +1,3 @@
-com.phonegap.NetworkManagerProxy = function() {
-    this.className = "com.phonegap.NetworkManager";
-};
-com.phonegap.NetworkManagerProxy.prototype.isAvailable = function() {
-    return PhoneGap.exec(this.className, "isAvailable", []);
-};
-com.phonegap.NetworkManagerProxy.prototype.isWifiActive = function() {
-    return PhoneGap.exec(this.className, "isWifiActive", []);
-};
-com.phonegap.NetworkManagerProxy.prototype.isReachable = function(uri) {
-    return PhoneGap.exec(this.className, "isReachable", [uri]);
-};
-com.phonegap.NetworkManager = new com.phonegap.NetworkManagerProxy();
 
 /**
  * This class contains information about any NetworkStatus.
@@ -42,32 +29,54 @@ function Network() {
  * Called by the geolocation framework when the reachability status has changed.
  * @param {Reachibility} reachability The current reachability status.
  */
+// TODO: Callback from native code not implemented for Android
 Network.prototype.updateReachability = function(reachability) {
     this.lastReachability = reachability;
 };
 
 /**
- * 
+ * Determine if a URI is reachable over the network.
+
  * @param {Object} uri
- * @param {Function} win
+ * @param {Function} callback
  * @param {Object} options  (isIpAddress:boolean)
  */
-Network.prototype.isReachable = function(uri, win, options) {
-    var status = new NetworkStatus();
-    if(com.phonegap.NetworkManager.isReachable(uri)) {
-        if (com.phonegap.NetworkManager.isWifiActive()) {
-            status.code = NetworkStatus.REACHABLE_VIA_WIFI_NETWORK;
-        }
-        else {
-            status.code = NetworkStatus.REACHABLE_VIA_CARRIER_DATA_NETWORK;
-        }
+Network.prototype.isReachable = function(uri, callback, options) {
+
+    // callback required
+    if (typeof callback != "function") {
+        console.log("Network Error: callback is not a function");
+        return;
     }
-    else {
-        status.code = NetworkStatus.NOT_REACHABLE;
-    }
-  win(status);
+
+    PhoneGap.execAsync(
+        function(status) {
+
+            // If reachable, the check for wifi vs carrier
+            if (status) {
+                PhoneGap.execAsync(
+                    function(wifi) {
+                        var s = new NetworkStatus();
+                        if (wifi) {
+                            s.code = NetworkStatus.REACHABLE_VIA_WIFI_NETWORK;
+                        }
+                        else {
+                            s.code = NetworkStatus.REACHABLE_VIA_CARRIER_DATA_NETWORK;
+                        }
+                        callback(s);
+                    }, null, "Network Status", "isWifiActive", []);
+            }
+
+            // If not
+            else {
+                var s = new NetworkStatus();
+                s.code = NetworkStatus.NOT_REACHABLE;
+                callback(s);
+            }
+        }, null, "Network Status", "isReachable", [uri]);
 };
 
 PhoneGap.addConstructor(function() {
     if (typeof navigator.network == "undefined") navigator.network = new Network();
-});
\ No newline at end of file
+});
+
diff --git a/framework/src/com/phonegap/NetworkManager.java b/framework/src/com/phonegap/NetworkManager.java
old mode 100644
new mode 100755
index 90cb3275..9967fde9
--- a/framework/src/com/phonegap/NetworkManager.java
+++ b/framework/src/com/phonegap/NetworkManager.java
@@ -76,7 +76,14 @@ public class NetworkManager implements Plugin {
 		}
 	}
 
+	/**
+	 * Identifies if action to be executed returns a value.
+	 * 
+	 * @param action	The action to execute
+	 * @return			T=returns value
+	 */
 	public boolean hasReturnValue(String action) {
+		// All methods take a while, so always use async
 		return false;
 	}