Fix a potentialy NPE in wifiConnect. (#109)

Also improve a log line.

1 files changed, 9 insertions, 4 deletions

diff --git a/src/main/java/com/google/android/mobly/snippet/bundled/WifiManagerSnippet.java b/src/main/java/com/google/android/mobly/snippet/bundled/WifiManagerSnippet.java
index d848eb9..f7cd049 100644
--- a/src/main/java/com/google/android/mobly/snippet/bundled/WifiManagerSnippet.java
+++ b/src/main/java/com/google/android/mobly/snippet/bundled/WifiManagerSnippet.java
@@ -199,7 +199,11 @@ public class WifiManagerSnippet implements Snippet {
      * WifiManager#addNetwork(WifiConfiguration)}.
      */
     private WifiConfiguration getExistingConfiguredNetwork(String ssid) {
-        for (WifiConfiguration config : mWifiManager.getConfiguredNetworks()) {
+        List<WifiConfiguration> wifiConfigs = mWifiManager.getConfiguredNetworks();
+        if (wifiConfigs == null) {
+            return null;
+        }
+        for (WifiConfiguration config : wifiConfigs) {
             if (config.SSID.equals(ssid)) {
                 return config;
             }
@@ -262,9 +266,10 @@ public class WifiManagerSnippet implements Snippet {
                                 && mWifiManager.getConnectionInfo().getNetworkId() != -1,
                 90)) {
             throw new WifiManagerSnippetException(
-                    "Failed to connect to Wi-Fi network "
-                            + wifiNetworkConfig.toString()
-                            + ", timeout!");
+                    String.format(
+                            "Failed to connect to '%s', timeout! Current connection: '%s'",
+                            wifiNetworkConfig.toString(),
+                            mWifiManager.getConnectionInfo().getSSID()));
         }
         Log.d(
                 "Connected to network '"