[tbb-commits] [torbutton/master] Bug 20244.4: Remove 'Change details that distinguish you...' checkbox

[gk at torproject.org]

commit ee88e783a98b22e743b943cc144cb6b79c70706e
Author: Arthur Edelstein <arthuredelstein at gmail.com>
Date:   Tue Oct 4 23:38:57 2016 +0000

    Bug 20244.4: Remove 'Change details that distinguish you...' checkbox
    
    Also, remove the 'extensions.torbutton.resist_fingerprinting' pref
    and just use the 'privacy.resistFingerprinting' pref instead. We will
    use this to implement a checkbox in the about:preferences#privacy page.
---
 src/chrome/content/preferences.js       | 2 --
 src/chrome/content/preferences.xul      | 3 ---
 src/chrome/content/torbutton.js         | 6 +++---
 src/defaults/preferences/preferences.js | 2 --
 4 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/chrome/content/preferences.js b/src/chrome/content/preferences.js
index b14309d..eb71019 100644
--- a/src/chrome/content/preferences.js
+++ b/src/chrome/content/preferences.js
@@ -13,7 +13,6 @@ function torbutton_prefs_init(doc) {
     var o_torprefs = torbutton_get_prefbranch('extensions.torbutton.');
 
     // Privacy and security settings
-    doc.getElementById('torbutton_resistFingerprinting').checked = o_torprefs.getBoolPref('resist_fingerprinting');
     let sec_slider = doc.getElementById('torbutton_sec_slider');
     let sec_custom = doc.getElementById('torbutton_sec_custom');
     let custom_values = o_torprefs.getBoolPref('security_custom');
@@ -44,7 +43,6 @@ function torbutton_prefs_save(doc) {
 
     // Privacy and Security Settings
 
-    o_torprefs.setBoolPref('resist_fingerprinting', doc.getElementById('torbutton_resistFingerprinting').checked);
     o_torprefs.setBoolPref('security_custom',
                            doc.getElementById('torbutton_sec_custom').checked);
     o_torprefs.setIntPref('security_slider',
diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul
index b54d799..3a54635 100644
--- a/src/chrome/content/preferences.xul
+++ b/src/chrome/content/preferences.xul
@@ -23,9 +23,6 @@
         <groupbox>
           <caption label="&torbutton.prefs.priv_caption;"
                    tooltiptext="&torbutton.prefs.priv_caption_tooltip;"/>
-          <checkbox id="torbutton_resistFingerprinting"
-                    label="&torbutton.prefs.resist_fingerprinting;"
-                    tooltiptext="&torbutton.prefs.resist_fingerprinting_tooltip;"/>
         </groupbox>
         <groupbox align="stretch" flex="1"> <!-- security settings container -->
           <caption label="&torbutton.prefs.sec_caption;"/>
diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js
index d768a9f..0f1046a 100644
--- a/src/chrome/content/torbutton.js
+++ b/src/chrome/content/torbutton.js
@@ -97,6 +97,7 @@ var torbutton_unique_pref_observer =
         this._branch.addObserver("svg", this, false);
         this._branch.addObserver("plugin.disable", this, false);
         this._branch.addObserver("privacy.thirdparty.isolate", this, false);
+        this._branch.addObserver("privacy.resistFingerprinting", this, false);
 
         // We observe xpcom-category-entry-added for plugins w/ Gecko-Content-Viewers
         var observerService = Cc["@mozilla.org/observer-service;1"].
@@ -174,7 +175,7 @@ var torbutton_unique_pref_observer =
             case "extensions.torbutton.use_nontor_proxy":
                 torbutton_use_nontor_proxy();
                 break;
-            case "extensions.torbutton.resist_fingerprinting":
+            case "privacy.resistFingerprinting":
             case "extensions.torbutton.spoof_english":
                 torbutton_update_fingerprinting_prefs();
                 break;
@@ -1756,7 +1757,7 @@ function torbutton_update_disk_prefs() {
 }
 
 function torbutton_update_fingerprinting_prefs() {
-    var mode = m_tb_prefs.getBoolPref("extensions.torbutton.resist_fingerprinting");
+    var mode = m_tb_prefs.getBoolPref("privacy.resistFingerprinting");
 
     if (m_tb_tbb) {
       if (mode) {
@@ -1791,7 +1792,6 @@ function torbutton_update_fingerprinting_prefs() {
     m_tb_prefs.setBoolPref("dom.enable_performance", !mode);
     m_tb_prefs.setBoolPref("plugin.expose_full_path", !mode);
     m_tb_prefs.setBoolPref("browser.zoom.siteSpecific", !mode);
-    m_tb_prefs.setBoolPref("privacy.resistFingerprinting", mode);
 
     m_tb_prefs.setBoolPref("extensions.torbutton.resize_new_windows", mode);
 
diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js
index b9a6584..3284bde 100644
--- a/src/defaults/preferences/preferences.js
+++ b/src/defaults/preferences/preferences.js
@@ -44,8 +44,6 @@ pref("extensions.torbutton.launch_warning",true);
 // https://developer.mozilla.org/en/Addons/Working_with_AMO
 pref("extensions.torbutton at torproject.org.getAddons.cache.enabled", false);
 
-pref("extensions.torbutton.resist_fingerprinting", true);
-
 // Security Slider
 pref("extensions.torbutton.security_slider", 4);
 pref("extensions.torbutton.security_custom", false);