diff options
| author | Parménides GV <parmegv@sdf.org> | 2015-01-21 17:27:40 +0100 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2015-01-21 17:27:40 +0100 |
| commit | 9d346be65e6808710b9e814d2899e5888984b4ab (patch) | |
| tree | c18d0da3317ecdb643ea8975446e9d48370aa5bf /app/src | |
| parent | 456e28e1e2eb8ab888bf40d49b912bd46cfb4802 (diff) | |
| parent | 1ad87b35085616d645fdae18bb03cbead03bd6c9 (diff) | |
Merge branch 'develop'0.9.1
Diffstat (limited to 'app/src')
| -rw-r--r-- | app/src/main/AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/eip/GatewaysManager.java | 2 |
2 files changed, 3 insertions, 3 deletions
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"); |