Merge branch 'release-0.8.0' into develop

4 files changed, 14 insertions, 4 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 9ba29e66..6115133a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,13 @@
+0.8.0 November 25 2014 - the "problematic" release
+Features:
+- Block connection until VPN is established
+- Start VPN automatically after logging in
+- Lollipop support
+- Update ndk and ics-openvpn codebase
+Bugs:
+- Pin provider certificate with configuration data
+- Autoupdate vpn certificate correctly
+
 0.7.0 September 26 2014 - the "quick" release
 Features
 - Restart quickly if killed
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();
     }
 
     /**