From bdd6b529285639ce739385fa265945b9a206df39 Mon Sep 17 00:00:00 2001 From: cyBerta Date: Fri, 1 Nov 2019 23:39:42 +0100 Subject: start void vpn if no more gateways available during setup --- app/src/main/java/se/leap/bitmaskclient/eip/EIP.java | 5 +++++ app/src/main/java/se/leap/bitmaskclient/eip/EipCommand.java | 5 +++++ 2 files changed, 10 insertions(+) (limited to 'app/src/main/java/se/leap/bitmaskclient/eip') diff --git a/app/src/main/java/se/leap/bitmaskclient/eip/EIP.java b/app/src/main/java/se/leap/bitmaskclient/eip/EIP.java index 63a2de0b..1d67cd12 100644 --- a/app/src/main/java/se/leap/bitmaskclient/eip/EIP.java +++ b/app/src/main/java/se/leap/bitmaskclient/eip/EIP.java @@ -64,6 +64,7 @@ import static se.leap.bitmaskclient.Constants.EIP_ACTION_CHECK_CERT_VALIDITY; import static se.leap.bitmaskclient.Constants.EIP_ACTION_IS_RUNNING; import static se.leap.bitmaskclient.Constants.EIP_ACTION_START; import static se.leap.bitmaskclient.Constants.EIP_ACTION_START_ALWAYS_ON_VPN; +import static se.leap.bitmaskclient.Constants.EIP_ACTION_START_BLOCKING_VPN; import static se.leap.bitmaskclient.Constants.EIP_ACTION_STOP; import static se.leap.bitmaskclient.Constants.EIP_ACTION_STOP_BLOCKING_VPN; import static se.leap.bitmaskclient.Constants.EIP_EARLY_ROUTES; @@ -185,6 +186,10 @@ public final class EIP extends JobIntentService implements Observer { case EIP_ACTION_CHECK_CERT_VALIDITY: checkVPNCertificateValidity(); break; + case EIP_ACTION_START_BLOCKING_VPN: + disconnect(); + earlyRoutes(); + break; } } diff --git a/app/src/main/java/se/leap/bitmaskclient/eip/EipCommand.java b/app/src/main/java/se/leap/bitmaskclient/eip/EipCommand.java index 2bca5c9b..eb266e3c 100644 --- a/app/src/main/java/se/leap/bitmaskclient/eip/EipCommand.java +++ b/app/src/main/java/se/leap/bitmaskclient/eip/EipCommand.java @@ -14,6 +14,7 @@ import se.leap.bitmaskclient.Provider; import static se.leap.bitmaskclient.Constants.EIP_ACTION_CHECK_CERT_VALIDITY; import static se.leap.bitmaskclient.Constants.EIP_ACTION_START; +import static se.leap.bitmaskclient.Constants.EIP_ACTION_START_BLOCKING_VPN; import static se.leap.bitmaskclient.Constants.EIP_ACTION_STOP; import static se.leap.bitmaskclient.Constants.EIP_EARLY_ROUTES; import static se.leap.bitmaskclient.Constants.EIP_N_CLOSEST_GATEWAY; @@ -62,6 +63,10 @@ public class EipCommand { execute(context, EIP_ACTION_START, null, baseIntent); } + public static void startBlockingVPN(Context context) { + execute(context, EIP_ACTION_START_BLOCKING_VPN); + } + @VisibleForTesting public static void startVPN(@NonNull Context context, ResultReceiver resultReceiver) { execute(context, EIP_ACTION_START, resultReceiver, null); -- cgit v1.2.3