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

Improvement

This commit is contained in:
M66B 2017-02-12 10:17:12 +01:00
parent 2753db41c4
commit 3576f8a9a4
4 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -223,14 +223,12 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere
EditTextPreference pref_dns1 = (EditTextPreference) screen.findPreference("dns");
EditTextPreference pref_dns2 = (EditTextPreference) screen.findPreference("dns2");
EditTextPreference pref_ttl = (EditTextPreference) screen.findPreference("ttl");
EditTextPreference pref_rcode = (EditTextPreference) screen.findPreference("rcode");
List<String> def_dns = Util.getDefaultDNS(this);
pref_dns1.getEditText().setHint(def_dns.get(0));
pref_dns2.getEditText().setHint(def_dns.get(1));
pref_dns1.setTitle(getString(R.string.setting_dns, prefs.getString("dns", def_dns.get(0))));
pref_dns2.setTitle(getString(R.string.setting_dns, prefs.getString("dns2", def_dns.get(1))));
pref_ttl.setTitle(getString(R.string.setting_ttl, prefs.getString("ttl", "259200")));
pref_rcode.setTitle(getString(R.string.setting_rcode, prefs.getString("rcode", "3")));
// SOCKS5 parameters
screen.findPreference("socks5_addr").setTitle(getString(R.string.setting_socks5_addr, prefs.getString("socks5_addr", "-")));
@ -247,10 +245,9 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere
// Show resolved
Preference pref_show_resolved = screen.findPreference("show_resolved");
if (Util.isPlayStoreInstall(this)) {
if (Util.isPlayStoreInstall(this))
cat_advanced.removePreference(pref_show_resolved);
cat_advanced.removePreference(pref_rcode);
} else
else
pref_show_resolved.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
@Override
public boolean onPreferenceClick(Preference preference) {
@ -291,14 +288,18 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere
// Hosts file settings
Preference pref_block_domains = screen.findPreference("use_hosts");
EditTextPreference pref_rcode = (EditTextPreference) screen.findPreference("rcode");
Preference pref_hosts_import = screen.findPreference("hosts_import");
EditTextPreference pref_hosts_url = (EditTextPreference) screen.findPreference("hosts_url");
final Preference pref_hosts_download = screen.findPreference("hosts_download");
pref_rcode.setTitle(getString(R.string.setting_rcode, prefs.getString("rcode", "3")));
if (Util.isPlayStoreInstall(this)) {
Log.i(TAG, "Play store install");
cat_options.removePreference(screen.findPreference("update_check"));
cat_advanced.removePreference(pref_block_domains);
cat_advanced.removePreference(pref_rcode);
cat_advanced.removePreference(pref_forwarding);
cat_backup.removePreference(pref_hosts_import);
cat_backup.removePreference(pref_hosts_url);

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

@ -91,12 +91,12 @@ however it is impossible to guarantee NetGuard will work correctly on every devi
<string name="setting_reset_usage">Reset network usage</string>
<string name="setting_show_resolved">Show resolved domain names</string>
<string name="setting_block_domains">Block domain names</string>
<string name="setting_rcode">DNS response code: %s</string>
<string name="setting_forwarding">Port forwarding</string>
<string name="setting_vpn4">VPN IPv4: %s</string>
<string name="setting_vpn6">VPN IPv6: %s</string>
<string name="setting_dns">VPN DNS: %s</string>
<string name="setting_ttl">Minimum DNS TTL: %s s</string>
<string name="setting_rcode">DNS response code: %s</string>
<string name="setting_socks5_enabled">Use SOCKS5 proxy</string>
<string name="setting_socks5_addr">SOCKS5 address: %s</string>
<string name="setting_socks5_port">SOCKS5 port: %s</string>
@ -145,7 +145,8 @@ however it is impossible to guarantee NetGuard will work correctly on every devi
<string name="summary_access">Show a status bar notification when an application attempts to access a new internet address (when filtering is disabled, only blocked internet access attempts will be notified)</string>
<string name="summary_filter">Filter IP packets going out of the VPN tunnel. This might result in extra battery usage.</string>
<string name="summary_track_usage">Track the number of bytes sent and received for each application and address. This might result in extra battery usage.</string>
<string name="summary_block_domains">Respond with \'name error\' (NXDOMAIN) for blocked domain names. This switch is disabled when no hosts file is available.</string>
<string name="summary_block_domains">Respond with the configured DNS response code for blocked domain names. This switch is disabled when no hosts file is available.</string>
<string name="summary_rcode">The default value is 3 (NXDOMAIN), which means \'non-existent domain\'.</string>
<string name="summary_socks5_enabled">Only TCP traffic will be sent to the proxy server</string>
<string name="summary_watchdog">Periodically check if NetGuard is still running (enter zero to disable this option). This might result in extra battery usage.</string>

9
app/src/main/res/xml-v14/preferences.xml
View File

@ -175,6 +175,11 @@
android:key="use_hosts"
android:summary="@string/summary_block_domains"
android:title="@string/setting_block_domains" />
<EditTextPreference
android:dependency="filter"
android:inputType="number"
android:key="rcode"
android:summary="@string/summary_rcode" />
<Preference
android:dependency="filter"
android:key="forwarding"
@ -200,10 +205,6 @@
android:dependency="filter"
android:inputType="number"
android:key="ttl" />
<EditTextPreference
android:dependency="filter"
android:inputType="number"
android:key="rcode" />
<CheckBoxPreference
android:defaultValue="false"
android:dependency="filter"

9
app/src/main/res/xml-v21/preferences.xml
View File

@ -175,6 +175,11 @@
android:key="use_hosts"
android:summary="@string/summary_block_domains"
android:title="@string/setting_block_domains" />
<EditTextPreference
android:dependency="filter"
android:inputType="number"
android:key="rcode"
android:summary="@string/summary_rcode" />
<Preference
android:dependency="filter"
android:key="forwarding"
@ -200,10 +205,6 @@
android:dependency="filter"
android:inputType="number"
android:key="ttl" />
<EditTextPreference
android:dependency="filter"
android:inputType="number"
android:key="rcode" />
<eu.faircode.netguard.SwitchPreference
android:defaultValue="false"
android:dependency="filter"