From f557975d72b64d7ed13c53c153b40c0fb5522757 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Fri, 26 Nov 2021 10:58:56 +0100
Subject: disable location entries that are not supporting current transport,
 show hint in GatewaySelectionFragment and an option to disable bridges

---
 .../base/fragments/MainActivityErrorDialog.java    | 38 +++++-----------------
 1 file changed, 9 insertions(+), 29 deletions(-)

(limited to 'app/src/main/java/se/leap/bitmaskclient/base/fragments/MainActivityErrorDialog.java')

diff --git a/app/src/main/java/se/leap/bitmaskclient/base/fragments/MainActivityErrorDialog.java b/app/src/main/java/se/leap/bitmaskclient/base/fragments/MainActivityErrorDialog.java
index f7805002..f1895307 100644
--- a/app/src/main/java/se/leap/bitmaskclient/base/fragments/MainActivityErrorDialog.java
+++ b/app/src/main/java/se/leap/bitmaskclient/base/fragments/MainActivityErrorDialog.java
@@ -18,37 +18,32 @@ package se.leap.bitmaskclient.base.fragments;
 
 import android.app.Dialog;
 import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
 import android.os.Bundle;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.fragment.app.DialogFragment;
 import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.DialogFragment;
 
 import org.json.JSONObject;
 
 import se.leap.bitmaskclient.R;
-import se.leap.bitmaskclient.base.MainActivity;
-import se.leap.bitmaskclient.base.utils.PreferenceHelper;
+import se.leap.bitmaskclient.base.models.Provider;
 import se.leap.bitmaskclient.eip.EIP;
 import se.leap.bitmaskclient.eip.EipCommand;
-import se.leap.bitmaskclient.base.models.Provider;
 import se.leap.bitmaskclient.providersetup.ProviderAPICommand;
 
-import static se.leap.bitmaskclient.base.MainActivity.ACTION_SHOW_DIALOG_FRAGMENT;
-import static se.leap.bitmaskclient.base.MainActivity.ACTION_SHOW_VPN_FRAGMENT;
-import static se.leap.bitmaskclient.base.utils.PreferenceHelper.getPreferredCity;
-import static se.leap.bitmaskclient.base.utils.PreferenceHelper.setPreferredCity;
-import static se.leap.bitmaskclient.providersetup.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.base.utils.PreferenceHelper.getPreferredCity;
+import static se.leap.bitmaskclient.base.utils.PreferenceHelper.getUseBridges;
+import static se.leap.bitmaskclient.base.utils.PreferenceHelper.setPreferredCity;
+import static se.leap.bitmaskclient.base.utils.PreferenceHelper.useBridges;
 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.base.utils.PreferenceHelper.getUseBridges;
-import static se.leap.bitmaskclient.base.utils.PreferenceHelper.useBridges;
+import static se.leap.bitmaskclient.eip.EIP.ERRORS;
+import static se.leap.bitmaskclient.providersetup.ProviderAPI.UPDATE_INVALID_VPN_CERTIFICATE;
 
 /**
  * Implements an error dialog for the main activity.
@@ -158,21 +153,6 @@ public class MainActivityErrorDialog extends DialogFragment {
             case ERROR_VPN_PREPARE:
                 builder.setPositiveButton(android.R.string.ok, (dialog, which) -> { });
                 break;
-            case TRANSPORT_NOT_SUPPORTED:
-
-                builder.setPositiveButton(R.string.option_different_location, (dialog, which) -> { });
-                builder.setNegativeButton(R.string.option_disable_bridges, (dialog, which) -> {
-                    PreferenceHelper.useBridges(applicationContext, false);
-                    PreferenceHelper.setPreferredCity(applicationContext, args[0]);
-
-                    EipCommand.startVPN(applicationContext, false);
-                    // at this point the gateway selection dialog is shown, let's switch to the main view
-                    Intent intent = new Intent(getContext(), MainActivity.class);
-                    intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP | Intent.FLAG_ACTIVITY_CLEAR_TOP);
-                    intent.setAction(ACTION_SHOW_VPN_FRAGMENT);
-                    startActivity(intent);
-                });
-                break;
             default:
                 break;
         }
-- 
cgit v1.2.3