summaryrefslogtreecommitdiff
path: root/app/src
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2014-11-13 17:16:51 +0100
committerParménides GV <parmegv@sdf.org>2014-11-13 17:16:51 +0100
commit5a13e3d020119ee224d9ff450e8bf2bde40b7f14 (patch)
treedd2016df8caf46340825713a0d9570fd0494786e /app/src
parentde7bf1e8ffaf363939514f778d27d0c3474c914f (diff)
parentd8055ea06f6e5cd2b010094831e0602c6aea97aa (diff)
Merge branch 'develop' into release-0.8.0
Diffstat (limited to 'app/src')
-rw-r--r--app/src/debug/java/se/leap/bitmaskclient/ProviderAPI.java2
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/EIP.java9
-rw-r--r--app/src/release/java/se/leap/bitmaskclient/ProviderAPI.java2
3 files changed, 6 insertions, 7 deletions
diff --git a/app/src/debug/java/se/leap/bitmaskclient/ProviderAPI.java b/app/src/debug/java/se/leap/bitmaskclient/ProviderAPI.java
index 1b2d723d..804e4b27 100644
--- a/app/src/debug/java/se/leap/bitmaskclient/ProviderAPI.java
+++ b/app/src/debug/java/se/leap/bitmaskclient/ProviderAPI.java
@@ -743,6 +743,7 @@ public class ProviderAPI extends IntentService {
// TODO Auto-generated catch block
e.printStackTrace();
} catch (UnknownHostException e) {
+ e.printStackTrace();
json_file_content = formatErrorMessage(R.string.server_unreachable_message);
} catch (IOException e) {
// The downloaded certificate doesn't validate our https connection.
@@ -761,6 +762,7 @@ public class ProviderAPI extends IntentService {
// TODO Auto-generated catch block
e.printStackTrace();
} catch (NoSuchElementException e) {
+ e.printStackTrace();
json_file_content = formatErrorMessage(R.string.server_unreachable_message);
}
return json_file_content;
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() {
diff --git a/app/src/release/java/se/leap/bitmaskclient/ProviderAPI.java b/app/src/release/java/se/leap/bitmaskclient/ProviderAPI.java
index 1c384581..f419afaf 100644
--- a/app/src/release/java/se/leap/bitmaskclient/ProviderAPI.java
+++ b/app/src/release/java/se/leap/bitmaskclient/ProviderAPI.java
@@ -740,6 +740,7 @@ public class ProviderAPI extends IntentService {
// TODO Auto-generated catch block
e.printStackTrace();
} catch (UnknownHostException e) {
+ e.printStackTrace();
json_file_content = formatErrorMessage(R.string.server_unreachable_message);
} catch (IOException e) {
// The downloaded certificate doesn't validate our https connection.
@@ -754,6 +755,7 @@ public class ProviderAPI extends IntentService {
// TODO Auto-generated catch block
e.printStackTrace();
} catch (NoSuchElementException e) {
+ e.printStackTrace();
json_file_content = formatErrorMessage(R.string.server_unreachable_message);
}
return json_file_content;