From ab86d5bc54f10fa043972c9f7cc6f6898ac34b0c Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Mon, 14 Sep 2020 00:31:00 +0200
Subject: Include --cipher into --data-ciphers for the sake of compatibility

---
 .../openvpn/fragments/Settings_Authentication.java     | 18 +++++++++---------
 main/src/ui/res/xml/vpn_authentification.xml           |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'main/src/ui')

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);
diff --git a/main/src/ui/res/xml/vpn_authentification.xml b/main/src/ui/res/xml/vpn_authentification.xml
index 374431e7..be24495a 100644
--- a/main/src/ui/res/xml/vpn_authentification.xml
+++ b/main/src/ui/res/xml/vpn_authentification.xml
@@ -52,7 +52,7 @@
         <EditTextPreference
             android:dialogMessage="@string/chipher_dialog_message"
             android:dialogTitle="@string/cipher_dialog_title"
-            android:key="cipher"
+            android:key="dataciphers"
             android:persistent="false"
             android:title="@string/encryption_cipher" />
         <EditTextPreference
-- 
cgit v1.2.3