[tor-commits] [torbirdy/master] Disable `--throw-keyids' by default

[sukhbir at torproject.org]

commit bdbcdac4c0415d5ea4e00bdb08be407b5ec1300f
Author: Sukhbir Singh <sukhbir at torproject.org>
Date:   Mon Sep 2 18:10:14 2013 -0400

    Disable `--throw-keyids' by default
---
 ChangeLog                     |    1 +
 chrome/content/preferences.js |   12 ++++++------
 chrome/locale/en/torbirdy.dtd |    2 +-
 components/torbirdy.js        |    2 --
 defaults/preferences/prefs.js |    2 +-
 5 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3dcb27b..56b0c7a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
     restore default TorBirdy settings
     toggle checking of new messages automatically for all accounts
   The minimum version of Thunderbird we now support is 10.0
+  `--throw-keyids' is now disabled by default
   Add Persian translation (thanks to Nima)
   Add Czech translation (thanks to dope)
   Add Esperanto translation (thanks to Michael Moroni)
diff --git a/chrome/content/preferences.js b/chrome/content/preferences.js
index a59c7ef..9fbf378 100644
--- a/chrome/content/preferences.js
+++ b/chrome/content/preferences.js
@@ -374,12 +374,12 @@ if (!org.torbirdy.prefs) org.torbirdy.prefs = new function() {
     }
 
     // Enigmail.
-    // --throw-keyids - default: true
+    // --throw-keyids - default: false
     if (pub.enigmail.checked) {
-      pub.prefs.setBoolPref(pub.prefBranch + 'enigmail.throwkeyid', false);
+      pub.prefs.setBoolPref(pub.prefBranch + 'enigmail.throwkeyid', true);
     }
     else {
-      pub.prefs.setBoolPref(pub.prefBranch + 'enigmail.throwkeyid', true);
+      pub.prefs.setBoolPref(pub.prefBranch + 'enigmail.throwkeyid', false);
     }
 
     // Confirm before sending - default: false
@@ -544,11 +544,11 @@ if (!org.torbirdy.prefs) org.torbirdy.prefs = new function() {
     }
 
     // Enigmal settings
-    // --throw-keyids - default: true
+    // --throw-keyids - default: false
     if (pub.prefs.getBoolPref(pub.prefBranch + 'enigmail.throwkeyid')) {
-      pub.enigmail.checked = false;
-    } else {
       pub.enigmail.checked = true;
+    } else {
+      pub.enigmail.checked = false;
     }
 
     // Confirm before sending - default: false
diff --git a/chrome/locale/en/torbirdy.dtd b/chrome/locale/en/torbirdy.dtd
index 2d8d268..6fefe12 100644
--- a/chrome/locale/en/torbirdy.dtd
+++ b/chrome/locale/en/torbirdy.dtd
@@ -39,7 +39,7 @@
 <!ENTITY torbirdy.prefs.startup_folder.key "l">
 <!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
 <!ENTITY torbirdy.prefs.timezone.key "z">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Put the recipient key IDs into encrypted messages [default: do not put]">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
 <!ENTITY torbirdy.prefs.confirmemail.key "c">
diff --git a/components/torbirdy.js b/components/torbirdy.js
index c1da834..bff74d1 100644
--- a/components/torbirdy.js
+++ b/components/torbirdy.js
@@ -202,8 +202,6 @@ const TorBirdyPrefs = {
                                               "--no-emit-version " +
                                               // Don't add additional comments (may leak language, etc)
                                               "--no-comments " +
-                                              // Don't include keyids that may disclose the sender or any other non-obvious keyids
-                                              "--throw-keyids " +
                                               // We want to force UTF-8 everywhere
                                               "--display-charset utf-8 " +
                                               // We want to ensure that Enigmail is proxy aware even when it runs gpg in a shell
diff --git a/defaults/preferences/prefs.js b/defaults/preferences/prefs.js
index e736745..eec4539 100644
--- a/defaults/preferences/prefs.js
+++ b/defaults/preferences/prefs.js
@@ -3,7 +3,7 @@ pref("extensions.torbirdy.proxy", 0);
 pref("extensions.torbirdy.first_run", true);
 pref("extensions.torbirdy.warn", true);
 pref("extensions.torbirdy.startup_folder", false);
-pref("extensions.torbirdy.enigmail.throwkeyid", true);
+pref("extensions.torbirdy.enigmail.throwkeyid", false);
 pref("extensions.torbirdy.enigmail.confirmemail", false);
 pref("extensions.torbirdy.timezone", true);
 pref("extensions.torbirdy.whonix_run", true);