android: Extract login dialog fragment

diff --git a/src/frontends/android/app/src/main/java/org/strongswan/android/ui/LoginDialogFragment.java b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/LoginDialogFragment.java
new file mode 100644 (file)
index 0000000..2efcc9f
--- /dev/null
+++ b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/LoginDialogFragment.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2020 Tobias Brunner
+ * HSR Hochschule fuer Technik Rapperswil
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * for more details.
+ */
+
+package org.strongswan.android.ui;
+
+import android.app.Dialog;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.EditText;
+
+import org.strongswan.android.R;
+import org.strongswan.android.data.VpnProfileDataSource;
+
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatDialogFragment;
+
+/**
+ * Class that displays a login dialog and triggers a callback.
+ */
+public class LoginDialogFragment extends AppCompatDialogFragment
+{
+       private OnLoginDialogFragmentListener mListener;
+
+       /**
+        * The activity containing this fragment should implement this interface to receive
+        * a password or NULL if canceled.
+        */
+       public interface OnLoginDialogFragmentListener {
+               void onLoginDialogDismissed(String password);
+       }
+
+       public static LoginDialogFragment newInstance(Bundle profileInfo, OnLoginDialogFragmentListener listener)
+       {
+               final LoginDialogFragment instance = new LoginDialogFragment();
+               instance.setArguments(profileInfo);
+               instance.mListener = listener;
+               return instance;
+       }
+
+       @Override
+       public Dialog onCreateDialog(Bundle savedInstanceState)
+       {
+               final Bundle profileInfo = getArguments();
+               LayoutInflater inflater = getActivity().getLayoutInflater();
+               View view = inflater.inflate(R.layout.login_dialog, null);
+               EditText username = view.findViewById(R.id.username);
+               username.setText(profileInfo.getString(VpnProfileDataSource.KEY_USERNAME));
+               final EditText password = view.findViewById(R.id.password);
+
+               AlertDialog.Builder adb = new AlertDialog.Builder(getActivity());
+               adb.setView(view);
+               adb.setTitle(getString(R.string.login_title));
+               adb.setPositiveButton(R.string.login_confirm, (dialog, which) ->
+                       mListener.onLoginDialogDismissed(password.getText().toString().trim()));
+               adb.setNegativeButton(android.R.string.cancel, (dialog, which) ->
+                       mListener.onLoginDialogDismissed(null));
+               return adb.create();
+       }
+
+       @Override
+       public void onCancel(DialogInterface dialog)
+       {
+               mListener.onLoginDialogDismissed(null);
+       }
+}

diff --git a/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileControlActivity.java b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileControlActivity.java
index 5174cafb07500db4c8d80ca5ee45b5c82af99c0f..1497e0295ad16e7c96ee639586efc5947c18c15b 100644 (file)
--- a/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileControlActivity.java
+++ b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileControlActivity.java
@@ -31,9 +31,6 @@ import android.os.Bundle;
 import android.os.IBinder;
 import android.os.PowerManager;
 import android.provider.Settings;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.EditText;
 import android.widget.Toast;
 
 import org.strongswan.android.R;
@@ -317,8 +314,14 @@ public class VpnProfileControlActivity extends AppCompatActivity
                if (profileInfo.getBoolean(PROFILE_REQUIRES_PASSWORD) &&
                        profileInfo.getString(VpnProfileDataSource.KEY_PASSWORD) == null)
                {
-                       LoginDialog login = new LoginDialog();
-                       login.setArguments(profileInfo);
+                       LoginDialogFragment login = LoginDialogFragment.newInstance(profileInfo, password -> {
+                               if (password == null)
+                               {
+                                       finish();
+                               }
+                               profileInfo.putString(VpnProfileDataSource.KEY_PASSWORD, password);
+                               prepareVpnService(profileInfo);
+                       });
                        login.show(getSupportFragmentManager(), DIALOG_TAG);
                        return;
                }
@@ -533,53 +536,6 @@ public class VpnProfileControlActivity extends AppCompatActivity
                }
        }
 
-       /**
-        * Class that displays a login dialog and initiates the selected VPN
-        * profile if the user confirms the dialog.
-        */
-       public static class LoginDialog extends AppCompatDialogFragment
-       {
-               @Override
-               public Dialog onCreateDialog(Bundle savedInstanceState)
-               {
-                       final Bundle profileInfo = getArguments();
-                       LayoutInflater inflater = getActivity().getLayoutInflater();
-                       View view = inflater.inflate(R.layout.login_dialog, null);
-                       EditText username = (EditText)view.findViewById(R.id.username);
-                       username.setText(profileInfo.getString(VpnProfileDataSource.KEY_USERNAME));
-                       final EditText password = (EditText)view.findViewById(R.id.password);
-
-                       AlertDialog.Builder adb = new AlertDialog.Builder(getActivity());
-                       adb.setView(view);
-                       adb.setTitle(getString(R.string.login_title));
-                       adb.setPositiveButton(R.string.login_confirm, new DialogInterface.OnClickListener()
-                       {
-                               @Override
-                               public void onClick(DialogInterface dialog, int whichButton)
-                               {
-                                       VpnProfileControlActivity activity = (VpnProfileControlActivity)getActivity();
-                                       profileInfo.putString(VpnProfileDataSource.KEY_PASSWORD, password.getText().toString().trim());
-                                       activity.prepareVpnService(profileInfo);
-                               }
-                       });
-                       adb.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener()
-                       {
-                               @Override
-                               public void onClick(DialogInterface dialog, int which)
-                               {
-                                       getActivity().finish();
-                               }
-                       });
-                       return adb.create();
-               }
-
-               @Override
-               public void onCancel(DialogInterface dialog)
-               {
-                       getActivity().finish();
-               }
-       }
-
        /**
         * Class that displays a warning before asking the user to add the app to the
         * device's power whitelist.