mirror
/
NetGuard
mirror of https://github.com/M66B/NetGuard.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed wifi home default title

This commit is contained in:
M66B 2015-12-09 08:11:20 +01:00
parent cf0896811d
commit 92b60f9a08
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/eu/faircode/netguard/ActivitySettings.java
View File

@ -101,6 +101,8 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere
ListPreference wifi_home_pref = (ListPreference) screen.findPreference("wifi_home"); ListPreference wifi_home_pref = (ListPreference) screen.findPreference("wifi_home");
String ssid = prefs.getString("wifi_home", ""); String ssid = prefs.getString("wifi_home", "");
if ("".equals(ssid))
ssid = getString(R.string.title_all);
wifi_home_pref.setTitle(getString(R.string.setting_wifi_home, ssid)); wifi_home_pref.setTitle(getString(R.string.setting_wifi_home, ssid));
WifiManager wm = (WifiManager) getSystemService(Context.WIFI_SERVICE); WifiManager wm = (WifiManager) getSystemService(Context.WIFI_SERVICE);
@ -282,7 +284,10 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere
else if ("wifi_home".equals(name)) { else if ("wifi_home".equals(name)) {
ListPreference pref_wifi_home = (ListPreference) getPreferenceScreen().findPreference(name); ListPreference pref_wifi_home = (ListPreference) getPreferenceScreen().findPreference(name);
pref_wifi_home.setTitle(getString(R.string.setting_wifi_home, prefs.getString(name, ""))); String ssid = prefs.getString(name, "");
if ("".equals(ssid))
ssid = getString(R.string.title_all);
pref_wifi_home.setTitle(getString(R.string.setting_wifi_home, ssid));
SinkholeService.reload(null, "setting changed", this); SinkholeService.reload(null, "setting changed", this);
} else if ("unmetered_2g".equals(name) || } else if ("unmetered_2g".equals(name) ||