Merge pull request #51 from sina-s/issue/android-8-findAndConnect

findAndConnect on Anroid 8: Use existing config if exists

Author: devstepbcn

android/src/main/java/com/devstepbcn/wifi/AndroidWifiModule.java

@@ -205,73 +205,76 @@ public void connectionStatus(Callback connectionStatusResult) {
 	public Boolean connectTo(ScanResult result, String password, String ssid) {
 		//Make new configuration
 		WifiConfiguration conf = new WifiConfiguration();
-		
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-        conf.SSID = ssid;
-    } else {
-        conf.SSID = "\"" + ssid + "\"";
-    }
+		if (Build.VERSION.SDK_INT >= 26) {
+			conf.SSID = "\"" + ssid + "\"";
+		} else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+			conf.SSID = ssid;
+		} else {
+			conf.SSID = "\"" + ssid + "\"";
+    	}
 
-		String capabilities = result.capabilities;
-		
-		if (capabilities.contains("WPA")  || 
-          capabilities.contains("WPA2") || 
-          capabilities.contains("WPA/WPA2 PSK")) {
-
-	    // appropriate ciper is need to set according to security type used,
-	    // ifcase of not added it will not be able to connect
-	    conf.preSharedKey = "\"" + password + "\"";
-	    
-	    conf.allowedProtocols.set(WifiConfiguration.Protocol.RSN);
-	    
-	    conf.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.WPA_PSK);
-	    
-	    conf.status = WifiConfiguration.Status.ENABLED;
-	    
-	    conf.allowedGroupCiphers.set(WifiConfiguration.GroupCipher.TKIP);
-	    conf.allowedGroupCiphers.set(WifiConfiguration.GroupCipher.CCMP);
-	    
-	    conf.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.WPA_PSK);
-	    
-	    conf.allowedPairwiseCiphers.set(WifiConfiguration.PairwiseCipher.TKIP);
-	    conf.allowedPairwiseCiphers.set(WifiConfiguration.PairwiseCipher.CCMP);
-	    
-	    conf.allowedProtocols.set(WifiConfiguration.Protocol.RSN);
-	    conf.allowedProtocols.set(WifiConfiguration.Protocol.WPA);
-
-		}	else if (capabilities.contains("WEP")) {
-			conf.wepKeys[0] = "\"" + password + "\"";
-			conf.wepTxKeyIndex = 0;
-			conf.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.NONE);
-			conf.allowedGroupCiphers.set(WifiConfiguration.GroupCipher.WEP40);
+		List<WifiConfiguration> mWifiConfigList = wifi.getConfiguredNetworks();
+		int updateNetwork = -1;
 
-		} else {
-			conf.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.NONE);
+		// Use the existing network config if exists
+		for (WifiConfiguration wifiConfig : mWifiConfigList) {
+			if (wifiConfig.SSID.equals(conf.SSID)) {
+				updateNetwork=wifiConfig.networkId;
+				conf=wifiConfig;
+			}
 		}
 
-		//Remove the existing configuration for this netwrok
-		List<WifiConfiguration> mWifiConfigList = wifi.getConfiguredNetworks();
+		// If a new network, try to configure it
+		if (updateNetwork == -1) {
+			String capabilities = result.capabilities;
 
-		int updateNetwork = -1;
+			if (capabilities.contains("WPA") ||
+					capabilities.contains("WPA2") ||
+					capabilities.contains("WPA/WPA2 PSK")) {
+
+				// appropriate ciper is need to set according to security type used,
+				// ifcase of not added it will not be able to connect
+				conf.preSharedKey = "\"" + password + "\"";
+
+				conf.allowedProtocols.set(WifiConfiguration.Protocol.RSN);
 
-		for(WifiConfiguration wifiConfig : mWifiConfigList){
-			if(wifiConfig.SSID.equals(conf.SSID)){
-				conf.networkId = wifiConfig.networkId;
-				updateNetwork = wifi.updateNetwork(conf);
+				conf.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.WPA_PSK);
+
+				conf.status = WifiConfiguration.Status.ENABLED;
+
+				conf.allowedGroupCiphers.set(WifiConfiguration.GroupCipher.TKIP);
+				conf.allowedGroupCiphers.set(WifiConfiguration.GroupCipher.CCMP);
+
+				conf.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.WPA_PSK);
+
+				conf.allowedPairwiseCiphers.set(WifiConfiguration.PairwiseCipher.TKIP);
+				conf.allowedPairwiseCiphers.set(WifiConfiguration.PairwiseCipher.CCMP);
+
+				conf.allowedProtocols.set(WifiConfiguration.Protocol.RSN);
+				conf.allowedProtocols.set(WifiConfiguration.Protocol.WPA);
+
+			} else if (capabilities.contains("WEP")) {
+				conf.wepKeys[0] = "\"" + password + "\"";
+				conf.wepTxKeyIndex = 0;
+				conf.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.NONE);
+				conf.allowedGroupCiphers.set(WifiConfiguration.GroupCipher.WEP40);
+
+			} else {
+				conf.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.NONE);
 			}
 		}
 
-    // If network not already in configured networks add new network
+		// If network not already in configured networks add new network
 		if ( updateNetwork == -1 ) {
-      updateNetwork = wifi.addNetwork(conf);
-      wifi.saveConfiguration();
+			updateNetwork = wifi.addNetwork(conf);
+      		wifi.saveConfiguration();
 		};
 
-    if ( updateNetwork == -1 ) {
-      return false;
-    }
+		if ( updateNetwork == -1 ) {
+			return false;
+		}
 
-    boolean disconnect = wifi.disconnect();
+		boolean disconnect = wifi.disconnect();
 		if ( !disconnect ) {
 			return false;
 		};
@@ -426,3 +429,4 @@ public void onReceive(Context c, Intent intent) {
       }
   }
 }
+