From 9c6a652a02eecb2b3747eb8e7ae72126611caa11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Thu, 16 Apr 2015 16:49:39 +0200 Subject: [PATCH] Avoid NPE when fetching the Wifi SSID Fixes #220 --- .../src/org/fdroid/fdroid/net/WifiStateChangeService.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java b/F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java index 7f0056050..bf9971013 100644 --- a/F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java +++ b/F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java @@ -70,7 +70,10 @@ public class WifiStateChangeService extends Service { (ipAddress >> 16 & 0xff), (ipAddress >> 24 & 0xff)); - FDroidApp.ssid = wifiInfo.getSSID().replaceAll("^\"(.*)\"$", "$1"); + FDroidApp.ssid = wifiInfo.getSSID(); + if (FDroidApp.ssid != null) { + FDroidApp.ssid.replaceAll("^\"(.*)\"$", "$1"); + } FDroidApp.bssid = wifiInfo.getBSSID(); String scheme;