Convert most fragments/activities to androidx

1 files changed, 161 insertions, 139 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 8fd6aa98..b58db81a 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
@@ -9,91 +9,98 @@ import android.app.Activity;
 import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
-import android.preference.CheckBoxPreference;
-import android.preference.EditTextPreference;
-import android.preference.ListPreference;
-import android.preference.Preference;
-import android.preference.Preference.OnPreferenceChangeListener;
-import android.preference.Preference.OnPreferenceClickListener;
-import android.preference.SwitchPreference;
 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 OnPreferenceChangeListener, OnPreferenceClickListener {
-	private static final int SELECT_TLS_FILE_LEGACY_DIALOG = 23223232;
-    private static final int SELECT_TLS_FILE_KITKAT = SELECT_TLS_FILE_LEGACY_DIALOG +1;
+public class Settings_Authentication extends OpenVpnPreferencesFragment implements Preference.OnPreferenceChangeListener, Preference.OnPreferenceClickListener {
+    private static final int SELECT_TLS_FILE_LEGACY_DIALOG = 23223232;
+    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 mCipher;
-	private String mTlsAuthFileData;
-	private EditTextPreference mAuth;
+    private CheckBoxPreference mCheckRemoteCN;
+    private RemoteCNPreference mRemoteCN;
+    private ListPreference mTLSAuthDirection;
+    private Preference mTLSAuthFile;
+    private SwitchPreference mUseTLSAuth;
+    private EditTextPreference mCipher;
+    private String mTlsAuthFileData;
+    private EditTextPreference mAuth;
     private EditTextPreference mRemoteX509Name;
 
     @Override
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
 
-		// Load the preferences from an XML resource
-		addPreferencesFromResource(R.xml.vpn_authentification);
+        // Load the preferences from an XML resource
+        addPreferencesFromResource(R.xml.vpn_authentification);
 
-		mExpectTLSCert = (CheckBoxPreference) findPreference("remoteServerTLS");
-		mCheckRemoteCN = (CheckBoxPreference) findPreference("checkRemoteCN");
-		mRemoteCN = (RemoteCNPreference) findPreference("remotecn");
-		mRemoteCN.setOnPreferenceChangeListener(this);
+        mExpectTLSCert = findPreference("remoteServerTLS");
+        mCheckRemoteCN = (CheckBoxPreference) findPreference("checkRemoteCN");
+        mRemoteCN = (RemoteCNPreference) findPreference("remotecn");
+        mRemoteCN.setOnPreferenceChangeListener(this);
 
-		mRemoteX509Name = (EditTextPreference) findPreference("remotex509name");
+        mRemoteX509Name = (EditTextPreference) findPreference("remotex509name");
         mRemoteX509Name.setOnPreferenceChangeListener(this);
 
-		mUseTLSAuth = (SwitchPreference) findPreference("useTLSAuth" );
-		mTLSAuthFile = findPreference("tlsAuthFile");
-		mTLSAuthDirection = (ListPreference) findPreference("tls_direction");
+        mUseTLSAuth = (SwitchPreference) findPreference("useTLSAuth");
+        mTLSAuthFile = findPreference("tlsAuthFile");
+        mTLSAuthDirection = (ListPreference) findPreference("tls_direction");
+
+
+        mTLSAuthFile.setOnPreferenceClickListener(this);
 
+        mCipher = (EditTextPreference) findPreference("cipher");
+        mCipher.setOnPreferenceChangeListener(this);
 
-		mTLSAuthFile.setOnPreferenceClickListener(this);
+        mAuth = (EditTextPreference) findPreference("auth");
+        mAuth.setOnPreferenceChangeListener(this);
 
-		mCipher =(EditTextPreference) findPreference("cipher");
-		mCipher.setOnPreferenceChangeListener(this);
+        loadSettings();
 
-		mAuth =(EditTextPreference) findPreference("auth");
-		mAuth.setOnPreferenceChangeListener(this);
+    }
 
-		loadSettings();
+    @Override
+    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
 
-	}
+    }
 
-	@Override
-	protected void loadSettings() {
+    @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));
+        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);
-		mCipher.setText(mProfile.mCipher);
-		onPreferenceChange(mCipher, mProfile.mCipher);
-		mAuth.setText(mProfile.mAuth);
-		onPreferenceChange(mAuth, mProfile.mAuth);
+        mUseTLSAuth.setChecked(mProfile.mUseTLSAuth);
+        mTlsAuthFileData = mProfile.mTLSAuthFilename;
+        setTlsAuthSummary(mTlsAuthFileData);
+        mTLSAuthDirection.setValue(mProfile.mTLSAuthDirection);
+        mCipher.setText(mProfile.mCipher);
+        onPreferenceChange(mCipher, mProfile.mCipher);
+        mAuth.setText(mProfile.mAuth);
+        onPreferenceChange(mAuth, mProfile.mAuth);
 
         if (mProfile.mAuthenticationType == VpnProfile.TYPE_STATICKEYS) {
             mExpectTLSCert.setEnabled(false);
@@ -104,47 +111,46 @@ public class Settings_Authentication extends OpenVpnPreferencesFragment implemen
             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;
+    @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(mCipher.getText()==null)
-			mProfile.mCipher=null;
-		else
-			mProfile.mCipher = mCipher.getText();
+        if (mTLSAuthDirection.getValue() == null)
+            mProfile.mTLSAuthDirection = null;
+        else
+            mProfile.mTLSAuthDirection = mTLSAuthDirection.getValue();
 
-		if(mAuth.getText()==null)
-			mProfile.mAuth = null;
-		else
-			mProfile.mAuth = mAuth.getText();
-
-	}
+        if (mCipher.getText() == null)
+            mProfile.mCipher = null;
+        else
+            mProfile.mCipher = mCipher.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)) {
+    @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 {
@@ -154,39 +160,40 @@ public class Settings_Authentication extends OpenVpnPreferencesFragment implemen
                 preference.setSummary(getX509String(authtype, dn));
             }
 
-		} else if (preference == mCipher || preference == mAuth) {
-			preference.setSummary((CharSequence) newValue);
-		} else if (preference == mRemoteX509Name) {
-            preference.setSummary(TextUtils.isEmpty((CharSequence) newValue) ? "CN (default)" : (CharSequence)newValue);
+        } else if (preference == mCipher || 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 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;
-	}
+        return ret + dn;
+    }
 
     void startFileDialog() {
         Intent startFC = null;
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT && ! Utils.alwaysUseOldFileChooser(getActivity())) {
+        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);
         }
@@ -200,22 +207,22 @@ public class Settings_Authentication extends OpenVpnPreferencesFragment implemen
     }
 
     @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) {
+    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());
+                mTlsAuthFileData = Utils.getFilePickerResult(Utils.FileType.TLS_AUTH_FILE, data, getActivity());
                 setTlsAuthSummary(mTlsAuthFileData);
             } catch (IOException e) {
                 VpnStatus.logException(e);
@@ -223,16 +230,31 @@ public class Settings_Authentication extends OpenVpnPreferencesFragment implemen
                 VpnStatus.logException(se);
             }
         }
-	}
+    }
 
-	private void setTlsAuthSummary(String result) {
-		if(result==null)
+    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);
+        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);
-	}
+            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