new year cleanup: restructure messy project

1 files changed, 0 insertions, 171 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/MainActivityErrorDialog.java b/app/src/main/java/se/leap/bitmaskclient/MainActivityErrorDialog.java
deleted file mode 100644
index 7e9bad22..00000000
--- a/app/src/main/java/se/leap/bitmaskclient/MainActivityErrorDialog.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/**
- * Copyright (c) 2018 LEAP Encryption Access Project and contributers
- *
- * 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 3 of the License, or
- * (at your option) any later version.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package se.leap.bitmaskclient;
-
-import android.app.Dialog;
-import android.content.Context;
-import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.DialogFragment;
-import androidx.appcompat.app.AlertDialog;
-
-import org.json.JSONObject;
-
-import se.leap.bitmaskclient.eip.EIP;
-import se.leap.bitmaskclient.eip.EipCommand;
-
-import static se.leap.bitmaskclient.ProviderAPI.UPDATE_INVALID_VPN_CERTIFICATE;
-import static se.leap.bitmaskclient.R.string.warning_option_try_ovpn;
-import static se.leap.bitmaskclient.R.string.warning_option_try_pt;
-import static se.leap.bitmaskclient.eip.EIP.EIPErrors.UNKNOWN;
-import static se.leap.bitmaskclient.eip.EIP.EIPErrors.valueOf;
-import static se.leap.bitmaskclient.eip.EIP.ERRORS;
-import static se.leap.bitmaskclient.eip.EIP.ERRORID;
-import static se.leap.bitmaskclient.utils.PreferenceHelper.getUsePluggableTransports;
-import static se.leap.bitmaskclient.utils.PreferenceHelper.usePluggableTransports;
-
-/**
- * Implements an error dialog for the main activity.
- *
- * @author fupduck
- * @author cyberta
- */
-public class MainActivityErrorDialog extends DialogFragment {
-
-    final public static String TAG = "downloaded_failed_dialog";
-    final private static String KEY_REASON_TO_FAIL = "key reason to fail";
-    final private static String KEY_PROVIDER = "key provider";
-    private String reasonToFail;
-    private EIP.EIPErrors downloadError = UNKNOWN;
-
-    private Provider provider;
-
-    /**
-     * @return a new instance of this DialogFragment.
-     */
-    public static DialogFragment newInstance(Provider provider, String reasonToFail) {
-        return newInstance(provider, reasonToFail, UNKNOWN);
-    }
-
-    /**
-     * @return a new instance of this DialogFragment.
-     */
-    public static DialogFragment newInstance(Provider provider, String reasonToFail, EIP.EIPErrors error) {
-        MainActivityErrorDialog dialogFragment = new MainActivityErrorDialog();
-        dialogFragment.reasonToFail = reasonToFail;
-        dialogFragment.provider = provider;
-        dialogFragment.downloadError = error;
-        return dialogFragment;
-    }
-
-    /**
-     * @return a new instance of this DialogFragment.
-     */
-    public static DialogFragment newInstance(Provider provider, JSONObject errorJson) {
-        MainActivityErrorDialog dialogFragment = new MainActivityErrorDialog();
-        dialogFragment.provider = provider;
-        try {
-            if (errorJson.has(ERRORS)) {
-                dialogFragment.reasonToFail = errorJson.getString(ERRORS);
-            } else {
-                //default error msg
-                dialogFragment.reasonToFail = dialogFragment.getString(R.string.error_io_exception_user_message);
-            }
-
-            if (errorJson.has(ERRORID)) {
-                dialogFragment.downloadError = valueOf(errorJson.getString(ERRORID));
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            dialogFragment.reasonToFail = dialogFragment.getString(R.string.error_io_exception_user_message);
-        }
-        return dialogFragment;
-    }
-
-    @Override
-    public void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        restoreFromSavedInstance(savedInstanceState);
-    }
-
-    @Override
-    @NonNull
-    public Dialog onCreateDialog(Bundle savedInstanceState) {
-        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-        Context applicationContext = getContext().getApplicationContext();
-        builder.setMessage(reasonToFail)
-                .setNegativeButton(R.string.cancel, (dialog, id) -> {
-                });
-        switch (downloadError) {
-            case ERROR_INVALID_VPN_CERTIFICATE:
-                builder.setPositiveButton(R.string.update_certificate, (dialog, which) ->
-                        ProviderAPICommand.execute(getContext(), UPDATE_INVALID_VPN_CERTIFICATE, provider));
-                break;
-            case NO_MORE_GATEWAYS:
-                if (provider.supportsPluggableTransports()) {
-                    if (getUsePluggableTransports(applicationContext)) {
-                        builder.setPositiveButton(warning_option_try_ovpn, ((dialog, which) -> {
-                            usePluggableTransports(applicationContext, false);
-                            EipCommand.startVPN(applicationContext, false);
-                        }));
-                    } else {
-                        builder.setPositiveButton(warning_option_try_pt, ((dialog, which) -> {
-                            usePluggableTransports(applicationContext, true);
-                            EipCommand.startVPN(applicationContext, false);
-                        }));
-                    }
-                } else {
-                    builder.setPositiveButton(R.string.retry, (dialog, which) -> {
-                        EipCommand.startVPN(applicationContext, false);
-                    });
-                }
-                break;
-            case ERROR_VPN_PREPARE:
-                builder.setPositiveButton(R.string.retry, (dialog, which) -> {
-                    EipCommand.startVPN(applicationContext, false);
-                });
-                break;
-            default:
-                break;
-        }
-
-        // Create the AlertDialog object and return it
-        return builder.create();
-    }
-
-
-    @Override
-    public void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        outState.putString(KEY_REASON_TO_FAIL, reasonToFail);
-        outState.putParcelable(KEY_PROVIDER, provider);
-    }
-
-    private void restoreFromSavedInstance(Bundle savedInstanceState) {
-        if (savedInstanceState == null) {
-            return;
-        }
-        if (savedInstanceState.containsKey(KEY_PROVIDER)) {
-            this.provider = savedInstanceState.getParcelable(KEY_PROVIDER);
-        }
-        if (savedInstanceState.containsKey(KEY_REASON_TO_FAIL)) {
-            this.reasonToFail = savedInstanceState.getString(KEY_REASON_TO_FAIL);
-        }
-    }
-
-}