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

Remove development options from release versions

This commit is contained in:
M66B 2016-07-24 10:40:12 +02:00
parent 643e1ba8ae
commit 5ba9022374
2 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -132,7 +132,6 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere
PreferenceGroup cat_advanced = (PreferenceGroup) ((PreferenceGroup) screen.findPreference("screen_advanced_options")).findPreference("category_advanced_options");
PreferenceGroup cat_stats = (PreferenceGroup) ((PreferenceGroup) screen.findPreference("screen_stats")).findPreference("category_stats");
PreferenceGroup cat_backup = (PreferenceGroup) ((PreferenceGroup) screen.findPreference("screen_backup")).findPreference("category_backup");
PreferenceGroup cat_development = (PreferenceGroup) ((PreferenceGroup) screen.findPreference("screen_development")).findPreference("category_development");
// Handle auto enable
Preference pref_auto_enable = screen.findPreference("auto_enable");
@ -346,21 +345,19 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere
}
// Development
Preference pref_show_resolved = screen.findPreference("show_resolved");
if (!(Util.isDebuggable(this) || Util.getSelfVersionName(this).contains("beta"))) {
screen.removePreference(cat_development);
prefs.edit().remove("loglevel").apply();
} else if (!Util.isDebuggable(this))
cat_development.removePreference(pref_show_resolved);
// Show resolved
pref_show_resolved.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
@Override
public boolean onPreferenceClick(Preference preference) {
startActivity(new Intent(ActivitySettings.this, ActivityDns.class));
return true;
}
});
if (!Util.isDebuggable(this))
screen.removePreference(screen.findPreference("screen_development"));
else {
// Show resolved
Preference pref_show_resolved = screen.findPreference("show_resolved");
pref_show_resolved.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
@Override
public boolean onPreferenceClick(Preference preference) {
startActivity(new Intent(ActivitySettings.this, ActivityDns.class));
return true;
}
});
}
// Handle technical info
Preference.OnPreferenceClickListener listener = new Preference.OnPreferenceClickListener() {

4
app/src/main/java/eu/faircode/netguard/Receiver.java
View File

@ -249,9 +249,11 @@ public class Receiver extends BroadcastReceiver {
editor.remove("update_check");
editor.remove("use_hosts");
editor.remove("hosts_url");
editor.remove("loglevel");
}
if (!Util.isDebuggable(context))
editor.remove("loglevel");
editor.putInt("version", newVersion);
editor.apply();
}