diff options
| -rw-r--r-- | res/layout/about.xml | 1 | ||||
| -rw-r--r-- | res/values/arrays.xml | 8 | ||||
| -rw-r--r-- | res/values/untranslatable.xml | 8 | ||||
| -rw-r--r-- | res/xml/vpn_obscure.xml | 6 | ||||
| -rw-r--r-- | src/de/blinkt/openvpn/fragments/Settings_Obscure.java | 24 |
5 files changed, 2 insertions, 45 deletions
diff --git a/res/layout/about.xml b/res/layout/about.xml index 50accad2..febdb954 100644 --- a/res/layout/about.xml +++ b/res/layout/about.xml @@ -171,6 +171,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/copyright_bouncycastle" /> + </LinearLayout> </ScrollView>
\ No newline at end of file diff --git a/res/values/arrays.xml b/res/values/arrays.xml index f4f85b8f..5f829971 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -16,14 +16,6 @@ <item>1</item> <item>Unspecified</item> </string-array> - <string-array name="verb_entries"> - <item>0 - No logging</item> - <item>1 - Default logging</item> - <item>2 - More verbose logging</item> - <item>3</item> - <item>4</item> - <item>5 - Debug logging</item> - </string-array> <string-array name="crm_entries"> <item>No reconnection retries</item> <item>One reconnection retry</item> diff --git a/res/values/untranslatable.xml b/res/values/untranslatable.xml index 1b4fdd9b..7458bc33 100644 --- a/res/values/untranslatable.xml +++ b/res/values/untranslatable.xml @@ -27,14 +27,6 @@ <item>1</item> <item></item> </string-array> - <string-array name="verb_values" translatable="false"> - <item>0</item> - <item>1</item> - <item>2</item> - <item>3</item> - <item>4</item> - <item>5</item> - </string-array> <string-array name="crm_values" translatable="false"> <item>1</item> <item>2</item> diff --git a/res/xml/vpn_obscure.xml b/res/xml/vpn_obscure.xml index ecdd4e29..6172dacb 100644 --- a/res/xml/vpn_obscure.xml +++ b/res/xml/vpn_obscure.xml @@ -2,12 +2,6 @@ <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" android:title="Obscure Settings" > - <ListPreference - android:entries="@array/verb_entries" - android:entryValues="@array/verb_values" - android:key="verblevel" - android:persistent="false" - android:title="@string/log_verbosity_level" /> <CheckBoxPreference android:key="useRandomHostname" diff --git a/src/de/blinkt/openvpn/fragments/Settings_Obscure.java b/src/de/blinkt/openvpn/fragments/Settings_Obscure.java index 03df51f2..0e8f1a02 100644 --- a/src/de/blinkt/openvpn/fragments/Settings_Obscure.java +++ b/src/de/blinkt/openvpn/fragments/Settings_Obscure.java @@ -28,13 +28,9 @@ public class Settings_Obscure extends OpenVpnPreferencesFragment implements OnPr mUseFloat = (CheckBoxPreference) findPreference("useFloat"); mUseCustomConfig = (CheckBoxPreference) findPreference("enableCustomOptions"); mCustomConfig = (EditTextPreference) findPreference("customOptions"); - mLogverbosity = (ListPreference) findPreference("verblevel"); mPersistent = (CheckBoxPreference) findPreference("usePersistTun"); mConnectretrymax = (ListPreference) findPreference("connectretrymax"); mConnectretry = (EditTextPreference) findPreference("connectretry"); - - mLogverbosity.setOnPreferenceChangeListener(this); - mLogverbosity.setSummary("%s"); mConnectretrymax.setOnPreferenceChangeListener(this); mConnectretrymax.setSummary("%s"); @@ -53,9 +49,6 @@ public class Settings_Obscure extends OpenVpnPreferencesFragment implements OnPr mCustomConfig.setText(mProfile.mCustomConfigOptions); mPersistent.setChecked(mProfile.mPersistTun); - mLogverbosity.setValue(mProfile.mVerb); - onPreferenceChange(mLogverbosity, mProfile.mVerb); - mConnectretrymax.setValue(mProfile.mConnectRetryMax); onPreferenceChange(mConnectretrymax, mProfile.mConnectRetryMax); @@ -69,7 +62,6 @@ public class Settings_Obscure extends OpenVpnPreferencesFragment implements OnPr mProfile.mUseFloat = mUseFloat.isChecked(); mProfile.mUseCustomConfig = mUseCustomConfig.isChecked(); mProfile.mCustomConfigOptions = mCustomConfig.getText(); - mProfile.mVerb = mLogverbosity.getValue(); mProfile.mConnectRetryMax = mConnectretrymax.getValue(); mProfile.mPersistTun = mPersistent.isChecked(); mProfile.mConnectRetry = mConnectretry.getText(); @@ -78,21 +70,7 @@ public class Settings_Obscure extends OpenVpnPreferencesFragment implements OnPr @Override public boolean onPreferenceChange(Preference preference, Object newValue) { - if(preference==mLogverbosity) { - // Catch old version problem - if(newValue==null){ - newValue="1"; - } - mLogverbosity.setDefaultValue(newValue); - //This is idiotic. - int i =Integer.parseInt((String) newValue); - - // verb >= 5 is not supported by the chooser - if(i < mLogverbosity.getEntries().length ) - mLogverbosity.setSummary(mLogverbosity.getEntries()[i]); - else - mLogverbosity.setSummary(String.format("debug verbosity: %d",i)); - } else if (preference == mConnectretrymax) { + if (preference == mConnectretrymax) { if(newValue==null) { newValue="5"; } |