X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fviews%2FNestedScrollWebView.java;h=f7d57b68065e7da54c39e25b2680bd29700e079c;hp=c4f54de9ee2488dc985a6ecdb0ba9fa2b599ccb1;hb=fe788514a50a591f9722ededc13e608ceb268bb8;hpb=3d167d1ec7d0cef1ef032f20859bb0de8ddb01cf diff --git a/app/src/main/java/com/stoutner/privacybrowser/views/NestedScrollWebView.java b/app/src/main/java/com/stoutner/privacybrowser/views/NestedScrollWebView.java index c4f54de9..f7d57b68 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/views/NestedScrollWebView.java +++ b/app/src/main/java/com/stoutner/privacybrowser/views/NestedScrollWebView.java @@ -24,35 +24,43 @@ import android.util.AttributeSet; import android.view.MotionEvent; import android.webkit.WebView; +import androidx.annotation.NonNull; import androidx.core.view.NestedScrollingChild2; import androidx.core.view.NestedScrollingChildHelper; import androidx.core.view.ViewCompat; import java.util.ArrayList; +import java.util.Date; // NestedScrollWebView extends WebView to handle nested scrolls (scrolling the app bar off the screen). public class NestedScrollWebView extends WebView implements NestedScrollingChild2 { // These constants identify the blocklists. public final static int BLOCKED_REQUESTS = 0; - public final static int EASY_LIST_BLOCKED_REQUESTS = 1; - public final static int EASY_PRIVACY_BLOCKED_REQUESTS = 2; - public final static int FANBOYS_ANNOYANCE_LIST_BLOCKED_REQUESTS = 3; - public final static int FANBOYS_SOCIAL_BLOCKING_LIST_BLOCKED_REQUESTS = 4; - public final static int ULTRA_PRIVACY_BLOCKED_REQUESTS = 5; - public final static int THIRD_PARTY_BLOCKED_REQUESTS = 6; + public final static int EASY_LIST = 1; + public final static int EASY_PRIVACY = 2; + public final static int FANBOYS_ANNOYANCE_LIST = 3; + public final static int FANBOYS_SOCIAL_BLOCKING_LIST = 4; + public final static int ULTRA_PRIVACY = 5; + public final static int THIRD_PARTY_REQUESTS = 6; - // The nested scrolling child helper is used throughout the class. - private NestedScrollingChildHelper nestedScrollingChildHelper; - - // The previous Y position needs to be tracked between motion events. - private int previousYPosition; + // Keep a copy of the WebView fragment ID. + private long webViewFragmentId; // Track if domain settings are applied to this nested scroll WebView and, if so, the database ID. private boolean domainSettingsApplied; private int domainSettingsDatabaseId; + // Keep track of when the domain name changes so that domain settings can be reapplied. This should never be null. + private String currentDomainName = ""; + // Track the resource requests. private ArrayList resourceRequests = new ArrayList<>(); + private boolean easyListEnabled; + private boolean easyPrivacyEnabled; + private boolean fanboysAnnoyanceListEnabled; + private boolean fanboysSocialBlockingListEnabled; + private boolean ultraPrivacyEnabled; + private boolean blockAllThirdPartyRequests; private int blockedRequests; private int easyListBlockedRequests; private int easyPrivacyBlockedRequests; @@ -61,19 +69,49 @@ public class NestedScrollWebView extends WebView implements NestedScrollingChild private int ultraPrivacyBlockedRequests; private int thirdPartyBlockedRequests; - // Basic constructor. + // The pinned SSL certificate variables. + private boolean hasPinnedSslCertificate; + private String pinnedSslIssuedToCName; + private String pinnedSslIssuedToOName; + private String pinnedSslIssuedToUName; + private String pinnedSslIssuedByCName; + private String pinnedSslIssuedByOName; + private String pinnedSslIssuedByUName; + private Date pinnedSslStartDate; + private Date pinnedSslEndDate; + + // The current IP addresses variables. + private boolean hasCurrentIpAddresses; + private String currentIpAddresses; + + // The pinned IP addresses variables. + private boolean hasPinnedIpAddresses; + private String pinnedIpAddresses; + + // The ignore pinned domain information tracker. This is set when a user proceeds past a pinned mismatch dialog to prevent the dialog from showing again until after the domain changes. + private boolean ignorePinnedDomainInformation; + + // The nested scrolling child helper is used throughout the class. + private NestedScrollingChildHelper nestedScrollingChildHelper; + + // The previous Y position needs to be tracked between motion events. + private int previousYPosition; + + + + // The basic constructor. public NestedScrollWebView(Context context) { // Roll up to the next constructor. this(context, null); } - // Intermediate constructor. + // The intermediate constructor. public NestedScrollWebView(Context context, AttributeSet attributeSet) { // Roll up to the next constructor. this(context, attributeSet, android.R.attr.webViewStyle); } - // Full constructor. + // The full constructor. public NestedScrollWebView(Context context, AttributeSet attributeSet, int defaultStyle) { // Run the default commands. super(context, attributeSet, defaultStyle); @@ -85,6 +123,21 @@ public class NestedScrollWebView extends WebView implements NestedScrollingChild nestedScrollingChildHelper.setNestedScrollingEnabled(true); } + + + // WebView Fragment ID. + public void setWebViewFragmentId(long webViewFragmentId) { + // Store the WebView fragment ID. + this.webViewFragmentId = webViewFragmentId; + } + + public long getWebViewFragmentId() { + // Return the WebView fragment ID. + return webViewFragmentId; + } + + + // Domain settings. public void setDomainSettingsApplied(boolean applied) { // Store the domain settings applied status. domainSettingsApplied = applied; @@ -95,6 +148,8 @@ public class NestedScrollWebView extends WebView implements NestedScrollingChild return domainSettingsApplied; } + + // Domain settings database ID. public void setDomainSettingsDatabaseId(int databaseId) { // Store the domain settings database ID. domainSettingsDatabaseId = databaseId; @@ -105,6 +160,25 @@ public class NestedScrollWebView extends WebView implements NestedScrollingChild return domainSettingsDatabaseId; } + + // Current domain name. To function well when called, the domain name should never be allowed to be null. + public void setCurrentDomainName(@NonNull String domainName) { + // Store the current domain name. + currentDomainName = domainName; + } + + public void resetCurrentDomainName() { + // Reset the current domain name. + currentDomainName = ""; + } + + public String getCurrentDomainName() { + // Return the current domain name. + return currentDomainName; + } + + + // Resource requests. public void addResourceRequest(String[] resourceRequest) { // Add the resource request to the list. resourceRequests.add(resourceRequest); @@ -120,114 +194,157 @@ public class NestedScrollWebView extends WebView implements NestedScrollingChild resourceRequests.clear(); } - public void resetRequestsCount(int list) { - // Run the command on the indicated list. - switch (list) { - case BLOCKED_REQUESTS: - // Reset the blocked requests count. - blockedRequests = 0; - break; - case EASY_LIST_BLOCKED_REQUESTS: - // Reset the EasyList blocked requests count. - easyListBlockedRequests = 0; + // Blocklists. + public void enableBlocklist(int blocklist, boolean status) { + // Update the status of the indicated blocklist. + switch (blocklist) { + case EASY_LIST: + // Update the status of the blocklist. + easyListEnabled = status; break; - case EASY_PRIVACY_BLOCKED_REQUESTS: - // Reset the EasyPrivacy blocked requests count. - easyPrivacyBlockedRequests = 0; + case EASY_PRIVACY: + // Update the status of the blocklist. + easyPrivacyEnabled = status; break; - case FANBOYS_ANNOYANCE_LIST_BLOCKED_REQUESTS: - // Reset the Fanboy's Annoyance List blocked requests count. - fanboysAnnoyanceListBlockedRequests = 0; + case FANBOYS_ANNOYANCE_LIST: + // Update the status of the blocklist. + fanboysAnnoyanceListEnabled = status; break; - case FANBOYS_SOCIAL_BLOCKING_LIST_BLOCKED_REQUESTS: - // Reset the Fanboy's Social Blocking List blocked requests count. - fanboysSocialBlockingListBlockedRequests = 0; + case FANBOYS_SOCIAL_BLOCKING_LIST: + // Update the status of the blocklist. + fanboysSocialBlockingListEnabled = status; break; - case ULTRA_PRIVACY_BLOCKED_REQUESTS: - // Reset the UltraPrivacy blocked requests count. - ultraPrivacyBlockedRequests = 0; + case ULTRA_PRIVACY: + // Update the status of the blocklist. + ultraPrivacyEnabled = status; break; - case THIRD_PARTY_BLOCKED_REQUESTS: - // Reset the Third Party blocked requests count. - thirdPartyBlockedRequests = 0; + case THIRD_PARTY_REQUESTS: + // Update the status of the blocklist. + blockAllThirdPartyRequests = status; break; } } - public void incrementRequestsCount(int list) { - // Run the command on the indicated list. - switch (list) { + public boolean isBlocklistEnabled(int blocklist) { + // Get the status of the indicated blocklist. + switch (blocklist) { + case EASY_LIST: + // Return the status of the blocklist. + return easyListEnabled; + + case EASY_PRIVACY: + // Return the status of the blocklist. + return easyPrivacyEnabled; + + case FANBOYS_ANNOYANCE_LIST: + // Return the status of the blocklist. + return fanboysAnnoyanceListEnabled; + + case FANBOYS_SOCIAL_BLOCKING_LIST: + // Return the status of the blocklist. + return fanboysSocialBlockingListEnabled; + + case ULTRA_PRIVACY: + // Return the status of the blocklist. + return ultraPrivacyEnabled; + + case THIRD_PARTY_REQUESTS: + // Return the status of the blocklist. + return blockAllThirdPartyRequests; + + default: + // The default value is required but should never be used. + return false; + } + } + + + // Resource request counters. + public void resetRequestsCounters() { + // Reset all the resource request counters. + blockedRequests = 0; + easyListBlockedRequests = 0; + easyPrivacyBlockedRequests = 0; + fanboysAnnoyanceListBlockedRequests = 0; + fanboysSocialBlockingListBlockedRequests = 0; + ultraPrivacyBlockedRequests = 0; + thirdPartyBlockedRequests = 0; + } + + public void incrementRequestsCount(int blocklist) { + // Increment the count of the indicated blocklist. + switch (blocklist) { case BLOCKED_REQUESTS: // Increment the blocked requests count. blockedRequests++; break; - case EASY_LIST_BLOCKED_REQUESTS: + case EASY_LIST: // Increment the EasyList blocked requests count. easyListBlockedRequests++; break; - case EASY_PRIVACY_BLOCKED_REQUESTS: + case EASY_PRIVACY: // Increment the EasyPrivacy blocked requests count. easyPrivacyBlockedRequests++; break; - case FANBOYS_ANNOYANCE_LIST_BLOCKED_REQUESTS: + case FANBOYS_ANNOYANCE_LIST: // Increment the Fanboy's Annoyance List blocked requests count. fanboysAnnoyanceListBlockedRequests++; break; - case FANBOYS_SOCIAL_BLOCKING_LIST_BLOCKED_REQUESTS: + case FANBOYS_SOCIAL_BLOCKING_LIST: // Increment the Fanboy's Social Blocking List blocked requests count. fanboysSocialBlockingListBlockedRequests++; break; - case ULTRA_PRIVACY_BLOCKED_REQUESTS: + case ULTRA_PRIVACY: // Increment the UltraPrivacy blocked requests count. ultraPrivacyBlockedRequests++; break; - case THIRD_PARTY_BLOCKED_REQUESTS: + case THIRD_PARTY_REQUESTS: // Increment the Third Party blocked requests count. thirdPartyBlockedRequests++; break; } } - public int getRequestsCount(int list) { - // Run the command on the indicated list. - switch (list) { + public int getRequestsCount(int blocklist) { + // Get the count of the indicated blocklist. + switch (blocklist) { case BLOCKED_REQUESTS: // Return the blocked requests count. return blockedRequests; - case EASY_LIST_BLOCKED_REQUESTS: + case EASY_LIST: // Return the EasyList blocked requests count. return easyListBlockedRequests; - case EASY_PRIVACY_BLOCKED_REQUESTS: + case EASY_PRIVACY: // Return the EasyPrivacy blocked requests count. return easyPrivacyBlockedRequests; - case FANBOYS_ANNOYANCE_LIST_BLOCKED_REQUESTS: + case FANBOYS_ANNOYANCE_LIST: // Return the Fanboy's Annoyance List blocked requests count. return fanboysAnnoyanceListBlockedRequests; - case FANBOYS_SOCIAL_BLOCKING_LIST_BLOCKED_REQUESTS: + case FANBOYS_SOCIAL_BLOCKING_LIST: // Return the Fanboy's Social Blocking List blocked requests count. return fanboysSocialBlockingListBlockedRequests; - case ULTRA_PRIVACY_BLOCKED_REQUESTS: + case ULTRA_PRIVACY: // Return the UltraPrivacy blocked requests count. return ultraPrivacyBlockedRequests; - case THIRD_PARTY_BLOCKED_REQUESTS: + case THIRD_PARTY_REQUESTS: // Return the Third Party blocked requests count. return thirdPartyBlockedRequests; @@ -237,6 +354,132 @@ public class NestedScrollWebView extends WebView implements NestedScrollingChild } } + + // Pinned SSL certificates. + public boolean hasPinnedSslCertificate() { + // Return the status of the pinned SSL certificate. + return hasPinnedSslCertificate; + } + + public void setPinnedSslCertificate(String issuedToCName, String issuedToOName, String issuedToUName, String issuedByCName, String issuedByOName, String issuedByUName, Date startDate, Date endDate) { + // Store the pinned SSL certificate information. + pinnedSslIssuedToCName = issuedToCName; + pinnedSslIssuedToOName = issuedToOName; + pinnedSslIssuedToUName = issuedToUName; + pinnedSslIssuedByCName = issuedByCName; + pinnedSslIssuedByOName = issuedByOName; + pinnedSslIssuedByUName = issuedByUName; + pinnedSslStartDate = startDate; + pinnedSslEndDate = endDate; + + // Set the pinned SSL certificate tracker. + hasPinnedSslCertificate = true; + } + + public ArrayList getPinnedSslCertificate() { + // Initialize an array list. + ArrayList arrayList = new ArrayList<>(); + + // Create the SSL certificate string array. + String[] sslCertificateStringArray = new String[] {pinnedSslIssuedToCName, pinnedSslIssuedToOName, pinnedSslIssuedToUName, pinnedSslIssuedByCName, pinnedSslIssuedByOName, pinnedSslIssuedByUName}; + + // Create the SSL certificate date array. + Date[] sslCertificateDateArray = new Date[] {pinnedSslStartDate, pinnedSslEndDate}; + + // Add the arrays to the array list. + arrayList.add(sslCertificateStringArray); + arrayList.add(sslCertificateDateArray); + + // Return the pinned SSL certificate array list. + return arrayList; + } + + public void clearPinnedSslCertificate() { + // Clear the pinned SSL certificate. + pinnedSslIssuedToCName = null; + pinnedSslIssuedToOName = null; + pinnedSslIssuedToUName = null; + pinnedSslIssuedByCName = null; + pinnedSslIssuedByOName = null; + pinnedSslIssuedByUName = null; + pinnedSslStartDate = null; + pinnedSslEndDate = null; + + // Clear the pinned SSL certificate tracker. + hasPinnedSslCertificate = false; + } + + + // Current IP addresses. + public boolean hasCurrentIpAddresses() { + // Return the status of the current IP addresses. + return hasCurrentIpAddresses; + } + + public void setCurrentIpAddresses(String ipAddresses) { + // Store the current IP addresses. + currentIpAddresses = ipAddresses; + + // Set the current IP addresses tracker. + hasCurrentIpAddresses = true; + } + + public String getCurrentIpAddresses() { + // Return the current IP addresses. + return currentIpAddresses; + } + + public void clearCurrentIpAddresses() { + // Clear the current IP addresses. + currentIpAddresses = null; + + // Clear the current IP addresses tracker. + hasCurrentIpAddresses = false; + } + + + // Pinned IP addresses. + public boolean hasPinnedIpAddresses() { + // Return the status of the pinned IP addresses. + return hasPinnedIpAddresses; + } + + public void setPinnedIpAddresses(String ipAddresses) { + // Store the pinned IP addresses. + pinnedIpAddresses = ipAddresses; + + // Set the pinned IP addresses tracker. + hasPinnedIpAddresses = true; + } + + public String getPinnedIpAddresses() { + // Return the pinned IP addresses. + return pinnedIpAddresses; + } + + public void clearPinnedIpAddresses() { + // Clear the pinned IP addresses. + pinnedIpAddresses = null; + + // Clear the pinned IP addresses tracker. + hasPinnedIpAddresses = false; + } + + + // Ignore pinned information. The syntax looks better as written, even if it is always inverted. + @SuppressWarnings("BooleanMethodIsAlwaysInverted") + public boolean ignorePinnedDomainInformation() { + // Return the status of the ignore pinned domain information tracker. + return ignorePinnedDomainInformation; + } + + public void setIgnorePinnedDomainInformation(boolean status) { + // Set the status of the ignore pinned domain information tracker. + ignorePinnedDomainInformation = status; + } + + + @Override public boolean onTouchEvent(MotionEvent motionEvent) { // Initialize a tracker to return if this motion event is handled.