Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/viewpager-main-activity

Author: nbradbury

WordPressUtils/src/androidTest/java/org/wordpress/android/util/UrlUtilsTest.java

@@ -0,0 +1,20 @@
+package org.wordpress.android.util;
+
+import android.test.InstrumentationTestCase;
+
+public class UrlUtilsTest extends InstrumentationTestCase {
+    public void testGetDomainFromUrlWithEmptyStringDoesNotReturnNull() {
+        assertNotNull(UrlUtils.getDomainFromUrl(""));
+    }
+
+    public void testGetDomainFromUrlWithNoHostDoesNotReturnNull() {
+        assertNotNull(UrlUtils.getDomainFromUrl("wordpress"));
+    }
+
+    public void testGetDomainFromUrlWithHostReturnsHost() {
+        String url = "http://www.wordpress.com";
+        String host = UrlUtils.getDomainFromUrl(url);
+
+        assertTrue(host.equals("www.wordpress.com"));
+    }
+}

WordPressUtils/src/main/java/org/wordpress/android/util/UrlUtils.java

@@ -32,12 +32,20 @@ public static String urlDecode(final String text) {
         }
     }
 
+    /**
+     *
+     * @param urlString url to get domain from
+     * @return domain of uri if available. Empty string otherwise.
+     */
     public static String getDomainFromUrl(final String urlString) {
-        if (urlString == null) {
-            return "";
+        if (urlString != null) {
+            Uri uri = Uri.parse(urlString);
+            if (uri.getHost() != null) {
+                return uri.getHost();
+            }
         }
-        Uri uri = Uri.parse(urlString);
-        return uri.getHost();
+
+        return "";
     }
 
     /**