summaryrefslogtreecommitdiff
path: root/main/src/ui/java/de
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2020-09-14 00:31:00 +0200
committerArne Schwabe <arne@rfc2549.org>2020-09-14 00:31:00 +0200
commitab86d5bc54f10fa043972c9f7cc6f6898ac34b0c (patch)
tree698b76d7bd7979c2cb59c95de0a3ace0cce4fda8 /main/src/ui/java/de
parent3abeb389bf62bcbedd668e3ee661249c7748cc16 (diff)
Include --cipher into --data-ciphers for the sake of compatibility
Diffstat (limited to 'main/src/ui/java/de')
-rw-r--r--main/src/ui/java/de/blinkt/openvpn/fragments/Settings_Authentication.java18
1 files changed, 9 insertions, 9 deletions
diff --git a/main/src/ui/java/de/blinkt/openvpn/fragments/Settings_Authentication.java b/main/src/ui/java/de/blinkt/openvpn/fragments/Settings_Authentication.java
index 8e6fbb1a..48e98cb9 100644
--- a/main/src/ui/java/de/blinkt/openvpn/fragments/Settings_Authentication.java
+++ b/main/src/ui/java/de/blinkt/openvpn/fragments/Settings_Authentication.java
@@ -38,7 +38,7 @@ public class Settings_Authentication extends OpenVpnPreferencesFragment implemen
private ListPreference mTLSAuthDirection;
private Preference mTLSAuthFile;
private SwitchPreference mUseTLSAuth;
- private EditTextPreference mCipher;
+ private EditTextPreference mDataCiphers;
private String mTlsAuthFileData;
private EditTextPreference mAuth;
private EditTextPreference mRemoteX509Name;
@@ -65,8 +65,8 @@ public class Settings_Authentication extends OpenVpnPreferencesFragment implemen
mTLSAuthFile.setOnPreferenceClickListener(this);
- mCipher = (EditTextPreference) findPreference("cipher");
- mCipher.setOnPreferenceChangeListener(this);
+ mDataCiphers = (EditTextPreference) findPreference("dataciphers");
+ mDataCiphers.setOnPreferenceChangeListener(this);
mAuth = (EditTextPreference) findPreference("auth");
mAuth.setOnPreferenceChangeListener(this);
@@ -97,8 +97,8 @@ public class Settings_Authentication extends OpenVpnPreferencesFragment implemen
mTlsAuthFileData = mProfile.mTLSAuthFilename;
setTlsAuthSummary(mTlsAuthFileData);
mTLSAuthDirection.setValue(mProfile.mTLSAuthDirection);
- mCipher.setText(mProfile.mCipher);
- onPreferenceChange(mCipher, mProfile.mCipher);
+ mDataCiphers.setText(mProfile.mDataCiphers);
+ onPreferenceChange(mDataCiphers, mProfile.mDataCiphers);
mAuth.setText(mProfile.mAuth);
onPreferenceChange(mAuth, mProfile.mAuth);
@@ -129,10 +129,10 @@ public class Settings_Authentication extends OpenVpnPreferencesFragment implemen
else
mProfile.mTLSAuthDirection = mTLSAuthDirection.getValue();
- if (mCipher.getText() == null)
- mProfile.mCipher = null;
+ if (mDataCiphers.getText() == null)
+ mProfile.mDataCiphers = null;
else
- mProfile.mCipher = mCipher.getText();
+ mProfile.mDataCiphers = mDataCiphers.getText();
if (mAuth.getText() == null)
mProfile.mAuth = null;
@@ -160,7 +160,7 @@ public class Settings_Authentication extends OpenVpnPreferencesFragment implemen
preference.setSummary(getX509String(authtype, dn));
}
- } else if (preference == mCipher || preference == mAuth) {
+ } else if (preference == mDataCiphers || preference == mAuth) {
preference.setSummary((CharSequence) newValue);
} else if (preference == mRemoteX509Name) {
preference.setSummary(TextUtils.isEmpty((CharSequence) newValue) ? "CN (default)" : (CharSequence) newValue);