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

Small improvement

This commit is contained in:
M66B 2015-12-10 13:40:33 +01:00
parent b79c8904d3
commit 6f80050a39
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,7 +61,6 @@ import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
@ -108,9 +107,12 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere
pref_stats_base.setTitle(getString(R.string.setting_stats_base, prefs.getString("stats_base", "5"))); pref_stats_base.setTitle(getString(R.string.setting_stats_base, prefs.getString("stats_base", "5")));
// Wi-Fi home // Wi-Fi home
MultiSelectListPreference wifi_homes_pref = (MultiSelectListPreference) screen.findPreference("wifi_homes"); MultiSelectListPreference pref_wifi_homes = (MultiSelectListPreference) screen.findPreference("wifi_homes");
Set<String> ssid = prefs.getStringSet("wifi_homes", new HashSet<String>()); Set<String> ssid = prefs.getStringSet("wifi_homes", new HashSet<String>());
wifi_homes_pref.setTitle(getString(R.string.setting_wifi_home, TextUtils.join(", ", ssid))); if (ssid.size() > 0)
pref_wifi_homes.setTitle(getString(R.string.setting_wifi_home, TextUtils.join(", ", ssid)));
else
pref_wifi_homes.setTitle(getString(R.string.setting_wifi_home, "-"));
WifiManager wm = (WifiManager) getSystemService(Context.WIFI_SERVICE); WifiManager wm = (WifiManager) getSystemService(Context.WIFI_SERVICE);
List<CharSequence> listSSID = new ArrayList<>(); List<CharSequence> listSSID = new ArrayList<>();
@ -118,8 +120,8 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere
if (configs != null) if (configs != null)
for (WifiConfiguration config : configs) for (WifiConfiguration config : configs)
listSSID.add(config.SSID); listSSID.add(config.SSID);
wifi_homes_pref.setEntries(listSSID.toArray(new CharSequence[0])); pref_wifi_homes.setEntries(listSSID.toArray(new CharSequence[0]));
wifi_homes_pref.setEntryValues(listSSID.toArray(new CharSequence[0])); pref_wifi_homes.setEntryValues(listSSID.toArray(new CharSequence[0]));
// Handle auto enable // Handle auto enable
Preference pref_auto_enable = screen.findPreference("auto_enable"); Preference pref_auto_enable = screen.findPreference("auto_enable");
@ -295,7 +297,10 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere
else if ("wifi_homes".equals(name)) { else if ("wifi_homes".equals(name)) {
MultiSelectListPreference pref_wifi_homes = (MultiSelectListPreference) getPreferenceScreen().findPreference(name); MultiSelectListPreference pref_wifi_homes = (MultiSelectListPreference) getPreferenceScreen().findPreference(name);
Set<String> ssid = prefs.getStringSet(name, new HashSet<String>()); Set<String> ssid = prefs.getStringSet(name, new HashSet<String>());
if (ssid.size() > 0)
pref_wifi_homes.setTitle(getString(R.string.setting_wifi_home, TextUtils.join(", ", ssid))); pref_wifi_homes.setTitle(getString(R.string.setting_wifi_home, TextUtils.join(", ", ssid)));
else
pref_wifi_homes.setTitle(getString(R.string.setting_wifi_home, "-"));
SinkholeService.reload(null, "setting changed", this); SinkholeService.reload(null, "setting changed", this);
} else if ("unmetered_2g".equals(name) || } else if ("unmetered_2g".equals(name) ||
@ -683,7 +688,7 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere
current.put(key, value); current.put(key, value);
else if ("set".equals(type)) { else if ("set".equals(type)) {
Set<String> set = new HashSet<>(); Set<String> set = new HashSet<>();
for (String s : ((String) value).split("\n")) for (String s : value.split("\n"))
set.add(s); set.add(s);
current.put(key, set); current.put(key, set);
} else } else

1
app/src/main/res/values/strings.xml
View File

@ -70,7 +70,6 @@ Since NetGuard has no internet permission, you know your internet traffic is not
<string name="msg_kbsec">%7.3f KB/s</string> <string name="msg_kbsec">%7.3f KB/s</string>
<string name="msg_mbsec">%7.3f MB/s</string> <string name="msg_mbsec">%7.3f MB/s</string>
<string name="title_all">All</string>
<string name="title_screen_wifi">Allow Wi-Fi when screen is on</string> <string name="title_screen_wifi">Allow Wi-Fi when screen is on</string>
<string name="title_screen_other">Allow mobile when screen is on</string> <string name="title_screen_other">Allow mobile when screen is on</string>
<string name="title_roaming">Block when roaming</string> <string name="title_roaming">Block when roaming</string>