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=c3f2fc51e2ee8e341b6cdf7667fffb877d71c186;hp=ddb1533bcd7cd59711a11dd42c74aacdd2491004;hb=0488649384ddea89d768c1fc1cc5fb71f8af6528;hpb=877ee4a6ba4d034bbd9843e037f6c70635c0a5b0 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 ddb1533b..c3f2fc51 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/views/NestedScrollWebView.java +++ b/app/src/main/java/com/stoutner/privacybrowser/views/NestedScrollWebView.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019 Soren Stoutner . + * Copyright © 2019-2020 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -46,12 +46,13 @@ import java.util.List; 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 = 1; - public final static int EASY_PRIVACY = 2; + public final static int EASYLIST = 1; + public final static int EASYPRIVACY = 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; + public final static int ULTRALIST = 5; + public final static int ULTRAPRIVACY = 6; + public final static int THIRD_PARTY_REQUESTS = 7; // Keep a copy of the WebView fragment ID. private long webViewFragmentId; @@ -64,21 +65,22 @@ public class NestedScrollWebView extends WebView implements NestedScrollingChild private boolean domainSettingsApplied; private int domainSettingsDatabaseId; + // Keep track of the current URL. This is used to not block resource requests to the main URL. + private String currentUrl; + // 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 status of first-party cookies. private boolean acceptFirstPartyCookies; - // Track the domain settings JavaScript status. This can be removed once night mode does not require JavaScript. - private boolean domainSettingsJavaScriptEnabled; - // Track the resource requests. private List resourceRequests = Collections.synchronizedList(new ArrayList<>()); // Using a synchronized list makes adding resource requests thread safe. private boolean easyListEnabled; private boolean easyPrivacyEnabled; private boolean fanboysAnnoyanceListEnabled; private boolean fanboysSocialBlockingListEnabled; + private boolean ultraListEnabled; private boolean ultraPrivacyEnabled; private boolean blockAllThirdPartyRequests; private int blockedRequests; @@ -86,6 +88,7 @@ public class NestedScrollWebView extends WebView implements NestedScrollingChild private int easyPrivacyBlockedRequests; private int fanboysAnnoyanceListBlockedRequests; private int fanboysSocialBlockingListBlockedRequests; + private int ultraListBlockedRequests; private int ultraPrivacyBlockedRequests; private int thirdPartyBlockedRequests; @@ -111,18 +114,15 @@ public class NestedScrollWebView extends WebView implements NestedScrollingChild // 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; - // Track navigation of history. - private boolean navigatingHistory; - // The default or favorite icon. private Bitmap favoriteOrDefaultIcon; - // Track night mode. - private boolean nightMode; - // Track swipe to refresh. private boolean swipeToRefresh; + // Track a URL waiting for a proxy. + private String waitingForProxyUrlString = ""; + // The nested scrolling child helper is used throughout the class. private NestedScrollingChildHelper nestedScrollingChildHelper; @@ -227,6 +227,18 @@ public class NestedScrollWebView extends WebView implements NestedScrollingChild } + // Current URL. + public void setCurrentUrl(String url) { + // Store the current URL. + currentUrl = url; + } + + public String getCurrentUrl() { + // Return the current URL. + return currentUrl; + } + + // 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. @@ -256,18 +268,6 @@ public class NestedScrollWebView extends WebView implements NestedScrollingChild } - // Domain settings JavaScript enabled. This can be removed once night mode does not require JavaScript. - public void setDomainSettingsJavaScriptEnabled(boolean status) { - // Store the domain settings JavaScript status. - domainSettingsJavaScriptEnabled = status; - } - - public boolean getDomainSettingsJavaScriptEnabled() { - // Return the domain settings JavaScript status. - return domainSettingsJavaScriptEnabled; - } - - // Resource requests. public void addResourceRequest(String[] resourceRequest) { // Add the resource request to the list. @@ -289,12 +289,12 @@ public class NestedScrollWebView extends WebView implements NestedScrollingChild public void enableBlocklist(int blocklist, boolean status) { // Update the status of the indicated blocklist. switch (blocklist) { - case EASY_LIST: + case EASYLIST: // Update the status of the blocklist. easyListEnabled = status; break; - case EASY_PRIVACY: + case EASYPRIVACY: // Update the status of the blocklist. easyPrivacyEnabled = status; break; @@ -309,7 +309,12 @@ public class NestedScrollWebView extends WebView implements NestedScrollingChild fanboysSocialBlockingListEnabled = status; break; - case ULTRA_PRIVACY: + case ULTRALIST: + // Update the status of the blocklist. + ultraListEnabled = status; + break; + + case ULTRAPRIVACY: // Update the status of the blocklist. ultraPrivacyEnabled = status; break; @@ -324,11 +329,11 @@ public class NestedScrollWebView extends WebView implements NestedScrollingChild public boolean isBlocklistEnabled(int blocklist) { // Get the status of the indicated blocklist. switch (blocklist) { - case EASY_LIST: + case EASYLIST: // Return the status of the blocklist. return easyListEnabled; - case EASY_PRIVACY: + case EASYPRIVACY: // Return the status of the blocklist. return easyPrivacyEnabled; @@ -340,7 +345,11 @@ public class NestedScrollWebView extends WebView implements NestedScrollingChild // Return the status of the blocklist. return fanboysSocialBlockingListEnabled; - case ULTRA_PRIVACY: + case ULTRALIST: + // Return the status of the blocklist. + return ultraListEnabled; + + case ULTRAPRIVACY: // Return the status of the blocklist. return ultraPrivacyEnabled; @@ -363,6 +372,7 @@ public class NestedScrollWebView extends WebView implements NestedScrollingChild easyPrivacyBlockedRequests = 0; fanboysAnnoyanceListBlockedRequests = 0; fanboysSocialBlockingListBlockedRequests = 0; + ultraListBlockedRequests = 0; ultraPrivacyBlockedRequests = 0; thirdPartyBlockedRequests = 0; } @@ -375,12 +385,12 @@ public class NestedScrollWebView extends WebView implements NestedScrollingChild blockedRequests++; break; - case EASY_LIST: + case EASYLIST: // Increment the EasyList blocked requests count. easyListBlockedRequests++; break; - case EASY_PRIVACY: + case EASYPRIVACY: // Increment the EasyPrivacy blocked requests count. easyPrivacyBlockedRequests++; break; @@ -395,7 +405,12 @@ public class NestedScrollWebView extends WebView implements NestedScrollingChild fanboysSocialBlockingListBlockedRequests++; break; - case ULTRA_PRIVACY: + case ULTRALIST: + // Increment the UltraList blocked requests count. + ultraListBlockedRequests++; + break; + + case ULTRAPRIVACY: // Increment the UltraPrivacy blocked requests count. ultraPrivacyBlockedRequests++; break; @@ -414,11 +429,11 @@ public class NestedScrollWebView extends WebView implements NestedScrollingChild // Return the blocked requests count. return blockedRequests; - case EASY_LIST: + case EASYLIST: // Return the EasyList blocked requests count. return easyListBlockedRequests; - case EASY_PRIVACY: + case EASYPRIVACY: // Return the EasyPrivacy blocked requests count. return easyPrivacyBlockedRequests; @@ -430,7 +445,11 @@ public class NestedScrollWebView extends WebView implements NestedScrollingChild // Return the Fanboy's Social Blocking List blocked requests count. return fanboysSocialBlockingListBlockedRequests; - case ULTRA_PRIVACY: + case ULTRALIST: + // Return the UltraList blocked requests count. + return ultraListBlockedRequests; + + case ULTRAPRIVACY: // Return the UltraPrivacy blocked requests count. return ultraPrivacyBlockedRequests; @@ -570,18 +589,6 @@ public class NestedScrollWebView extends WebView implements NestedScrollingChild } - // Navigating history. - public void setNavigatingHistory(boolean status) { - // Set the status of navigating history. - navigatingHistory = status; - } - - public boolean getNavigatingHistory() { - // Return the status of navigating history. - return navigatingHistory; - } - - // Favorite or default icon. public void initializeFavoriteIcon() { // Get the default favorite icon drawable. `ContextCompat` must be used until API >= 21. @@ -613,18 +620,6 @@ public class NestedScrollWebView extends WebView implements NestedScrollingChild } - // Night mode. - public void setNightMode(boolean status) { - // Store the night mode status. - nightMode = status; - } - - public boolean getNightMode() { - // Return the night mode status. - return nightMode; - } - - // Swipe to refresh. public void setSwipeToRefresh(boolean status) { // Store the swipe to refresh status. @@ -637,6 +632,22 @@ public class NestedScrollWebView extends WebView implements NestedScrollingChild } + // Waiting for proxy. + public void setWaitingForProxyUrlString(String urlString) { + // Store the waiting for proxy URL string. + waitingForProxyUrlString = urlString; + } + + public String getWaitingForProxyUrlString() { + // Return the waiting for proxy URL string. + return waitingForProxyUrlString; + } + + public void resetWaitingForProxyUrlString() { + // Clear the waiting for proxy URL string. + waitingForProxyUrlString = ""; + } + // Scroll range. public int getHorizontalScrollRange() { // Return the horizontal scroll range.