Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-13 13:25:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug 293583: When phone home occurs for more than one extension the update info is used from the first extension update info

Browse Source 
patch by Robert Strong <moz_bugzilla@exchangecode.com>, r=bsmedberg, a=asa
This commit is contained in:
db48x%yahoo.com 2005-05-23 00:40:03 +00:00
parent f8fed2404d
commit 864630c0c0
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
toolkit/mozapps/extensions/src/nsExtensionManager.js.in
View File

@ -3325,6 +3325,7 @@ ExtensionManager.prototype = {
*/
function IncompatibleObserver() {}
IncompatibleObserver.prototype = {
_id: null,
_type: nsIUpdateItem.TYPE_ANY,
_xpi: null,
@ -3341,6 +3342,7 @@ ExtensionManager.prototype = {
* up by this process.
*/
checkForUpdates: function(installManifest, installData, xpiFile) {
this._id = installData.id;
this._type = installData.type;
this._xpi = xpiFile;
this._installManifest = installManifest;
@ -3371,14 +3373,17 @@ ExtensionManager.prototype = {
* @param topic
* Extension Update Messages
* @param data
* unused (XXXben - use a single topic and switch on this!)
* item update check success and failure
*/
observe: function(subject, topic, data) {
var item = subject.QueryInterface(Components.interfaces.nsIUpdateItem);
if (this._id != item.id)
return;
switch (topic) {
case "Update:Extension:Item-Ended":
if (subject) {
LOG("Version Check Phone Home Completed");
var item = subject.QueryInterface(Components.interfaces.nsIUpdateItem);
LOG("Version Check Phone Home Completed");
if (data == "update-check-success") {
em.datasource.setTargetApplicationInfo(item.id,
item.minAppVersion,
item.maxAppVersion,
@ -4392,7 +4397,7 @@ ExtensionItemUpdater.prototype = {
// whether or not the item can be installed.
//
checkForUpdates: function(aItems, aItemCount, aVersionUpdateOnly) {
gOS.notifyObservers(null, "Update:Extension:Started", "");
gOS.notifyObservers(aItems[0], "Update:Extension:Started", "");
this._versionUpdateOnly = aVersionUpdateOnly;
this._items = aItems;
this._responseCount = aItemCount;
@ -4449,7 +4454,7 @@ ExtensionItemUpdater.prototype = {
if (!this._versionUpdateOnly)
gPref.setIntPref(PREF_UPDATE_COUNT, this._updateCount);
gOS.notifyObservers(null, "Update:Extension:Ended", "");
gOS.notifyObservers(this._items[0], "Update:Extension:Ended", "");
}
},
@ -4476,7 +4481,7 @@ RDFItemUpdater.prototype = {
// A preference setting can disable updating for this item
try {
if (!gPref.getBoolPref(PREF_EM_ITEM_UPDATE_ENABLED.replace(/%UUID%/, aItem.id))) {
gOS.notifyObservers(null, "Update:Extension:Item-Ended", "");
gOS.notifyObservers(aItem, "Update:Extension:Item-Ended", "update-check-disabled");
this._updater._checkForDone();
return;
}
@ -4658,7 +4663,7 @@ RDFItemUpdater.prototype = {
"version of this item: " + sameItem.objectSource);
}
gOS.notifyObservers(!this._versionUpdateOnly ? newerItem : sameItem,
"Update:Extension:Item-Ended", "");
"Update:Extension:Item-Ended", "update-check-success");
// Only one call of this._updater._checkForDone is needed for RDF
// responses, since there is only one response per item.

2
toolkit/mozapps/update/content/update.js
View File

@ -379,7 +379,7 @@ var gUpdatePage = {
case "Update:Extension:Item-Started":
break;
case "Update:Extension:Item-Ended":
if (aSubject) {
if (aData == "update-check-success") {
var item = aSubject.QueryInterface(Components.interfaces.nsIUpdateItem);
gUpdateWizard.itemsToUpdate.push(item);