diff options
author | cyberta <cyberta@riseup.net> | 2022-08-07 21:41:16 +0000 |
---|---|---|
committer | cyberta <cyberta@riseup.net> | 2022-08-07 21:41:16 +0000 |
commit | 8d06c86a2fedf7a758801ac0b029b53b54977bd7 (patch) | |
tree | f415af41a05c766846d83c2b5d8de0ec40325ef1 /app/src/main/java/se/leap/bitmaskclient/base/utils | |
parent | b1cb49a2f78c80db0b3fa037a0b4e3c1c9c7dd61 (diff) | |
parent | 6e824a7bf5b127239d838a64a98c45c5d20e7e05 (diff) |
Merge branch 'bugfix_branch' into 'master'
Bugfixes and more
Closes #9110
See merge request leap/bitmask_android!205
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/base/utils')
-rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/base/utils/ConfigHelper.java | 5 |
1 files changed, 5 insertions, 0 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 91894fb8..dbcb55b0 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 @@ -51,6 +51,7 @@ import java.util.Calendar; import java.util.regex.Matcher; import java.util.regex.Pattern; +import okhttp3.internal.publicsuffix.PublicSuffixDatabase; import se.leap.bitmaskclient.BuildConfig; import se.leap.bitmaskclient.R; import se.leap.bitmaskclient.providersetup.ProviderAPI; @@ -273,6 +274,10 @@ public class ConfigHelper { Matcher matcher = IPv4_PATTERN.matcher(ipv4); return matcher.matches(); } + + public static String getDomainFromMainURL(@NonNull String mainUrl) throws NullPointerException { + return PublicSuffixDatabase.get().getEffectiveTldPlusOne(mainUrl).replaceFirst("http[s]?://", "").replaceFirst("/.*", ""); + } public static boolean isCalyxOSWithTetheringSupport(Context context) { return SystemPropertiesHelper.contains("ro.calyxos.version", context) && |