diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-07-07 20:20:21 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-07-07 20:20:21 +0200 |
| commit | c55a1f24d55b8da60fa6bb9897eb0b3b49b065ee (patch) | |
| tree | 18fa3dd7b2b12471fb7dacabf7828d307e3834bf | |
| parent | a91fc1c0c9a1c1558e6783a6ea1406aaaaa54ba0 (diff) | |
| parent | 6baf8163deb045f8a31fea7ad853b156502f018e (diff) | |
| download | open-keychain-c55a1f24d55b8da60fa6bb9897eb0b3b49b065ee.tar.gz open-keychain-c55a1f24d55b8da60fa6bb9897eb0b3b49b065ee.tar.bz2 open-keychain-c55a1f24d55b8da60fa6bb9897eb0b3b49b065ee.zip | |
Merge pull request #1416 from open-keychain/proxy-settings
Linked normal proxy settings to normal proxy checkbox
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsActivity.java | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsActivity.java index f72a552d5..bcf42ba74 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsActivity.java @@ -277,8 +277,14 @@ public class SettingsActivity extends AppCompatPreferenceActivity { initializeEditTextPreferences(); initializeProxyTypePreference(); - if (mUseTor.isChecked()) disableNormalProxyPrefs(); - else if (mUseNormalProxy.isChecked()) disableUseTorPrefs(); + if (mUseTor.isChecked()) { + disableNormalProxyPrefs(); + } + else if (mUseNormalProxy.isChecked()) { + disableUseTorPrefs(); + } else { + disableNormalProxySettings(); + } } private void initializeUseTorPref() { @@ -301,7 +307,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity { } } else { // we're unchecking Tor, so enable other proxy - enableNormalProxyPrefs(); + enableNormalProxyCheckbox(); return true; } } @@ -314,8 +320,10 @@ public class SettingsActivity extends AppCompatPreferenceActivity { public boolean onPreferenceChange(Preference preference, Object newValue) { if ((Boolean) newValue) { disableUseTorPrefs(); + enableNormalProxySettings(); } else { enableUseTorPrefs(); + disableNormalProxySettings(); } return true; } @@ -389,18 +397,25 @@ public class SettingsActivity extends AppCompatPreferenceActivity { private void disableNormalProxyPrefs() { mUseNormalProxy.setChecked(false); mUseNormalProxy.setEnabled(false); - mProxyHost.setEnabled(false); - mProxyPort.setEnabled(false); - mProxyType.setEnabled(false); + disableNormalProxySettings(); } - private void enableNormalProxyPrefs() { + private void enableNormalProxyCheckbox() { mUseNormalProxy.setEnabled(true); + } + + private void enableNormalProxySettings() { mProxyHost.setEnabled(true); mProxyPort.setEnabled(true); mProxyType.setEnabled(true); } + private void disableNormalProxySettings() { + mProxyHost.setEnabled(false); + mProxyPort.setEnabled(false); + mProxyType.setEnabled(false); + } + private void disableUseTorPrefs() { mUseTor.setChecked(false); mUseTor.setEnabled(false); |