@capgo/capacitor-wifi 8.2.0 → 8.3.0

package/android/src/main/java/ee/forgr/plugin/capacitor_wifi/CapacitorWifiPlugin.java

@@ -1,5 +1,7 @@
 package ee.forgr.plugin.capacitor_wifi;
 
+import static android.app.Activity.RESULT_OK;
+
 import android.Manifest;
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -18,7 +20,9 @@ import android.net.wifi.WifiNetworkSpecifier;
 import android.net.wifi.WifiNetworkSuggestion;
 import android.os.Build;
 import android.provider.Settings;
+import androidx.activity.result.ActivityResult;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 import com.getcapacitor.JSArray;
 import com.getcapacitor.JSObject;
@@ -26,6 +30,7 @@ import com.getcapacitor.PermissionState;
 import com.getcapacitor.Plugin;
 import com.getcapacitor.PluginCall;
 import com.getcapacitor.PluginMethod;
+import com.getcapacitor.annotation.ActivityCallback;
 import com.getcapacitor.annotation.CapacitorPlugin;
 import com.getcapacitor.annotation.Permission;
 import com.getcapacitor.annotation.PermissionCallback;
@@ -44,7 +49,7 @@ import java.util.List;
 )
 public class CapacitorWifiPlugin extends Plugin {
 
-    private final String pluginVersion = "8.2.0";
+    private final String pluginVersion = "8.3.0";
 
     private WifiManager wifiManager;
     private ConnectivityManager connectivityManager;
@@ -119,13 +124,50 @@ public class CapacitorWifiPlugin extends Plugin {
             suggestionsList.add(suggestionBuilder.build());
 
             intent.putParcelableArrayListExtra(Settings.EXTRA_WIFI_NETWORK_LIST, suggestionsList);
-            getActivity().startActivity(intent);
-            call.resolve();
+            startActivityForResult(call, intent, "handleAddNetworkModernResult");
         } catch (Exception e) {
             call.reject("Failed to add network: " + e.getMessage(), e);
         }
     }
 
