1 files changed, 13 insertions, 2 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/base/utils/ConfigHelper.java b/app/src/main/java/se/leap/bitmaskclient/base/utils/ConfigHelper.java
index 0e192882..c7087b67 100644
--- a/app/src/main/java/se/leap/bitmaskclient/base/utils/ConfigHelper.java
+++ b/app/src/main/java/se/leap/bitmaskclient/base/utils/ConfigHelper.java
@@ -230,8 +230,19 @@ public class ConfigHelper {
     public static boolean isDomainName(String url) {
         return url != null && Patterns.DOMAIN_NAME.matcher(url).matches();
     }
-    public static String getDomainFromMainURL(@NonNull String mainUrl) throws NullPointerException {
-        return PublicSuffixDatabase.Companion.get().getEffectiveTldPlusOne(mainUrl).replaceFirst("http[s]?://", "").replaceFirst("/.*", "");
+
+    /**
+     * Extracts a domain from a given URL
+     * @param mainUrl URL as String
+     * @return Domain as String, null if mainUrl is an invalid URL
+     */
+    public static String getDomainFromMainURL(String mainUrl) {
+        try {
+            String topLevelDomain = PublicSuffixDatabase.Companion.get().getEffectiveTldPlusOne(mainUrl);
+            return topLevelDomain.replaceFirst("http[s]?://", "").replaceFirst("/.*", "");
+        } catch (NullPointerException | IllegalArgumentException e) {
+            return null;
+        }
     }
     
     public static boolean isCalyxOSWithTetheringSupport(Context context) {