X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Ffragments%2FDomainSettingsFragment.java;h=90b999ceddc0c9b77c4be964daacc589acb8682a;hp=477ab9e321976e676458757e4950b51bd47b97cc;hb=d206502603e904c817b3add2482bfbc66692167d;hpb=337aebc73ea8d43fd912198e1eff9fe9f8f8f536 diff --git a/app/src/main/java/com/stoutner/privacybrowser/fragments/DomainSettingsFragment.java b/app/src/main/java/com/stoutner/privacybrowser/fragments/DomainSettingsFragment.java index 477ab9e3..90b999ce 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/fragments/DomainSettingsFragment.java +++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/DomainSettingsFragment.java @@ -1703,15 +1703,15 @@ public class DomainSettingsFragment extends Fragment { // Initialize `domainNamesMatch`. boolean domainNamesMatch = false; - // Check if the domains match. - if (domainName.equals(certificateCommonName)) { - domainNamesMatch = true; - } - // Check various wildcard permutations if `domainName` and `certificateCommonName` are not empty. // `noinspection ConstantCondition` removes Android Studio's incorrect lint warning that `domainName` can never be `null`. //noinspection ConstantConditions if ((domainName != null) && (certificateCommonName != null)) { + // Check if the domains match. + if (domainName.equals(certificateCommonName)) { + domainNamesMatch = true; + } + // If `domainName` starts with a wildcard, check the base domain against all the subdomains of `certificateCommonName`. if (!domainNamesMatch && domainName.startsWith("*.") && (domainName.length() > 2)) { // Remove the initial `*.`.