diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-11-04 19:23:23 +0100 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-11-04 19:23:23 +0100 |
| commit | 713c3a98f53a6bd1ad94e90f28d3e37d20abfab9 (patch) | |
| tree | 76da9532bfa297191d66363ad1e6bc3d7a1a7d03 | |
| parent | 69ee1167a0b2150fd4b9165e16b7c68d9a0100dd (diff) | |
| parent | 195f0bc8f11792781bb828b0ff088314de322e22 (diff) | |
Merge branch 'feature/Rebuild-profile-for-auth-failure-restart' into develop
| -rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/Dashboard.java | 2 | ||||
| -rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/EIP.java | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/Dashboard.java b/app/src/main/java/se/leap/bitmaskclient/Dashboard.java index 3ae1d81a..547e4179 100644 --- a/app/src/main/java/se/leap/bitmaskclient/Dashboard.java +++ b/app/src/main/java/se/leap/bitmaskclient/Dashboard.java @@ -112,11 +112,13 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf switch(versionCode) { case 91: // 0.6.0 without Bug #5999 + case 94: // 0.8.0 with if(!preferences.getString(EIP.KEY, "").isEmpty()) { Intent rebuildVpnProfiles = new Intent(getApplicationContext(), EIP.class); rebuildVpnProfiles.setAction(EIP.ACTION_REBUILD_PROFILES); startService(rebuildVpnProfiles); } + break; } } catch (NameNotFoundException e) { } diff --git a/app/src/main/java/se/leap/bitmaskclient/EIP.java b/app/src/main/java/se/leap/bitmaskclient/EIP.java index cf02f32f..ad7552c8 100644 --- a/app/src/main/java/se/leap/bitmaskclient/EIP.java +++ b/app/src/main/java/se/leap/bitmaskclient/EIP.java @@ -350,6 +350,7 @@ public final class EIP extends IntentService { private void updateGateways(){ JSONArray gatewaysDefined = null; try { + if(eipDefinition == null) updateEIPService(); gatewaysDefined = eipDefinition.getJSONArray("gateways"); for ( int i=0 ; i < gatewaysDefined.length(); i++ ){ JSONObject gw = null; |