From fa50caff5f5d29d4638ab64a63b6f8a88b87f9c2 Mon Sep 17 00:00:00 2001 From: Andrew Havens Date: Mon, 9 Sep 2019 12:32:15 -0700 Subject: [PATCH] Handle null SSIDs --- .../src/main/java/com/devstepbcn/wifi/AndroidWifiModule.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/src/main/java/com/devstepbcn/wifi/AndroidWifiModule.java b/android/src/main/java/com/devstepbcn/wifi/AndroidWifiModule.java index e5518ee..f075bba 100644 --- a/android/src/main/java/com/devstepbcn/wifi/AndroidWifiModule.java +++ b/android/src/main/java/com/devstepbcn/wifi/AndroidWifiModule.java @@ -279,7 +279,7 @@ public Boolean connectTo(ScanResult result, String password, String ssid) { // Use the existing network config if exists for (WifiConfiguration wifiConfig : mWifiConfigList) { - if (wifiConfig.SSID.equals(conf.SSID)) { + if (wifiConfig.SSID != null && wifiConfig.SSID.equals(conf.SSID)) { conf=wifiConfig; updateNetwork=conf.networkId; } @@ -452,7 +452,7 @@ public void isRemoveWifiNetwork(String ssid, final Callback callback) { for (WifiConfiguration wifiConfig : mWifiConfigList) { String comparableSSID = ('"' + ssid + '"'); //Add quotes because wifiConfig.SSID has them - if(wifiConfig.SSID.equals(comparableSSID)) { + if(wifiConfig.SSID != null && wifiConfig.SSID.equals(comparableSSID)) { wifi.removeNetwork(wifiConfig.networkId); wifi.saveConfiguration(); callback.invoke(true);