Force tracking protection for Private Sessions (#3090)

* Hide ETP button in PB and force tracking protection for Private Sessions

* Show ETP in private mode except PB page. Padding fixes

* Use reload instead of recreateSession when adding/removing exceptions

* Remove extra tracking exclusion notifications

Update tracking protection on location change instead of url change
Rebase fixes

Co-authored-by: Randall E. Barker <[email protected]>

Author: keianhzo

app/src/common/shared/org/mozilla/vrbrowser/browser/content/TrackingProtectionStore.java

@@ -226,18 +226,26 @@ public void fetchAll(Function<List<SitePermission>, Void> onResult) {
 
     public void add(@NonNull Session session) {
         mContentBlockingController.addException(session.getGeckoSession());
-        mListeners.forEach(listener -> listener.onExcludedTrackingProtectionChange(
-                UrlUtils.getHost(session.getCurrentUri()),
-                true));
-        persist();
+        // Private sessions don't persist to the content blocking controller exceptions list so we just notify
+        if (session.isPrivateMode()) {
+            mListeners.forEach(listener -> listener.onExcludedTrackingProtectionChange(
+                    UrlUtils.getHost(session.getCurrentUri()),
+                    true));
+        } else {
+            persist();
+        }
     }
 
     public void remove(@NonNull Session session) {
         mContentBlockingController.removeException(session.getGeckoSession());
-        mListeners.forEach(listener -> listener.onExcludedTrackingProtectionChange(
-                UrlUtils.getHost(session.getCurrentUri()),
-                false));
-        persist();
+        // Private sessions don't persist to the content blocking controller exceptions list so we just notify
+        if (session.isPrivateMode()) {
+            mListeners.forEach(listener -> listener.onExcludedTrackingProtectionChange(
+                    UrlUtils.getHost(session.getCurrentUri()),
+                    true));
+        } else {
+            persist();
+        }
     }
 
     public void remove(@NonNull SitePermission permission) {

app/src/common/shared/org/mozilla/vrbrowser/browser/engine/Session.java

@@ -522,7 +522,7 @@ public void recreateSession() {
         mState = mState.recreate();
 
         TrackingProtectionPolicy policy = TrackingProtectionStore.getTrackingProtectionPolicy(mContext);
-        mState.mSettings.setTrackingProtectionEnabled(policy.shouldBlockContent());
+        mState.mSettings.setTrackingProtectionEnabled(mState.mSettings.isPrivateBrowsingEnabled() || policy.shouldBlockContent());
 
         restore();
 

app/src/common/shared/org/mozilla/vrbrowser/browser/engine/SessionSettings.java

@@ -89,11 +89,13 @@ public Builder() {
 
         public Builder withPrivateBrowsing(boolean enabled) {
             isPrivateBrowsingEnabled = enabled;
+            isTrackingProtectionEnabled = isPrivateBrowsingEnabled || isTrackingProtectionEnabled;
+
             return this;
         }
 
         public Builder withTrackingProtection(boolean isTrackingProtectionEnabled){
-            this.isTrackingProtectionEnabled = isTrackingProtectionEnabled;
+            this.isTrackingProtectionEnabled = isPrivateBrowsingEnabled || isTrackingProtectionEnabled;
             return this;
         }
 

app/src/common/shared/org/mozilla/vrbrowser/browser/engine/SessionStore.java

@@ -70,7 +70,7 @@ public void onExcludedTrackingProtectionChange(@NonNull String host, boolean exc
                 mSessions.forEach(existingSession -> {
                     String existingHost = UrlUtils.getHost(existingSession.getCurrentUri());
                     if (existingHost.equals(host)) {
-                        existingSession.recreateSession();
+                        existingSession.reload(GeckoSession.LOAD_FLAGS_BYPASS_CACHE);
                     }
                 });
             }

app/src/common/shared/org/mozilla/vrbrowser/ui/viewmodel/WindowViewModel.java

@@ -317,6 +317,7 @@ public void onChanged(Spannable aUrl) {
                             !isLibraryVisible.getValue().get() &&
                             !UrlUtils.isContentFeed(getApplication(), aUrl.toString()) &&
                             !UrlUtils.isFileUri(aUrl.toString()) &&
+                            !UrlUtils.isPrivateAboutPage(getApplication(), aUrl.toString()) &&
                             (
                                     (SettingsStore.getInstance(getApplication()).getTrackingProtectionLevel() != ContentBlocking.EtpLevel.NONE) ||
                                     isPopUpAvailable.getValue().get() ||

app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/NavigationBarWidget.java

@@ -491,7 +491,6 @@ public void detachFromWindow() {
             mViewModel.getIsFullscreen().removeObserver(mIsFullscreenObserver);
             mViewModel.getIsActiveWindow().removeObserver(mIsActiveWindowObserver);
             mViewModel.getIsPopUpBlocked().removeObserver(mIsPopUpBlockedListener);
-            mViewModel.getUrl().removeObserver(mUrlObserver);
             mViewModel = null;
         }
 
@@ -518,7 +517,6 @@ public void attachToWindow(@NonNull WindowWidget aWindow) {
         mViewModel.getIsFullscreen().observeForever( mIsFullscreenObserver);
         mViewModel.getIsActiveWindow().observeForever(mIsActiveWindowObserver);
         mViewModel.getIsPopUpBlocked().observeForever(mIsPopUpBlockedListener);
-        mViewModel.getUrl().observeForever(mUrlObserver);
         mBinding.navigationBarNavigation.urlBar.attachToWindow(mAttachedWindow);
 
         mTrackingDelegate.addListener(mTrackingListener);
@@ -803,6 +801,15 @@ private void closeFloatingMenus() {
         }
     }
 
+    // NavigationDelegate
+
+    @Override
+    public void onLocationChange(@NonNull GeckoSession geckoSession, @Nullable String s) {
+        if (getSession() != null && getSession().getGeckoSession() == geckoSession) {
+            updateTrackingProtection();
+        }
+    }
+
     // Content delegate
 
     private Observer<ObservableBoolean> mIsFullscreenObserver = isFullScreen -> {
@@ -835,8 +842,6 @@ private void closeFloatingMenus() {
         }
     };
 
-    private Observer<Spannable> mUrlObserver = sitePermissions -> updateTrackingProtection();
-
     private Observer<ObservableBoolean> mIsActiveWindowObserver = aIsActiveWindow -> updateTrackingProtection();
 
     private Observer<ObservableBoolean> mIsPopUpBlockedListener = observableBoolean -> {

app/src/main/res/layout/navigation_url.xml

@@ -53,7 +53,7 @@
                     android:src="@{viewmodel.isTrackingEnabled ? @drawable/ic_icon_tracking_enabled : @drawable/ic_icon_tracking_disabled}"
                     app:privateMode="@{viewmodel.isPrivateSession}"
                     android:tint="@color/fog"
-                    app:visibleGone="@{settingsViewmodel.isTrackingProtectionEnabled}"
+                    app:visibleGone="@{!UrlUtils.isPrivateAboutPage(context, viewmodel.url.toString()) && settingsViewmodel.isTrackingProtectionEnabled && !UrlUtils.isContentFeed(context, viewmodel.url.toString())}"
                     android:tooltipText="@{viewmodel.isTrackingEnabled ? @string/tracking_allowed_tooltip : @string/tracking_disabled_tooltip}" />
 
                 <LinearLayout