X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fasynctasks%2FGetHostIpAddresses.java;h=811eb7d322192a445a55c1ca5d3b08f98972bd45;hp=050ae1dd502437c302383e2b86c5079c6419751a;hb=86e63c8ed007311ab392d4beb7dd7ba64b9c3c70;hpb=815a274380068235a5598f7495dd946605f48685 diff --git a/app/src/main/java/com/stoutner/privacybrowser/asynctasks/GetHostIpAddresses.java b/app/src/main/java/com/stoutner/privacybrowser/asynctasks/GetHostIpAddresses.java index 050ae1dd..811eb7d3 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/asynctasks/GetHostIpAddresses.java +++ b/app/src/main/java/com/stoutner/privacybrowser/asynctasks/GetHostIpAddresses.java @@ -68,16 +68,13 @@ public class GetHostIpAddresses extends AsyncTask { // Add each IP address to the string builder. for (InetAddress inetAddress : inetAddressesArray) { - if (ipAddresses.length() == 0) { // This is the first IP address. - // Add the IP address to the string builder. - ipAddresses.append(inetAddress.getHostAddress()); - } else { // This is not the first IP address. - // Add a line break to the string builder first. + // Add a line break to the string builder if this is not the first IP address. + if (ipAddresses.length() > 0) { ipAddresses.append("\n"); - - // Add the IP address to the string builder. - ipAddresses.append(inetAddress.getHostAddress()); } + + // Add the IP address to the string builder. + ipAddresses.append(inetAddress.getHostAddress()); } } catch (UnknownHostException exception) { // Do nothing. @@ -103,8 +100,8 @@ public class GetHostIpAddresses extends AsyncTask { // Store the IP addresses. nestedScrollWebView.setCurrentIpAddresses(ipAddresses); - // Checked for pinned mismatches if the WebView is not loading a URL, pinned information is not ignored, and there is pinned information. - if ((nestedScrollWebView.getProgress() == 100) && !nestedScrollWebView.ignorePinnedDomainInformation() && (nestedScrollWebView.hasPinnedSslCertificate() || nestedScrollWebView.hasPinnedIpAddresses())) { + // Checked for pinned mismatches if there is pinned information and it is not ignored. + if ((nestedScrollWebView.hasPinnedSslCertificate() || nestedScrollWebView.hasPinnedIpAddresses()) && !nestedScrollWebView.ignorePinnedDomainInformation()) { CheckPinnedMismatchHelper.checkPinnedMismatch(fragmentManager, nestedScrollWebView); } }