scriptoriumadmin/zotero
1
0
Fork 0
mirror of https://github.com/zotero/zotero.git synced 2026-10-03 02:21:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fx128: Fix "No updates found" if update was already downloaded

Browse source 
Previously fixed for fx115 in #3148, but `nsIUpdateManager` changed in
fx128

https://forums.zotero.org/discussion/121482/zotero-7-1beta-does-not-find-updates
This commit is contained in:
Dan Stillman 2025-01-29 00:43:04 -05:00
parent 51349a5a97
commit eb776f8e6e
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
chrome/content/zotero/update/updates.js
View file

@ -600,7 +600,7 @@ var gUpdates = {
var um = Cc["@mozilla.org/updates/update-manager;1"].getService(
Ci.nsIUpdateManager
);
let activeUpdate = um.downloadingUpdate || um.readyUpdate;
let activeUpdate = um.internal.downloadingUpdate || um.internal.readyUpdate;
if (activeUpdate) {
this.setUpdate(activeUpdate);
aCallback("downloading");
@ -738,8 +738,8 @@ var gCheckingPage = {
LOG("gCheckingPage:onPageShow - Got user approval. Proceeding with download");
// If we resolved because of `aus.stateTransition`, we may actually be
// downloading a different update now.
if (this.um.downloadingUpdate) {
this.#update = this.um.downloadingUpdate;
if (this.um.internal.downloadingUpdate) {
this.#update = this.um.internal.downloadingUpdate;
}
} else {
LOG(
@ -927,7 +927,7 @@ var gDownloadingPage = {
var um = Cc["@mozilla.org/updates/update-manager;1"].getService(
Ci.nsIUpdateManager
);
var activeUpdate = um.downloadingUpdate || um.readyUpdate;
var activeUpdate = um.internal.downloadingUpdate || um.internal.readyUpdate;
if (activeUpdate) {
gUpdates.setUpdate(activeUpdate);
@ -1085,7 +1085,7 @@ var gDownloadingPage = {
var um = Cc["@mozilla.org/updates/update-manager;1"].getService(
Ci.nsIUpdateManager
);
um.readyUpdate = gUpdates.update;
um.internal.readyUpdate = gUpdates.update;
// Continue download in the background at full speed.
LOG(
@ -1480,7 +1480,7 @@ var gFinishedPage = {
let um = Cc["@mozilla.org/updates/update-manager;1"].getService(
Ci.nsIUpdateManager
);
um.cleanupActiveUpdate();
um.cleanupActiveUpdates();
gUpdates.never();
gUpdates.wiz.cancel();
},