diff options
author | Parménides GV <parmegv@sdf.org> | 2014-11-13 17:16:51 +0100 |
---|---|---|
committer | Parménides GV <parmegv@sdf.org> | 2014-11-13 17:16:51 +0100 |
commit | 5a13e3d020119ee224d9ff450e8bf2bde40b7f14 (patch) | |
tree | dd2016df8caf46340825713a0d9570fd0494786e /app/src/main/java | |
parent | de7bf1e8ffaf363939514f778d27d0c3474c914f (diff) | |
parent | d8055ea06f6e5cd2b010094831e0602c6aea97aa (diff) |
Merge branch 'develop' into release-0.8.0
Diffstat (limited to 'app/src/main/java')
-rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/EIP.java | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/EIP.java b/app/src/main/java/se/leap/bitmaskclient/EIP.java index 7f15b944..00a0afb0 100644 --- a/app/src/main/java/se/leap/bitmaskclient/EIP.java +++ b/app/src/main/java/se/leap/bitmaskclient/EIP.java @@ -94,7 +94,6 @@ public final class EIP extends IntentService { private static ResultReceiver mReceiver; private static boolean mBound = false; - private static int parsedEipSerial; private static JSONObject eipDefinition = null; private static OVPNGateway activeGateway = null; @@ -323,16 +322,12 @@ public final class EIP extends IntentService { if(eip_definition_string.isEmpty() == false) { eipDefinition = new JSONObject(eip_definition_string); } - parsedEipSerial = preferences.getInt(PARSED_SERIAL, 0); + deleteAllVpnProfiles(); + updateGateways(); } catch (JSONException e) { // TODO Auto-generated catch block e.printStackTrace(); } - if(parsedEipSerial == 0) { - deleteAllVpnProfiles(); - } - if (eipDefinition != null && eipDefinition.optInt("serial") >= parsedEipSerial) - updateGateways(); } private void deleteAllVpnProfiles() { |