1.11b.rev2

* If time server is down i report that now

bootstrap.js

@@ -180,7 +180,7 @@ var MainWorkerMainThreadFuncs = {
 					}
 				}
 			];
-		} else if (aLocalizedKey == 'attn-failed-signing' || aLocalizedKey == 'attn-failed-signing-not-logged-in' || aLocalizedKey == 'attn-failed-signing-didnt-agree') {
+		} else if (aLocalizedKey == 'attn-failed-signing' || aLocalizedKey == 'attn-failed-signing-not-logged-in' || aLocalizedKey == 'attn-failed-signing-didnt-agree' || aLocalizedKey == 'attn-failed-signing-time-server') {
 			aAttnBarInfoObj.aBtns = [];
 			aAttnBarInfoObj.aBtns.push({
 				bTxt: justFormatStringFromName(gL10N.bootstrap['install-as-temp']),

locale/en-US/bootstrap.properties

@@ -45,4 +45,5 @@ attn-failed-signing-not-logged-in=In order to sign the addon, you need to have a
 open-amo=Open Login - addons.mozilla.org
 retry=Retry
 open-agree=Open Agreement - addons.mozilla.org
-attn-failed-signing-didnt-agree=In order to sign the addon, you must have agreed to the agreement
+attn-failed-signing-didnt-agree=In order to sign the addon, you must have agreed to the agreement
+attn-failed-signing-time-server=The server from which time is fetched, is currently down

modules/MainWorker/MainWorker.js

@@ -368,7 +368,10 @@ function jpmSign(aPathOrBlobToXpi, aAddonVersionInXpi, aAddonIdInXpi, aPlatofrmP
 	}
 }
 
-function getNowDateFromServer() {
+function getNowDateFromServer(aTryCnt) {
+	if (!aTryCnt) {
+		aTryCnt = 0;
+	}
 	var requestStartDate = Date.now();
 
 	var requestUnixNow = xhr('http://currenttimestamp.com/');
@@ -378,10 +381,19 @@ function getNowDateFromServer() {
 	console.log('request took:', requestDuration, 'ms');
 
 	if (requestUnixNow.status != 200) {
+		if (aTryCnt > 4) {
+			throw {
+				msg: 'signing-failed:time server down',
+				xhr: {
+					status: requestUnixNow.status,
+					response: requestUnixNow.response,
+				}
+			};
+		}
 		console.log('response status was bad, will wait 5 sec then try again');
 		setTimeoutSync(5000);
 		console.log('ok waitied, will now try');
-		return getNowDateFromServer();
+		return getNowDateFromServer(aTryCnt + 1);
 	}
 
 	console.log('requestUnixNow.status:', requestUnixNow.status);
@@ -557,6 +569,11 @@ function doit(aExtId, aExtName, aPrefs, aAttnBarInstState) {
 			}
 		};
 
+		// the persistent property is not reconized by firefox, and it will break it
+		if (manifestContentsJSON.background && manifestContentsJSON.background.persistent) {
+			delete manifestContentsJSON.background.persistent;
+		}
+
 		// write/overwrite with modified manifest.json back to zip
 		zipJSZIP.file('manifest.json', JSON.stringify(manifestContentsJSON));
 
@@ -684,6 +701,9 @@ function doit(aExtId, aExtName, aPrefs, aAttnBarInstState) {
 				} else if (ex.msg == 'signing-failed:didnt agree') {
 					aLocalizedKey = 'attn-failed-signing-didnt-agree';
 					aAttnBarInstState.aTxt = formatStringFromName(aLocalizedKey, 'bootstrap', [aExtName]);					
+				} else if (ex.msg == 'signing-failed:time server down') {
+					aLocalizedKey = 'attn-failed-signing-time-server';
+					aAttnBarInstState.aTxt = formatStringFromName(aLocalizedKey, 'bootstrap', [aExtName]);					
 				} else {
 					aLocalizedKey = 'attn-failed-signing';
 					aAttnBarInstState.aTxt = formatStringFromName(aLocalizedKey, 'bootstrap', [aExtName]);