Merge branch 'beta-release' into 'master'

Beta release

See merge request leap/bitmask_android!131

1 files changed, 0 insertions, 17 deletions

diff --git a/app/src/main/java/de/blinkt/openvpn/core/VPNLaunchHelper.java b/app/src/main/java/de/blinkt/openvpn/core/VPNLaunchHelper.java
index 7c742746..540ca043 100644
--- a/app/src/main/java/de/blinkt/openvpn/core/VPNLaunchHelper.java
+++ b/app/src/main/java/de/blinkt/openvpn/core/VPNLaunchHelper.java
@@ -7,7 +7,6 @@ package de.blinkt.openvpn.core;
 
 import android.annotation.TargetApi;
 import android.content.Context;
-import android.content.Intent;
 import android.os.Build;
 
 import java.io.File;
@@ -18,7 +17,6 @@ import java.util.Arrays;
 import java.util.Vector;
 
 import se.leap.bitmaskclient.R;
-import de.blinkt.openvpn.VpnProfile;
 
 public class VPNLaunchHelper {
     private static final String MININONPIEVPN = "nopie_openvpn";
@@ -120,7 +118,6 @@ public class VPNLaunchHelper {
                 return false;
             }
 
-
             return true;
         } catch (IOException e) {
             VpnStatus.logException(e);
@@ -129,20 +126,6 @@ public class VPNLaunchHelper {
 
     }
 
-
-    public static void startOpenVpn(VpnProfile startprofile, Context context) {
-        Intent startVPN = startprofile.prepareStartService(context);
-        if (startVPN != null) {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
-                //noinspection NewApi
-                context.startForegroundService(startVPN);
-            else
-                context.startService(startVPN);
-
-        }
-    }
-
-
     public static String getConfigFilePath(Context context) {
         return context.getCacheDir().getAbsolutePath() + "/" + OVPNCONFIGFILE;
     }