Fixes #2424 Enhanced Tracking Protection (#3037)

* Enhanced Tracking Protection * Updated naming to Enhanced Tracking protection and Standard
MozillaReality · Mar 26, 2020 · 97b2c5e · 97b2c5e
1 parent 2544753
commit 97b2c5e
Show file tree

Hide file tree

Showing 44 changed files with 1,142 additions and 297 deletions.
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/VRBrowserActivity.java b/app/src/common/shared/org/mozilla/vrbrowser/VRBrowserActivity.java
@@ -279,6 +279,7 @@ protected void onCreate(Bundle savedInstanceState) {
         mAudioUpdateRunnable = () -> mAudioEngine.update();
 
         mSettings = SettingsStore.getInstance(this);
+        mSettings.initModel(this);
 
         queueRunnable(() -> {
             createOffscreenDisplay();
@@ -486,7 +487,6 @@ protected void onDestroy() {
 
         SessionStore.get().onDestroy();
 
-
         super.onDestroy();
         mLifeCycle.setCurrentState(Lifecycle.State.DESTROYED);
         mViewModelStore.clear();

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/VRBrowserApplication.java b/app/src/common/shared/org/mozilla/vrbrowser/VRBrowserApplication.java
@@ -34,7 +34,6 @@ public void onCreate() {
         mAppExecutors = new AppExecutors();
         mBitmapCache = new BitmapCache(this, mAppExecutors.diskIO(), mAppExecutors.mainThread());
 
-
         TelemetryWrapper.init(this);
         GleanMetricsService.init(this);
     }

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/browser/PermissionDelegate.java b/app/src/common/shared/org/mozilla/vrbrowser/browser/PermissionDelegate.java
@@ -287,7 +287,7 @@ public void setPermissionAllowed(String uri, @SitePermission.Category int catego
             mSitePermissionModel.deleteSite(site);
         } else {
             if (site == null) {
-                site = new SitePermission(uri, false, category);
+                site = new SitePermission(uri, uri, false, category);
                 mSitePermissions.add(site);
             }
             site.allowed = false;

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/browser/PromptDelegate.java b/app/src/common/shared/org/mozilla/vrbrowser/browser/PromptDelegate.java
@@ -357,7 +357,7 @@ private void showPopUp(int sessionId, @NonNull Pair<String, LinkedList<PopUpRequ
                 boolean allowed = index != PopUpBlockDialogWidget.NEGATIVE;
                 boolean askAgain = mPopUpPrompt.askAgain();
                 if (allowed && !askAgain) {
-                    SitePermission permission = new SitePermission(uri, allowed, SitePermission.SITE_PERMISSION_POPUP);
+                    SitePermission permission = new SitePermission(uri, uri, allowed, SitePermission.SITE_PERMISSION_POPUP);
                     mAllowedPopUpSites.add(permission);
                     mViewModel.insertSite(permission);
                 }

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/browser/SettingsStore.java b/app/src/common/shared/org/mozilla/vrbrowser/browser/SettingsStore.java
@@ -8,14 +8,19 @@
 import android.util.Log;
 
 import androidx.annotation.NonNull;
+import androidx.lifecycle.ViewModelProvider;
 
 import org.json.JSONArray;
 import org.json.JSONObject;
+import org.mozilla.geckoview.ContentBlocking;
 import org.mozilla.geckoview.GeckoSessionSettings;
 import org.mozilla.telemetry.TelemetryHolder;
 import org.mozilla.vrbrowser.R;
+import org.mozilla.vrbrowser.VRBrowserActivity;
+import org.mozilla.vrbrowser.VRBrowserApplication;
 import org.mozilla.vrbrowser.telemetry.GleanMetricsService;
 import org.mozilla.vrbrowser.telemetry.TelemetryWrapper;
+import org.mozilla.vrbrowser.ui.viewmodel.SettingsViewModel;
 import org.mozilla.vrbrowser.utils.DeviceType;
 import org.mozilla.vrbrowser.utils.StringUtils;
 import org.mozilla.vrbrowser.utils.SystemUtils;
@@ -44,6 +49,7 @@ SettingsStore getInstance(final @NonNull Context aContext) {
 
     private Context mContext;
     private SharedPreferences mPrefs;
+    private SettingsViewModel mSettingsViewModel;
 
     // Developer options default values
     public final static boolean REMOTE_DEBUGGING_DEFAULT = false;
@@ -53,7 +59,7 @@ SettingsStore getInstance(final @NonNull Context aContext) {
     public final static boolean UI_HARDWARE_ACCELERATION_DEFAULT_WAVEVR = false;
     public final static boolean PERFORMANCE_MONITOR_DEFAULT = true;
     public final static boolean DRM_PLAYBACK_DEFAULT = false;
-    public final static boolean TRACKING_DEFAULT = true;
+    public final static int TRACKING_DEFAULT = ContentBlocking.EtpLevel.DEFAULT;
     public final static boolean NOTIFICATIONS_DEFAULT = true;
     public final static boolean SPEECH_DATA_COLLECTION_DEFAULT = false;
     public final static boolean SPEECH_DATA_COLLECTION_REVIEWED_DEFAULT = false;
@@ -97,6 +103,14 @@ public SettingsStore(Context aContext) {
         mPrefs = PreferenceManager.getDefaultSharedPreferences(aContext);
     }
 
+    public void initModel(@NonNull Context context) {
+        mSettingsViewModel = new ViewModelProvider(
+                (VRBrowserActivity)context,
+                ViewModelProvider.AndroidViewModelFactory.getInstance(((VRBrowserActivity) context).getApplication()))
+                .get(SettingsViewModel.class);
+        mSettingsViewModel.refresh();
+    }
+
     public boolean isCrashReportingEnabled() {
         return mPrefs.getBoolean(mContext.getString(R.string.settings_key_crash), CRASH_REPORTING_DEFAULT);
     }
@@ -206,15 +220,17 @@ public void setDrmContentPlaybackEnabled(boolean isEnabled) {
         editor.commit();
     }
 
-    public boolean isTrackingProtectionEnabled() {
-        return mPrefs.getBoolean(
-                mContext.getString(R.string.settings_key_tracking_protection), TRACKING_DEFAULT);
+    public int getTrackingProtectionLevel() {
+        return mPrefs.getInt(
+                mContext.getString(R.string.settings_key_tracking_protection_level), TRACKING_DEFAULT);
     }
 
-    public void setTrackingProtectionEnabled(boolean isEnabled) {
+    public void setTrackingProtectionLevel(int level) {
         SharedPreferences.Editor editor = mPrefs.edit();
-        editor.putBoolean(mContext.getString(R.string.settings_key_tracking_protection), isEnabled);
+        editor.putInt(mContext.getString(R.string.settings_key_tracking_protection_level), level);
         editor.commit();
+
+        mSettingsViewModel.setIsTrackingProtectionEnabled(level != ContentBlocking.EtpLevel.NONE);
     }
 
     public boolean isEnvironmentOverrideEnabled() {

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/browser/content/TrackingProtectionPolicy.java b/app/src/common/shared/org/mozilla/vrbrowser/browser/content/TrackingProtectionPolicy.java
@@ -0,0 +1,68 @@
+package org.mozilla.vrbrowser.browser.content;
+
+import org.mozilla.geckoview.ContentBlocking;
+import org.mozilla.geckoview.ContentBlocking.AntiTracking;
+
+public class TrackingProtectionPolicy {
+
+    private static final int RECOMMENDED =
+            AntiTracking.AD |
+            AntiTracking.ANALYTIC |
+            AntiTracking.SOCIAL |
+            AntiTracking.TEST |
+            AntiTracking.STP |
+            AntiTracking.CRYPTOMINING;
+    private static final int STRICT =
+            RECOMMENDED | AntiTracking.FINGERPRINTING;
+
+    private int trackingPolicy;
+    private int cookiePolicy;
+
+    private TrackingProtectionPolicy() {
+        trackingPolicy = AntiTracking.NONE;
+    }
+
+    /**
+     * Strict policy.
+     * Combining the [TrackingCategory.STRICT] plus a cookiePolicy of [ACCEPT_NON_TRACKERS]
+     * This is the strictest setting and may cause issues on some web sites.
+     */
+    static TrackingProtectionPolicy strict() {
+        TrackingProtectionPolicy policy = new TrackingProtectionPolicy();
+        policy.trackingPolicy = STRICT;
+        policy.cookiePolicy = ContentBlocking.CookieBehavior.ACCEPT_NON_TRACKERS;
+        return policy;
+    }
+
+    /**
+     * Recommended policy.
+     * Combining the [TrackingCategory.RECOMMENDED] plus a [CookiePolicy] of [ACCEPT_NON_TRACKERS].
+     * This is the recommended setting.
+     */
+    static TrackingProtectionPolicy recommended() {
+        TrackingProtectionPolicy policy = new TrackingProtectionPolicy();
+        policy.trackingPolicy = RECOMMENDED;
+        policy.cookiePolicy = ContentBlocking.CookieBehavior.ACCEPT_NON_TRACKERS;
+        return policy;
+    }
+
+    static TrackingProtectionPolicy none() {
+        TrackingProtectionPolicy policy = new TrackingProtectionPolicy();
+        policy.trackingPolicy = AntiTracking.NONE;
+        policy.cookiePolicy = ContentBlocking.CookieBehavior.ACCEPT_ALL;
+        return policy;
+    }
+
+    public boolean shouldBlockContent() {
+        return trackingPolicy == STRICT;
+    }
+
+    public int getCookiePolicy() {
+        return cookiePolicy;
+    }
+
+    public int getAntiTrackingPolicy() {
+        return trackingPolicy;
+    }
+
+}