cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1416 from open-keychain/proxy-settings

Browse Source 
Linked normal proxy settings to normal proxy checkbox
This commit is contained in:
Dominik Schürmann
2015-07-07 20:20:21 +02:00
parent a91fc1c0c9 6baf8163de
commit c55a1f24d5
1 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsActivity.java
View File

@@ -277,8 +277,14 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
initializeEditTextPreferences(); initializeEditTextPreferences();
initializeProxyTypePreference(); initializeProxyTypePreference();
if (mUseTor.isChecked()) disableNormalProxyPrefs(); if (mUseTor.isChecked()) {
else if (mUseNormalProxy.isChecked()) disableUseTorPrefs(); disableNormalProxyPrefs();
}
else if (mUseNormalProxy.isChecked()) {
disableUseTorPrefs();
} else {
disableNormalProxySettings();
}
} }
private void initializeUseTorPref() { private void initializeUseTorPref() {
@@ -301,7 +307,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
} }
} else { } else {
// we're unchecking Tor, so enable other proxy // we're unchecking Tor, so enable other proxy
enableNormalProxyPrefs(); enableNormalProxyCheckbox();
return true; return true;
} }
} }
@@ -314,8 +320,10 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
public boolean onPreferenceChange(Preference preference, Object newValue) { public boolean onPreferenceChange(Preference preference, Object newValue) {
if ((Boolean) newValue) { if ((Boolean) newValue) {
disableUseTorPrefs(); disableUseTorPrefs();
enableNormalProxySettings();
} else { } else {
enableUseTorPrefs(); enableUseTorPrefs();
disableNormalProxySettings();
} }
return true; return true;
} }
@@ -389,18 +397,25 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
private void disableNormalProxyPrefs() { private void disableNormalProxyPrefs() {
mUseNormalProxy.setChecked(false); mUseNormalProxy.setChecked(false);
mUseNormalProxy.setEnabled(false); mUseNormalProxy.setEnabled(false);
mProxyHost.setEnabled(false); disableNormalProxySettings();
mProxyPort.setEnabled(false);
mProxyType.setEnabled(false);
} }
private void enableNormalProxyPrefs() { private void enableNormalProxyCheckbox() {
mUseNormalProxy.setEnabled(true); mUseNormalProxy.setEnabled(true);
}
private void enableNormalProxySettings() {
mProxyHost.setEnabled(true); mProxyHost.setEnabled(true);
mProxyPort.setEnabled(true); mProxyPort.setEnabled(true);
mProxyType.setEnabled(true); mProxyType.setEnabled(true);
} }
private void disableNormalProxySettings() {
mProxyHost.setEnabled(false);
mProxyPort.setEnabled(false);
mProxyType.setEnabled(false);
}
private void disableUseTorPrefs() { private void disableUseTorPrefs() {
mUseTor.setChecked(false); mUseTor.setChecked(false);
mUseTor.setEnabled(false); mUseTor.setEnabled(false);