Pier Angelo Vendrame pushed to branch tor-browser-128.3.0esr-14.0-1 at The Tor Project / Applications / Tor Browser
Commits:
-
aad5e9c7
by Beatriz Rizental at 2024-10-22T10:15:38+02:00
-
b27ebe80
by Beatriz Rizental at 2024-10-22T10:16:06+02:00
-
7d9e9856
by Beatriz Rizental at 2024-10-22T10:20:38+02:00
-
638726b3
by Beatriz Rizental at 2024-10-22T10:24:10+02:00
5 changed files:
- .gitlab/ci/lint.yml
- docshell/base/nsAboutRedirector.cpp
- mobile/android/geckoview/src/main/java/org/mozilla/geckoview/CrashReporter.java
- toolkit/mozapps/extensions/AddonManager.sys.mjs
- toolkit/mozapps/extensions/internal/XPIInstall.sys.mjs
Changes:
| ... | ... | @@ -264,6 +264,7 @@ file-whitespace: |
| 264 | 264 | - '**/*.rst'
|
| 265 | 265 | - '**/*.webidl'
|
| 266 | 266 | - '**/*.xhtml'
|
| 267 | + - '**/*.java'
|
|
| 267 | 268 | - 'tools/lint/file-whitespace.yml'
|
| 268 | 269 | # Run job whenever a commit is merged to a protected branch
|
| 269 | 270 | - if: $CI_COMMIT_REF_PROTECTED == 'true'
|
| ... | ... | @@ -193,7 +193,7 @@ static const RedirEntry kRedirMap[] = { |
| 193 | 193 | # endif
|
| 194 | 194 | {"telemetry", "chrome://global/content/aboutTelemetry.xhtml",
|
| 195 | 195 | nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI},
|
| 196 | -#endif
|
|
| 196 | +#endif
|
|
| 197 | 197 | {"torconnect", "chrome://global/content/torconnect/aboutTorConnect.html",
|
| 198 | 198 | nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
|
| 199 | 199 | nsIAboutModule::URI_CAN_LOAD_IN_CHILD | nsIAboutModule::ALLOW_SCRIPT |
|
| ... | ... | @@ -173,7 +173,7 @@ public class CrashReporter { |
| 173 | 173 | if (true) {
|
| 174 | 174 | return GeckoResult.fromValue("0");
|
| 175 | 175 | }
|
| 176 | -
|
|
| 176 | + |
|
| 177 | 177 | Log.d(LOGTAG, "Sending crash report: " + minidumpFile.getPath());
|
| 178 | 178 | |
| 179 | 179 | HttpURLConnection conn = null;
|
| ... | ... | @@ -2541,7 +2541,8 @@ var AddonManagerInternal = { |
| 2541 | 2541 | if (installAllowed) {
|
| 2542 | 2542 | if (AppConstants.platform == "android") {
|
| 2543 | 2543 | aInstall.cancel();
|
| 2544 | - return this.installGeckoViewWebExtension(aInstall.sourceURI);
|
|
| 2544 | + this.installGeckoViewWebExtension(aInstall.sourceURI);
|
|
| 2545 | + return;
|
|
| 2545 | 2546 | }
|
| 2546 | 2547 | startInstall("AMO");
|
| 2547 | 2548 | } else if (installPerm === Ci.nsIPermissionManager.DENY_ACTION) {
|
| ... | ... | @@ -4476,7 +4476,10 @@ export var XPIInstall = { |
| 4476 | 4476 | }
|
| 4477 | 4477 | |
| 4478 | 4478 | // tor-browser#43132: short-circuit permission check on Android scriptless install from AMO
|
| 4479 | - if (AppConstants.platform == "android" && uri.prePath == "https://addons.mozilla.org") {
|
|
| 4479 | + if (
|
|
| 4480 | + AppConstants.platform == "android" &&
|
|
| 4481 | + uri.prePath == "https://addons.mozilla.org"
|
|
| 4482 | + ) {
|
|
| 4480 | 4483 | return true;
|
| 4481 | 4484 | }
|
| 4482 | 4485 |