Remove technical info in stable versions

This commit is contained in:
M66B 2016-01-28 12:03:57 +01:00
parent e16c4c4af2
commit 5feac232c6
1 changed files with 20 additions and 18 deletions

View File

@ -208,12 +208,14 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere
}); });
} }
// Development
if (!(Util.isDebuggable(this) || Util.getSelfVersionName(this).contains("beta"))) { if (!(Util.isDebuggable(this) || Util.getSelfVersionName(this).contains("beta"))) {
// Development
screen.removePreference(screen.findPreference("category_development")); screen.removePreference(screen.findPreference("category_development"));
prefs.edit().remove("loglevel").apply(); prefs.edit().remove("loglevel").apply();
}
// Technical info
screen.removePreference(screen.findPreference("category_technical"));
} else {
// Handle technical info // Handle technical info
Preference.OnPreferenceClickListener listener = new Preference.OnPreferenceClickListener() { Preference.OnPreferenceClickListener listener = new Preference.OnPreferenceClickListener() {
@Override @Override
@ -223,17 +225,17 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere
} }
}; };
// Technical info
Preference pref_technical_info = screen.findPreference("technical_info"); Preference pref_technical_info = screen.findPreference("technical_info");
Preference pref_technical_network = screen.findPreference("technical_network"); Preference pref_technical_network = screen.findPreference("technical_network");
Preference pref_technical_subscription = screen.findPreference("technical_subscription"); Preference pref_technical_subscription = screen.findPreference("technical_subscription");
if (Util.isDebuggable(this)) {
pref_technical_info.setEnabled(INTENT_VPN_SETTINGS.resolveActivity(this.getPackageManager()) != null); pref_technical_info.setEnabled(INTENT_VPN_SETTINGS.resolveActivity(this.getPackageManager()) != null);
pref_technical_info.setIntent(INTENT_VPN_SETTINGS); pref_technical_info.setIntent(INTENT_VPN_SETTINGS);
}
pref_technical_info.setOnPreferenceClickListener(listener); pref_technical_info.setOnPreferenceClickListener(listener);
pref_technical_network.setOnPreferenceClickListener(listener); pref_technical_network.setOnPreferenceClickListener(listener);
pref_technical_subscription.setOnPreferenceClickListener(listener); pref_technical_subscription.setOnPreferenceClickListener(listener);
updateTechnicalInfo(); updateTechnicalInfo();
}
// Handle devices without wifi // Handle devices without wifi
if (!Util.hasWifi(this)) { if (!Util.hasWifi(this)) {