Convert SettingsAuthentication to Kotlin

3 files changed, 214 insertions, 262 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
deleted file mode 100644
index 48e98cb9..00000000
--- a/main/src/ui/java/de/blinkt/openvpn/fragments/Settings_Authentication.java
+++ /dev/null
@@ -1,260 +0,0 @@
-/*
- * Copyright (c) 2012-2016 Arne Schwabe
- * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
- */
-
-package de.blinkt.openvpn.fragments;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Build;
-import android.os.Bundle;
-import android.text.TextUtils;
-import android.util.Pair;
-
-import androidx.fragment.app.DialogFragment;
-import androidx.preference.CheckBoxPreference;
-import androidx.preference.EditTextPreference;
-import androidx.preference.ListPreference;
-import androidx.preference.Preference;
-import androidx.preference.SwitchPreference;
-
-import de.blinkt.openvpn.activities.FileSelect;
-import de.blinkt.openvpn.R;
-import de.blinkt.openvpn.core.VpnStatus;
-import de.blinkt.openvpn.views.RemoteCNPreference;
-import de.blinkt.openvpn.VpnProfile;
-import de.blinkt.openvpn.views.RemoteCNPreferenceDialog;
-
-import java.io.IOException;
-
-
-public class Settings_Authentication extends OpenVpnPreferencesFragment implements Preference.OnPreferenceChangeListener, Preference.OnPreferenceClickListener {
-    private static final int SELECT_TLS_FILE_LEGACY_DIALOG = 10;
-    private static final int SELECT_TLS_FILE_KITKAT = SELECT_TLS_FILE_LEGACY_DIALOG + 1;
-    private CheckBoxPreference mExpectTLSCert;
-    private CheckBoxPreference mCheckRemoteCN;
-    private RemoteCNPreference mRemoteCN;
-    private ListPreference mTLSAuthDirection;
-    private Preference mTLSAuthFile;
-    private SwitchPreference mUseTLSAuth;
-    private EditTextPreference mDataCiphers;
-    private String mTlsAuthFileData;
-    private EditTextPreference mAuth;
-    private EditTextPreference mRemoteX509Name;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        // Load the preferences from an XML resource
-        addPreferencesFromResource(R.xml.vpn_authentification);
-
-        mExpectTLSCert = findPreference("remoteServerTLS");
-        mCheckRemoteCN = (CheckBoxPreference) findPreference("checkRemoteCN");
-        mRemoteCN = (RemoteCNPreference) findPreference("remotecn");
-        mRemoteCN.setOnPreferenceChangeListener(this);
-
-        mRemoteX509Name = (EditTextPreference) findPreference("remotex509name");
-        mRemoteX509Name.setOnPreferenceChangeListener(this);
-
-        mUseTLSAuth = (SwitchPreference) findPreference("useTLSAuth");
-        mTLSAuthFile = findPreference("tlsAuthFile");
-        mTLSAuthDirection = (ListPreference) findPreference("tls_direction");
-
-
-        mTLSAuthFile.setOnPreferenceClickListener(this);
-
-        mDataCiphers = (EditTextPreference) findPreference("dataciphers");
-        mDataCiphers.setOnPreferenceChangeListener(this);
-
-        mAuth = (EditTextPreference) findPreference("auth");
-        mAuth.setOnPreferenceChangeListener(this);
-
-        loadSettings();
-
-    }
-
-    @Override
-    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-
-    }
-
-    @Override
-    protected void loadSettings() {
-
-        mExpectTLSCert.setChecked(mProfile.mExpectTLSCert);
-        mCheckRemoteCN.setChecked(mProfile.mCheckRemoteCN);
-        mRemoteCN.setDN(mProfile.mRemoteCN);
-        mRemoteCN.setAuthType(mProfile.mX509AuthType);
-        onPreferenceChange(mRemoteCN,
-                new Pair<Integer, String>(mProfile.mX509AuthType, mProfile.mRemoteCN));
-
-        mRemoteX509Name.setText(mProfile.mx509UsernameField);
-        onPreferenceChange(mRemoteX509Name, mProfile.mx509UsernameField);
-
-        mUseTLSAuth.setChecked(mProfile.mUseTLSAuth);
-        mTlsAuthFileData = mProfile.mTLSAuthFilename;
-        setTlsAuthSummary(mTlsAuthFileData);
-        mTLSAuthDirection.setValue(mProfile.mTLSAuthDirection);
-        mDataCiphers.setText(mProfile.mDataCiphers);
-        onPreferenceChange(mDataCiphers, mProfile.mDataCiphers);
-        mAuth.setText(mProfile.mAuth);
-        onPreferenceChange(mAuth, mProfile.mAuth);
-
-        if (mProfile.mAuthenticationType == VpnProfile.TYPE_STATICKEYS) {
-            mExpectTLSCert.setEnabled(false);
-            mCheckRemoteCN.setEnabled(false);
-            mUseTLSAuth.setChecked(true);
-        } else {
-            mExpectTLSCert.setEnabled(true);
-            mCheckRemoteCN.setEnabled(true);
-
-        }
-    }
-
-    @Override
-    protected void saveSettings() {
-        mProfile.mExpectTLSCert = mExpectTLSCert.isChecked();
-        mProfile.mCheckRemoteCN = mCheckRemoteCN.isChecked();
-        mProfile.mRemoteCN = mRemoteCN.getCNText();
-        mProfile.mX509AuthType = mRemoteCN.getAuthtype();
-
-        mProfile.mUseTLSAuth = mUseTLSAuth.isChecked();
-        mProfile.mTLSAuthFilename = mTlsAuthFileData;
-        mProfile.mx509UsernameField = mRemoteX509Name.getText();
-
-        if (mTLSAuthDirection.getValue() == null)
-            mProfile.mTLSAuthDirection = null;
-        else
-            mProfile.mTLSAuthDirection = mTLSAuthDirection.getValue();
-
-        if (mDataCiphers.getText() == null)
-            mProfile.mDataCiphers = null;
-        else
-            mProfile.mDataCiphers = mDataCiphers.getText();
-
-        if (mAuth.getText() == null)
-            mProfile.mAuth = null;
-        else
-            mProfile.mAuth = mAuth.getText();
-
-    }
-
-
-    @Override
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
-        if (preference == mRemoteCN) {
-            @SuppressWarnings("unchecked")
-            int authtype = ((Pair<Integer, String>) newValue).first;
-            @SuppressWarnings("unchecked")
-            String dn = ((Pair<Integer, String>) newValue).second;
-
-            if ("".equals(dn)) {
-                if (mProfile.mConnections.length > 0) {
-                    preference.setSummary(getX509String(VpnProfile.X509_VERIFY_TLSREMOTE_RDN, mProfile.mConnections[0].mServerName));
-                } else {
-                    preference.setSummary(R.string.no_remote_defined);
-                }
-            } else {
-                preference.setSummary(getX509String(authtype, dn));
-            }
-
-        } else if (preference == mDataCiphers || preference == mAuth) {
-            preference.setSummary((CharSequence) newValue);
-        } else if (preference == mRemoteX509Name) {
-            preference.setSummary(TextUtils.isEmpty((CharSequence) newValue) ? "CN (default)" : (CharSequence) newValue);
-        }
-        return true;
-    }
-
-    private CharSequence getX509String(int authtype, String dn) {
-        String ret = "";
-        switch (authtype) {
-            case VpnProfile.X509_VERIFY_TLSREMOTE:
-            case VpnProfile.X509_VERIFY_TLSREMOTE_COMPAT_NOREMAPPING:
-                ret += "tls-remote ";
-                break;
-
-            case VpnProfile.X509_VERIFY_TLSREMOTE_DN:
-                ret = "dn: ";
-                break;
-
-            case VpnProfile.X509_VERIFY_TLSREMOTE_RDN:
-                ret = "rdn: ";
-                break;
-
-            case VpnProfile.X509_VERIFY_TLSREMOTE_RDN_PREFIX:
-                ret = "rdn prefix: ";
-                break;
-        }
-        return ret + dn;
-    }
-
-    void startFileDialog() {
-        Intent startFC = null;
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT && !Utils.alwaysUseOldFileChooser(getActivity())) {
-            startFC = Utils.getFilePickerIntent(getActivity(), Utils.FileType.TLS_AUTH_FILE);
-            startActivityForResult(startFC, SELECT_TLS_FILE_KITKAT);
-        }
-
-        if (startFC == null) {
-            startFC = new Intent(getActivity(), FileSelect.class);
-            startFC.putExtra(FileSelect.START_DATA, mTlsAuthFileData);
-            startFC.putExtra(FileSelect.WINDOW_TITLE, R.string.tls_auth_file);
-            startActivityForResult(startFC, SELECT_TLS_FILE_LEGACY_DIALOG);
-        }
-    }
-
-    @Override
-    public boolean onPreferenceClick(Preference preference) {
-        startFileDialog();
-        return true;
-
-    }
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        if (requestCode == SELECT_TLS_FILE_LEGACY_DIALOG && resultCode == Activity.RESULT_OK) {
-            String result = data.getStringExtra(FileSelect.RESULT_DATA);
-            mTlsAuthFileData = result;
-            setTlsAuthSummary(result);
-        } else if (requestCode == SELECT_TLS_FILE_KITKAT && resultCode == Activity.RESULT_OK) {
-            try {
-                mTlsAuthFileData = Utils.getFilePickerResult(Utils.FileType.TLS_AUTH_FILE, data, getActivity());
-                setTlsAuthSummary(mTlsAuthFileData);
-            } catch (IOException e) {
-                VpnStatus.logException(e);
-            } catch (SecurityException se) {
-                VpnStatus.logException(se);
-            }
-        }
-    }
-
-    private void setTlsAuthSummary(String result) {
-        if (result == null)
-            result = getString(R.string.no_certificate);
-        if (result.startsWith(VpnProfile.INLINE_TAG))
-            mTLSAuthFile.setSummary(R.string.inline_file_data);
-        else if (result.startsWith(VpnProfile.DISPLAYNAME_TAG))
-            mTLSAuthFile.setSummary(getString(R.string.imported_from_file, VpnProfile.getDisplayName(result)));
-        else
-            mTLSAuthFile.setSummary(result);
-    }
-
-    @Override
-    public void onDisplayPreferenceDialog(Preference preference) {
-        DialogFragment dialogFragment = null;
-        if (preference instanceof RemoteCNPreference) {
-            dialogFragment = RemoteCNPreferenceDialog.newInstance(preference.getKey());
-        }
-
-        if (dialogFragment != null) {
-            dialogFragment.setTargetFragment(this, 0);
-            dialogFragment.show(requireFragmentManager(), "RemoteCNDialog");
-        } else {
-            super.onDisplayPreferenceDialog(preference);
-        }
-    }
-}
\ No newline at end of file
diff --git a/main/src/ui/java/de/blinkt/openvpn/fragments/Settings_Authentication.kt b/main/src/ui/java/de/blinkt/openvpn/fragments/Settings_Authentication.kt
new file mode 100644
index 00000000..15687f26
--- /dev/null
+++ b/main/src/ui/java/de/blinkt/openvpn/fragments/Settings_Authentication.kt
@@ -0,0 +1,212 @@
+/*
+ * Copyright (c) 2012-2016 Arne Schwabe
+ * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
+ */
+package de.blinkt.openvpn.fragments
+
+import android.app.Activity
+import android.content.Intent
+import android.os.Build
+import android.os.Bundle
+import android.util.Pair
+import androidx.activity.result.ActivityResult
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.fragment.app.DialogFragment
+import androidx.preference.*
+import de.blinkt.openvpn.R
+import de.blinkt.openvpn.VpnProfile
+import de.blinkt.openvpn.activities.FileSelect
+import de.blinkt.openvpn.core.VpnStatus
+import de.blinkt.openvpn.fragments.Utils.alwaysUseOldFileChooser
+import de.blinkt.openvpn.fragments.Utils.getFilePickerIntent
+import de.blinkt.openvpn.fragments.Utils.getFilePickerResult
+import de.blinkt.openvpn.views.RemoteCNPreference
+import de.blinkt.openvpn.views.RemoteCNPreferenceDialog
+import java.io.IOException
+
+class Settings_Authentication : OpenVpnPreferencesFragment(), Preference.OnPreferenceChangeListener,
+    Preference.OnPreferenceClickListener {
+    private lateinit var mExpectTLSCert: CheckBoxPreference
+    private lateinit var mCheckRemoteCN: CheckBoxPreference
+    private lateinit var mRemoteCN: RemoteCNPreference
+    private lateinit var mTLSAuthDirection: ListPreference
+    private lateinit var mTLSAuthFile: Preference
+    private lateinit var mUseTLSAuth: SwitchPreference
+    private lateinit var mDataCiphers: EditTextPreference
+    private var mTlsAuthFileData: String? = null
+    private lateinit var mAuth: EditTextPreference
+    private lateinit var mRemoteX509Name: EditTextPreference
+
+    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        // Load the preferences from an XML resource
+        addPreferencesFromResource(R.xml.vpn_authentification)
+        mExpectTLSCert = findPreference("remoteServerTLS")!!
+        mCheckRemoteCN = findPreference("checkRemoteCN")!!
+        mRemoteCN = findPreference("remotecn")!!
+        mRemoteCN.onPreferenceChangeListener = this
+        mRemoteX509Name = findPreference("remotex509name")!!
+        mRemoteX509Name.onPreferenceChangeListener = this
+        mUseTLSAuth = findPreference("useTLSAuth")!!
+        mTLSAuthFile = findPreference("tlsAuthFile")!!
+        mTLSAuthDirection = findPreference("tls_direction")!!
+        mTLSAuthFile.onPreferenceClickListener = this
+        mDataCiphers = findPreference("dataciphers")!!
+        mDataCiphers.onPreferenceChangeListener = this
+        mAuth = findPreference("auth")!!
+        mAuth.onPreferenceChangeListener = this
+        loadSettings()
+    }
+
+    override fun loadSettings() {
+        mExpectTLSCert.isChecked = mProfile.mExpectTLSCert
+        mCheckRemoteCN.isChecked = mProfile.mCheckRemoteCN
+        mRemoteCN.setDN(mProfile.mRemoteCN)
+        mRemoteCN.setAuthType(mProfile.mX509AuthType)
+        onPreferenceChange(
+            mRemoteCN,
+            Pair(mProfile.mX509AuthType, mProfile.mRemoteCN)
+        )
+        mRemoteX509Name.text = mProfile.mx509UsernameField ?: ""
+        onPreferenceChange(mRemoteX509Name, mProfile.mx509UsernameField ?: "")
+        mUseTLSAuth.isChecked = mProfile.mUseTLSAuth
+        mTlsAuthFileData = mProfile.mTLSAuthFilename
+        setTlsAuthSummary(mTlsAuthFileData)
+        mTLSAuthDirection.value = mProfile.mTLSAuthDirection
+        mDataCiphers.text = mProfile.mDataCiphers
+        onPreferenceChange(mDataCiphers, mProfile.mDataCiphers)
+        mAuth.text = mProfile.mAuth
+        onPreferenceChange(mAuth, mProfile.mAuth)
+        if (mProfile.mAuthenticationType == VpnProfile.TYPE_STATICKEYS) {
+            mExpectTLSCert.isEnabled = false
+            mCheckRemoteCN.isEnabled = false
+            mUseTLSAuth.isChecked = true
+        } else {
+            mExpectTLSCert.isEnabled = true
+            mCheckRemoteCN.isEnabled = true
+        }
+    }
+
+    override fun saveSettings() {
+        mProfile.mExpectTLSCert = mExpectTLSCert.isChecked
+        mProfile.mCheckRemoteCN = mCheckRemoteCN.isChecked
+        mProfile.mRemoteCN = mRemoteCN.cnText
+        mProfile.mX509AuthType = mRemoteCN.authtype
+        mProfile.mUseTLSAuth = mUseTLSAuth.isChecked
+        mProfile.mTLSAuthFilename = mTlsAuthFileData
+        mProfile.mx509UsernameField = mRemoteX509Name.text
+        if (mTLSAuthDirection.value == null) mProfile.mTLSAuthDirection =
+            null else mProfile.mTLSAuthDirection = mTLSAuthDirection.value
+        if (mDataCiphers.text == null) mProfile.mDataCiphers = null else mProfile.mDataCiphers =
+            mDataCiphers.text
+        if (mAuth.text == null) mProfile.mAuth = null else mProfile.mAuth = mAuth.text
+    }
+
+    override fun onPreferenceChange(preference: Preference, newValue: Any): Boolean {
+        if (preference === mRemoteCN && newValue is Pair<*, *>) {
+            val authtype = newValue.first as Int
+            val dn = newValue.second
+            if ("" == dn) {
+                if (mProfile.mConnections.size > 0) {
+                    preference.summary = getX509String(
+                        VpnProfile.X509_VERIFY_TLSREMOTE_RDN,
+                        mProfile.mConnections[0].mServerName
+                    )
+                } else {
+                    preference.setSummary(R.string.no_remote_defined)
+                }
+            } else {
+                preference.summary = getX509String(authtype, dn as String)
+            }
+        } else if (preference === mDataCiphers || preference === mAuth) {
+            preference.summary = (newValue as CharSequence)
+        } else if (preference === mRemoteX509Name) {
+            preference.summary =
+                (if (newValue.toString().isEmpty()) "CN (default)" else newValue as CharSequence)
+        }
+        return true
+    }
+
+    private fun getX509String(authtype: Int, dn: String): CharSequence {
+        var ret = ""
+        when (authtype) {
+            VpnProfile.X509_VERIFY_TLSREMOTE, VpnProfile.X509_VERIFY_TLSREMOTE_COMPAT_NOREMAPPING -> ret += "tls-remote "
+            VpnProfile.X509_VERIFY_TLSREMOTE_DN -> ret = "dn: "
+            VpnProfile.X509_VERIFY_TLSREMOTE_RDN -> ret = "rdn: "
+            VpnProfile.X509_VERIFY_TLSREMOTE_RDN_PREFIX -> ret = "rdn prefix: "
+        }
+        return ret + dn
+    }
+
+    fun startFileDialog() {
+        var startFC: Intent? = null
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT && !alwaysUseOldFileChooser(activity)) {
+            startFC = getFilePickerIntent(requireContext(), Utils.FileType.TLS_AUTH_FILE)
+            registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result: ActivityResult ->
+                if (result.resultCode == Activity.RESULT_OK)
+                    try {
+                        mTlsAuthFileData =
+                            getFilePickerResult(
+                                Utils.FileType.TLS_AUTH_FILE,
+                                result.data,
+                                requireContext()
+                            )
+                        setTlsAuthSummary(mTlsAuthFileData)
+                    } catch (e: IOException) {
+                        VpnStatus.logException(e)
+                    } catch (se: SecurityException) {
+                        VpnStatus.logException(se)
+                    }
+            }
+        }
+        if (startFC == null) {
+            startFC = Intent(activity, FileSelect::class.java)
+            startFC.putExtra(FileSelect.START_DATA, mTlsAuthFileData)
+            startFC.putExtra(FileSelect.WINDOW_TITLE, R.string.tls_auth_file)
+            registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result: ActivityResult ->
+
+                val resData = result.data?.getStringExtra(FileSelect.RESULT_DATA)
+                mTlsAuthFileData = resData
+                setTlsAuthSummary(resData)
+
+            }
+        }
+    }
+
+    override fun onPreferenceClick(preference: Preference): Boolean {
+        startFileDialog()
+        return true
+    }
+
+
+    private fun setTlsAuthSummary(result: String?) {
+        var result = result
+        if (result == null)
+            result = getString(R.string.no_certificate)
+
+        if (result.startsWith(VpnProfile.INLINE_TAG))
+            mTLSAuthFile.setSummary(R.string.inline_file_data)
+        else if (result.startsWith(VpnProfile.DISPLAYNAME_TAG))
+            mTLSAuthFile.summary =
+                getString(R.string.imported_from_file, VpnProfile.getDisplayName(result))
+        else
+            mTLSAuthFile.summary = result
+    }
+
+    override fun onDisplayPreferenceDialog(preference: Preference) {
+        var dialogFragment: DialogFragment? = null
+        if (preference is RemoteCNPreference) {
+            dialogFragment = RemoteCNPreferenceDialog.newInstance(preference.getKey())
+        }
+        if (dialogFragment != null) {
+            dialogFragment.setTargetFragment(this, 0)
+            dialogFragment.show(parentFragmentManager, "RemoteCNDialog")
+        } else {
+            super.onDisplayPreferenceDialog(preference)
+        }
+    }
+}
\ No newline at end of file
diff --git a/main/src/ui/java/de/blinkt/openvpn/fragments/Utils.kt b/main/src/ui/java/de/blinkt/openvpn/fragments/Utils.kt
index ae3f0617..8756b5b0 100644
--- a/main/src/ui/java/de/blinkt/openvpn/fragments/Utils.kt
+++ b/main/src/ui/java/de/blinkt/openvpn/fragments/Utils.kt
@@ -187,8 +187,8 @@ object Utils {
 
     @JvmStatic
     @Throws(IOException::class, SecurityException::class)
-    fun getFilePickerResult(ft: FileType?, result: Intent, c: Context): String? {
-        val uri = result.data ?: return null
+    fun getFilePickerResult(ft: FileType?, result: Intent?, c: Context): String? {
+        val uri = result?.data ?: return null
         val fileData = readBytesFromStream(c.contentResolver.openInputStream(uri))
         var newData: String? = null
         val cursor = c.contentResolver.query(uri, null, null, null, null)