From adecd479dc4ba19cc987936d85ecfc84bba31307 Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 8 Dec 2015 16:43:25 +0100 Subject: [PATCH] Fixed crash --- .../java/eu/faircode/netguard/ActivitySettings.java | 10 +++++++--- app/src/main/res/values/strings.xml | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/eu/faircode/netguard/ActivitySettings.java b/app/src/main/java/eu/faircode/netguard/ActivitySettings.java index ab77eadc..cd661ebf 100644 --- a/app/src/main/java/eu/faircode/netguard/ActivitySettings.java +++ b/app/src/main/java/eu/faircode/netguard/ActivitySettings.java @@ -105,10 +105,14 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere WifiManager wm = (WifiManager) getSystemService(Context.WIFI_SERVICE); List listSSID = new ArrayList<>(); - listSSID.add(""); - for (WifiConfiguration config : wm.getConfiguredNetworks()) - listSSID.add(config.SSID); + List configs = wm.getConfiguredNetworks(); + if (configs != null) + for (WifiConfiguration config : configs) + listSSID.add(config.SSID); + listSSID.add(0, getString(R.string.title_all)); wifi_home_pref.setEntries(listSSID.toArray(new CharSequence[0])); + listSSID.remove(0); + listSSID.add(0, ""); wifi_home_pref.setEntryValues(listSSID.toArray(new CharSequence[0])); // Handle auto enable diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a781316c..335ba6a6 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -62,6 +62,7 @@ Since NetGuard has no internet permission, you know your internet traffic is not By donating you agree to the terms & conditions If you cannot press OK in the next dialog, another (screen dimming) application is likely manipulating the screen. + All Allow Wi-Fi when screen is on Allow mobile when screen is on Block when roaming