diff options
| author | Sean Leonard <meanderingcode@aetherislands.net> | 2013-12-04 19:36:58 -0800 |
|---|---|---|
| committer | Sean Leonard <meanderingcode@aetherislands.net> | 2013-12-04 19:36:58 -0800 |
| commit | d594e8579d95b304bdd13ebc6786b2bf7d672cf5 (patch) | |
| tree | a0670d1abaf2a5e3ab546035e5f37429f1a052c9 /src/se/leap/bitmaskclient/EIP.java | |
| parent | 53b7ba635f8a37db6594eae135ef5fbb3a934351 (diff) | |
| parent | 6f31f91a82f9822a34ae55c5275130d23be29f4b (diff) | |
Merge branch 'develop' into release-0.2.3
Diffstat (limited to 'src/se/leap/bitmaskclient/EIP.java')
| -rw-r--r-- | src/se/leap/bitmaskclient/EIP.java | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/se/leap/bitmaskclient/EIP.java b/src/se/leap/bitmaskclient/EIP.java index 22f7558d..ec2f6972 100644 --- a/src/se/leap/bitmaskclient/EIP.java +++ b/src/se/leap/bitmaskclient/EIP.java @@ -214,8 +214,7 @@ public final class EIP extends IntentService { * Intent to {@link se.leap.openvpn.LaunchVPN} */ private void startEIP() { - if (activeGateway==null) - activeGateway = selectGateway(); + activeGateway = selectGateway(); Intent intent = new Intent(this,LaunchVPN.class); intent.setAction(Intent.ACTION_MAIN); @@ -252,10 +251,19 @@ public final class EIP extends IntentService { private void updateEIPService() { try { eipDefinition = ConfigHelper.getJsonFromSharedPref(EIP.KEY); + parsedEipSerial = ConfigHelper.getIntFromSharedPref(PARSED_SERIAL); } catch (JSONException e) { // TODO Auto-generated catch block e.printStackTrace(); } + if(parsedEipSerial == 0) { + // Delete all vpn profiles + ProfileManager vpl = ProfileManager.getInstance(context); + Collection<VpnProfile> profiles = vpl.getProfiles(); + for (VpnProfile profile : profiles){ + vpl.removeProfile(context, profile); + } + } if (eipDefinition.optInt("serial") > parsedEipSerial) updateGateways(); } |