Merge branch 'develop' into release-0.8.1

7 files changed, 24 insertions, 4 deletions

diff --git a/app/assets/urls/calyx.url b/app/assets/urls/calyx.url
new file mode 100644
index 00000000..8de04fe9
--- /dev/null
+++ b/app/assets/urls/calyx.url
@@ -0,0 +1,3 @@
+{
+	"main_url" : "https://calyx.net/"
+}
diff --git a/app/assets/urls/riseup.url b/app/assets/urls/riseup.url
new file mode 100644
index 00000000..4548b433
--- /dev/null
+++ b/app/assets/urls/riseup.url
@@ -0,0 +1,3 @@
+{
+	"main_url" : "https://riseup.net/"
+}
diff --git a/app/src/main/java/se/leap/bitmaskclient/Provider.java b/app/src/main/java/se/leap/bitmaskclient/Provider.java
index f22a4bfb..d7ff6633 100644
--- a/app/src/main/java/se/leap/bitmaskclient/Provider.java
+++ b/app/src/main/java/se/leap/bitmaskclient/Provider.java
@@ -35,6 +35,7 @@ import java.util.Locale;
 
 /**
  * @author Sean Leonard <meanderingcode@aetherislands.net>
+ * @author Parménides GV <parmegv@sdf.org>
  *
  */
 public final class Provider implements Parcelable {
@@ -187,7 +188,7 @@ public final class Provider implements Parcelable {
     public boolean equals(Object o) {
         if(o instanceof Provider) {
             Provider p = (Provider) o;
-            return p.mainUrl().equals(mainUrl());
+            return p.mainUrl().getHost().equals(mainUrl().getHost());
         } else return false;
     }
 
@@ -203,6 +204,6 @@ public final class Provider implements Parcelable {
 
     @Override
     public int hashCode() {
-        return main_url.hashCode();
+        return mainUrl().getHost().hashCode();
     }
 }
diff --git a/app/src/main/java/se/leap/bitmaskclient/ProviderManager.java b/app/src/main/java/se/leap/bitmaskclient/ProviderManager.java
index 911144f7..69bd7c1e 100644
--- a/app/src/main/java/se/leap/bitmaskclient/ProviderManager.java
+++ b/app/src/main/java/se/leap/bitmaskclient/ProviderManager.java
@@ -136,7 +136,8 @@ public class ProviderManager implements AdapteeCollection<Provider> {
 
     @Override
     public void add(Provider element) {
-        custom_providers.add(element);
+        if(!default_providers.contains(element))
+            custom_providers.add(element);
     }
 
     @Override
diff --git a/app/src/main/java/se/leap/bitmaskclient/eip/EIP.java b/app/src/main/java/se/leap/bitmaskclient/eip/EIP.java
index 0713e521..7db35c17 100644
--- a/app/src/main/java/se/leap/bitmaskclient/eip/EIP.java
+++ b/app/src/main/java/se/leap/bitmaskclient/eip/EIP.java
@@ -195,6 +195,7 @@ public final class EIP extends IntentService {
     private void deleteAllVpnProfiles() {
 	Collection<VpnProfile> profiles = profile_manager.getProfiles();
 	profiles.removeAll(profiles);
+	gateways.clear();
     }
 	
     /**
diff --git a/app/src/main/res/layout/about.xml b/app/src/main/res/layout/about.xml
index ccb1ea26..2669caa3 100644
--- a/app/src/main/res/layout/about.xml
+++ b/app/src/main/res/layout/about.xml
@@ -35,6 +35,17 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:autoLink="all"
+            android:text="@string/copyright_blinktgui" />
+
+
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="10sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:autoLink="all"
             android:text="@string/repository_url_text" />
 
 	<TextView
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3666b39c..68e71886 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -60,7 +60,7 @@
     <string name="signingup_message">Signing up</string>
     <string name="logout_message">Logging out from this session.</string>
     <string name="logged_out_message">Logged out.</string>
-    <string name="log_out_failed_message">Didn\'t logged out.</string>
+    <string name="log_out_failed_message">Didn\'t log out.</string>
     <string name="succesful_authentication_message">Authentication succeeded.</string>
     <string name="authentication_failed_message">Authentication failed.</string>
     <string name="registration_failed_message">Registration failed..</string>