summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2013-12-23 14:26:52 -0200
committerdrebs <drebs@leap.se>2013-12-23 14:26:52 -0200
commit7f851488dbc8fe70924432c279488e31b662f854 (patch)
tree8d9f3c8389ea416effa79b542f63216fc0b4a9b7
parent2a71d0c9b74c69f8c195f219a82b689685b6d110 (diff)
parent79bef2ea88c01e629973df3de97eb3456add3793 (diff)
Merge branch 'release-0.0.3'0.0.3
-rw-r--r--CHANGELOG3
-rwxr-xr-xMakefile2
-rw-r--r--chrome/content/accountWizard/accountWizard.js34
-rw-r--r--chrome/content/accountWizard/accountWizard.xul6
-rw-r--r--chrome/locale/en-US/accountWizard.properties2
5 files changed, 29 insertions, 18 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 3817d1c..d8e3811 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+0.0.3 Dez 23:
+ o Remove the password field from the account wizard. Closes #4525.
+ o Remove misleading encryption information from wizard (#4545).
0.0.2 Nov 5:
o Fix items from Mozilla editors review. Closes #4374.
o Create a Thunderbird extension with a wizard for creating LEAP's Bitmask
diff --git a/Makefile b/Makefile
index fb59643..d331e5b 100755
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ RSA_FILE := META-INF/zigbert.rsa
# the following variables are updated automatically
COMMIT := $(shell git --no-pager log -1 --format=format:%h)
-VERSION = $(shell head -n1 Changelog | sed -e 's/^.*(//' -e 's/).*$$//')
+VERSION = $(shell head -n1 CHANGELOG | cut -d" " -f1)
PKGNAME := $(EXTNAME)-$(VERSION)-$(COMMIT).xpi
TARGET := $(CURDIR)/build/$(PKGNAME)
TEMPDIR := $(shell mktemp -d -u)
diff --git a/chrome/content/accountWizard/accountWizard.js b/chrome/content/accountWizard/accountWizard.js
index da49536..35dae00 100644
--- a/chrome/content/accountWizard/accountWizard.js
+++ b/chrome/content/accountWizard/accountWizard.js
@@ -28,6 +28,7 @@ Cu.import("resource:///modules/gloda/log4moz.js");
let gEmailWizardLogger = Log4Moz.getConfiguredLogger("mail.wizard");
var gStringsBundle;
+var gAccountWizardStringsBundle;
var gBrandShortName;
function e(elementID)
@@ -110,7 +111,7 @@ BitmaskAccountWizard.prototype =
this._email = "";
this._realname = (userFullname) ? userFullname : "";
e("realname").value = this._realname;
- this._password = "";
+ this._password = "123"; // use any password for now
this._okCallback = null;
if (window.arguments && window.arguments[0]) {
@@ -125,14 +126,16 @@ BitmaskAccountWizard.prototype =
gEmailWizardLogger.info("Email account setup dialog loaded.");
gStringsBundle = e("accountCreationStrings");
+ gAccountWizardStringsBundle = e("accountWizardStrings");
gBrandShortName = e("bundle_brand").getString("brandShortName");
// admin-locked prefs hurray
- if (!Services.prefs.getBoolPref("signon.rememberSignons")) {
- let rememberPasswordE = e("remember_password");
- rememberPasswordE.checked = false;
- rememberPasswordE.disabled = true;
- }
+ // we do not use password for now
+ //if (!Services.prefs.getBoolPref("signon.rememberSignons")) {
+ // let rememberPasswordE = e("remember_password");
+ // rememberPasswordE.checked = false;
+ // rememberPasswordE.disabled = true;
+ //}
// First, unhide the main window areas, and store the width,
// so that we don't resize wildly when we unhide areas.
@@ -203,8 +206,9 @@ BitmaskAccountWizard.prototype =
{
var result = this._currentConfig.copy();
replaceVariables(result, this._realname, this._email, this._password);
- result.rememberPassword = e("remember_password").checked &&
- !!this._password;
+ //result.rememberPassword = e("remember_password").checked &&
+ // !!this._password;
+ result.rememberPassword = true;
return result;
},
@@ -461,13 +465,13 @@ BitmaskAccountWizard.prototype =
unknownString);
let host = server.hostname +
(isStandardPort(server.port) ? "" : ":" + server.port);
- let ssl = gStringsBundle.getString(sanitize.translate(server.socketType,
- { 1 : "resultNoEncryption", 2 : "resultSSL", 3 : "resultSTARTTLS" }),
- unknownString);
- let certStatus = gStringsBundle.getString(server.badCert ?
- "resultSSLCertWeak" : "resultSSLCertOK");
- return gStringsBundle.getFormattedString(stringName,
- [ type, host, ssl, certStatus ]);
+ //let ssl = gStringsBundle.getString(sanitize.translate(server.socketType,
+ // { 1 : "resultNoEncryption", 2 : "resultSSL", 3 : "resultSTARTTLS" }),
+ // unknownString);
+ //let certStatus = gStringsBundle.getString(server.badCert ?
+ // "resultSSLCertWeak" : "resultSSLCertOK");
+ return gAccountWizardStringsBundle.getFormattedString(stringName,
+ [ type, host ]);
};
var incomingResult = unknownString;
diff --git a/chrome/content/accountWizard/accountWizard.xul b/chrome/content/accountWizard/accountWizard.xul
index f9ff6f4..1587c50 100644
--- a/chrome/content/accountWizard/accountWizard.xul
+++ b/chrome/content/accountWizard/accountWizard.xul
@@ -33,6 +33,8 @@
src="chrome://branding/locale/brand.properties"/>
<stringbundle id="accountCreationStrings"
src="chrome://messenger/locale/accountCreation.properties"/>
+ <stringbundle id="accountWizardStrings"
+ src="chrome://bitmask/locale/accountWizard.properties"/>
</stringbundleset>
<script type="application/javascript"
src="chrome://bitmask/content/serverConfig.js"/>
@@ -108,9 +110,8 @@
<description id="emailerror" class="errordescription" hidden="true"/>
</hbox>
</row>
+ <!-- we do not use the password for now.
<row align="center">
- <!-- this starts out as text so the emptytext shows, but then
- changes to type=password once it's not empty -->
<label accesskey="&password.accesskey;"
class="autoconfigLabel"
value="&password.label;"
@@ -137,6 +138,7 @@
accesskey="&rememberPassword.accesskey;"
checked="true"/>
</row>
+ -->
</rows>
</grid>
<spacer flex="1" />
diff --git a/chrome/locale/en-US/accountWizard.properties b/chrome/locale/en-US/accountWizard.properties
index 51532d0..f91fc70 100644
--- a/chrome/locale/en-US/accountWizard.properties
+++ b/chrome/locale/en-US/accountWizard.properties
@@ -1,2 +1,4 @@
# verifyConfig.js
cannot_login.error=Unable to log in at server. Probably wrong configuration, username or password.
+resultIncoming=%1$S, %2$S
+resultOutgoing=%1$S, %2$S