diff options
author | lalottacontinua <loddatio@posteo.de> | 2018-06-18 21:15:15 +0200 |
---|---|---|
committer | lalottacontinua <loddatio@posteo.de> | 2018-06-18 21:15:15 +0200 |
commit | 1a34cc1e3ebf152505ed591787a7778744020bbd (patch) | |
tree | 4dc3054b63ef53b32ba0591aca8c317b8cd2cd8d /app/src/main/java/se/leap/bitmaskclient/eip/EipCommand.java | |
parent | 2fbf5a2cadabb503306af4a59c1f98596784e488 (diff) | |
parent | 77879cf10f7857b95c968446f5ce9e0437bceb0f (diff) |
solved merge conflict
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/eip/EipCommand.java')
-rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/eip/EipCommand.java | 6 |
1 files changed, 5 insertions, 1 deletions
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 d2c8b4fc..19735483 100644 --- a/app/src/main/java/se/leap/bitmaskclient/eip/EipCommand.java +++ b/app/src/main/java/se/leap/bitmaskclient/eip/EipCommand.java @@ -5,6 +5,7 @@ import android.content.Context; import android.content.Intent; import android.os.ResultReceiver; import android.support.annotation.NonNull; +import android.support.annotation.VisibleForTesting; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -41,7 +42,7 @@ public class EipCommand { vpnIntent.setAction(action); if (resultReceiver != null) vpnIntent.putExtra(EIP_RECEIVER, resultReceiver); - context.startService(vpnIntent); + EIP.enqueueWork(context, vpnIntent); } public static void startVPN(@NonNull Context context, boolean earlyRoutes) { @@ -50,6 +51,7 @@ public class EipCommand { execute(context, EIP_ACTION_START, null, baseIntent); } + @VisibleForTesting public static void startVPN(@NonNull Context context, ResultReceiver resultReceiver) { execute(context, EIP_ACTION_START, resultReceiver, null); } @@ -58,6 +60,7 @@ public class EipCommand { execute(context, EIP_ACTION_STOP); } + @VisibleForTesting public static void stopVPN(@NonNull Context context, ResultReceiver resultReceiver) { execute(context, EIP_ACTION_STOP, resultReceiver, null); } @@ -66,6 +69,7 @@ public class EipCommand { execute(context, EIP_ACTION_CHECK_CERT_VALIDITY); } + @VisibleForTesting public static void checkVpnCertificate(@NonNull Context context, ResultReceiver resultReceiver) { execute(context, EIP_ACTION_CHECK_CERT_VALIDITY, resultReceiver, null); } |