Redesign file access to work with the scoped storage. https://redmine.stoutner.com...

[PrivacyBrowserAndroid.git] / app / src / main / java / com / stoutner / privacybrowser / asynctasks / GetHostIpAddresses.java

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 050ae1dd502437c302383e2b86c5079c6419751a..96a223f0e6eba42bb63b018e8d9be837105353c0 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/asynctasks/GetHostIpAddresses.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/asynctasks/GetHostIpAddresses.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2019 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2019,2021 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *
@@ -68,16 +68,13 @@ public class GetHostIpAddresses extends AsyncTask<String, Void, String> {
 
             // 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,9 +100,9 @@ public class GetHostIpAddresses extends AsyncTask<String, Void, String> {
         // 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())) {
-            CheckPinnedMismatchHelper.checkPinnedMismatch(fragmentManager, nestedScrollWebView);
+        // Checked for pinned mismatches if there is pinned information and it is not ignored.
+        if ((nestedScrollWebView.hasPinnedSslCertificate() || nestedScrollWebView.hasPinnedIpAddresses()) && !nestedScrollWebView.ignorePinnedDomainInformation()) {
+            CheckPinnedMismatchHelper.checkPinnedMismatch(activity, fragmentManager, nestedScrollWebView);
         }
     }
 }
\ No newline at end of file