diff options
author | wolfbeast <mcwerewolf@gmail.com> | 2018-07-02 19:05:56 +0200 |
---|---|---|
committer | wolfbeast <mcwerewolf@gmail.com> | 2018-07-02 19:05:56 +0200 |
commit | e92808f0ebbeab3ffb79a0b1a4d190f61fb8b43a (patch) | |
tree | e5ba54415e62d447a4238aa0000f1ef2e58cfd53 /application/palemoon/components/downloads | |
parent | 4c9914227ed9e675d65ad16e0bb899e8107a0ee5 (diff) | |
download | UXP-e92808f0ebbeab3ffb79a0b1a4d190f61fb8b43a.tar UXP-e92808f0ebbeab3ffb79a0b1a4d190f61fb8b43a.tar.gz UXP-e92808f0ebbeab3ffb79a0b1a4d190f61fb8b43a.tar.lz UXP-e92808f0ebbeab3ffb79a0b1a4d190f61fb8b43a.tar.xz UXP-e92808f0ebbeab3ffb79a0b1a4d190f61fb8b43a.zip |
Prevent suppressing executable warnings using the "don't ask me this again" checkbox.
A hidden preference matching the behavior of "browser.download.manager.alertOnEXEOpen" is kept, but is renamed in order to recover cases where the checkbox was used accidentally.
While there, simplify the `confirmLaunchExecutable` function by converting from promises to async function.
Since Basilisk moved this prompting to toolkit, we also clean up some unused duplicate strings from application/basilisk while we're there.
This resolves #581
Diffstat (limited to 'application/palemoon/components/downloads')
-rw-r--r-- | application/palemoon/components/downloads/DownloadsCommon.jsm | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/application/palemoon/components/downloads/DownloadsCommon.jsm b/application/palemoon/components/downloads/DownloadsCommon.jsm index 156578572..bd5d55a73 100644 --- a/application/palemoon/components/downloads/DownloadsCommon.jsm +++ b/application/palemoon/components/downloads/DownloadsCommon.jsm @@ -77,7 +77,7 @@ const nsIDM = Ci.nsIDownloadManager; const kDownloadsStringBundleUrl = "chrome://browser/locale/downloads/downloads.properties"; -const kPrefBdmAlertOnExeOpen = "browser.download.manager.alertOnEXEOpen"; +const kPrefConfirmOpenExe = "browser.download.confirmOpenExecutable"; const kDownloadsStringsRequiringFormatting = { sizeWithUnits: true, @@ -530,8 +530,10 @@ this.DownloadsCommon = { if (aFile.isExecutable() && !isWindowsExe) { let showAlert = true; try { - showAlert = Services.prefs.getBoolPref(kPrefBdmAlertOnExeOpen); - } catch (ex) { } + showAlert = Services.prefs.getBoolPref(kPrefConfirmOpenExe); + } catch (ex) { + // If the preference does not exist, continue with the prompt. + } if (showAlert) { let name = aFile.leafName; @@ -539,18 +541,11 @@ this.DownloadsCommon = { DownloadsCommon.strings.fileExecutableSecurityWarning(name, name); let title = DownloadsCommon.strings.fileExecutableSecurityWarningTitle; - let dontAsk = - DownloadsCommon.strings.fileExecutableSecurityWarningDontAsk; - let checkbox = { value: false }; - let open = Services.prompt.confirmCheck(aOwnerWindow, title, message, - dontAsk, checkbox); + let open = Services.prompt.confirm(aOwnerWindow, title, message); if (!open) { return; } - - Services.prefs.setBoolPref(kPrefBdmAlertOnExeOpen, - !checkbox.value); } } |