diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-11-20 19:57:45 +0100 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-11-20 19:57:45 +0100 |
| commit | ecc30090447deaa65dc848147b6a60fd8eae4862 (patch) | |
| tree | 780ef64c3fbcb9433139f13c02a3993a6a1bb632 /app/src/main/java/se/leap/bitmaskclient/EIP.java | |
| parent | d8055ea06f6e5cd2b010094831e0602c6aea97aa (diff) | |
| parent | 8f37e6f940ae4034458a1d9d39dc5ffe4ff70848 (diff) | |
Merge branch 'bug/JSON-error-when-updating-client-certificate-#6364' into develop
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/EIP.java')
| -rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/EIP.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/EIP.java b/app/src/main/java/se/leap/bitmaskclient/EIP.java index 00a0afb0..0d11847e 100644 --- a/app/src/main/java/se/leap/bitmaskclient/EIP.java +++ b/app/src/main/java/se/leap/bitmaskclient/EIP.java @@ -324,6 +324,7 @@ public final class EIP extends IntentService { } deleteAllVpnProfiles(); updateGateways(); + if(mReceiver != null) mReceiver.send(Activity.RESULT_OK, Bundle.EMPTY); } catch (JSONException e) { // TODO Auto-generated catch block e.printStackTrace(); @@ -394,7 +395,7 @@ public final class EIP extends IntentService { Calendar offset_date = Calendar.getInstance(); try { Date date = certificate_date_format.parse(date_string); - long difference = Math.abs(date.getTime() - certificate.getNotAfter().getTime())/2; + long difference = Math.abs(date.getTime() - certificate.getNotAfter().getTime())/2; long current_date_millis = offset_date.getTimeInMillis(); offset_date.setTimeInMillis(current_date_millis + difference); Log.d(TAG, "certificate not after = " + certificate.getNotAfter()); |