November 2016 - tor-commits - lists.torproject.org

[torbirdy/develop] Also apply TorBirdy's account tweaks after autoconfiguraion.
by sukhbir＠torproject.org 25 Nov '16

25 Nov '16

commit 56c72de801a816a3f0e231a37a2dff5b7cf3bffb Author: anonym <anonym(a)riseup.net> Date: Wed Mar 9 18:53:34 2016 +0100 Also apply TorBirdy's account tweaks after autoconfiguraion. This fixes Tails bug #11204: https://labs.riseup.net/code/issues/11204 --- chrome/content/emailwizard.js | 70 +++++++++++++++++++++++++++---------------- 1 file changed, 44 insertions(+), 26 deletions(-) diff --git a/chrome/content/emailwizard.js b/chrome/content/emailwizard.js index f149446..baf1ef5 100644 --- a/chrome/content/emailwizard.js +++ b/chrome/content/emailwizard.js @@ -12,6 +12,36 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new function() { disableWizard = true; } + fixupTorbirdySettingsOnNewAccount = function(account) { + var idkey = account.defaultIdentity.key; + var serverkey = account.incomingServer.key; + var protocol = account.incomingServer.type; + + // Make sure that drafts are saved to Local Folders if it is an IMAP account. + if (protocol === "imap") { + var draftFolder = 'mail.identity.%idkey%.draft_folder'; + var draftFolderPref = draftFolder.replace("%idkey%", idkey); + prefs.setCharPref(draftFolderPref, "mailbox://nobody@Local%20Folders/Drafts"); + } + + // Set check_new_mail to false. We can't do this through the account setup, so let's do it here. + var checkNewMail = 'mail.server.%serverkey%.check_new_mail'; + var checkNewMailPref = checkNewMail.replace("%serverkey%", serverkey); + prefs.setBoolPref(checkNewMailPref, false); + + // Do not check for new messages at startup. + var loginAtStartup = 'mail.server.%serverkey%.login_at_startup'; + var loginAtStartupPref = loginAtStartup.replace("%serverkey%", serverkey); + prefs.setBoolPref(loginAtStartupPref, false); + + // Do not automatically download new messages. + if (protocol === "pop3") { + var downloadOnBiff = 'mail.server.%serverkey%.download_on_biff'; + var downloadOnBiffPref = downloadOnBiff.replace("%serverkey%", serverkey); + prefs.setBoolPref(downloadOnBiffPref, false); + } + } + pub.adjustAutoWizard = function() { if (!disableWizard) { var realname = document.getElementById("realname").value; @@ -66,31 +96,8 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new function() { replaceVariables(config, realname, email, password); config.rememberPassword = rememberPassword && !!password; - var newAccount = createAccountInBackend(config); - - // Set check_new_mail to false. We can't do this through the account setup, so let's do it here. - var checkNewMail = 'mail.server.%serverkey%.check_new_mail'; - var serverkey = newAccount.incomingServer.key; - var checkNewMailPref = checkNewMail.replace("%serverkey%", serverkey); - prefs.setBoolPref(checkNewMailPref, false); - - // Make sure that drafts are saved to Local Folders if it is an IMAP account. - if (protocol === "imap") { - var identity = newAccount.defaultIdentity; - identity.draftFolder = "mailbox://nobody@Local%20Folders/Drafts"; - } - - // Do not check for new messages at startup. - var loginAtStartup = 'mail.server.%serverkey%.login_at_startup'; - var loginAtStartupPref = loginAtStartup.replace("%serverkey%", serverkey); - prefs.setBoolPref(loginAtStartupPref, false); - - // Do not automatically download new messages. - if (protocol === "pop3") { - var downloadOnBiff = 'mail.server.%serverkey%.download_on_biff'; - var downloadOnBiffPref = downloadOnBiff.replace("%serverkey%", serverkey); - prefs.setBoolPref(downloadOnBiffPref, false); - } + var new_account = createAccountInBackend(config); + fixupTorbirdySettingsOnNewAccount(new_account); // From comm-release/mailnews/base/prefs/content/accountcreation/emailWizard.js : onAdvancedSetup(). var windowManager = Cc["@mozilla.org/appshell/window-mediator;1"] @@ -102,12 +109,23 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new function() { } else { window.openDialog("chrome://messenger/content/AccountManager.xul", "AccountManager", "chrome,centerscreen,modal,titlebar", - { server: newAccount.incomingServer, + { server: new_account.incomingServer, selectPage: "am-server.xul" }); } window.close(); } else { + // From comm-release/mailnews/base/prefs/content/accountcreation/emailWizard.js : finish(). + // We need somewhere to hook in, so we can access the new + // account object created through the autoconfig wizard, and + // apply Torbirdy's settings on it. + gEmailConfigWizard.finish = function() { + gEmailWizardLogger.info("creating account in backend"); + var account = createAccountInBackend(this.getConcreteConfig()); + fixupTorbirdySettingsOnNewAccount(account); + window.close(); + } + gEmailConfigWizard.onNext(); } };

