mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 552732: Update the app update service to work with the new API. r=robstrong
This commit is contained in:
Dave Townsend
parent
d75ab5e396
commit
9bce08e51c
@ -39,6 +39,7 @@
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
Components.utils.import("resource://gre/modules/DownloadUtils.jsm");
|
||||
Components.utils.import("resource://gre/modules/AddonManager.jsm");
|
||||
|
||||
// Firefox's macBrowserOverlay.xul includes scripts that define Cc, Ci, and Cr
|
||||
// so we have to use different names.
|
||||
@ -360,9 +361,10 @@ var gUpdates = {
|
||||
this._cacheButtonStrings("extra2");
|
||||
|
||||
// Advance to the Start page.
|
||||
var startPage = this.startPage;
|
||||
LOG("gUpdates", "onLoad - setting current page to startpage " + startPage.id);
|
||||
this.wiz.currentPage = startPage;
|
||||
this.getStartPageID(function(startPageID) {
|
||||
LOG("gUpdates", "onLoad - setting current page to startpage " + startPageID);
|
||||
gUpdates.wiz.currentPage = document.getElementById(startPageID);
|
||||
});
|
||||
},
|
||||
|
||||
/**
|
||||
@ -377,7 +379,9 @@ var gUpdates = {
|
||||
},
|
||||
|
||||
/**
|
||||
* Return the <wizardpage> object that should be displayed first.
|
||||
* Gets the ID of the <wizardpage> object that should be displayed first. This
|
||||
* is an asynchronous method that passes the resulting object to a callback
|
||||
* function.
|
||||
*
|
||||
* This is determined by how we were called by the update prompt:
|
||||
*
|
||||
@ -395,8 +399,10 @@ var gUpdates = {
|
||||
* No new enabled incompatible add-ons: either updatesfoundbasic or
|
||||
* updatesfoundbillboard as determined by
|
||||
* updatesFoundPageId
|
||||
* @param aCallback
|
||||
* A callback to pass the <wizardpage> object to be displayed first to.
|
||||
*/
|
||||
get startPage() {
|
||||
getStartPageID: function(aCallback) {
|
||||
if ("arguments" in window && window.arguments[0]) {
|
||||
var arg0 = window.arguments[0];
|
||||
if (arg0 instanceof CoI.nsIUpdate) {
|
||||
@ -434,28 +440,40 @@ var gUpdates = {
|
||||
switch (state) {
|
||||
case STATE_PENDING:
|
||||
this.sourceEvent = SRCEVT_BACKGROUND;
|
||||
return document.getElementById("finishedBackground");
|
||||
aCallback("finishedBackground");
|
||||
return;
|
||||
case STATE_DOWNLOADING:
|
||||
return document.getElementById("downloading");
|
||||
aCallback("downloading");
|
||||
return;
|
||||
case STATE_FAILED:
|
||||
window.getAttention();
|
||||
return document.getElementById("errorpatching");
|
||||
aCallback("errorpatching");
|
||||
return;
|
||||
case STATE_DOWNLOAD_FAILED:
|
||||
case STATE_APPLYING:
|
||||
return document.getElementById("errors");
|
||||
aCallback("errors");
|
||||
return;
|
||||
}
|
||||
}
|
||||
if (this.update.licenseURL)
|
||||
this.wiz.getPageById(this.updatesFoundPageId).setAttribute("next", "license");
|
||||
if (this.shouldCheckAddonCompatibility) {
|
||||
var incompatCheckPage = document.getElementById("incompatibleCheck");
|
||||
incompatCheckPage.setAttribute("next", this.updatesFoundPageId);
|
||||
return incompatCheckPage;
|
||||
}
|
||||
return document.getElementById(this.updatesFoundPageId);
|
||||
|
||||
var self = this;
|
||||
this.getShouldCheckAddonCompatibility(function(shouldCheck) {
|
||||
if (shouldCheck) {
|
||||
var incompatCheckPage = document.getElementById("incompatibleCheck");
|
||||
incompatCheckPage.setAttribute("next", self.updatesFoundPageId);
|
||||
aCallback(incompatCheckPage.id);
|
||||
}
|
||||
else {
|
||||
aCallback(self.updatesFoundPageId);
|
||||
}
|
||||
});
|
||||
return;
|
||||
}
|
||||
else if (arg0 == "installed") {
|
||||
return document.getElementById("installed");
|
||||
aCallback("installed");
|
||||
return;
|
||||
}
|
||||
}
|
||||
else {
|
||||
@ -463,7 +481,8 @@ var gUpdates = {
|
||||
getService(CoI.nsIUpdateManager);
|
||||
if (um.activeUpdate) {
|
||||
this.setUpdate(um.activeUpdate);
|
||||
return document.getElementById("downloading");
|
||||
aCallback("downloading");
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
@ -480,45 +499,48 @@ var gUpdates = {
|
||||
displayVersion : "Billboard Test 1.0",
|
||||
showNeverForVersion : true,
|
||||
type : "major" };
|
||||
return updatesFoundBillboardPage;
|
||||
aCallback(updatesFoundBillboardPage.id);
|
||||
}
|
||||
else {
|
||||
aCallback("checking");
|
||||
}
|
||||
|
||||
return document.getElementById("checking");
|
||||
},
|
||||
|
||||
get shouldCheckAddonCompatibility() {
|
||||
getShouldCheckAddonCompatibility: function(aCallback) {
|
||||
// this early return should never happen
|
||||
if (!this.update)
|
||||
return false;
|
||||
if (!this.update) {
|
||||
aCallback(false);
|
||||
return;
|
||||
}
|
||||
|
||||
delete this.shouldCheckAddonCompatibility;
|
||||
var ai = CoC["@mozilla.org/xre/app-info;1"].getService(CoI.nsIXULAppInfo);
|
||||
var vc = CoC["@mozilla.org/xpcom/version-comparator;1"].
|
||||
getService(CoI.nsIVersionComparator);
|
||||
if (!this.update.appVersion ||
|
||||
vc.compare(this.update.appVersion, ai.version) == 0)
|
||||
return this.shouldCheckAddonCompatibility = false;
|
||||
|
||||
var em = CoC["@mozilla.org/extensions/manager;1"].
|
||||
getService(CoI.nsIExtensionManager);
|
||||
this.addons = em.getIncompatibleItemList(this.update.appVersion,
|
||||
this.update.platformVersion,
|
||||
CoI.nsIUpdateItem.TYPE_ANY, false);
|
||||
if (this.addons.length > 0) {
|
||||
// Don't include add-ons that are already incompatible with the current
|
||||
// version of the application
|
||||
var addons = em.getIncompatibleItemList(null, null,
|
||||
CoI.nsIUpdateItem.TYPE_ANY, false);
|
||||
for (var i = 0; i < addons.length; ++i) {
|
||||
for (var j = 0; j < this.addons.length; ++j) {
|
||||
if (addons[i].id == this.addons[j].id) {
|
||||
this.addons.splice(j, 1);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
vc.compare(this.update.appVersion, ai.version) == 0) {
|
||||
aCallback(false);
|
||||
return;
|
||||
}
|
||||
return this.shouldCheckAddonCompatibility = (this.addons.length != 0);
|
||||
|
||||
var self = this;
|
||||
AddonManager.getAddonsByTypes(["extension", "theme", "locale"], function(addons) {
|
||||
self.addons = [];
|
||||
addons.forEach(function(addon) {
|
||||
// If an add-on isn't appDisabled and isn't userDisabled then it is
|
||||
// either active now or the user expects it to be active after the
|
||||
// restart. If that is the case and the add-on is not installed by the
|
||||
// application and is not compatible with the new application version
|
||||
// then the user should be warned that the add-on will become
|
||||
// incompatible.
|
||||
if (!addon.appDisabled && !addon.userDisabled &&
|
||||
addon.scope != AddonManager.SCOPE_APPLICATION &&
|
||||
!addon.isCompatibleWith(self.update.appVersion,
|
||||
self.update.platformVersion))
|
||||
self.addons.push(addon);
|
||||
});
|
||||
|
||||
aCallback(self.addons.length != 0);
|
||||
});
|
||||
},
|
||||
|
||||
/**
|
||||
@ -611,14 +633,16 @@ var gCheckingPage = {
|
||||
gUpdates.wiz.getPageById(gUpdates.updatesFoundPageId).setAttribute("next", "license");
|
||||
}
|
||||
|
||||
if (gUpdates.shouldCheckAddonCompatibility) {
|
||||
var incompatCheckPage = document.getElementById("incompatibleCheck");
|
||||
incompatCheckPage.setAttribute("next", gUpdates.updatesFoundPageId);
|
||||
gUpdates.wiz.goTo("incompatibleCheck");
|
||||
}
|
||||
else {
|
||||
gUpdates.wiz.goTo(gUpdates.updatesFoundPageId);
|
||||
}
|
||||
gUpdates.getShouldCheckAddonCompatibility(function(shouldCheck) {
|
||||
if (shouldCheck) {
|
||||
var incompatCheckPage = document.getElementById("incompatibleCheck");
|
||||
incompatCheckPage.setAttribute("next", gUpdates.updatesFoundPageId);
|
||||
gUpdates.wiz.goTo("incompatibleCheck");
|
||||
}
|
||||
else {
|
||||
gUpdates.wiz.goTo(gUpdates.updatesFoundPageId);
|
||||
}
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
@ -756,25 +780,50 @@ var gIncompatibleCheckPage = {
|
||||
this._pBar = document.getElementById("incompatibleCheckProgress");
|
||||
this._totalCount = gUpdates.addons.length;
|
||||
|
||||
var em = CoC["@mozilla.org/extensions/manager;1"].
|
||||
getService(CoI.nsIExtensionManager);
|
||||
em.update(gUpdates.addons, gUpdates.addons.length,
|
||||
CoI.nsIExtensionManager.UPDATE_NOTIFY_NEWVERSION, this,
|
||||
CoI.nsIExtensionManager.UPDATE_WHEN_NEW_APP_DETECTED,
|
||||
gUpdates.update.appVersion, gUpdates.update.platformVersion);
|
||||
},
|
||||
|
||||
/**
|
||||
* See nsIExtensionManager.idl
|
||||
*/
|
||||
onUpdateStarted: function() {
|
||||
this._pBar.mode = "normal";
|
||||
gUpdates.addons.forEach(function(addon) {
|
||||
addon.findUpdates(this, AddonManager.UPDATE_WHEN_NEW_APP_DETECTED,
|
||||
gUpdates.update.appVersion,
|
||||
gUpdates.update.platformVersion);
|
||||
}, this);
|
||||
},
|
||||
|
||||
/**
|
||||
* See nsIExtensionManager.idl
|
||||
*/
|
||||
onUpdateEnded: function() {
|
||||
// Addon UpdateListener
|
||||
onCompatibilityUpdateAvailable: function(addon) {
|
||||
// Remove the add-on from the list of add-ons that will become incompatible
|
||||
// with the new version of the application.
|
||||
for (var i = 0; i < gUpdates.addons.length; ++i) {
|
||||
if (gUpdates.addons[i].id == addon.id) {
|
||||
LOG("gIncompatibleCheckPage", "onAddonUpdateEnded - found update " +
|
||||
"for add-on ID: " + addon.id);
|
||||
gUpdates.addons.splice(i, 1);
|
||||
break;
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
onUpdateAvailable: function(addon, install) {
|
||||
// If the new version of this add-on is blocklisted for the new application
|
||||
// then it isn't a valid update and the user should still be warned that
|
||||
// the add-on will become incompatible.
|
||||
let bs = Cc["@mozilla.org/extensions/blocklist;1"].
|
||||
getService(Ci.nsIBlocklistService);
|
||||
if (bs.isAddonBlocklisted(addon.id, install.version,
|
||||
gUpdates.update.appVersion,
|
||||
gUpdates.update.platformVersion))
|
||||
return;
|
||||
|
||||
// Compatibility or new version updates mean the same thing here.
|
||||
this.onCompatibilityUpdateAvailable(addon);
|
||||
},
|
||||
|
||||
onUpdateFinished: function(addon) {
|
||||
++this._completedCount;
|
||||
this._pBar.value = Math.ceil((this._completedCount / this._totalCount) * 100);
|
||||
|
||||
if (this._completedCount < this._totalCount)
|
||||
return;
|
||||
|
||||
if (gUpdates.addons.length == 0) {
|
||||
LOG("gIncompatibleCheckPage", "onUpdateEnded - updates were found " +
|
||||
"for all incompatible add-ons");
|
||||
@ -792,40 +841,6 @@ var gIncompatibleCheckPage = {
|
||||
}
|
||||
}
|
||||
gUpdates.wiz.goTo(gUpdates.updatesFoundPageId);
|
||||
},
|
||||
|
||||
/**
|
||||
* See nsIExtensionManager.idl
|
||||
*/
|
||||
onAddonUpdateStarted: function(addon) {
|
||||
},
|
||||
|
||||
/**
|
||||
* See nsIExtensionManager.idl
|
||||
*/
|
||||
onAddonUpdateEnded: function(addon, status) {
|
||||
++this._completedCount;
|
||||
this._pBar.value = Math.ceil((this._completedCount / this._totalCount) * 100);
|
||||
|
||||
if (status != CoI.nsIAddonUpdateCheckListener.STATUS_UPDATE &&
|
||||
status != CoI.nsIAddonUpdateCheckListener.STATUS_VERSIONINFO)
|
||||
return;
|
||||
|
||||
for (var i = 0; i < gUpdates.addons.length; ++i) {
|
||||
if (gUpdates.addons[i].id == addon.id) {
|
||||
LOG("gIncompatibleCheckPage", "onAddonUpdateEnded - found update " +
|
||||
"for add-on ID: " + addon.id);
|
||||
gUpdates.addons.splice(i, 1);
|
||||
break;
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
QueryInterface: function(iid) {
|
||||
if (!iid.equals(CoI.nsIAddonUpdateCheckListener) &&
|
||||
!iid.equals(CoI.nsISupports))
|
||||
throw CoR.NS_ERROR_NO_INTERFACE;
|
||||
return this;
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@ -44,6 +44,7 @@
|
||||
*/
|
||||
Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
|
||||
Components.utils.import("resource://gre/modules/FileUtils.jsm");
|
||||
Components.utils.import("resource://gre/modules/AddonManager.jsm");
|
||||
|
||||
const Cc = Components.classes;
|
||||
const Ci = Components.interfaces;
|
||||
@ -1462,33 +1463,25 @@ UpdateService.prototype = {
|
||||
},
|
||||
|
||||
_checkAddonCompatibility: function AUS__checkAddonCompatibility() {
|
||||
var em = Cc["@mozilla.org/extensions/manager;1"].
|
||||
getService(Ci.nsIExtensionManager);
|
||||
// Get the add-ons that are incompatible with the update's application
|
||||
// version and toolkit version.
|
||||
var currentAddons = em.getIncompatibleItemList(this._update.appVersion,
|
||||
this._update.platformVersion,
|
||||
Ci.nsIUpdateItem.TYPE_ANY,
|
||||
false);
|
||||
if (currentAddons.length > 0) {
|
||||
// Get the add-ons that are incompatible with the current application
|
||||
// version and toolkit version.
|
||||
var previousAddons = em.getIncompatibleItemList(null, null,
|
||||
Ci.nsIUpdateItem.TYPE_ANY,
|
||||
false);
|
||||
// Don't include add-ons that are already incompatible with the current
|
||||
// application version and toolkit version.
|
||||
for (var i = 0; i < previousAddons.length; ++i) {
|
||||
for (var j = 0; j < currentAddons.length; ++j) {
|
||||
if (previousAddons[i].id === currentAddons[j].id) {
|
||||
currentAddons.splice(j, 1);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
// Get all the installed add-ons
|
||||
var self = this;
|
||||
AddonManager.getAddonsByTypes(["extension", "theme", "locale"], function(addons) {
|
||||
self._incompatibleAddons = [];
|
||||
addons.forEach(function(addon) {
|
||||
// If an add-on isn't appDisabled and isn't userDisabled then it is
|
||||
// either active now or the user expects it to be active after the
|
||||
// restart. If that is the case and the add-on is not installed by the
|
||||
// application and is not compatible with the new application version
|
||||
// then the user should be warned that the add-on will become
|
||||
// incompatible.
|
||||
if (!addon.appDisabled && !addon.userDisabled &&
|
||||
addon.scope != AddonManager.SCOPE_APPLICATION &&
|
||||
!addon.isCompatibleWith(self._update.appVersion,
|
||||
self._update.platformVersion))
|
||||
self._incompatibleAddons.push(addon);
|
||||
});
|
||||
|
||||
if (currentAddons.length > 0) {
|
||||
if (self._incompatibleAddons.length > 0) {
|
||||
/**
|
||||
# PREF_APP_UPDATE_INCOMPATIBLE_MODE
|
||||
# Controls the mode in which we check for updates as follows.
|
||||
@ -1509,37 +1502,62 @@ UpdateService.prototype = {
|
||||
# required after the update. This is not the default and is supplied
|
||||
# only as a hidden option for those that want it.
|
||||
*/
|
||||
this._incompatAddonsCount = currentAddons.length;
|
||||
LOG("UpdateService:_checkAddonCompatibility - checking for " +
|
||||
"incompatible add-ons");
|
||||
var updateIncompatMode = getPref("getIntPref", PREF_APP_UPDATE_INCOMPATIBLE_MODE, 0);
|
||||
var mode = (updateIncompatMode == 1) ? Ci.nsIExtensionManager.UPDATE_CHECK_COMPATIBILITY :
|
||||
Ci.nsIExtensionManager.UPDATE_NOTIFY_NEWVERSION;
|
||||
em.update(currentAddons, currentAddons.length, mode, this,
|
||||
Ci.nsIExtensionManager.UPDATE_WHEN_NEW_APP_DETECTED,
|
||||
this._update.appVersion, this._update.platformVersion);
|
||||
}
|
||||
else {
|
||||
LOG("UpdateService:_checkAddonCompatibility - no need to show prompt, " +
|
||||
"just download the update");
|
||||
var status = this.downloadUpdate(this._update, true);
|
||||
if (status == STATE_NONE)
|
||||
cleanupActiveUpdate();
|
||||
this._update = null;
|
||||
self._updateCheckCount = self._incompatibleAddons.length;
|
||||
LOG("UpdateService:_checkAddonCompatibility - checking for " +
|
||||
"incompatible add-ons");
|
||||
|
||||
self._incompatibleAddons.forEach(function(addon) {
|
||||
addon.findUpdates(this, AddonManager.UPDATE_WHEN_NEW_APP_DETECTED,
|
||||
this._update.appVersion, this._update.platformVersion);
|
||||
}, self);
|
||||
}
|
||||
else {
|
||||
LOG("UpdateService:_checkAddonCompatibility - no need to show prompt, " +
|
||||
"just download the update");
|
||||
var status = self.downloadUpdate(self._update, true);
|
||||
if (status == STATE_NONE)
|
||||
cleanupActiveUpdate();
|
||||
self._update = null;
|
||||
}
|
||||
});
|
||||
},
|
||||
|
||||
// AddonUpdateListener
|
||||
onCompatibilityUpdateAvailable: function(addon) {
|
||||
// Remove the add-on from the list of add-ons that will become incompatible
|
||||
// with the new version of the application.
|
||||
for (var i = 0; i < this._incompatibleAddons.length; ++i) {
|
||||
if (this._incompatibleAddons[i].id == addon.id) {
|
||||
LOG("UpdateService:onAddonUpdateEnded - found update for add-on ID: " +
|
||||
addon.id);
|
||||
this._incompatibleAddons.splice(i, 1);
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* See nsIExtensionManager.idl
|
||||
*/
|
||||
onUpdateStarted: function AUS_onUpdateStarted() {
|
||||
onUpdateAvailable: function(addon, install) {
|
||||
if (getPref("getIntPref", PREF_APP_UPDATE_INCOMPATIBLE_MODE, 0) == 1)
|
||||
return;
|
||||
|
||||
// If the new version of this add-on is blocklisted for the new application
|
||||
// then it isn't a valid update and the user should still be warned that
|
||||
// the add-on will become incompatible.
|
||||
let bs = Cc["@mozilla.org/extensions/blocklist;1"].
|
||||
getService(Ci.nsIBlocklistService);
|
||||
if (bs.isAddonBlocklisted(addon.id, install.version,
|
||||
gUpdates.update.appVersion,
|
||||
gUpdates.update.platformVersion))
|
||||
return;
|
||||
|
||||
// Compatibility or new version updates mean the same thing here.
|
||||
this.onCompatibilityUpdateAvailable(addon);
|
||||
},
|
||||
|
||||
/**
|
||||
* See nsIExtensionManager.idl
|
||||
*/
|
||||
onUpdateEnded: function AUS_onUpdateEnded() {
|
||||
if (this._incompatAddonsCount > 0 || !gCanApplyUpdates) {
|
||||
onUpdateFinished: function(addon) {
|
||||
if (--this._updateCheckCount > 0)
|
||||
return;
|
||||
|
||||
if (this._incompatibleAddons.length > 0 || !gCanApplyUpdates) {
|
||||
LOG("Checker:onUpdateEnded - prompting because there are incompatible " +
|
||||
"add-ons");
|
||||
this._showPrompt(this._update);
|
||||
@ -1554,25 +1572,6 @@ UpdateService.prototype = {
|
||||
this._update = null;
|
||||
},
|
||||
|
||||
/**
|
||||
* See nsIExtensionManager.idl
|
||||
*/
|
||||
onAddonUpdateStarted: function AUS_onAddonUpdateStarted(addon) {
|
||||
},
|
||||
|
||||
/**
|
||||
* See nsIExtensionManager.idl
|
||||
*/
|
||||
onAddonUpdateEnded: function AUS_onAddonUpdateEnded(addon, status) {
|
||||
if (status != Ci.nsIAddonUpdateCheckListener.STATUS_UPDATE &&
|
||||
status != Ci.nsIAddonUpdateCheckListener.STATUS_VERSIONINFO)
|
||||
return;
|
||||
|
||||
LOG("UpdateService:onAddonUpdateEnded - found update for add-on ID: " +
|
||||
addon.id);
|
||||
--this._incompatAddonsCount;
|
||||
},
|
||||
|
||||
/**
|
||||
* The Checker used for background update checks.
|
||||
*/
|
||||
|
||||
Loading…
Reference in New Issue
Block a user