diff options
author | cyberta <cyberta@riseup.net> | 2021-02-15 21:38:33 +0000 |
---|---|---|
committer | cyberta <cyberta@riseup.net> | 2021-02-15 21:38:33 +0000 |
commit | efd90a35caf042d7955727e4a5d9a12927714ca8 (patch) | |
tree | 8a429d2cc592cc093802c237d633556233cb4a7b /app/src/main/java/se/leap/bitmaskclient/base/fragments | |
parent | 50588d08d77529eb84686220cfe3c8816195d46b (diff) | |
parent | 4aad61b74f67a025e46fb1d5b4b96d916104912f (diff) |
Merge branch 'faster_gateway_switch' into 'master'
switch faster to next gateway during eip setup if current one is not responsive
Closes #9022
See merge request leap/bitmask_android!124
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/base/fragments')
-rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/base/fragments/EipFragment.java | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/base/fragments/EipFragment.java b/app/src/main/java/se/leap/bitmaskclient/base/fragments/EipFragment.java index d8501a92..4ff80ea6 100644 --- a/app/src/main/java/se/leap/bitmaskclient/base/fragments/EipFragment.java +++ b/app/src/main/java/se/leap/bitmaskclient/base/fragments/EipFragment.java @@ -55,7 +55,6 @@ import butterknife.Unbinder; import de.blinkt.openvpn.core.IOpenVPNServiceInternal; import de.blinkt.openvpn.core.OpenVPNService; import de.blinkt.openvpn.core.VpnStatus; -import se.leap.bitmaskclient.providersetup.ProviderListActivity; import se.leap.bitmaskclient.R; import se.leap.bitmaskclient.base.FragmentManagerEnhanced; import se.leap.bitmaskclient.base.models.Provider; @@ -64,6 +63,7 @@ import se.leap.bitmaskclient.base.views.VpnStateImage; import se.leap.bitmaskclient.eip.EipCommand; import se.leap.bitmaskclient.eip.EipStatus; import se.leap.bitmaskclient.providersetup.ProviderAPICommand; +import se.leap.bitmaskclient.providersetup.ProviderListActivity; import se.leap.bitmaskclient.providersetup.activities.CustomProviderSetupActivity; import se.leap.bitmaskclient.providersetup.activities.LoginActivity; import se.leap.bitmaskclient.providersetup.models.LeapSRPSession; @@ -83,7 +83,6 @@ import static se.leap.bitmaskclient.base.models.Constants.REQUEST_CODE_SWITCH_PR import static se.leap.bitmaskclient.base.models.Constants.SHARED_PREFERENCES; import static se.leap.bitmaskclient.base.utils.ConfigHelper.isDefaultBitmask; import static se.leap.bitmaskclient.base.utils.ViewHelper.convertDimensionToPx; -import static se.leap.bitmaskclient.eip.EipSetupObserver.connectionRetry; import static se.leap.bitmaskclient.eip.EipSetupObserver.gatewayOrder; import static se.leap.bitmaskclient.eip.EipSetupObserver.reconnectingWithDifferentGateway; import static se.leap.bitmaskclient.providersetup.ProviderAPI.DOWNLOAD_GEOIP_JSON; @@ -475,10 +474,6 @@ public class EipFragment extends Fragment implements Observer { toast.setView(layout); toast.show(); } - private void showReconnectToast(Activity activity) { - String message = (String.format("Retry %d of %d before the next closest gateway will be selected.", connectionRetry()+1, 5)); - showToast(activity, message, false); - } private void showRetryToast(Activity activity) { int nClosestGateway = gatewayOrder(); |