1 0

[torbirdy/develop] Switch to Preferences.jsm.
by sukhbir＠torproject.org 25 Nov '16

25 Nov '16

commit c87a2a2b11dc62b4b9a11fe27b2dbc3fd8d163f5 Author: anonym <anonym(a)riseup.net> Date: Wed Mar 9 20:07:17 2016 +0100 Switch to Preferences.jsm. It's cleaner and simpler due to the type inference which we already use, so let's stick with one approach. Also the explicit default values make stuff clearer. --- chrome/content/emailwizard.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/chrome/content/emailwizard.js b/chrome/content/emailwizard.js index ec73113..3352fb9 100644 --- a/chrome/content/emailwizard.js +++ b/chrome/content/emailwizard.js @@ -6,11 +6,8 @@ if (!org.torbirdy) org.torbirdy = {}; if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new function() { var pub = {}; - var prefs = Cc["@mozilla.org/preferences-service;1"] - .getService(Ci.nsIPrefBranch); - var disableWizard = false; - if (prefs.getBoolPref("extensions.torbirdy.emailwizard")) { + if (Preferences.get("extensions.torbirdy.emailwizard", false)) { disableWizard = true; }

1 0

[torbirdy/develop] Add README.RELEASE instructions
by sukhbir＠torproject.org 25 Nov '16

25 Nov '16

commit 714252d242dc967204215063ec300fcf24886890 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Thu Oct 23 14:30:06 2014 +0000 Add README.RELEASE instructions --- Makefile | 2 +- README.RELEASE | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 414dff0..5b1fe94 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ SHELL := /bin/bash VERSION := $(shell cat install.rdf|grep '<em:version>'|cut -d\> -f2|cut -d\< -f1) make-xpi: - zip -r ../torbirdy-$(VERSION).xpi * -x "debian/*" -x "patches/*" -x "ChangeLog" -x "Makefile" -x "gpg.conf" -x "import-translations.sh" + zip -r ../torbirdy-$(VERSION).xpi * -x "debian/*" -x "patches/*" -x "ChangeLog" -x "Makefile" -x "gpg.conf" -x "import-translations.sh" -x "README.RELEASE" clean: rm -f ../torbirdy-$(VERSION).xpi diff --git a/README.RELEASE b/README.RELEASE new file mode 100644 index 0000000..f398409 --- /dev/null +++ b/README.RELEASE @@ -0,0 +1,20 @@ +To perform a release for TorBirdy: + + Perform substantial development effort or patch security issues + Review all changes with at least one other person + Update ChangeLog to refelect all changes and add a release date + Run `make` and test the resulting xpi + Confirm that there are no issues with normal use on The Big Three platforms + Confirm that the error console does not have any errors related to TorBirdy + Tag, sign and push the signatures to git: + Run `make git-tag` and sign a tag for this release + Run `make git-push` and push the tag upstream + Make detached signature for non-git users: + Run `make sign-release` and sign the .xpi file + Upload packages to the Tor Project webserver: + Run `push-release` and the packages are uploaded + Upload the package to Mozilla's AddOn site manually + Write a blog post anouncing the release on the Tor Project blog + Write an email anouncing the release to tor-talk + Announce the release widely in whatever format is reasonable or desired +

1 0

[torbirdy/develop] Simplify.
by sukhbir＠torproject.org 25 Nov '16

25 Nov '16

commit 63aba79747531845fd44fd96879c669b2921fab3 Author: anonym <anonym(a)riseup.net> Date: Wed Mar 9 14:00:41 2016 +0100 Simplify. The removed logic is already present in pub.adjustAutoWizard(). --- chrome/content/emailwizard.js | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/chrome/content/emailwizard.js b/chrome/content/emailwizard.js index e17bbd1..a82a188 100644 --- a/chrome/content/emailwizard.js +++ b/chrome/content/emailwizard.js @@ -116,12 +116,7 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new function() { var keycode = event.keyCode; if (keycode == 13) { if (document.getElementById("next_button").disabled === false) { - if (!disableWizard) { - pub.adjustAutoWizard(); - } - else { - gEmailConfigWizard.onNext(); - } + pub.adjustAutoWizard(); } } };

1 0

[torbirdy/develop] Fix name.
by sukhbir＠torproject.org 25 Nov '16

25 Nov '16

commit 9ea891ff0819ece07418cde374b97923a0dde2a1 Author: anonym <anonym(a)riseup.net> Date: Wed Mar 9 14:00:24 2016 +0100 Fix name. This method does not necessarily disable the wizard. --- chrome/content/emailwizard.js | 4 ++-- chrome/content/emailwizard.xul | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/chrome/content/emailwizard.js b/chrome/content/emailwizard.js index f3f1abd..e17bbd1 100644 --- a/chrome/content/emailwizard.js +++ b/chrome/content/emailwizard.js @@ -12,7 +12,7 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new function() { disableWizard = true; } - pub.disableAutoWizard = function() { + pub.adjustAutoWizard = function() { if (!disableWizard) { var realname = document.getElementById("realname").value; var email = document.getElementById("email").value; @@ -117,7 +117,7 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new function() { if (keycode == 13) { if (document.getElementById("next_button").disabled === false) { if (!disableWizard) { - pub.disableAutoWizard(); + pub.adjustAutoWizard(); } else { gEmailConfigWizard.onNext(); diff --git a/chrome/content/emailwizard.xul b/chrome/content/emailwizard.xul index 72fad2a..f3a9c60 100644 --- a/chrome/content/emailwizard.xul +++ b/chrome/content/emailwizard.xul @@ -9,7 +9,7 @@ </stringbundleset> <button id="next_button" - oncommand="org.torbirdy.emailwizard.disableAutoWizard();" /> + oncommand="org.torbirdy.emailwizard.adjustAutoWizard();" /> <vbox id="mastervbox" flex="1"> <groupbox id="torbirdy-protocol-box" class="indent" insertafter="initialSettings">

1 0

[torbirdy/develop] Merge pull request #26 from arthuredelstein/6314
by sukhbir＠torproject.org 25 Nov '16

25 Nov '16

commit bfa822de6071e894dad3d5c59e4fdf2ebacd91e2 Merge: 19cc1c7 7169642 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Thu Dec 10 22:00:00 2015 -0500 Merge pull request #26 from arthuredelstein/6314 Bug #6314: Round Date header down to nearest minute. components/torbirdy.js | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)

1 0

[torbirdy/develop] switch to new GnuPG key
by sukhbir＠torproject.org 25 Nov '16

25 Nov '16

commit afa1e7d019d5765458feba9a2d21bab55beb461a Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Thu Oct 23 14:16:26 2014 +0000 switch to new GnuPG key --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 078535c..414dff0 100644 --- a/Makefile +++ b/Makefile @@ -8,14 +8,14 @@ clean: rm -f ../torbirdy-$(VERSION).xpi git-tag: - git tag -u 0xD81D840E -s $(VERSION) + git tag -u 0xD255D3F5C868227F -s $(VERSION) git-push: git push --tags git push sign-release: - gpg -u 0xD81D840E -abs ../torbirdy-${VERSION}.xpi$ + gpg -u 0xD255D3F5C868227F -abs ../torbirdy-${VERSION}.xpi$ sha1sum ../torbirdy-${VERSION}.xpi$ push-release:

1 0

[torbirdy/develop] Update website push details
by sukhbir＠torproject.org 25 Nov '16

25 Nov '16

commit 1ec029f3f7e6b3892e3b6de9d5dde0af9f2d7b1d Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Thu Oct 23 14:55:13 2014 +0000 Update website push details --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 5b1fe94..96214b1 100644 --- a/Makefile +++ b/Makefile @@ -19,10 +19,10 @@ sign-release: sha1sum ../torbirdy-${VERSION}.xpi$ push-release: - chmod 664 ../torbirdy-${VERSION}.xpi*$ - scp ../torbirdy-${VERSION}.xpi* vescum.torproject.org:/srv/www-master.torproject.org/htdocs/dist/torbirdy/$ - scp ../torbirdy-${VERSION}.xpi vescum.torproject.org:/srv/www-master.torproject.org/htdocs/dist/torbirdy/t… - scp ../torbirdy-${VERSION}.xpi.asc vescum.torproject.org:/srv/www-master.torproject.org/htdocs/dist/torbirdy/t… - ssh vescum.torproject.org ~mirroradm/bin/trigger-mirrors + chmod 664 ../torbirdy-${VERSION}.xpi* + scp ../torbirdy-${VERSION}.xpi* staticiforme.torproject.org:/srv/dist-master.torproject.org/htdocs/torbirdy/ + scp ../torbirdy-${VERSION}.xpi staticiforme.torproject.org:/srv/dist-master.torproject.org/htdocs/torbirdy… + scp ../torbirdy-${VERSION}.xpi.asc staticiforme.torproject.org:/srv/dist-master.torproject.org/htdocs/torbirdy… + ssh staticiforme.torproject.org static-update-component dist.torproject.org release: sign-release push-release

1 0

[torbirdy/develop] Merge pull request #24 from u451f/patch+13721-default-locale
by sukhbir＠torproject.org 25 Nov '16

25 Nov '16

commit 19cc1c71b9ee44554f3ff5ac6006da1380bd3a95 Merge: 4cdded4 3d625f3 Author: Sukhbir Singh <s3singh(a)uwaterloo.ca> Date: Mon Sep 28 03:40:26 2015 -0400 Merge pull request #24 from u451f/patch+13721-default-locale As suggested by anonym on #13721, add en-US locale to chrome.manifest chrome.manifest | 1 + 1 file changed, 1 insertion(+)

1 0

[torbirdy/develop] Update the version number
by sukhbir＠torproject.org 25 Nov '16

25 Nov '16

commit 4cdded42ca5c6f900c893a8b3d27c50ce6854eac Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon Mar 9 16:31:58 2015 +0530 Update the version number --- install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.rdf b/install.rdf index d3108ab..3bad250 100644 --- a/install.rdf +++ b/install.rdf @@ -4,7 +4,7 @@ xmlns:em="http://www.mozilla.org/2004/em-rdf#"> <Description about="urn:mozilla:install-manifest"> <em:id>castironthunderbirdclub(a)torproject.org</em:id> - <em:version>0.1.3</em:version> + <em:version>0.1.4</em:version> <em:type>2</em:type> <em:iconURL>chrome://castironthunderbirdclub/skin/images/tor.png</em:iconURL>

1 0