Tails 6156 - Fix outdated error handling in accountcreation and remove buggy debug code

Tag #1273
This commit is contained in:
Matt A. Tobin 2019-11-11 00:39:20 -05:00 • committed by Roy Tam
commit 13a2cf2b8a
3 changed files with 7 additions and 12 deletions

View file

@ -75,7 +75,7 @@ Things to test (works for me):
former bug: goes to manual first shortly, then to result former bug: goes to manual first shortly, then to result
**********************/ **********************/
// To debug, set mail.wizard.logging.dump (or .console)="All" and kDebug = true // To debug, set mail.wizard.logging.dump (or .console)="All"
function e(elementID) function e(elementID)
{ {

View file

@ -159,17 +159,14 @@ FetchHTTP.prototype =
else else
{ {
success = false; success = false;
try errorCode = this._request.status;
{ if (errorCode == 0) {
errorCode = this._request.status;
errorStr = this._request.statusText;
} catch (e) {
// If we can't resolve the hostname in DNS etc., .statusText throws
errorCode = -2;
errorStr = getStringBundle( errorStr = getStringBundle(
"chrome://messenger/locale/accountCreationUtil.properties") "chrome://messenger/locale/accountCreationUtil.properties")
.GetStringFromName("cannot_contact_server.error"); .GetStringFromName("cannot_contact_server.error");
ddump(errorStr); ddump(errorStr);
} else {
errorStr = this._request.statusText;
} }
} }

View file

@ -198,8 +198,6 @@ function MalformedException(msgID, uncheckedBadValue)
var stringBundle = getStringBundle( var stringBundle = getStringBundle(
"chrome://messenger/locale/accountCreationUtil.properties"); "chrome://messenger/locale/accountCreationUtil.properties");
var msg = stringBundle.GetStringFromName(msgID); var msg = stringBundle.GetStringFromName(msgID);
if (kDebug)
msg += " (bad value: " + new String(uncheckedBadValue) + ")";
Exception.call(this, msg); Exception.call(this, msg);
} }
MalformedException.prototype = Object.create(Exception.prototype); MalformedException.prototype = Object.create(Exception.prototype);