diff --git a/mobile/src/main/java/org/openhab/habdroid/ui/OpenHABPreferencesActivity.java b/mobile/src/main/java/org/openhab/habdroid/ui/OpenHABPreferencesActivity.java index 3ef3091ee760d53c45efad60832148341a83aaf3..fe8cb455685d04da872962359dd3130bbb6a5ab3 100644 --- a/mobile/src/main/java/org/openhab/habdroid/ui/OpenHABPreferencesActivity.java +++ b/mobile/src/main/java/org/openhab/habdroid/ui/OpenHABPreferencesActivity.java @@ -425,8 +425,8 @@ public class OpenHABPreferencesActivity extends AppCompatActivity { pref.setSummary(summary); } - private static String beautifyUrl(String url) { - return url.contains("myopenhab.org") ? "myopenHAB" : url; + public static @Nullable String beautifyUrl(@Nullable String url) { + return url != null && url.contains("myopenhab.org") ? "myopenHAB" : url; } } diff --git a/mobile/src/test/java/org/openhab/habdroid/ui/OpenHABPreferencesActivityTest.java b/mobile/src/test/java/org/openhab/habdroid/ui/OpenHABPreferencesActivityTest.java index ed02cd2798d9ea422681ff5d40294f1b3d57c027..0f12e445028d13035bdac33a47ae9794cbbcfe52 100644 --- a/mobile/src/test/java/org/openhab/habdroid/ui/OpenHABPreferencesActivityTest.java +++ b/mobile/src/test/java/org/openhab/habdroid/ui/OpenHABPreferencesActivityTest.java @@ -10,8 +10,10 @@ package org.openhab.habdroid.ui; import org.junit.Test; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.openhab.habdroid.ui.OpenHABPreferencesActivity.AbstractSettingsFragment.isWeakPassword; +import static org.openhab.habdroid.ui.OpenHABPreferencesActivity.MainSettingsFragment.beautifyUrl; public class OpenHABPreferencesActivityTest { @Test @@ -25,4 +27,14 @@ public class OpenHABPreferencesActivityTest { assertTrue(!isWeakPassword("Mb2.r5oHf-0t")); assertTrue(!isWeakPassword("abcdefg1+")); } + + @Test + public void testBeautifyUrl() { + assertEquals("abc", beautifyUrl("abc")); + assertEquals("", beautifyUrl("")); + assertEquals("myopenHAB", beautifyUrl("myopenhab.org")); + assertEquals("myopenHAB", beautifyUrl("home.myopenhab.org")); + assertEquals("myopenhab.WRONG_TLD", beautifyUrl("myopenhab.WRONG_TLD")); + assertEquals(null, beautifyUrl(null)); + } }