Merge branch 'develop'0.9.1

3 files changed, 7 insertions, 3 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 687f3d51..702bfd8f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+0.9.1 January 21 2015 - the "insistent reloaded" release
+Bugs:
+- Autostart on boot works
+
 0.9.0 January 19 2015 - the "insistent" release
 Features:
 - Fail back to other ports/servers in case of error
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 436a6bb6..33c3eaba 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="111"
-    android:versionName="0.9.0" >
+    android:versionCode="112"
+    android:versionName="0.9.1" >
 
     <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/eip/GatewaysManager.java b/app/src/main/java/se/leap/bitmaskclient/eip/GatewaysManager.java
index b1aa5a2f..401cd701 100644
--- a/app/src/main/java/se/leap/bitmaskclient/eip/GatewaysManager.java
+++ b/app/src/main/java/se/leap/bitmaskclient/eip/GatewaysManager.java
@@ -72,7 +72,7 @@ public class GatewaysManager {
 
         if(gateways_list != null) {
             for (Gateway gateway : gateways_list)
-                removeDuplicatedGateway(gateway);
+		addGateway(gateway);
             this.gateways.addAll(gateways_list);
         } else
             Log.d("GatewaysManager", "No gateways added");