Merge branch 'origin_0.9.8' into #8831_progress_animation_when_connecting

* added new EipCommand in StartActivity
* added option to add intent extras to EipCommand
* resolved merge conflicts and minor refactorings in:
	app/src/main/java/se/leap/bitmaskclient/EipFragment.java
	app/src/main/java/se/leap/bitmaskclient/eip/EIP.java

1 files changed, 31 insertions, 0 deletions

diff --git a/app/src/test/java/se/leap/bitmaskclient/DefaultedURLTest.java b/app/src/test/java/se/leap/bitmaskclient/DefaultedURLTest.java
new file mode 100644
index 00000000..cbf47621
--- /dev/null
+++ b/app/src/test/java/se/leap/bitmaskclient/DefaultedURLTest.java
@@ -0,0 +1,31 @@
+package se.leap.bitmaskclient;
+
+import org.junit.Test;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import static org.junit.Assert.*;
+
+/**
+ * Created by cyberta on 11.02.18.
+ */
+public class DefaultedURLTest {
+
+    @Test
+    public void testEquals_false() throws MalformedURLException {
+        DefaultedURL defaultedURL = new DefaultedURL();
+        DefaultedURL customURL = new DefaultedURL();
+        customURL.setUrl(new URL("https://customurl.com"));
+
+        assertFalse(defaultedURL.equals(customURL));
+    }
+
+    @Test
+    public void testEquals_true() throws MalformedURLException {
+        DefaultedURL defaultedURL = new DefaultedURL();
+        DefaultedURL customURL = new DefaultedURL();
+        assertTrue(defaultedURL.equals(customURL));
+    }
+
+}