Skip to content

Commit 4f62cc8

Browse files
committed
Disable Firefox welcome popup (closes #725)
1 parent 6f2f90e commit 4f62cc8

File tree

9 files changed

+22
-19
lines changed

9 files changed

+22
-19
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,4 +118,4 @@ Additional open source software will be downloaded and installed at runtime when
118118

119119
* Installing the runtime on Windows will install [7-Zip](https://7-zip.org/) if it is not already installed. The 7-Zip project is made by Igor Pavlov and [licensed under the GNU LGPL license and others](https://7-zip.org/license.txt). This project is not affiliated with the 7-Zip project or its developers in any way.
120120

121-
* Installing the runtime on any system will download the unmodified [Mozilla Firefox](https://www.mozilla.org/firefox/) browser and locally modify it. By using this project, you also agree to [the Firefox Privacy Notice](https://www.mozilla.org/privacy/firefox/). Firefox is licensed under the Mozilla Public License 2.0. Firefox and the Firefox logo are trademarks of the Mozilla Foundation in the U.S. and other countries. This project is not affiliated with the Mozilla Foundation in any way.
121+
* Installing the runtime on any system will download the unmodified [Mozilla Firefox](https://www.mozilla.org/firefox/) browser and locally modify it. By using the runtime you agree to the Firefox [Terms of Use](https://www.mozilla.org/about/legal/terms/firefox/) and [Privacy Notice](https://www.mozilla.org/privacy/firefox/). Firefox is licensed under the Mozilla Public License 2.0. Firefox and the Firefox logo are trademarks of the Mozilla Foundation in the U.S. and other countries. This project is not affiliated with the Mozilla Foundation in any way.

docs/docs/about/privacy-policy.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ No personal data leave the computer or are sent to third parties.
1111
## Runtime Privacy Policy
1212

1313
As installed web apps are running inside a Mozilla Firefox browser, you need to agree
14-
to [the Firefox Privacy Notice](https://www.mozilla.org/privacy/firefox/).
14+
to the Firefox [Terms of Use](https://www.mozilla.org/about/legal/terms/firefox/) and
15+
[Privacy Notice](https://www.mozilla.org/privacy/firefox/).
1516

1617
## Website Privacy Policy
1718

extension/src/_locales/en/messages.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@
235235
"description": "The notice for downloaded 7-Zip on the setup page"
236236
},
237237
"setupPageLicenseFirefoxDownloaded": {
238-
"message": "Installing the runtime on any system will download the unmodified <a href=\"https://www.mozilla.org/firefox/\" target=\"_blank\">Mozilla Firefox</a> browser and locally modify it. By using this project, you also agree to <a href=\"https://www.mozilla.org/privacy/firefox/\">the Firefox Privacy Notice</a>. Firefox is licensed under the Mozilla Public License 2.0. Firefox and the Firefox logo are trademarks of the Mozilla Foundation in the U.S. and other countries. This project is not affiliated with the Mozilla Foundation in any way.",
238+
"message": "Installing the runtime on any system will download the unmodified <a href=\"https://www.mozilla.org/firefox/\" target=\"_blank\">Mozilla Firefox</a> browser and locally modify it. By using the runtime you agree to the Firefox <a href=\"https://www.mozilla.org/about/legal/terms/firefox/\">Terms of Use</a> and <a href=\"https://www.mozilla.org/privacy/firefox/\">Privacy Notice</a>. Firefox is licensed under the Mozilla Public License 2.0. Firefox and the Firefox logo are trademarks of the Mozilla Foundation in the U.S. and other countries. This project is not affiliated with the Mozilla Foundation in any way.",
239239
"description": "The notice for downloaded Firefox on the setup page"
240240
},
241241
"setupPageLicensePrivacyPolicy": {

native/packages/choco/legal/LICENSE.txt

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,10 @@ Additional open source software will be downloaded and installed at runtime when
4040
LGPL license and others <https://7-zip.org/license.txt>. This project is not affiliated
4141
with the 7-Zip project or its developers in any way.
4242

43-
- Installing the runtime on any system will download the unmodified Mozilla Firefox
44-
<https://www.mozilla.org/firefox/>, and locally modify it. By using this project you also
45-
agree to the Firefox Privacy Notice <https://www.mozilla.org/privacy/firefox/>. Firefox is
46-
licensed under the Mozilla Public License 2.0. Firefox and the Firefox logo are trademarks
47-
of the Mozilla Foundation in the U.S. and other countries. This project is not affiliated
48-
with the Mozilla Foundation in any way.
43+
- Installing the runtime on any system will download the unmodified Mozilla Firefox browser
44+
<https://www.mozilla.org/firefox/> and locally modify it. By using the runtime you agree
45+
to the Firefox Terms of Use <https://www.mozilla.org/about/legal/terms/firefox/> and
46+
Privacy Notice <https://www.mozilla.org/privacy/firefox/>. Firefox is licensed under the
47+
Mozilla Public License 2.0. Firefox and the Firefox logo are trademarks of the Mozilla
48+
Foundation in the U.S. and other countries. This project is not affiliated with the Mozilla
49+
Foundation in any way.

native/packages/paf/PWAsForFirefoxPortable/App/AppInfo/EULA.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ The project uses additional third-party assets and code:
1616

1717
Additional open source software will be downloaded if you continue with the installation:
1818

19-
- Proceeding with the installation will automatically download the unmodified Mozilla Firefox <https://www.mozilla.org/firefox/>, and locally modify it. By using this project you also agree to the Firefox Privacy Notice <https://www.mozilla.org/privacy/firefox/>. Firefox is licensed under the Mozilla Public License 2.0. Firefox and the Firefox logo are trademarks of the Mozilla Foundation in the U.S. and other countries. This project is not affiliated with the Mozilla Foundation in any way.
19+
- Proceeding with the installation will automatically download the unmodified Mozilla Firefox browser <https://www.mozilla.org/firefox/> and locally modify it. By using the runtime you agree to the Firefox Terms of Use <https://www.mozilla.org/about/legal/terms/firefox/> and Privacy Notice <https://www.mozilla.org/privacy/firefox/>. Firefox is licensed under the Mozilla Public License 2.0. Firefox and the Firefox logo are trademarks of the Mozilla Foundation in the U.S. and other countries. This project is not affiliated with the Mozilla Foundation in any way.

native/packages/wix/assets/license.rtf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ The project uses additional third-party assets and code:\par
1515
\par
1616
Additional open source software will be downloaded and installed at runtime when initiated by the user:\par
1717
\pard{\pntext\f2\'B7\tab}{\*\pn\pnlvlblt\pnf2\pnindent0{\pntxtb\'B7}}\fi-360\li540\ri120\sb120\sa120\qj Installing the runtime on Windows will install {{\field{\*\fldinst{HYPERLINK https://7-zip.org/ }}{\fldrslt{7-Zip}}}} if it is not already installed. The 7-Zip project is made by Igor Pavlov and {{\field{\*\fldinst{HYPERLINK https://7-zip.org/license.txt }}{\fldrslt{licensed under the GNU LGPL license and others}}}}. This project is not affiliated with the 7-Zip project or its developers in any way.\par
18-
{\pntext\f2\'B7\tab}Installing the runtime on any system will download the unmodified {{\field{\*\fldinst{HYPERLINK https://www.mozilla.org/firefox/ }}{\fldrslt{Mozilla Firefox}}}}, and locally modify it. By using this project you also agree to {{\field{\*\fldinst{HYPERLINK https://www.mozilla.org/privacy/firefox/ }}{\fldrslt{the Firefox Privacy Notice}}}}. Firefox is licensed under the Mozilla Public License 2.0. Firefox and the Firefox logo are trademarks of the Mozilla Foundation in the U.S. and other countries. This project is not affiliated with the Mozilla Foundation in any way.\par
18+
{\pntext\f2\'B7\tab}Installing the runtime on any system will download the unmodified {{\field{\*\fldinst{HYPERLINK https://www.mozilla.org/firefox/ }}{\fldrslt{Mozilla Firefox}}}} browser and locally modify it. By using the runtime you agree to the Firefox {{\field{\*\fldinst{HYPERLINK https://www.mozilla.org/about/legal/terms/firefox/ }}{\fldrslt{Terms of Use}}}} and {{\field{\*\fldinst{HYPERLINK https://www.mozilla.org/privacy/firefox/ }}{\fldrslt{Privacy Notice}}}}. Firefox is licensed under the Mozilla Public License 2.0. Firefox and the Firefox logo are trademarks of the Mozilla Foundation in the U.S. and other countries. This project is not affiliated with the Mozilla Foundation in any way.\par
1919
\pard\li120\ri120\sb120\sa120\qj
2020
\par
2121
This license is also available at: https://github.com/filips123/PWAsForFirefox#license\par

native/src/components/_7zip.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -141,11 +141,11 @@ impl _7Zip {
141141
const EXEC_ERROR: &str = "Failed to execute the 7-Zip installer";
142142
const CLEANUP_ERROR: &str = "Failed to clean up the 7-Zip installer";
143143

144-
warn!(
145-
"This will install 7-Zip, made by Igor Pavlov, licensed under the GNU LGPL license and others"
146-
);
144+
warn!("This will install 7-Zip on your system");
145+
warn!("7-Zip is made by Igor Pavlov, and licensed under the GNU LGPL license and others");
147146
warn!("This project is not affiliated with the 7-Zip project or its developers in any way");
148-
warn!("Check the 7-zip website for more details: https://7-zip.org/");
147+
warn!("7-Zip License: https://7-zip.org/license.txt");
148+
warn!("7-Zip Website: https://7-zip.org/");
149149

150150
let mut installer = Builder::new()
151151
.prefix("firefoxpwa-7zip-")

native/src/components/runtime.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -261,10 +261,10 @@ impl Runtime {
261261
warn!("Firefox is licensed under the Mozilla Public License 2.0");
262262
warn!("Firefox is a trademark of the Mozilla Foundation in the U.S. and other countries");
263263
warn!("This project is not affiliated with the Mozilla Foundation in any way");
264-
warn!(
265-
"By using this project you also agree to the Firefox Privacy Notice: https://www.mozilla.org/privacy/firefox/"
266-
);
267-
warn!("Check the Firefox website for more details: https://www.mozilla.org/firefox/");
264+
warn!("By using the runtime you agree to the Firefox Terms of Use and Privacy Notice");
265+
warn!("Firefox Terms of Use: https://www.mozilla.org/about/legal/terms/firefox/");
266+
warn!("Firefox Privacy Notice: https://www.mozilla.org/privacy/firefox/");
267+
warn!("Firefox Website: https://www.mozilla.org/firefox/");
268268

269269
info!("Downloading the runtime archive");
270270
let mut archive = NamedTempFile::new().context(TEMP_FILE_ERROR)?;

native/userchrome/profile/chrome/pwa/content/browser.sys.mjs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1852,6 +1852,7 @@ class PwaBrowser {
18521852
xPref.set('browser.uidensity', 1, true);
18531853
xPref.set('browser.link.open_newwindow', 1, true);
18541854
xPref.set('datareporting.policy.firstRunURL', '', true);
1855+
xPref.set('termsofuse.bypassNotification', true, true);
18551856

18561857
// Prevent syncing preferences that are commonly set to different values in web apps
18571858
// In the future, we could try to implement a different syncing "channel" just for web apps

0 commit comments

Comments
 (0)