Ensure the entire exception list is rebuilt when inserting new except…

…ion (#3118) Fixes #3103
MozillaReality · Apr 7, 2020 · c2fa4f7 · c2fa4f7
1 parent 633529f
commit c2fa4f7
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/browser/content/TrackingProtectionStore.java b/app/src/common/shared/org/mozilla/vrbrowser/browser/content/TrackingProtectionStore.java
@@ -105,18 +105,24 @@ public void onInserted(int position, int count) {
             return;
         }
 
-        final List<ContentBlockingException> exceptionsList = new ArrayList<>();
-        mContentBlockingController.clearExceptionList();
         for (int i=0; i<count; i++) {
             SitePermission permission = mSitePermissions.get(position + i);
             ContentBlockingException exception = toContentBlockingException(permission);
             if (exception != null) {
-                exceptionsList.add(exception);
                 mListeners.forEach(listener -> listener.onExcludedTrackingProtectionChange(
                         UrlUtils.getHost(exception.uri),
                         true));
             }
         }
+
+        final List<ContentBlockingException> exceptionsList = new ArrayList<>();
+        mContentBlockingController.clearExceptionList();
+        for (SitePermission permission: mSitePermissions) {
+            ContentBlockingException exception = toContentBlockingException(permission);
+            if (exception != null) {
+                exceptionsList.add(exception);
+            }
+        }
         mContentBlockingController.restoreExceptionList(exceptionsList);
     }