From 54a4934dc83b6d5753fb1ff367d1d60600e540bb Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Fri, 10 Dec 2021 17:12:17 +0100
Subject: always use application context in EipCommand to start eip service

---
 app/src/main/java/se/leap/bitmaskclient/eip/EipCommand.java  |  4 ++--
 .../java/se/leap/bitmaskclient/eip/EipSetupObserver.java     | 12 ++++++------
 .../main/java/se/leap/bitmaskclient/eip/VoidVpnLauncher.java |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'app/src/main/java/se/leap/bitmaskclient/eip')

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 46704419..b5229b0a 100644
--- a/app/src/main/java/se/leap/bitmaskclient/eip/EipCommand.java
+++ b/app/src/main/java/se/leap/bitmaskclient/eip/EipCommand.java
@@ -28,7 +28,7 @@ import static se.leap.bitmaskclient.base.models.Constants.PROVIDER_PROFILE;
 public class EipCommand {
 
     private static void execute(@NonNull Context context, @NonNull String action) {
-        execute(context.getApplicationContext(), action, null, null);
+        execute(context, action, null, null);
     }
 
     /**
@@ -46,7 +46,7 @@ public class EipCommand {
         vpnIntent.setAction(action);
         if (resultReceiver != null)
             vpnIntent.putExtra(EIP_RECEIVER, resultReceiver);
-        EIP.enqueueWork(context, vpnIntent);
+        EIP.enqueueWork(context.getApplicationContext(), vpnIntent);
     }
 
     public static void startVPN(@NonNull Context context, boolean earlyRoutes) {
diff --git a/app/src/main/java/se/leap/bitmaskclient/eip/EipSetupObserver.java b/app/src/main/java/se/leap/bitmaskclient/eip/EipSetupObserver.java
index 4e5016f0..beed35d1 100644
--- a/app/src/main/java/se/leap/bitmaskclient/eip/EipSetupObserver.java
+++ b/app/src/main/java/se/leap/bitmaskclient/eip/EipSetupObserver.java
@@ -193,14 +193,14 @@ public class EipSetupObserver extends BroadcastReceiver implements VpnStatus.Sta
                 ProviderObservable.getInstance().updateProvider(provider);
                 PreferenceHelper.storeProviderInPreferences(preferences, provider);
                 if (EipStatus.getInstance().isDisconnected()) {
-                    EipCommand.startVPN(context.getApplicationContext(), false);
+                    EipCommand.startVPN(context, false);
                 }
                 break;
             case CORRECTLY_UPDATED_INVALID_VPN_CERTIFICATE:
                 provider = resultData.getParcelable(PROVIDER_KEY);
                 ProviderObservable.getInstance().updateProvider(provider);
                 PreferenceHelper.storeProviderInPreferences(preferences, provider);
-                EipCommand.startVPN(context.getApplicationContext(), false);
+                EipCommand.startVPN(context, false);
                 break;
             case CORRECTLY_DOWNLOADED_GEOIP_JSON:
                 provider = resultData.getParcelable(PROVIDER_KEY);
@@ -235,7 +235,7 @@ public class EipSetupObserver extends BroadcastReceiver implements VpnStatus.Sta
     private void maybeStartEipService(Bundle resultData) {
         if (resultData.getBoolean(EIP_ACTION_START)) {
             boolean earlyRoutes = resultData.getBoolean(EIP_EARLY_ROUTES);
-            EipCommand.startVPN(context.getApplicationContext(), earlyRoutes);
+            EipCommand.startVPN(context, earlyRoutes);
         }
     }
 
@@ -262,7 +262,7 @@ public class EipSetupObserver extends BroadcastReceiver implements VpnStatus.Sta
                     switch (error) {
                         case NO_MORE_GATEWAYS:
                             finishGatewaySetup(false);
-                            EipCommand.startBlockingVPN(context.getApplicationContext());
+                            EipCommand.startBlockingVPN(context);
                             break;
                         case ERROR_INVALID_PROFILE:
                             selectNextGateway();
@@ -364,7 +364,7 @@ public class EipSetupObserver extends BroadcastReceiver implements VpnStatus.Sta
     private void selectNextGateway() {
         changingGateway.set(true);
         reconnectTry.set(0);
-        EipCommand.startVPN(context.getApplicationContext(), false, setupNClosestGateway.get() + 1);
+        EipCommand.startVPN(context, false, setupNClosestGateway.get() + 1);
     }
 
     private void finishGatewaySetup(boolean changingGateway) {
@@ -396,7 +396,7 @@ public class EipSetupObserver extends BroadcastReceiver implements VpnStatus.Sta
                 case SHAPESHIFTER:
                     VpnProfile profile = VpnStatus.getLastConnectedVpnProfile();
                     if (profile == null) {
-                        EipCommand.startVPN(context.getApplicationContext(), false, 0);
+                        EipCommand.startVPN(context, false, 0);
                     } else {
                         GatewaysManager gatewaysManager = new GatewaysManager(context.getApplicationContext());
                         int position = gatewaysManager.getPosition(profile);
diff --git a/app/src/main/java/se/leap/bitmaskclient/eip/VoidVpnLauncher.java b/app/src/main/java/se/leap/bitmaskclient/eip/VoidVpnLauncher.java
index e2cd86b9..a8494e2b 100644
--- a/app/src/main/java/se/leap/bitmaskclient/eip/VoidVpnLauncher.java
+++ b/app/src/main/java/se/leap/bitmaskclient/eip/VoidVpnLauncher.java
@@ -30,14 +30,14 @@ public class VoidVpnLauncher extends Activity {
             startActivityForResult(blockingIntent, VPN_USER_PERMISSION);
         }
         else {
-            EipCommand.startBlockingVPN(getApplicationContext());
+            EipCommand.startBlockingVPN(this);
         }
     }
 
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (requestCode == VPN_USER_PERMISSION) {
             if (resultCode == RESULT_OK) {
-                EipCommand.launchVoidVPN(getApplicationContext());
+                EipCommand.launchVoidVPN(this);
             }
         }
         finish();
-- 
cgit v1.2.3