update wifi connecter file

ihrthk · Feb 2, 2015 · 9ffcd79 · 9ffcd79
1 parent 1088b94
commit 9ffcd79
Show file tree

Hide file tree

Showing 3 changed files with 93 additions and 18 deletions.
diff --git a/app/src/main/java/com/android/utils/wificonnecter/demo/TestActivity.java b/app/src/main/java/com/android/utils/wificonnecter/demo/TestActivity.java
@@ -52,6 +52,12 @@ private void init() {
         setCurrentSsid();
     }
 
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        mWiFiConnecter.onPause();
+    }
+
     private void setCurrentSsid() {
         WifiInfo info = mWifiManager.getConnectionInfo();
         String s = (info == null) ? "null" : info.getSSID();

diff --git a/library/libs/android-wifi-connecter.jar b/library/libs/android-wifi-connecter.jar
diff --git a/library/src/main/java/com/android/utils/wificonnecter/WiFiConnecter.java b/library/src/main/java/com/android/utils/wificonnecter/WiFiConnecter.java
@@ -7,6 +7,7 @@
 import android.content.IntentFilter;
 import android.net.NetworkInfo;
 import android.net.wifi.ScanResult;
+import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
 import android.os.Handler;
@@ -81,15 +82,6 @@ public void connect(String ssid, String password, ActionListener listener) {
             listener.onStarted(ssid);
         }
 
-        WifiInfo info = mWifiManager.getConnectionInfo();
-        if (info != null && mSsid.equalsIgnoreCase(info.getSSID())) {
-            if (listener != null) {
-                listener.onSuccess(info);
-                listener.onFinished(true);
-            }
-            return;
-        }
-
         isActiveScan = true;
         mScanner.forceScan();
     }
@@ -104,15 +96,11 @@ private void handleEvent(Context context, Intent intent) {
             List<ScanResult> results = mWifiManager.getScanResults();
             Log.d("WiFiConnecter", "results:" + results.size());
             for (ScanResult result : results) {
-                if (mSsid.equalsIgnoreCase(result.SSID)) {
+                if (mSsid.equals(result.SSID)) {
                     //            mScanner.pause();
-                    int mNumOpenNetworksKept = Settings.Secure.getInt(context.getContentResolver(),
-                            Settings.Secure.WIFI_NUM_OPEN_NETWORKS_KEPT, 10);
-                    //refer:https://code.google.com/p/android-wifi-connecter/
-                    boolean connResult = Wifi.connectToNewNetwork(context, mWifiManager,
-                            result, mPassword, mNumOpenNetworksKept);
-//                    Loger.d("result.SSID=" +result.SSID+"  newNetwork:"+newNetwork);
-                    if (!connResult) {
+                    //https://code.google.com/p/android-wifi-connecter/
+//                  Loger.d("result.SSID=" +result.SSID+"  newNetwork:"+newNetwork);
+                    if (!connect(context, result, mPassword)) {
                         if (mListener != null) {
                             mListener.onFailure();
                             mListener.onFinished(false);
@@ -130,7 +118,8 @@ private void handleEvent(Context context, Intent intent) {
             //Loger.d("mInfo:"+mInfo.toString());
             if (mInfo.isConnected() && mWifiInfo != null && mWifiInfo.getSSID() != null &&
                     //nexus 5 have quote,sumsang don't have quote
-                    (mWifiInfo.getSSID().equals(mSsid) || mWifiInfo.getSSID().equals("\"" + mSsid + "\""))) {
+                    (mWifiInfo.getSSID().equals(mSsid) ||
+                     mWifiInfo.getSSID().equals(Wifi.convertToQuotedString(mSsid)))) {
                 if (mListener != null) {
 //                    Loger.d("success");
                     mListener.onSuccess(mWifiInfo);
@@ -141,6 +130,86 @@ private void handleEvent(Context context, Intent intent) {
         }
     }
 
+    /**
+     * connect wifi
+     *
+     * @param context
+     * @param mScanResult
+     * @param mPassword
+     * @return
+     */
+
+    public boolean connect(Context context, ScanResult mScanResult, String mPassword) {
+        boolean connResult;
+
+        String security = Wifi.ConfigSec.getScanResultSecurity(mScanResult);
+        WifiConfiguration config = Wifi.getWifiConfiguration(mWifiManager, mScanResult, security);
+
+        if (config == null) {
+            connResult = newNetWork(context, mScanResult, mPassword);
+        } else {
+            final boolean isCurrentNetwork_ConfigurationStatus = config.status == WifiConfiguration.Status.CURRENT;
+            final WifiInfo info = mWifiManager.getConnectionInfo();
+            final boolean isCurrentNetwork_WifiInfo = info != null
+                    && android.text.TextUtils.equals(info.getSSID(), mScanResult.SSID)
+                    && android.text.TextUtils.equals(info.getBSSID(), mScanResult.BSSID);
+            if (isCurrentNetwork_ConfigurationStatus || isCurrentNetwork_WifiInfo) {
+                connResult = true;
+            } else {
+                connResult = configuredNetwork(context, config, security, mPassword);
+            }
+        }
+        return connResult;
+    }
+
+    /**
+     * Configure a network, and connect to it.
+     *
+     * @param context
+     * @param mScanResult
+     * @param mPassword
+     * @return
+     */
+    private boolean newNetWork(Context context, ScanResult mScanResult, String mPassword) {
+        boolean connResult;
+        int mNumOpenNetworksKept = Settings.Secure.getInt(context.getContentResolver(),
+                Settings.Secure.WIFI_NUM_OPEN_NETWORKS_KEPT, 10);
+        String mScanResultSecurity = Wifi.ConfigSec.getScanResultSecurity(mScanResult);
+        boolean mIsOpenNetwork = Wifi.ConfigSec.isOpenNetwork(mScanResultSecurity);
+        String password = mIsOpenNetwork ? null : mPassword;
+        connResult = Wifi.connectToNewNetwork(context, mWifiManager, mScanResult, password, mNumOpenNetworksKept);
+        return connResult;
+    }
+
+    /**
+     * Connect to a configured network.
+     *
+     * @param context
+     * @return
+     */
+    private boolean configuredNetwork(Context context, WifiConfiguration config) {
+        boolean connResult = false;
+        if (config != null) {
+            connResult = Wifi.connectToConfiguredNetwork(context, mWifiManager, config, false);
+        }
+        return connResult;
+    }
+
+    /**
+     * Connect to a configured network.
+     *
+     * @param context
+     * @param mPassword optional
+     * @param security
+     * @param config
+     * @return
+     */
+    private boolean configuredNetwork(Context context, WifiConfiguration config, String security, String mPassword) {
+        //optional
+        Wifi.ConfigSec.setupSecurity(config, security, mPassword);
+        return configuredNetwork(context, config);
+    }
+
     public void onPause() {
         if (isRegistered) {
             mContext.unregisterReceiver(mReceiver);