summaryrefslogtreecommitdiff
path: root/app/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main')
-rw-r--r--app/src/main/java/de/blinkt/openvpn/LaunchVPN.java19
-rw-r--r--app/src/main/java/de/blinkt/openvpn/core/DeviceStateReceiver.java2
-rw-r--r--app/src/main/java/de/blinkt/openvpn/core/ICSOpenVPNApplication.java68
-rw-r--r--app/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java6
-rw-r--r--app/src/main/java/de/blinkt/openvpn/core/OpenVPNStatusService.java2
-rw-r--r--app/src/main/java/de/blinkt/openvpn/core/ProfileManager.java263
-rw-r--r--app/src/main/java/de/blinkt/openvpn/core/StatusListener.java109
-rw-r--r--app/src/main/java/de/blinkt/openvpn/core/VpnStatus.java33
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/EipFragment.java9
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/EipSetupObserver.java5
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/eip/EIP.java5
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/eip/EipStatus.java5
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/eip/Gateway.java14
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/eip/GatewaysManager.java80
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/utils/PreferenceHelper.java47
15 files changed, 89 insertions, 578 deletions
diff --git a/app/src/main/java/de/blinkt/openvpn/LaunchVPN.java b/app/src/main/java/de/blinkt/openvpn/LaunchVPN.java
index 5bf178ae..60e4abb6 100644
--- a/app/src/main/java/de/blinkt/openvpn/LaunchVPN.java
+++ b/app/src/main/java/de/blinkt/openvpn/LaunchVPN.java
@@ -5,10 +5,6 @@
package de.blinkt.openvpn;
-import se.leap.bitmaskclient.R;
-
-import se.leap.bitmaskclient.R;
-
import android.annotation.TargetApi;
import android.app.Activity;
import android.app.AlertDialog;
@@ -25,10 +21,12 @@ import java.io.IOException;
import de.blinkt.openvpn.core.ConnectionStatus;
import de.blinkt.openvpn.core.Preferences;
-import de.blinkt.openvpn.core.ProfileManager;
import de.blinkt.openvpn.core.VPNLaunchHelper;
import de.blinkt.openvpn.core.VpnStatus;
import se.leap.bitmaskclient.MainActivity;
+import se.leap.bitmaskclient.R;
+
+import static se.leap.bitmaskclient.Constants.PROVIDER_PROFILE;
/**
* This Activity actually handles two stages of a launcher shortcut's life cycle.
@@ -61,7 +59,6 @@ public class LaunchVPN extends Activity {
public static final String EXTRA_NAME = "de.blinkt.openvpn.shortcutProfileName";
public static final String EXTRA_HIDELOG = "de.blinkt.openvpn.showNoLogWindow";
public static final String CLEARLOG = "clearlogconnect";
- public static final String EXTRA_TEMP_VPN_PROFILE = "se.leap.bitmask.tempVpnProfile";
private static final int START_VPN_PROFILE = 70;
@@ -94,15 +91,8 @@ public class LaunchVPN extends Activity {
VpnStatus.clearLog();
// we got called to be the starting point, most likely a shortcut
- String shortcutUUID = intent.getStringExtra(EXTRA_KEY);
- String shortcutName = intent.getStringExtra(EXTRA_NAME);
mhideLog = intent.getBooleanExtra(EXTRA_HIDELOG, false);
- VpnProfile profileToConnect = (VpnProfile) intent.getExtras().getSerializable(EXTRA_TEMP_VPN_PROFILE);
- if (profileToConnect == null)
- profileToConnect = ProfileManager.get(this, shortcutUUID);
-
- if (shortcutName != null && profileToConnect == null)
- profileToConnect = ProfileManager.getInstance(this).getProfileByName(shortcutName);
+ VpnProfile profileToConnect = (VpnProfile) intent.getExtras().getSerializable(PROVIDER_PROFILE);
if (profileToConnect == null) {
VpnStatus.logError(R.string.shortcut_profile_notfound);
@@ -126,7 +116,6 @@ public class LaunchVPN extends Activity {
if(!mhideLog && showLogWindow)
showLogWindow();
- ProfileManager.updateLRU(this, mSelectedProfile);
VPNLaunchHelper.startOpenVpn(mSelectedProfile, getBaseContext());
finish();
diff --git a/app/src/main/java/de/blinkt/openvpn/core/DeviceStateReceiver.java b/app/src/main/java/de/blinkt/openvpn/core/DeviceStateReceiver.java
index c396f181..eeed29bc 100644
--- a/app/src/main/java/de/blinkt/openvpn/core/DeviceStateReceiver.java
+++ b/app/src/main/java/de/blinkt/openvpn/core/DeviceStateReceiver.java
@@ -145,7 +145,7 @@ public class DeviceStateReceiver extends BroadcastReceiver implements ByteCountL
boolean screenOffPause = prefs.getBoolean("screenoff", false);
if (screenOffPause) {
- if (ProfileManager.getLastConnectedVpn() != null && !ProfileManager.getLastConnectedVpn().mPersistTun)
+ if (VpnStatus.getLastConnectedVpnProfile() != null && !VpnStatus.getLastConnectedVpnProfile().mPersistTun)
VpnStatus.logError(R.string.screen_nopersistenttun);
screen = connectState.PENDINGDISCONNECT;
diff --git a/app/src/main/java/de/blinkt/openvpn/core/ICSOpenVPNApplication.java b/app/src/main/java/de/blinkt/openvpn/core/ICSOpenVPNApplication.java
deleted file mode 100644
index 5b1307b7..00000000
--- a/app/src/main/java/de/blinkt/openvpn/core/ICSOpenVPNApplication.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2012-2016 Arne Schwabe
- * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
- */
-
-package de.blinkt.openvpn.core;
-
-import android.annotation.TargetApi;
-import android.app.Application;
-import android.app.NotificationChannel;
-import android.app.NotificationManager;
-import android.content.Context;
-import android.graphics.Color;
-import android.os.Build;
-
-/*
-import org.acra.ACRA;
-import org.acra.ReportingInteractionMode;
-import org.acra.annotation.ReportsCrashes;
-*/
-
-import se.leap.bitmaskclient.R;
-
-public class ICSOpenVPNApplication extends Application {
- private StatusListener mStatus;
-
- @Override
- public void onCreate() {
- super.onCreate();
- PRNGFixes.apply();
-
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
-
- createNotificationChannels();
- mStatus = new StatusListener();
- mStatus.init(getApplicationContext());
-
- }
-
- @TargetApi(Build.VERSION_CODES.O)
- private void createNotificationChannels() {
- NotificationManager mNotificationManager =
- (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
-
- // Background message
- CharSequence name = getString(R.string.channel_name_background);
- NotificationChannel mChannel = new NotificationChannel(OpenVPNService.NOTIFICATION_CHANNEL_BG_ID,
- name, NotificationManager.IMPORTANCE_MIN);
-
- mChannel.setDescription(getString(R.string.channel_description_background));
- mChannel.enableLights(false);
-
- mChannel.setLightColor(Color.DKGRAY);
- mNotificationManager.createNotificationChannel(mChannel);
-
- // Connection status change messages
-
- name = getString(R.string.channel_name_status);
- mChannel = new NotificationChannel(OpenVPNService.NOTIFICATION_CHANNEL_NEWSTATUS_ID,
- name, NotificationManager.IMPORTANCE_LOW);
-
- mChannel.setDescription(getString(R.string.channel_description_status));
- mChannel.enableLights(true);
-
- mChannel.setLightColor(Color.BLUE);
- mNotificationManager.createNotificationChannel(mChannel);
- }
-} \ No newline at end of file
diff --git a/app/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java b/app/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java
index ea782e00..4e92f67b 100644
--- a/app/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java
+++ b/app/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java
@@ -322,7 +322,7 @@ public class OpenVPNService extends VpnService implements StateListener, Callbac
PreferenceHelper.setAlwaysOn(this, false);
} else {
/* The intent is null when we are set as always-on or the service has been restarted. */
- mProfile = ProfileManager.getLastConnectedProfile(this);
+ mProfile = VpnStatus.getLastConnectedVpnProfile(this);
VpnStatus.logInfo(R.string.service_restarted);
if (mProfile != null) {
@@ -344,9 +344,7 @@ public class OpenVPNService extends VpnService implements StateListener, Callbac
/* start the OpenVPN process itself in a background thread */
new Thread(this::startOpenVPN).start();
-
- ProfileManager.setConnectedVpnProfile(this, mProfile);
- VpnStatus.setConnectedVPNProfile(mProfile.getUUIDString());
+ VpnStatus.setLastConnectedVpnProfile(getApplicationContext(), mProfile);
return START_STICKY;
}
diff --git a/app/src/main/java/de/blinkt/openvpn/core/OpenVPNStatusService.java b/app/src/main/java/de/blinkt/openvpn/core/OpenVPNStatusService.java
index 6df1379a..b52e39a2 100644
--- a/app/src/main/java/de/blinkt/openvpn/core/OpenVPNStatusService.java
+++ b/app/src/main/java/de/blinkt/openvpn/core/OpenVPNStatusService.java
@@ -114,7 +114,7 @@ public class OpenVPNStatusService extends Service implements VpnStatus.LogListen
@Override
public String getLastConnectedVPN() throws RemoteException {
- return VpnStatus.getLastConnectedVPNProfile();
+ return VpnStatus.getLastConnectedVPNProfileId();
}
@Override
diff --git a/app/src/main/java/de/blinkt/openvpn/core/ProfileManager.java b/app/src/main/java/de/blinkt/openvpn/core/ProfileManager.java
deleted file mode 100644
index d897e91f..00000000
--- a/app/src/main/java/de/blinkt/openvpn/core/ProfileManager.java
+++ /dev/null
@@ -1,263 +0,0 @@
-/*
- * Copyright (c) 2012-2016 Arne Schwabe
- * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
- */
-
-package de.blinkt.openvpn.core;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.content.SharedPreferences.Editor;
-
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Locale;
-import java.util.Set;
-import java.util.UUID;
-
-import de.blinkt.openvpn.VpnProfile;
-
-public class ProfileManager {
- private static final String PREFS_NAME = "VPNList";
-
- private static final String LAST_CONNECTED_PROFILE = "lastConnectedProfile";
- private static final String TEMPORARY_PROFILE_FILENAME = "temporary-vpn-profile";
- private static ProfileManager instance;
-
- private static VpnProfile mLastConnectedVpn = null;
- private HashMap<String, VpnProfile> profiles = new HashMap<>();
- private static VpnProfile tmpprofile = null;
-
-
- private static VpnProfile get(String key) {
- if (tmpprofile != null && tmpprofile.getUUIDString().equals(key))
- return tmpprofile;
-
- if (instance == null)
- return null;
- return instance.profiles.get(key);
-
- }
-
-
- private ProfileManager() {
- }
-
- private static void checkInstance(Context context) {
- if (instance == null) {
- instance = new ProfileManager();
- instance.loadVPNList(context);
- }
- }
-
- synchronized public static ProfileManager getInstance(Context context) {
- checkInstance(context);
- return instance;
- }
-
- public static void setConntectedVpnProfileDisconnected(Context c) {
- SharedPreferences prefs = Preferences.getDefaultSharedPreferences(c);
- Editor prefsedit = prefs.edit();
- prefsedit.putString(LAST_CONNECTED_PROFILE, null);
- prefsedit.apply();
-
- }
-
- /**
- * Sets the profile that is connected (to connect if the service restarts)
- */
- public static void setConnectedVpnProfile(Context c, VpnProfile connectedProfile) {
- SharedPreferences prefs = Preferences.getDefaultSharedPreferences(c);
- Editor prefsedit = prefs.edit();
-
- prefsedit.putString(LAST_CONNECTED_PROFILE, connectedProfile.toJson());
- prefsedit.apply();
- mLastConnectedVpn = connectedProfile;
-
- }
-
- /**
- * Returns the profile that was last connected (to connect if the service restarts)
- */
- public static VpnProfile getLastConnectedProfile(Context c) {
- SharedPreferences prefs = Preferences.getDefaultSharedPreferences(c);
-
- String lastConnectedProfileJson = prefs.getString(LAST_CONNECTED_PROFILE, null);
- return VpnProfile.fromJson(lastConnectedProfileJson);
- }
-
-
- public Collection<VpnProfile> getProfiles() {
- return profiles.values();
- }
-
- public VpnProfile getProfileByName(String name) {
- for (VpnProfile vpnp : profiles.values()) {
- if (vpnp.getName().equals(name)) {
- return vpnp;
- }
- }
- return null;
- }
-
- public void saveProfileList(Context context) {
- SharedPreferences sharedprefs = Preferences.getSharedPreferencesMulti(PREFS_NAME, context);
- Editor editor = sharedprefs.edit();
- editor.putStringSet("vpnlist", profiles.keySet());
-
- // For reasing I do not understand at all
- // Android saves my prefs file only one time
- // if I remove the debug code below :(
- int counter = sharedprefs.getInt("counter", 0);
- editor.putInt("counter", counter + 1);
- editor.apply();
-
- }
-
- public void addProfile(VpnProfile profile) {
- profiles.put(profile.getUUID().toString(), profile);
-
- }
-
- public static void setTemporaryProfile(Context c, VpnProfile tmp) {
- tmp.mTemporaryProfile = true;
- ProfileManager.tmpprofile = tmp;
- saveProfile(c, tmp, true, true);
- }
-
- public static boolean isTempProfile() {
- return mLastConnectedVpn != null && mLastConnectedVpn == tmpprofile;
- }
-
- public void saveProfile(Context context, VpnProfile profile) {
- saveProfile(context, profile, true, false);
- }
-
- private static void saveProfile(Context context, VpnProfile profile, boolean updateVersion, boolean isTemporary) {
-
- if (updateVersion)
- profile.mVersion += 1;
- ObjectOutputStream vpnFile;
-
- String filename = profile.getUUID().toString() + ".vp";
- if (isTemporary)
- filename = TEMPORARY_PROFILE_FILENAME + ".vp";
-
- try {
- vpnFile = new ObjectOutputStream(context.openFileOutput(filename, Activity.MODE_PRIVATE));
-
- vpnFile.writeObject(profile);
- vpnFile.flush();
- vpnFile.close();
- } catch (IOException e) {
- VpnStatus.logException("saving VPN profile", e);
- throw new RuntimeException(e);
- }
- }
-
-
- private void loadVPNList(Context context) {
- profiles = new HashMap<>();
- SharedPreferences listpref = Preferences.getSharedPreferencesMulti(PREFS_NAME, context);
- Set<String> vlist = listpref.getStringSet("vpnlist", null);
- if (vlist == null) {
- vlist = new HashSet<>();
- }
- // Always try to load the temporary profile
- vlist.add(TEMPORARY_PROFILE_FILENAME);
-
- for (String vpnentry : vlist) {
- ObjectInputStream vpnfile=null;
- try {
- vpnfile = new ObjectInputStream(context.openFileInput(vpnentry + ".vp"));
- VpnProfile vp = ((VpnProfile) vpnfile.readObject());
-
- // Sanity check
- if (vp == null || vp.mName == null || vp.getUUID() == null)
- continue;
-
- vp.upgradeProfile();
- if (vpnentry.equals(TEMPORARY_PROFILE_FILENAME)) {
- tmpprofile = vp;
- } else {
- profiles.put(vp.getUUID().toString(), vp);
- }
-
-
- } catch (IOException | ClassNotFoundException e) {
- if (!vpnentry.equals(TEMPORARY_PROFILE_FILENAME))
- VpnStatus.logException("Loading VPN List", e);
- } finally {
- if (vpnfile!=null) {
- try {
- vpnfile.close();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- }
- }
- }
-
-
- public void removeProfile(Context context, VpnProfile profile) {
- String vpnentry = profile.getUUID().toString();
- profiles.remove(vpnentry);
- saveProfileList(context);
- context.deleteFile(vpnentry + ".vp");
- if (mLastConnectedVpn == profile)
- mLastConnectedVpn = null;
-
- }
-
- public static VpnProfile get(Context context, String profileUUID) {
- return get(context, profileUUID, 0, 10);
- }
-
- public static VpnProfile get(Context context, String profileUUID, int version, int tries) {
- checkInstance(context);
- VpnProfile profile = get(profileUUID);
- int tried = 0;
- while ((profile == null || profile.mVersion < version) && (tried++ < tries)) {
- try {
- Thread.sleep(100);
- } catch (InterruptedException ignored) {
- }
- instance.loadVPNList(context);
- profile = get(profileUUID);
- int ver = profile == null ? -1 : profile.mVersion;
- }
-
- if (tried > 5)
-
- {
- int ver = profile == null ? -1 : profile.mVersion;
- VpnStatus.logError(String.format(Locale.US, "Used x %d tries to get current version (%d/%d) of the profile", tried, ver, version));
- }
- return profile;
- }
-
- public static VpnProfile getLastConnectedVpn() {
- return mLastConnectedVpn;
- }
-
- public static VpnProfile getAlwaysOnVPN(Context context) {
- checkInstance(context);
- SharedPreferences prefs = Preferences.getDefaultSharedPreferences(context);
-
- String uuid = prefs.getString("alwaysOnVpn", null);
- return get(uuid);
- }
-
- public static void updateLRU(Context c, VpnProfile profile) {
- profile.mLastUsed = System.currentTimeMillis();
- // LRU does not change the profile, no need for the service to refresh
- if (profile!=tmpprofile)
- saveProfile(c, profile, false, false);
- }
-}
diff --git a/app/src/main/java/de/blinkt/openvpn/core/StatusListener.java b/app/src/main/java/de/blinkt/openvpn/core/StatusListener.java
deleted file mode 100644
index 5d0b7037..00000000
--- a/app/src/main/java/de/blinkt/openvpn/core/StatusListener.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright (c) 2012-2016 Arne Schwabe
- * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
- */
-
-package de.blinkt.openvpn.core;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.ServiceConnection;
-import android.os.IBinder;
-import android.os.ParcelFileDescriptor;
-import android.os.RemoteException;
-
-import java.io.DataInputStream;
-import java.io.File;
-import java.io.IOException;
-
-/**
- * Created by arne on 09.11.16.
- */
-
-public class StatusListener {
- private File mCacheDir;
- private ServiceConnection mConnection = new ServiceConnection() {
-
-
- @Override
- public void onServiceConnected(ComponentName className,
- IBinder service) {
- // We've bound to LocalService, cast the IBinder and get LocalService instance
- IServiceStatus serviceStatus = IServiceStatus.Stub.asInterface(service);
- try {
- /* Check if this a local service ... */
- if (service.queryLocalInterface("de.blinkt.openvpn.core.IServiceStatus") == null) {
- // Not a local service
- VpnStatus.setConnectedVPNProfile(serviceStatus.getLastConnectedVPN());
- VpnStatus.setTrafficHistory(serviceStatus.getTrafficHistory());
- ParcelFileDescriptor pfd = serviceStatus.registerStatusCallback(mCallback);
- DataInputStream fd = new DataInputStream(new ParcelFileDescriptor.AutoCloseInputStream(pfd));
-
- short len = fd.readShort();
- byte[] buf = new byte[65336];
- while (len != 0x7fff) {
- fd.readFully(buf, 0, len);
- LogItem logitem = new LogItem(buf, len);
- VpnStatus.newLogItem(logitem, false);
- len = fd.readShort();
- }
- fd.close();
-
-
-
- } else {
- VpnStatus.initLogCache(mCacheDir);
- }
-
- } catch (RemoteException | IOException e) {
- e.printStackTrace();
- VpnStatus.logException(e);
- }
- }
-
- @Override
- public void onServiceDisconnected(ComponentName arg0) {
-
- }
-
- };
-
- void init(Context c) {
-
- Intent intent = new Intent(c, OpenVPNStatusService.class);
- intent.setAction(OpenVPNService.START_SERVICE);
- mCacheDir = c.getCacheDir();
-
- c.bindService(intent, mConnection, Context.BIND_AUTO_CREATE);
-
-
- }
-
-
- private IStatusCallbacks mCallback = new IStatusCallbacks.Stub()
-
- {
- @Override
- public void newLogItem(LogItem item) throws RemoteException {
- VpnStatus.newLogItem(item);
- }
-
- @Override
- public void updateStateString(String state, String msg, int resid, ConnectionStatus
- level) throws RemoteException {
- VpnStatus.updateStateString(state, msg, resid, level);
- }
-
- @Override
- public void updateByteCount(long inBytes, long outBytes) throws RemoteException {
- VpnStatus.updateByteCount(inBytes, outBytes);
- }
-
- @Override
- public void connectedVPN(String uuid) throws RemoteException {
- VpnStatus.setConnectedVPNProfile(uuid);
- }
- };
-
-}
diff --git a/app/src/main/java/de/blinkt/openvpn/core/VpnStatus.java b/app/src/main/java/de/blinkt/openvpn/core/VpnStatus.java
index fa28a875..33851b8f 100644
--- a/app/src/main/java/de/blinkt/openvpn/core/VpnStatus.java
+++ b/app/src/main/java/de/blinkt/openvpn/core/VpnStatus.java
@@ -18,7 +18,9 @@ import java.util.Locale;
import java.util.Vector;
import java.util.concurrent.CopyOnWriteArrayList;
+import de.blinkt.openvpn.VpnProfile;
import se.leap.bitmaskclient.R;
+import se.leap.bitmaskclient.utils.PreferenceHelper;
import static se.leap.bitmaskclient.utils.ConfigHelper.getProviderFormattedString;
@@ -39,10 +41,10 @@ public class VpnStatus {
private static HandlerThread mHandlerThread;
- private static String mLastConnectedVPNUUID;
static boolean readFileLog =false;
final static java.lang.Object readFileLock = new Object();
+ private static VpnProfile lastConnectedProfile;
public static TrafficHistory trafficHistory;
@@ -136,17 +138,40 @@ public class VpnStatus {
}
public static void setConnectedVPNProfile(String uuid) {
- mLastConnectedVPNUUID = uuid;
for (StateListener sl: stateListener)
sl.setConnectedVPN(uuid);
}
- public static String getLastConnectedVPNProfile()
+ public static String getLastConnectedVPNProfileId()
{
- return mLastConnectedVPNUUID;
+ return lastConnectedProfile != null ? lastConnectedProfile.getUUIDString() : null;
}
+ public static VpnProfile getLastConnectedVpnProfile() {
+ return lastConnectedProfile;
+ }
+
+ public static VpnProfile getLastConnectedVpnProfile(Context context) {
+ return PreferenceHelper.getLastConnectedVpnProfile(context);
+ }
+
+
+ /**
+ * Sets the profile that is connected (to connect if the service restarts)
+ */
+ public static void setLastConnectedVpnProfile(Context context, VpnProfile connectedProfile) {
+ PreferenceHelper.setLastUsedVpnProfile(context, connectedProfile);
+ lastConnectedProfile = connectedProfile;
+ setConnectedVPNProfile(lastConnectedProfile.getUUIDString());
+ }
+
+
+ public static String getLastConnectedVpnName() {
+ return lastConnectedProfile != null ? lastConnectedProfile.mName : null;
+ }
+
+
public static void setTrafficHistory(TrafficHistory trafficHistory) {
VpnStatus.trafficHistory = trafficHistory;
}
diff --git a/app/src/main/java/se/leap/bitmaskclient/EipFragment.java b/app/src/main/java/se/leap/bitmaskclient/EipFragment.java
index 11ad8da3..269bf61f 100644
--- a/app/src/main/java/se/leap/bitmaskclient/EipFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/EipFragment.java
@@ -50,10 +50,9 @@ import java.util.Observer;
import butterknife.ButterKnife;
import butterknife.InjectView;
import butterknife.OnClick;
-import de.blinkt.openvpn.VpnProfile;
import de.blinkt.openvpn.core.IOpenVPNServiceInternal;
import de.blinkt.openvpn.core.OpenVPNService;
-import de.blinkt.openvpn.core.ProfileManager;
+import de.blinkt.openvpn.core.VpnStatus;
import se.leap.bitmaskclient.eip.EipCommand;
import se.leap.bitmaskclient.eip.EipStatus;
import se.leap.bitmaskclient.fragments.DonationReminderDialog;
@@ -537,9 +536,9 @@ public class EipFragment extends Fragment implements Observer {
private void setVpnRouteText() {
String vpnRouteString = provider.getName();
- VpnProfile vpnProfile = ProfileManager.getLastConnectedVpn();
- if (vpnProfile != null && !TextUtils.isEmpty(vpnProfile.mName)) {
- vpnRouteString += " (" + vpnProfile.mName + ")";
+ String profileName = VpnStatus.getLastConnectedVpnName();
+ if (!TextUtils.isEmpty(profileName)) {
+ vpnRouteString += " (" + profileName + ")";
}
vpnRoute.setText(vpnRouteString);
}
diff --git a/app/src/main/java/se/leap/bitmaskclient/EipSetupObserver.java b/app/src/main/java/se/leap/bitmaskclient/EipSetupObserver.java
index ff94fe82..a8aa2dfb 100644
--- a/app/src/main/java/se/leap/bitmaskclient/EipSetupObserver.java
+++ b/app/src/main/java/se/leap/bitmaskclient/EipSetupObserver.java
@@ -35,6 +35,7 @@ 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_REQUEST;
import static se.leap.bitmaskclient.Constants.PROVIDER_KEY;
+import static se.leap.bitmaskclient.Constants.PROVIDER_PROFILE;
import static se.leap.bitmaskclient.Constants.SHARED_PREFERENCES;
import static se.leap.bitmaskclient.ProviderAPI.CORRECTLY_DOWNLOADED_EIP_SERVICE;
import static se.leap.bitmaskclient.ProviderAPI.CORRECTLY_UPDATED_INVALID_VPN_CERTIFICATE;
@@ -186,7 +187,7 @@ class EipSetupObserver extends BroadcastReceiver implements VpnStatus.StateListe
finishGatewaySetup(true);
}
- VpnProfile vpnProfile = (VpnProfile) event.getSerializableExtra(LaunchVPN.EXTRA_TEMP_VPN_PROFILE);
+ VpnProfile vpnProfile = (VpnProfile) event.getSerializableExtra(PROVIDER_PROFILE);
if (vpnProfile == null) {
Log.e(TAG, "Tried to setup non existing vpn profile.");
return;
@@ -204,7 +205,7 @@ class EipSetupObserver extends BroadcastReceiver implements VpnStatus.StateListe
intent.setAction(Intent.ACTION_MAIN);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
intent.putExtra(LaunchVPN.EXTRA_HIDELOG, true);
- intent.putExtra(LaunchVPN.EXTRA_TEMP_VPN_PROFILE, vpnProfile);
+ intent.putExtra(PROVIDER_PROFILE, vpnProfile);
intent.putExtra(Gateway.KEY_N_CLOSEST_GATEWAY, setupNClosestGateway.get());
context.startActivity(intent);
}
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 a0c96267..a5434871 100644
--- a/app/src/main/java/se/leap/bitmaskclient/eip/EIP.java
+++ b/app/src/main/java/se/leap/bitmaskclient/eip/EIP.java
@@ -46,7 +46,6 @@ import java.util.concurrent.LinkedBlockingQueue;
import de.blinkt.openvpn.core.ConnectionStatus;
import de.blinkt.openvpn.core.IOpenVPNServiceInternal;
import de.blinkt.openvpn.core.OpenVPNService;
-import de.blinkt.openvpn.core.ProfileManager;
import de.blinkt.openvpn.core.VpnStatus;
import se.leap.bitmaskclient.OnBootReceiver;
import se.leap.bitmaskclient.R;
@@ -54,7 +53,6 @@ import se.leap.bitmaskclient.R;
import static android.app.Activity.RESULT_CANCELED;
import static android.app.Activity.RESULT_OK;
import static android.content.Intent.CATEGORY_DEFAULT;
-import static de.blinkt.openvpn.LaunchVPN.EXTRA_TEMP_VPN_PROFILE;
import static se.leap.bitmaskclient.Constants.BROADCAST_EIP_EVENT;
import static se.leap.bitmaskclient.Constants.BROADCAST_GATEWAY_SETUP_OBSERVER_EVENT;
import static se.leap.bitmaskclient.Constants.BROADCAST_RESULT_CODE;
@@ -70,6 +68,7 @@ import static se.leap.bitmaskclient.Constants.EIP_N_CLOSEST_GATEWAY;
import static se.leap.bitmaskclient.Constants.EIP_RECEIVER;
import static se.leap.bitmaskclient.Constants.EIP_REQUEST;
import static se.leap.bitmaskclient.Constants.EIP_RESTART_ON_BOOT;
+import static se.leap.bitmaskclient.Constants.PROVIDER_PROFILE;
import static se.leap.bitmaskclient.Constants.PROVIDER_VPN_CERTIFICATE;
import static se.leap.bitmaskclient.Constants.SHARED_PREFERENCES;
import static se.leap.bitmaskclient.MainActivityErrorDialog.DOWNLOAD_ERRORS.ERROR_INVALID_VPN_CERTIFICATE;
@@ -243,7 +242,7 @@ public final class EIP extends JobIntentService implements Observer {
*/
private void launchActiveGateway(@NonNull Gateway gateway, int nClosestGateway) {
Intent intent = new Intent(BROADCAST_GATEWAY_SETUP_OBSERVER_EVENT);
- intent.putExtra(EXTRA_TEMP_VPN_PROFILE, gateway.getProfile());
+ intent.putExtra(PROVIDER_PROFILE, gateway.getProfile());
intent.putExtra(Gateway.KEY_N_CLOSEST_GATEWAY, nClosestGateway);
LocalBroadcastManager.getInstance(this).sendBroadcast(intent);
diff --git a/app/src/main/java/se/leap/bitmaskclient/eip/EipStatus.java b/app/src/main/java/se/leap/bitmaskclient/eip/EipStatus.java
index fc07c521..64904816 100644
--- a/app/src/main/java/se/leap/bitmaskclient/eip/EipStatus.java
+++ b/app/src/main/java/se/leap/bitmaskclient/eip/EipStatus.java
@@ -25,9 +25,7 @@ import java.util.Observable;
import de.blinkt.openvpn.core.ConnectionStatus;
import de.blinkt.openvpn.core.LogItem;
-import de.blinkt.openvpn.core.ProfileManager;
import de.blinkt.openvpn.core.VpnStatus;
-import se.leap.bitmaskclient.Provider;
/**
* EipStatus is a Singleton that represents a reduced set of a vpn's ConnectionStatus.
@@ -37,6 +35,7 @@ import se.leap.bitmaskclient.Provider;
public class EipStatus extends Observable implements VpnStatus.StateListener {
public static String TAG = EipStatus.class.getSimpleName();
private static EipStatus currentStatus;
+
public enum EipLevel {
CONNECTING,
DISCONNECTING,
@@ -99,7 +98,7 @@ public class EipStatus extends Observable implements VpnStatus.StateListener {
currentEipLevel = EipLevel.CONNECTED;
break;
case LEVEL_VPNPAUSED:
- if (ProfileManager.getLastConnectedVpn() != null && ProfileManager.getLastConnectedVpn().mPersistTun) {
+ if (VpnStatus.getLastConnectedVpnProfile() != null && VpnStatus.getLastConnectedVpnProfile().mPersistTun) {
//if persistTun is enabled, treat EipLevel as connecting as it *shouldn't* allow passing traffic in the clear...
currentEipLevel = EipLevel.CONNECTING;
} else {
diff --git a/app/src/main/java/se/leap/bitmaskclient/eip/Gateway.java b/app/src/main/java/se/leap/bitmaskclient/eip/Gateway.java
index 317a91bd..55ade1ae 100644
--- a/app/src/main/java/se/leap/bitmaskclient/eip/Gateway.java
+++ b/app/src/main/java/se/leap/bitmaskclient/eip/Gateway.java
@@ -132,4 +132,18 @@ public class Gateway {
public String toString() {
return new Gson().toJson(this, Gateway.class);
}
+
+ @Override
+ public boolean equals(Object obj) {
+ return obj instanceof Gateway &&
+ (this.mVpnProfile != null &&
+ ((Gateway) obj).mVpnProfile != null &&
+ this.mVpnProfile.mConnections != null &&
+ ((Gateway) obj).mVpnProfile != null &&
+ this.mVpnProfile.mConnections.length > 0 &&
+ ((Gateway) obj).mVpnProfile.mConnections.length > 0 &&
+ this.mVpnProfile.mConnections[0].mServerName != null &&
+ this.mVpnProfile.mConnections[0].mServerName.equals(((Gateway) obj).mVpnProfile.mConnections[0].mServerName)) ||
+ this.mVpnProfile == null && ((Gateway) obj).mVpnProfile == null;
+ }
}
diff --git a/app/src/main/java/se/leap/bitmaskclient/eip/GatewaysManager.java b/app/src/main/java/se/leap/bitmaskclient/eip/GatewaysManager.java
index 003cef7d..060843fd 100644
--- a/app/src/main/java/se/leap/bitmaskclient/eip/GatewaysManager.java
+++ b/app/src/main/java/se/leap/bitmaskclient/eip/GatewaysManager.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2013, 2014, 2015 LEAP Encryption Access Project and contributers
+ * Copyright (c) 2013 - 2019 LEAP Encryption Access Project and contributors
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -18,7 +18,6 @@ package se.leap.bitmaskclient.eip;
import android.content.Context;
import android.content.SharedPreferences;
-import android.util.Log;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
@@ -29,13 +28,8 @@ import org.json.JSONObject;
import java.lang.reflect.Type;
import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
import java.util.List;
-import de.blinkt.openvpn.VpnProfile;
-import de.blinkt.openvpn.core.Connection;
-import de.blinkt.openvpn.core.ProfileManager;
import se.leap.bitmaskclient.Provider;
import se.leap.bitmaskclient.utils.PreferenceHelper;
@@ -52,13 +46,11 @@ public class GatewaysManager {
private Context context;
private SharedPreferences preferences;
private List<Gateway> gateways = new ArrayList<>();
- private ProfileManager profileManager;
private Type listType = new TypeToken<ArrayList<Gateway>>() {}.getType();
GatewaysManager(Context context, SharedPreferences preferences) {
this.context = context;
this.preferences = preferences;
- profileManager = ProfileManager.getInstance(context);
}
/**
@@ -102,7 +94,7 @@ public class GatewaysManager {
if (isOpenVpnGateway(gw)) {
JSONObject secrets = secretsConfiguration();
Gateway aux = new Gateway(eipDefinition, secrets, gw);
- if (!containsProfileWithSecrets(aux.getProfile())) {
+ if (!gateways.contains(aux)) {
addGateway(aux);
}
}
@@ -139,85 +131,19 @@ public class GatewaysManager {
return result;
}
- private boolean containsProfileWithSecrets(VpnProfile profile) {
- boolean result = false;
- Collection<VpnProfile> profiles = profileManager.getProfiles();
- for (VpnProfile aux : profiles) {
- result = result || sameConnections(profile.mConnections, aux.mConnections)
- && profile.mClientCertFilename.equalsIgnoreCase(aux.mClientCertFilename)
- && profile.mClientKeyFilename.equalsIgnoreCase(aux.mClientKeyFilename);
- }
- return result;
- }
-
- void clearGatewaysAndProfiles() {
+ void clearGateways() {
gateways.clear();
- ArrayList<VpnProfile> profiles = new ArrayList<>(profileManager.getProfiles());
- for (VpnProfile profile : profiles) {
- profileManager.removeProfile(context, profile);
- }
}
private void addGateway(Gateway gateway) {
- removeDuplicatedGateway(gateway);
gateways.add(gateway);
-
- VpnProfile profile = gateway.getProfile();
- profileManager.addProfile(profile);
- }
-
- private void removeDuplicatedGateway(Gateway gateway) {
- Iterator<Gateway> it = gateways.iterator();
- List<Gateway> gatewaysToRemove = new ArrayList<>();
- while (it.hasNext()) {
- Gateway aux = it.next();
- if (sameConnections(aux.getProfile().mConnections, gateway.getProfile().mConnections)) {
- gatewaysToRemove.add(aux);
- }
- }
- gateways.removeAll(gatewaysToRemove);
- removeDuplicatedProfiles(gateway.getProfile());
- }
-
- private void removeDuplicatedProfiles(VpnProfile original) {
- Collection<VpnProfile> profiles = profileManager.getProfiles();
- List<VpnProfile> removeList = new ArrayList<>();
- for (VpnProfile aux : profiles) {
- if (sameConnections(original.mConnections, aux.mConnections)) {
- removeList.add(aux);
- }
- }
- for (VpnProfile profile : removeList) {
- profileManager.removeProfile(context, profile);
- }
- }
-
- /**
- * check if all connections in c1 are also in c2
- * @param c1 array of connections
- * @param c2 array of connections
- * @return true if all connections of c1 exist in c2 and vice versa
- */
- private boolean sameConnections(Connection[] c1, Connection[] c2) {
- int sameConnections = 0;
- for (Connection c1_aux : c1) {
- for (Connection c2_aux : c2)
- if (c2_aux.mServerName.equals(c1_aux.mServerName)) {
- sameConnections++;
- break;
- }
- }
- return c1.length == c2.length && c1.length == sameConnections;
}
/**
* read EipServiceJson from preferences and set gateways
*/
void configureFromPreferences() {
- //TODO: THIS IS A QUICK FIX - it deletes all profiles in ProfileManager, thus it's possible
- // to add all gateways from prefs without duplicates, but this should be refactored.
- clearGatewaysAndProfiles();
fromEipServiceJson(
PreferenceHelper.getEipDefinitionFromPreferences(preferences)
);
diff --git a/app/src/main/java/se/leap/bitmaskclient/utils/PreferenceHelper.java b/app/src/main/java/se/leap/bitmaskclient/utils/PreferenceHelper.java
index cff983b9..8c74ae0e 100644
--- a/app/src/main/java/se/leap/bitmaskclient/utils/PreferenceHelper.java
+++ b/app/src/main/java/se/leap/bitmaskclient/utils/PreferenceHelper.java
@@ -16,12 +16,15 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
+import de.blinkt.openvpn.VpnProfile;
+import de.blinkt.openvpn.core.Preferences;
import se.leap.bitmaskclient.Provider;
import static android.content.Context.MODE_PRIVATE;
import static se.leap.bitmaskclient.Constants.ALWAYS_ON_SHOW_DIALOG;
import static se.leap.bitmaskclient.Constants.DEFAULT_SHARED_PREFS_BATTERY_SAVER;
import static se.leap.bitmaskclient.Constants.EIP_IS_ALWAYS_ON;
+import static se.leap.bitmaskclient.Constants.LAST_USED_PROFILE;
import static se.leap.bitmaskclient.Constants.PREFERENCES_APP_VERSION;
import static se.leap.bitmaskclient.Constants.PROVIDER_CONFIGURED;
import static se.leap.bitmaskclient.Constants.PROVIDER_EIP_DEFINITION;
@@ -142,6 +145,27 @@ public class PreferenceHelper {
apply();
}
+ /**
+ * Sets the profile that is connected (to connect if the service restarts)
+ */
+ public static void setLastUsedVpnProfile(Context c, VpnProfile connectedProfile) {
+ SharedPreferences prefs = Preferences.getDefaultSharedPreferences(c);
+ SharedPreferences.Editor prefsedit = prefs.edit();
+ prefsedit.putString(LAST_USED_PROFILE, connectedProfile.toJson());
+ prefsedit.apply();
+ }
+
+ /**
+ * Returns the profile that was last connected (to connect if the service restarts)
+ */
+ public static VpnProfile getLastConnectedVpnProfile(Context context) {
+ SharedPreferences preferences = context.getSharedPreferences(SHARED_PREFERENCES, MODE_PRIVATE);
+ String lastConnectedProfileJson = preferences.getString(LAST_USED_PROFILE, null);
+ return VpnProfile.fromJson(lastConnectedProfileJson);
+ }
+
+
+
public static void clearDataOfLastProvider(SharedPreferences preferences) {
clearDataOfLastProvider(preferences, false);
@@ -248,29 +272,6 @@ public class PreferenceHelper {
return preferences.getBoolean(EIP_IS_ALWAYS_ON, false);
}
- /*public static void saveLastProfile(Context context, String uuid) {
- if (context == null) {
- return;
- }
- putString(context, PROVIDER_PROFILE_UUID, uuid);
- }
-
- public static void clearLastProfile(Context context) {
- if (context == null) {
- return;
- }
- SharedPreferences preferences = context.getSharedPreferences(SHARED_PREFERENCES, Context.MODE_PRIVATE);
- preferences.edit().remove(PROVIDER_PROFILE_UUID).apply();
- }
-
- public static String getLastProfile(Context context){
- return getString(context, PROVIDER_PROFILE_UUID, null);
- }
-
- public static void saveLastGatewayNumber(Context context, int number) {
-
- }
-*/
public static String getString(Context context, String key, String defValue) {
SharedPreferences preferences = context.getSharedPreferences(SHARED_PREFERENCES, MODE_PRIVATE);
return preferences.getString(key, defValue);