Pier Angelo Vendrame pushed to branch mullvad-browser-115.8.0esr-13.5-1 at The Tor Project / Applications / Mullvad Browser
Commits:
-
1b9657fb
by Pier Angelo Vendrame at 2024-03-07T10:46:47+01:00
2 changed files:
- browser/components/migration/ChromeMigrationUtils.sys.mjs
- browser/components/migration/content/migration-wizard.mjs
Changes:
| ... | ... | @@ -317,7 +317,10 @@ export var ChromeMigrationUtils = { |
| 317 | 317 | for (let subfolders of options) {
|
| 318 | 318 | let rootDir = subfolders[0];
|
| 319 | 319 | try {
|
| 320 | - let targetPath = Services.dirsvc.get(rootDir, Ci.nsIFile).path;
|
|
| 320 | + let targetPath =
|
|
| 321 | + rootDir === "Home" && Services.env.get("BB_ORIGINAL_HOME")
|
|
| 322 | + ? Services.env.get("BB_ORIGINAL_HOME")
|
|
| 323 | + : Services.dirsvc.get(rootDir, Ci.nsIFile).path;
|
|
| 321 | 324 | targetPath = PathUtils.join(targetPath, ...subfolders.slice(1));
|
| 322 | 325 | if (await IOUtils.exists(targetPath)) {
|
| 323 | 326 | return targetPath;
|
| ... | ... | @@ -416,7 +416,10 @@ export class MigrationWizard extends HTMLElement { |
| 416 | 416 | }
|
| 417 | 417 | |
| 418 | 418 | let key = panelItem.getAttribute("key");
|
| 419 | - let resourceTypes = panelItem.resourceTypes;
|
|
| 419 | + const allowedTypes = ["BOOKMARKS"];
|
|
| 420 | + let resourceTypes = panelItem.resourceTypes.filter(t =>
|
|
| 421 | + allowedTypes.includes(t)
|
|
| 422 | + );
|
|
| 420 | 423 | |
| 421 | 424 | for (let child of this.#resourceTypeList.querySelectorAll(
|
| 422 | 425 | "label[data-resource-type]"
|