feat(wifi_iot): add support for WPA3 and explicit WPA2 security types

packages/wifi_iot/android/src/main/java/com/alternadom/wifiiot/WifiIotPlugin.java

@@ -935,8 +935,10 @@ private void registerWifiNetwork(final MethodCall poCall, final Result poResult)
         suggestedNet.setBssid(macAddress);
       }
 
-      if (security != null && security.toUpperCase().equals("WPA")) {
+      if (security != null && (security.toUpperCase().equals("WPA") || security.toUpperCase().equals("WPA2"))) {
         suggestedNet.setWpa2Passphrase(password);
+      } else if (security != null && security.toUpperCase().equals("WPA3")) {
+        suggestedNet.setWpa3Passphrase(password);
       } else if (security != null && security.toUpperCase().equals("WEP")) {
         // WEP is not supported
         poResult.error(
@@ -1038,7 +1040,9 @@ public void run() {
   private static String getSecurityType(ScanResult scanResult) {
     String capabilities = scanResult.capabilities;
 
-    if (capabilities.contains("WPA")
+    if (capabilities.contains("SAE") || capabilities.contains("WPA3")) {
+      return "WPA3";
+    } else if (capabilities.contains("WPA")
         || capabilities.contains("WPA2")
         || capabilities.contains("WPA/WPA2 PSK")) {
       return "WPA";
@@ -1310,8 +1314,10 @@ public void run() {
         }
 
         // set password
-        if (security != null && security.toUpperCase().equals("WPA")) {
+        if (security != null && (security.toUpperCase().equals("WPA") || security.toUpperCase().equals("WPA2"))) {
           builder.setWpa2Passphrase(password);
+        } else if (security != null && security.toUpperCase().equals("WPA3")) {
+          builder.setWpa3Passphrase(password);
         }
 
         // remove suggestions if already existing
@@ -1360,8 +1366,10 @@ public void run() {
         }
 
         // set security
-        if (security != null && security.toUpperCase().equals("WPA")) {
+        if (security != null && (security.toUpperCase().equals("WPA") || security.toUpperCase().equals("WPA2"))) {
           builder.setWpa2Passphrase(password);
+        } else if (security != null && security.toUpperCase().equals("WPA3")) {
+          builder.setWpa3Passphrase(password);
         }
 
         final NetworkRequest networkRequest =
@@ -1464,7 +1472,7 @@ private android.net.wifi.WifiConfiguration generateConfiguration(
     if (security != null) security = security.toUpperCase();
     else security = "NONE";
 
-    if (security.toUpperCase().equals("WPA")) {
+    if (security.equals("WPA") || security.equals("WPA2")) {
 
       /// appropriate ciper is need to set according to security type used,
       /// ifcase of not added it will not be able to connect
@@ -1486,6 +1494,13 @@ private android.net.wifi.WifiConfiguration generateConfiguration(
 
       conf.allowedProtocols.set(android.net.wifi.WifiConfiguration.Protocol.RSN);
       conf.allowedProtocols.set(android.net.wifi.WifiConfiguration.Protocol.WPA);
+    } else if (security.equals("WPA3")) {
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+        conf.preSharedKey = "\"" + password + "\"";
+        conf.allowedKeyManagement.set(android.net.wifi.WifiConfiguration.KeyMgmt.SAE);
+        conf.allowedProtocols.set(android.net.wifi.WifiConfiguration.Protocol.RSN);
+        conf.status = android.net.wifi.WifiConfiguration.Status.ENABLED;
+      }
     } else if (security.equals("WEP")) {
       conf.wepKeys[0] = "\"" + password + "\"";
       conf.wepTxKeyIndex = 0;

packages/wifi_iot/ios/Classes/SwiftWifiIotPlugin.swift

@@ -167,13 +167,30 @@ public class SwiftWifiIotPlugin: NSObject, FlutterPlugin {
 
     @available(iOS 11.0, *)
     private func initHotspotConfiguration(ssid: String, passphrase: String?, security: String? = nil) -> NEHotspotConfiguration {
-        switch security?.uppercased() {
-            case "WPA":
-                return NEHotspotConfiguration.init(ssid: ssid, passphrase: passphrase!, isWEP: false)
-            case "WEP":
-                return NEHotspotConfiguration.init(ssid: ssid, passphrase: passphrase!, isWEP: true)
-            default:
-                return NEHotspotConfiguration.init(ssid: ssid)
+        let sec = security?.uppercased() ?? ""
+
+        if sec.hasPrefix("WPA") {
+            // WPA / WPA2 / WPA3
+            guard let passphrase = passphrase else {
+                fatalError("WPA security requires passphrase")
+            }
+            return NEHotspotConfiguration(
+                ssid: ssid,
+                passphrase: passphrase,
+                isWEP: false
+            )
+        } else if sec.hasPrefix("WEP") {
+            guard let passphrase = passphrase else {
+                fatalError("WEP security requires passphrase")
+            }
+            return NEHotspotConfiguration(
+                ssid: ssid,
+                passphrase: passphrase,
+                isWEP: true
+            )
+        } else {
+            // Open network
+            return NEHotspotConfiguration(ssid: ssid)
         }
     }
 

packages/wifi_iot/lib/wifi_iot.dart

@@ -13,12 +13,14 @@ enum WIFI_AP_STATE {
   WIFI_AP_STATE_FAILED
 }
 
-enum NetworkSecurity { WPA, WEP, NONE }
+enum NetworkSecurity { WPA, WEP, NONE, WPA2, WPA3 }
 
 const serializeNetworkSecurityMap = <NetworkSecurity, String>{
   NetworkSecurity.WPA: "WPA",
   NetworkSecurity.WEP: "WEP",
   NetworkSecurity.NONE: "NONE",
+  NetworkSecurity.WPA2: "WPA2",
+  NetworkSecurity.WPA3: "WPA3",
 };
 
 const MethodChannel _channel = const MethodChannel('wifi_iot');

packages/wifi_iot/pubspec.yaml

@@ -1,6 +1,6 @@
 name: wifi_iot
 description: Flutter plugin which can handle WiFi connections and hotspot (AP, STA)
-version: 0.3.19+2
+version: 0.3.20+2
 homepage: https://github.com/flutternetwork/WiFiFlutter/tree/master/packages/wifi_iot
 
 flutter: