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=21ab2c64b19504f4169e4358b5bdebe73b0c7db2;hp=c7122cb8c83c4c34cad3ff4ff5a7a549cc2dc059;hb=81179d84ced6b43360d42a4b44eb8fb329532ff4;hpb=de4e15cd445f2659165676e524a99f3c0f42033c 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 c7122cb8..21ab2c64 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/views/NestedScrollWebView.java +++ b/app/src/main/java/com/stoutner/privacybrowser/views/NestedScrollWebView.java @@ -117,9 +117,6 @@ 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; @@ -129,6 +126,9 @@ public class NestedScrollWebView extends WebView implements NestedScrollingChild // 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; @@ -607,18 +607,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. @@ -674,6 +662,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.