From a4998aefd3e752006b59b6d0689796283df629eb Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Mon, 23 Dec 2013 16:48:01 -0400 Subject: add logo to install.rdf also: * Fix minimum version to include -rcs * Add contributors list * Spelling OCD Fixes. --- install.rdf.template | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/install.rdf.template b/install.rdf.template index e447a3e..88ecbfc 100644 --- a/install.rdf.template +++ b/install.rdf.template @@ -25,37 +25,39 @@ along with this program. If not, see . bitmask-thunderbird@leap.se Bitmask Thunderbird Extension __VERSION__ + 2 + Automatic configuration for Bitmask Encrypted Mail accounts. + LEAP developers - 2 + Andre Jucovsky Bianchi + + https://github.com/leapcode/thunderbird_extension/ + chrome://bitmask/content/logo-small.png {3550f703-e582-4d05-9a08-453d09bdfdc6} - 24.0 + 23.999 24.* - en-US Bitmask - Configure Bitmask encrypted mail accounts. + Configure Bitmask Encrypted Mail accounts. The LEAP Encryption Access Project - + es-ES Bitmask - Configura cuentas Bitmask de correo cifrado. + Configura cuentas Bitmask de Correo Cifrado. El projecto LEAP, Encryption Access Project - - + -- cgit v1.2.3 From b5945ca733c218da29b04bbe88c0f5b33ff385de Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Fri, 3 Jan 2014 14:53:50 -0400 Subject: add properties files to xpi files This is a merge from the Makefile in the debian branch. bitmask.xpi rule is the one expected/used by the debhelper. I think it was not correctly included or merged in a past pullreq. --- Makefile | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Makefile b/Makefile index d331e5b..ac87837 100755 --- a/Makefile +++ b/Makefile @@ -33,6 +33,13 @@ endif endif endif +XPI_CONTENTS:=$(shell find chrome -name "*.html" -o -name "*.xhtml" -o -name "*.css" -o -name "*.png" -o -name "*.gif" -o -name "*.js" -o -name "*.jsm" -o -name "*.dtd" -o -name "*.xul" -o -name "messages" -o -name "*.properties") chrome.manifest install.rdf COPYING + +bitmask.xpi: $(XPI_CONTENTS) + zip $@ $(XPI_CONTENTS) + +xpi_release: + ln -s $(XPINAME) $(PKGNAME) # main rule all: clean $(TARGET) -- cgit v1.2.3 From 9f5d0fbc6fd01ec610ba5353e9e99c4419685b45 Mon Sep 17 00:00:00 2001 From: drebs Date: Mon, 6 Jan 2014 14:56:15 -0200 Subject: Small fixes in install.rdf template structure. --- install.rdf.template | 36 ++++++++++++++++-------------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/install.rdf.template b/install.rdf.template index 88ecbfc..c64bb44 100644 --- a/install.rdf.template +++ b/install.rdf.template @@ -26,14 +26,12 @@ along with this program. If not, see . Bitmask Thunderbird Extension __VERSION__ 2 - Automatic configuration for Bitmask Encrypted Mail accounts. - + Automatic configuration for Bitmask Encrypted Mail accounts. LEAP developers - Andre Jucovsky Bianchi - + Andre Jucovsky Bianchi https://github.com/leapcode/thunderbird_extension/ chrome://bitmask/content/logo-small.png - + {3550f703-e582-4d05-9a08-453d09bdfdc6} @@ -41,23 +39,21 @@ along with this program. If not, see . 24.* - - - en-US + + + en-US Bitmask - Configure Bitmask Encrypted Mail accounts. - + Configure Bitmask Encrypted Mail accounts. The LEAP Encryption Access Project - - - - - es-ES + + + + + es-ES Bitmask - Configura cuentas Bitmask de Correo Cifrado. - + Configura cuentas Bitmask de Correo Cifrado. El projecto LEAP, Encryption Access Project - - - + + + -- cgit v1.2.3 From 80f0f5728edb2d0cff7934c994e795316b526f6f Mon Sep 17 00:00:00 2001 From: drebs Date: Wed, 12 Mar 2014 10:15:09 -0300 Subject: Fix error string on new account setup (#5193). --- chrome/content/accountWizard/accountWizard.js | 12 ++++++------ chrome/content/accountWizard/accountWizard.xul | 2 +- chrome/locale/en-US/accountWizard.properties | 3 +++ 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/chrome/content/accountWizard/accountWizard.js b/chrome/content/accountWizard/accountWizard.js index 35dae00..c3f8887 100644 --- a/chrome/content/accountWizard/accountWizard.js +++ b/chrome/content/accountWizard/accountWizard.js @@ -405,14 +405,14 @@ BitmaskAccountWizard.prototype = { e("status_area").setAttribute("status", "loading"); gEmailWizardLogger.warn("spinner start " + actionStrName); - this._showStatusTitle(actionStrName); + this._showStatusTitle(actionStrName, gStringsBundle); }, stopSpinner : function(actionStrName) { e("status_area").setAttribute("status", "result"); _hide("stop_button"); - this._showStatusTitle(actionStrName); + this._showStatusTitle(actionStrName, gStringsBundle); gEmailWizardLogger.warn("all spinner stop " + actionStrName); }, @@ -420,15 +420,15 @@ BitmaskAccountWizard.prototype = { e("status_area").setAttribute("status", "error"); gEmailWizardLogger.warn("status error " + actionStrName); - this._showStatusTitle(actionStrName); + this._showStatusTitle(actionStrName, gAccountWizardStringsBundle); }, - _showStatusTitle : function(msgName) + _showStatusTitle : function(msgName, bundle) { let msg = " "; // assure height. Do via min-height in CSS, for 2 lines? try { if (msgName) { - msg = gStringsBundle.getFormattedString(msgName, [gBrandShortName]); + msg = bundle.getFormattedString(msgName, [gBrandShortName]); } } catch(ex) { gEmailWizardLogger.error("missing string for " + msgName); @@ -687,7 +687,7 @@ BitmaskAccountWizard.prototype = self.showErrorStatus("config_unverifiable"); // TODO bug 555448: wrong error msg, there may be a 1000 other // reasons why this failed, and this is misleading users. - self.setError("passworderror", "user_pass_invalid"); + //self.setError("passworderror", "user_pass_invalid"); // TODO use switchToMode(), see above // give user something to proceed after fixing _enable("create_button"); diff --git a/chrome/content/accountWizard/accountWizard.xul b/chrome/content/accountWizard/accountWizard.xul index 1587c50..12b4d17 100644 --- a/chrome/content/accountWizard/accountWizard.xul +++ b/chrome/content/accountWizard/accountWizard.xul @@ -145,7 +145,7 @@ -   +   diff --git a/chrome/locale/en-US/accountWizard.properties b/chrome/locale/en-US/accountWizard.properties index f91fc70..3a12f78 100644 --- a/chrome/locale/en-US/accountWizard.properties +++ b/chrome/locale/en-US/accountWizard.properties @@ -1,4 +1,7 @@ # verifyConfig.js cannot_login.error=Unable to log in at server. Probably wrong configuration, username or password. + +# accountWizard.js resultIncoming=%1$S, %2$S resultOutgoing=%1$S, %2$S +config_unverifiable=Configuration could not be verified - are you logged into\nBitmask with the correct username? -- cgit v1.2.3 From 10df7fe9c707597da323915e6e415072f099418f Mon Sep 17 00:00:00 2001 From: drebs Date: Wed, 12 Mar 2014 10:40:36 -0300 Subject: Fix develop and build info on readme. --- README.rst | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/README.rst b/README.rst index be00062..cc29f9b 100644 --- a/README.rst +++ b/README.rst @@ -22,8 +22,7 @@ extension directory whose contents point to the repository dir: * The file must be created in the `~/.thunderbird//extensions/` directory. * The file name must be `bitmask-thunderbird@leap.se`. -* The file contents must be the path for the `src/` directory inside this - repository. +* The file contents must be the path for this repository. XPI Package ----------- @@ -48,7 +47,7 @@ Signed XPI package To generate a signed XPI package you must first have a certificate and then do the following: - make sign CERTDIR= CERTNAME= DEFAULTKEY= + make signed CERTDIR= CERTNAME= DEFAULTKEY= This command will: -- cgit v1.2.3 From e8de1db4a667fab1525c78847d7b672072caeba2 Mon Sep 17 00:00:00 2001 From: drebs Date: Wed, 12 Mar 2014 10:49:57 -0300 Subject: Reorder makefile targets. --- Makefile | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index ac87837..10d667a 100755 --- a/Makefile +++ b/Makefile @@ -33,6 +33,15 @@ endif endif endif + +# main rule +all: clean $(TARGET) + + +#----------------------------------------------------------------------------- +# debhelper targets +#----------------------------------------------------------------------------- + XPI_CONTENTS:=$(shell find chrome -name "*.html" -o -name "*.xhtml" -o -name "*.css" -o -name "*.png" -o -name "*.gif" -o -name "*.js" -o -name "*.jsm" -o -name "*.dtd" -o -name "*.xul" -o -name "messages" -o -name "*.properties") chrome.manifest install.rdf COPYING bitmask.xpi: $(XPI_CONTENTS) @@ -41,10 +50,10 @@ bitmask.xpi: $(XPI_CONTENTS) xpi_release: ln -s $(XPINAME) $(PKGNAME) -# main rule -all: clean $(TARGET) -# main target: .xpi file +#----------------------------------------------------------------------------- +# unsigned XPI file +#----------------------------------------------------------------------------- $(TARGET): clean install.rdf mkdir -p $(TEMPDIR) @@ -55,7 +64,12 @@ $(TARGET): clean install.rdf rm -rf $(TEMPDIR) (cd build/ && sha512sum $(PKGNAME) > SHA512SUMS && gpg -a --default-key $(DEFAULTKEY) --detach-sign SHA512SUMS) -signed: clean + +#----------------------------------------------------------------------------- +# signed XPI file +#----------------------------------------------------------------------------- + +signed: clean install.rdf mkdir -p $(TEMPDIR) mkdir -p `dirname $@` cp -r $(PREFIX)/{$(FILES_TO_PACKAGE)} $(TEMPDIR)/ @@ -79,4 +93,5 @@ debian-package: install.rdf: install.rdf.template Changelog sed 's/__VERSION__/$(VERSION)/' < $< > $@ + .PHONY: all clean signed -- cgit v1.2.3 From c29e78d2caa6bd0477e92ebab38c62f5bc18c857 Mon Sep 17 00:00:00 2001 From: drebs Date: Tue, 3 Jun 2014 11:04:02 -0300 Subject: Only disable caching checkbox if caching is already disabled (#4811). --- ...o-not-disable-caching-checkbox-for-manual-accounts | 2 ++ .../content/preventCaching/bitmaskAmOfflineOverlay.js | 19 ++++++++++++++----- chrome/content/statusBar/statusBarOverlay.js | 17 +++++++++++++++-- 3 files changed, 31 insertions(+), 7 deletions(-) create mode 100644 changes/bug_4811_do-not-disable-caching-checkbox-for-manual-accounts diff --git a/changes/bug_4811_do-not-disable-caching-checkbox-for-manual-accounts b/changes/bug_4811_do-not-disable-caching-checkbox-for-manual-accounts new file mode 100644 index 0000000..6804912 --- /dev/null +++ b/changes/bug_4811_do-not-disable-caching-checkbox-for-manual-accounts @@ -0,0 +1,2 @@ + o Do not disable caching checkbox for manual accounts when caching is turned + on (#4811). diff --git a/chrome/content/preventCaching/bitmaskAmOfflineOverlay.js b/chrome/content/preventCaching/bitmaskAmOfflineOverlay.js index c88b2ab..afc35a3 100644 --- a/chrome/content/preventCaching/bitmaskAmOfflineOverlay.js +++ b/chrome/content/preventCaching/bitmaskAmOfflineOverlay.js @@ -22,23 +22,32 @@ var currentAccount = null; -// The following function disables UI items that would allow a user to turn -// on offline caching for a LEAP account. It acts on am-offline.xul items that +// The following function disables UI items that would allow a user to turn on +// offline caching for a LEAP account. It acts on am-offline.xul items that // can be accessed in Thunderbird by choosing: // // Edit -> Account Settings... -> Synchronization and Storage. +// In order to be somewhat consistent, we only disable those items if the +// account already has its offline caching turned off. Accounts created with +// the Bitmask wizard are created with offline caching turned off (and so the +// UI items are disabled from the beginning). Accounts created manually will +// have offline caching turned on by default, and thus need a way to disable +// it if the user ever wants to. Once offline caching is disabled, then the +// user will not be able to turn it on again for Leap accounts. function disableOfflineCaching() { var disabled; - // for now, we consider a LEAP account every account whose incoming server + var checkbox = document.getElementById("offline.folders") + // For now, we consider a LEAP account every account whose incoming server // has a hostname equal to IMAP_HOST and port equal to IMAP_PORT. if (currentAccount.incomingServer.port == IMAP_PORT && - currentAccount.incomingServer.hostName == IMAP_HOST) + currentAccount.incomingServer.hostName == IMAP_HOST && + checkbox.checked == false) disabled = true; else disabled = false; // The "Keep messsages for this account on this computer" checkbox. - document.getElementById("offline.folders").disabled = disabled; + checkbox.disabled = disabled; // The "Advanced..." button. document.getElementById("selectImapFoldersButton").disabled = disabled; } diff --git a/chrome/content/statusBar/statusBarOverlay.js b/chrome/content/statusBar/statusBarOverlay.js index 31ec16a..c82b3f2 100644 --- a/chrome/content/statusBar/statusBarOverlay.js +++ b/chrome/content/statusBar/statusBarOverlay.js @@ -18,6 +18,7 @@ Components.utils.import("resource:///modules/mailServices.js"); +Components.utils.import("resource://gre/modules/Services.jsm"); var accountNotConfigured = getStringBundle( "chrome://bitmask/locale/statusBar.properties") @@ -51,6 +52,12 @@ function starUp() { updatePanel(); if (!isBitmaskAccountConfigured()) { launchAccountWizard(); + } else { + var server = getBitmaskServer(); + // TODO: add an alert that there exists a bitmask account with caching + // enabled. + //if (server.offlineDownload == true) + // alertPrompt('WARNING!'); } } @@ -86,9 +93,15 @@ function handleStatusBarClick() { * TODO: also verify for SMTP configuration? */ function isBitmaskAccountConfigured() { + return !!getBitmaskServer(); +} + +/** + * Get a configured bitmask account + */ +function getBitmaskServer() { var accountManager = Cc["@mozilla.org/messenger/account-manager;1"] .getService(Ci.nsIMsgAccountManager); - var existing = accountManager.findRealServer( + return accountManager.findRealServer( "", IMAP_HOST, "imap", IMAP_PORT); - return !!existing; } -- cgit v1.2.3 From 6bfef35987ec87292cdc561361f37bfc6754b421 Mon Sep 17 00:00:00 2001 From: drebs Date: Mon, 15 Sep 2014 12:04:53 -0300 Subject: Remove status bar messages (#4871). --- chrome/content/statusBar/statusBarOverlay.js | 19 ++++++++++++------- chrome/content/statusBar/statusBarOverlay.xul | 5 +++-- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/chrome/content/statusBar/statusBarOverlay.js b/chrome/content/statusBar/statusBarOverlay.js index c82b3f2..fbe91bb 100644 --- a/chrome/content/statusBar/statusBarOverlay.js +++ b/chrome/content/statusBar/statusBarOverlay.js @@ -33,15 +33,19 @@ var accountConfigured = getStringBundle( ****************************************************************************/ // run startUp() once when window loads -window.addEventListener("load", function(e) { - starUp(); +window.addEventListener("load", function(e) { + starUp(); }, false); +/** + * We don't want a message with the bitmask account status in the status bar + * for now (see https://leap.se/code/issues/4871). + */ // run updatePanel() periodically -window.setInterval( - function() { - updatePanel(); - }, 10000); // update every ten seconds +//window.setInterval( +// function() { +// updatePanel(); +// }, 10000); // update every ten seconds /***************************************************************************** @@ -49,7 +53,8 @@ window.setInterval( ****************************************************************************/ function starUp() { - updatePanel(); + // TODO: uncomment when we want messages in the status bar again. + //updatePanel(); if (!isBitmaskAccountConfigured()) { launchAccountWizard(); } else { diff --git a/chrome/content/statusBar/statusBarOverlay.xul b/chrome/content/statusBar/statusBarOverlay.xul index 006ccb9..4557a14 100644 --- a/chrome/content/statusBar/statusBarOverlay.xul +++ b/chrome/content/statusBar/statusBarOverlay.xul @@ -10,8 +10,9 @@