From 92c70bd15da8b58f59047ba740d5dc7eed41639b Mon Sep 17 00:00:00 2001 From: Sean Owen Date: Sun, 9 Feb 2014 09:40:51 -0500 Subject: [PATCH] Avoid NPE on networks with no SSID --- .../google/zxing/client/android/wifi/WifiConfigManager.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/android/src/com/google/zxing/client/android/wifi/WifiConfigManager.java b/android/src/com/google/zxing/client/android/wifi/WifiConfigManager.java index 24e1f8ef7..8038673b6 100644 --- a/android/src/com/google/zxing/client/android/wifi/WifiConfigManager.java +++ b/android/src/com/google/zxing/client/android/wifi/WifiConfigManager.java @@ -171,7 +171,8 @@ public final class WifiConfigManager extends AsyncTask existingConfigs = wifiManager.getConfiguredNetworks(); for (WifiConfiguration existingConfig : existingConfigs) { - if (existingConfig.SSID.equals(ssid)) { + String existingSSID = existingConfig.SSID; + if (existingSSID != null && existingSSID.equals(ssid)) { return existingConfig.networkId; } }