+    @ActivityCallback
+    private void handleAddNetworkModernResult(@Nullable PluginCall call, ActivityResult result) {
+        if (call == null) {
+            return;
+        }
+
+        if (result.getResultCode() != RESULT_OK) {
+            call.reject("Adding network was canceled");
+            return;
+        }
+
+        Intent data = result.getData();
+        if (data == null || !data.hasExtra(Settings.EXTRA_WIFI_NETWORK_RESULT_LIST)) {
+            call.reject("Failed to add network");
+            return;
+        }
+
+        ArrayList<Integer> codes = data.getIntegerArrayListExtra(Settings.EXTRA_WIFI_NETWORK_RESULT_LIST);
+        Integer firstCode = codes != null && !codes.isEmpty() ? codes.get(0) : null;
+
+        if (firstCode == null) {
+            call.reject("Failed to add network");
+            return;
+        }
+
+        switch (firstCode) {
+            case Settings.ADD_WIFI_RESULT_SUCCESS:
+            case Settings.ADD_WIFI_RESULT_ALREADY_EXISTS:
+                call.resolve();
+                return;
+            case Settings.ADD_WIFI_RESULT_ADD_OR_UPDATE_FAILED:
+                call.reject("Failed to add network");
+                return;
+            default:
+                call.reject("Failed to add network");
+        }
+    }
+
     private void addNetworkLegacy(PluginCall call) {
         if (getPermissionState("location") != PermissionState.GRANTED) {
             requestPermissionForAlias("location", call, "addNetworkCallback");
@@ -426,16 +468,14 @@ public class CapacitorWifiPlugin extends Plugin {
     @PluginMethod
     public void getIpAddress(PluginCall call) {
         try {
-            String ipAddress = null;
-
-            Network network = connectivityManager.getActiveNetwork();
-            if (network != null) {
-                NetworkCapabilities capabilities = connectivityManager.getNetworkCapabilities(network);
-                if (capabilities != null && capabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)) {
-                    ipAddress = getWifiIpAddress();
-                }
+            WifiInfo wifiInfo = wifiManager.getConnectionInfo();
+            if (wifiInfo == null) {
+                call.reject("Failed to get WiFi info");
+                return;
             }
 
+            String ipAddress = resolveWifiIpAddress(wifiInfo);
+
             if (ipAddress != null && !ipAddress.isEmpty()) {
                 JSObject ret = new JSObject();
                 ret.put("ipAddress", ipAddress);
@@ -550,7 +590,7 @@ public class CapacitorWifiPlugin extends Plugin {
             }
 
             // Get IP Address
-            String ipAddress = getWifiIpAddress();
+            String ipAddress = resolveWifiIpAddress(wifiInfo);
             if (ipAddress != null && !ipAddress.isEmpty()) {
                 ret.put("ip", ipAddress);
             } else {
@@ -579,6 +619,21 @@ public class CapacitorWifiPlugin extends Plugin {
         }
     }
 
+    private String resolveWifiIpAddress(@NonNull WifiInfo wifiInfo) {
+        String ipAddress = formatIpv4Address(wifiInfo.getIpAddress());
+        if (ipAddress != null) {
+            return ipAddress;
+        }
+        return getWifiIpAddress();
+    }
+
+    private String formatIpv4Address(int ipAddress) {
+        if (ipAddress == 0) {
+            return null;
+        }
+        return (ipAddress & 0xff) + "." + ((ipAddress >> 8) & 0xff) + "." + ((ipAddress >> 16) & 0xff) + "." + ((ipAddress >> 24) & 0xff);
+    }
+
     /**
      * Calculate signal strength percentage (0-100) from RSSI
      * RSSI typically ranges from -100 (weak) to -50 (strong)

package/ios/Sources/CapacitorWifiPlugin/CapacitorWifiPlugin.swift

@@ -4,8 +4,8 @@ import NetworkExtension
 import CoreLocation
 
 @objc(CapacitorWifiPlugin)
-public class CapacitorWifiPlugin: CAPPlugin, CAPBridgedPlugin {
-    private let pluginVersion: String = "8.2.0"
+public class CapacitorWifiPlugin: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelegate {
+    private let pluginVersion: String = "8.3.0"
     public let identifier = "CapacitorWifiPlugin"
     public let jsName = "CapacitorWifi"
     public let pluginMethods: [CAPPluginMethod] = [
@@ -26,9 +26,13 @@ public class CapacitorWifiPlugin: CAPPlugin, CAPBridgedPlugin {
     ]
 
     private var hotspotManager: NEHotspotConfigurationManager?
+    private var locationManager: CLLocationManager?
+    private var permissionCalls: [CAPPluginCall] = []
 
     override public func load() {
         hotspotManager = NEHotspotConfigurationManager.shared
+        locationManager = CLLocationManager()
+        locationManager?.delegate = self
     }
 
     @objc func addNetwork(_ call: CAPPluginCall) {
@@ -194,10 +198,20 @@ public class CapacitorWifiPlugin: CAPPlugin, CAPBridgedPlugin {
     }
 
     @objc override public func requestPermissions(_ call: CAPPluginCall) {
-        // On iOS, location permission is automatically requested when accessing WiFi info
-        // For iOS 13+, location permission is required to access SSID
-        let status = getLocationPermissionStatus()
-        call.resolve(["location": status])
+        DispatchQueue.main.async {
+            let status = self.getLocationPermissionStatus()
+            if status != "prompt" {
+                call.resolve(["location": status])
+                return
+            }
+
+            self.permissionCalls.append(call)
+            if self.permissionCalls.count > 1 {
+                return
+            }
+
+            self.locationManager?.requestWhenInUseAuthorization()
+        }
     }
 
     @objc func isNetworkSaved(_ call: CAPPluginCall) {
@@ -276,4 +290,36 @@ public class CapacitorWifiPlugin: CAPPlugin, CAPBridgedPlugin {
             return "prompt"
         }
     }
+
+    public func locationManagerDidChangeAuthorization(_ manager: CLLocationManager) {
+        resolvePermissionCallIfNeeded()
+    }
+
+    public func locationManager(_ manager: CLLocationManager, didChangeAuthorization status: CLAuthorizationStatus) {
+        resolvePermissionCallIfNeeded()
+    }
+
+    private func resolvePermissionCallIfNeeded() {
+        if !Thread.isMainThread {
+            DispatchQueue.main.async {
+                self.resolvePermissionCallIfNeeded()
+            }
+            return
+        }
+
+        if permissionCalls.isEmpty {
+            return
+        }
+
+        let status = getLocationPermissionStatus()
+        if status == "prompt" {
+            return
+        }
+
+        let pendingCalls = permissionCalls
+        permissionCalls.removeAll()
+        for pendingCall in pendingCalls {
+            pendingCall.resolve(["location": status])
+        }
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-wifi",
-  "version": "8.2.0",
+  "version": "8.3.0",
   "description": "Manage WiFi connectivity for your Capacitor app",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",