summaryrefslogtreecommitdiff
path: root/app/src/main/java/se
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2014-11-13 17:16:33 +0100
committerParménides GV <parmegv@sdf.org>2014-11-13 17:16:33 +0100
commitd8055ea06f6e5cd2b010094831e0602c6aea97aa (patch)
tree9a5ac547720e7ada2597ae9d09717ae46abd9dbc /app/src/main/java/se
parent8007384a1c8056308016ddb3291c149083a549e3 (diff)
parent5870156057b9d1f6f0bd8c22824b7e0fd8ec300b (diff)
Merge branch 'bug/JSON-error-when-updating-client-certificate-#6364' into develop
Diffstat (limited to 'app/src/main/java/se')
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/EIP.java9
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() {