summaryrefslogtreecommitdiff
path: root/app/src/main
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2014-11-25 13:18:35 +0100
committerParménides GV <parmegv@sdf.org>2014-11-25 13:18:35 +0100
commit48cd0f2fa3094b5a6b7b07d6413d77bdbc9bbc20 (patch)
tree8b2986d66ed4e6bdf5a3253c81f32cc5a8e53b99 /app/src/main
parent8b272e8db92051ef9824d8552f47a3207e365a5a (diff)
parent9e8392da2c8e48f674291ebfed6b82177fade9c7 (diff)
Merge branch 'release-0.8.0' into develop
Diffstat (limited to 'app/src/main')
-rw-r--r--app/src/main/AndroidManifest.xml4
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/Dashboard.java2
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/EIP.java2
3 files changed, 4 insertions, 4 deletions
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 68a99560..d5081b8d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -17,8 +17,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="se.leap.bitmaskclient"
- android:versionCode="93"
- android:versionName="0.7.0" >
+ android:versionCode="102"
+ android:versionName="0.8.0" >
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
diff --git a/app/src/main/java/se/leap/bitmaskclient/Dashboard.java b/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
index 7d00ca77..364a79af 100644
--- a/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
+++ b/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
@@ -112,7 +112,7 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
switch(versionCode) {
case 91: // 0.6.0 without Bug #5999
- case 94: // 0.8.0 with
+ case 101: // 0.8.0
if(!preferences.getString(EIP.KEY, "").isEmpty()) {
Intent rebuildVpnProfiles = new Intent(getApplicationContext(), EIP.class);
rebuildVpnProfiles.setAction(EIP.ACTION_REBUILD_PROFILES);
diff --git a/app/src/main/java/se/leap/bitmaskclient/EIP.java b/app/src/main/java/se/leap/bitmaskclient/EIP.java
index 2ce3c20f..2f06def3 100644
--- a/app/src/main/java/se/leap/bitmaskclient/EIP.java
+++ b/app/src/main/java/se/leap/bitmaskclient/EIP.java
@@ -150,13 +150,13 @@ public final class EIP extends IntentService {
* It also sets up early routes.
*/
private void startEIP() {
+ earlyRoutes();
activeGateway = selectGateway();
if(activeGateway != null && activeGateway.mVpnProfile != null) {
mReceiver = EipServiceFragment.getReceiver();
launchActiveGateway();
}
- //earlyRoutes();
}
/**