From 1f3e638dd04b73a47dc1e77c7c7711c9be94a7d8 Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 2 Feb 2016 19:50:28 +0100 Subject: [PATCH] Fixed technical info --- app/build.gradle | 4 +- .../faircode/netguard/ActivitySettings.java | 43 +++++++++---------- 2 files changed, 22 insertions(+), 25 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index bfb2ecf9..d94c78e3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ model { applicationId = "eu.faircode.netguard" minSdkVersion.apiLevel = 14 targetSdkVersion.apiLevel = 23 - versionCode = 2016020201 - versionName = "0.81" + versionCode = 2016020202 + versionName = "0.81-beta" archivesBaseName = "NetGuard-v$versionName-$versionCode" } } diff --git a/app/src/main/java/eu/faircode/netguard/ActivitySettings.java b/app/src/main/java/eu/faircode/netguard/ActivitySettings.java index efdf8677..68473b3d 100644 --- a/app/src/main/java/eu/faircode/netguard/ActivitySettings.java +++ b/app/src/main/java/eu/faircode/netguard/ActivitySettings.java @@ -224,31 +224,28 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere // Development screen.removePreference(screen.findPreference("category_development")); prefs.edit().remove("loglevel").apply(); - - // Technical info - screen.removePreference(screen.findPreference("category_technical")); - } else { - // Handle technical info - Preference.OnPreferenceClickListener listener = new Preference.OnPreferenceClickListener() { - @Override - public boolean onPreferenceClick(Preference preference) { - updateTechnicalInfo(); - return true; - } - }; - - // Technical info - Preference pref_technical_info = screen.findPreference("technical_info"); - Preference pref_technical_network = screen.findPreference("technical_network"); - Preference pref_technical_subscription = screen.findPreference("technical_subscription"); - pref_technical_info.setEnabled(INTENT_VPN_SETTINGS.resolveActivity(this.getPackageManager()) != null); - pref_technical_info.setIntent(INTENT_VPN_SETTINGS); - pref_technical_info.setOnPreferenceClickListener(listener); - pref_technical_network.setOnPreferenceClickListener(listener); - pref_technical_subscription.setOnPreferenceClickListener(listener); - updateTechnicalInfo(); } + // Handle technical info + Preference.OnPreferenceClickListener listener = new Preference.OnPreferenceClickListener() { + @Override + public boolean onPreferenceClick(Preference preference) { + updateTechnicalInfo(); + return true; + } + }; + + // Technical info + Preference pref_technical_info = screen.findPreference("technical_info"); + Preference pref_technical_network = screen.findPreference("technical_network"); + Preference pref_technical_subscription = screen.findPreference("technical_subscription"); + pref_technical_info.setEnabled(INTENT_VPN_SETTINGS.resolveActivity(this.getPackageManager()) != null); + pref_technical_info.setIntent(INTENT_VPN_SETTINGS); + pref_technical_info.setOnPreferenceClickListener(listener); + pref_technical_network.setOnPreferenceClickListener(listener); + pref_technical_subscription.setOnPreferenceClickListener(listener); + updateTechnicalInfo(); + // Handle devices without wifi if (!Util.hasWifi(this)) { PreferenceCategory defaults = (PreferenceCategory) screen.findPreference("category_defaults");