upgrade to cordove 2.2.0

Author: hungtatai

Readme.md

@@ -3,14 +3,14 @@ PhoneGap WifiInfoPlugin
 
 * Author: HondaDai
 * License - The MIT License
-* Test on PhoneGap 1.7.0 (cordova 1.7)
+* Test on cordova 2.2.0 (PhoneGap 2.2.0)
 
 
 Install Step (On Eclipse)
 --------------------------
 
 1. Import File System to folder **src**, select **WifiInfoPlugin.java**
-2. Edit **res\xml\plugins.xml**, add `<plugin name="WifiInfoPlugin" value="com.phonegap.plugin.WifiInfoPlugin"/>` into `<plugins> </plugins>`
+2. Edit **res\xml\config.xml**, add `<plugin name="WifiInfoPlugin" value="org.apache.cordova.plugin.WifiInfoPlugin"/>` into `<plugins> </plugins>`
 3. add `<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>` into **AndroidManifest.xml**
 4. Import **WifiInfoPlugin.js** into .html
 

WifiInfoPlugin.java

@@ -1,23 +1,23 @@
-package com.phonegap.plugin;
+package org.apache.cordova.plugin;
 
-import org.apache.cordova.api.PluginResult;
-import org.apache.cordova.api.PluginResult.Status;
+
+import org.apache.cordova.api.CallbackContext;
+import org.apache.cordova.api.CordovaPlugin;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import com.phonegap.api.Plugin;
 
 import android.content.Context;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
 
-public class WifiInfoPlugin extends Plugin { 
+public class WifiInfoPlugin extends CordovaPlugin { 
 
 	@Override 
-	public PluginResult execute(String action, JSONArray data, String callback) {
+	public boolean execute(String action, JSONArray data, CallbackContext callbackContext) throws JSONException {
 
-		Context context = ctx.getApplicationContext();
+		Context context = cordova.getActivity().getApplicationContext();
 		WifiManager wifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
 		WifiInfo wifiInfo = wifiManager.getConnectionInfo();
 
@@ -33,15 +33,10 @@ public PluginResult execute(String action, JSONArray data, String callback) {
 			obj.put("LinkSpeed", wifiInfo.getLinkSpeed());
 
 		} catch (JSONException e) {
-			
 			e.printStackTrace();
-			return new PluginResult(Status.JSON_EXCEPTION);
+			callbackContext.error("JSON Exception");
 		}
-		
-		return new PluginResult(Status.OK, obj);
-		
-		
-		
+		callbackContext.success(obj);
+		return true;
 	}
-
 }

old version/PhoneGap 1.7/Readme.md

@@ -0,0 +1,38 @@
+PhoneGap WifiInfoPlugin
+==============
+
+* Author: HondaDai
+* License - The MIT License
+* Test on PhoneGap 1.7.0 (cordova 1.7)
+
+
+Install Step (On Eclipse)
+--------------------------
+
+1. Import File System to folder **src**, select **WifiInfoPlugin.java**
+2. Edit **res\xml\plugins.xml**, add `<plugin name="WifiInfoPlugin" value="com.phonegap.plugin.WifiInfoPlugin"/>` into `<plugins> </plugins>`
+3. add `<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>` into **AndroidManifest.xml**
+4. Import **WifiInfoPlugin.js** into .html
+
+API
+-----
+
+### Example 1
+	window.plugins.WifiInfo.get(function(wifi){ console.log(wifi); });
+	> undefined
+	> Object
+		   BSSID: "00:21:91:08:63:19"
+		   HiddenSSID: false
+		   IpAddress: -1191139136
+		   LinkSpeed: 65
+		   MacAddress: "E0:B9:A5:8B:6E:95"
+		   NetworkId: 0
+		   RSSI: -55
+		   SSID: "dlink"
+		   __proto__: Object
+
+### Example 2
+	window.plugins.WifiInfo.get(function(wifi){ 
+		alert(wifi.SSID); 
+	});
+

old version/PhoneGap 1.7/WifiInfoPlugin.java

@@ -0,0 +1,47 @@
+package com.phonegap.plugin;
+
+import org.apache.cordova.api.PluginResult;
+import org.apache.cordova.api.PluginResult.Status;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import com.phonegap.api.Plugin;
+
+import android.content.Context;
+import android.net.wifi.WifiInfo;
+import android.net.wifi.WifiManager;
+
+public class WifiInfoPlugin extends Plugin { 
+
+	@Override 
+	public PluginResult execute(String action, JSONArray data, String callback) {
+		
+		Context context = ctx.getApplicationContext();
+		WifiManager wifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
+		WifiInfo wifiInfo = wifiManager.getConnectionInfo();
+		
+		JSONObject obj = new JSONObject();
+		try {
+			obj.put("BSSID", wifiInfo.getBSSID());
+			obj.put("HiddenSSID", wifiInfo.getHiddenSSID());
+			obj.put("SSID", wifiInfo.getSSID());
+			obj.put("MacAddress", wifiInfo.getMacAddress());
+			obj.put("IpAddress", wifiInfo.getIpAddress());
+			obj.put("NetworkId", wifiInfo.getNetworkId());
+			obj.put("RSSI", wifiInfo.getRssi());
+			obj.put("LinkSpeed", wifiInfo.getLinkSpeed());
+			
+		} catch (JSONException e) {
+			
+			e.printStackTrace();
+			return new PluginResult(Status.JSON_EXCEPTION);
+		}
+		
+		return new PluginResult(Status.OK, obj);
+		
+		
+		
+	}
+
+}

old version/PhoneGap 1.7/WifiInfoPlugin.js

@@ -0,0 +1,14 @@
+var WifiInfo= function() {
+};
+
+WifiInfo.prototype.get = function(success, fail) {
+		PhoneGap.exec(success, success, 'WifiInfoPlugin', null, [] );
+};
+
+cordova.addConstructor(function() {
+
+	if (!window.plugins) {
+		window.plugins = {};
+	}
+	window.plugins.WifiInfo = new WifiInfo();
+});