wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 887655 - Revert hiding the download notification on completion. r=margaret

Browse Source
This commit is contained in:
Brian Nicholson 2013-07-18 12:12:38 -07:00
parent 36f8586ceb
commit dc9febbae0
1 changed files with 10 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
mobile/android/chrome/content/downloads.js
View File

@ -16,7 +16,6 @@ var Downloads = {
_dlmgr: null,
_progressAlert: null,
_privateDownloads: [],
isForeground : true,
_getLocalFile: function dl__getLocalFile(aFileURI) {
// if this is a URL, get the file from that
@ -35,8 +34,6 @@ var Downloads = {
this._progressAlert = new AlertDownloadProgressListener();
this._dlmgr.addPrivacyAwareListener(this._progressAlert);
Services.obs.addObserver(this, "last-pb-context-exited", true);
Services.obs.addObserver(this, "application-background", false);
Services.obs.addObserver(this, "application-foreground", false);
},
openDownload: function dl_openDownload(aDownload) {
@ -107,29 +104,16 @@ var Downloads = {
// observer for last-pb-context-exited
observe: function dl_observe(aSubject, aTopic, aData) {
switch (aTopic) {
case "last-pb-context-exited": {
let alertsService = Cc["@mozilla.org/alerts-service;1"].getService(Ci.nsIAlertsService);
let progressListener = alertsService.QueryInterface(Ci.nsIAlertsProgressListener);
let download;
while ((download = this._privateDownloads.pop())) {
try {
let notificationName = download.target.spec.replace("file:", "download:");
progressListener.onCancel(notificationName);
} catch (e) {
dump("Error removing private download: " + e);
}
}
break;
let alertsService = Cc["@mozilla.org/alerts-service;1"].getService(Ci.nsIAlertsService);
let progressListener = alertsService.QueryInterface(Ci.nsIAlertsProgressListener);
let download;
while ((download = this._privateDownloads.pop())) {
try {
let notificationName = download.target.spec.replace("file:", "download:");
progressListener.onCancel(notificationName);
} catch (e) {
dump("Error removing private download: " + e);
}
case "application-foreground":
this.isForeground = true;
break;
case "application-background":
this.isForeground = false;
break;
}
},
@ -197,14 +181,8 @@ AlertDownloadProgressListener.prototype = {
this._privateDownloads.splice(index, 1);
}
}
// Checking existance of MimeInfo and if there is at least one application handler in addition
// to default one.
let existsAvailableHandler = (aDownload.MIMEInfo && aDownload.MIMEInfo.possibleApplicationHandlers.length > 1);
// We want to show the download finished notification only if it is not automatically opened.
// A download is automatically opened if it has a default handler and fennec is in foreground.
if (state == Ci.nsIDownloadManager.DOWNLOAD_FINISHED &&
!(existsAvailableHandler && Downloads.isForeground)) {
if (state == Ci.nsIDownloadManager.DOWNLOAD_FINISHED) {
Downloads.showAlert(aDownload, Strings.browser.GetStringFromName("alertDownloadsDone2"),
aDownload.displayName);
}