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
Bug 42438: Tweaks to the migration wizard.

Remove the items not compatible with our features (such as history) from
the migration wizard.

On Linux, allow to specify an alternative home directory, since we
usually change $HOME in our startup script.

- - - - -


2 changed files:

- browser/components/migration/ChromeMigrationUtils.sys.mjs
- browser/components/migration/content/migration-wizard.mjs


Changes:

=====================================
browser/components/migration/ChromeMigrationUtils.sys.mjs
=====================================
@@ -317,7 +317,10 @@ export var ChromeMigrationUtils = {
     for (let subfolders of options) {
       let rootDir = subfolders[0];
       try {
-        let targetPath = Services.dirsvc.get(rootDir, Ci.nsIFile).path;
+        let targetPath =
+          rootDir === "Home" && Services.env.get("BB_ORIGINAL_HOME")
+            ? Services.env.get("BB_ORIGINAL_HOME")
+            : Services.dirsvc.get(rootDir, Ci.nsIFile).path;
         targetPath = PathUtils.join(targetPath, ...subfolders.slice(1));
         if (await IOUtils.exists(targetPath)) {
           return targetPath;


=====================================
browser/components/migration/content/migration-wizard.mjs
=====================================
@@ -416,7 +416,10 @@ export class MigrationWizard extends HTMLElement {
     }
 
     let key = panelItem.getAttribute("key");
-    let resourceTypes = panelItem.resourceTypes;
+    const allowedTypes = ["BOOKMARKS"];
+    let resourceTypes = panelItem.resourceTypes.filter(t =>
+      allowedTypes.includes(t)
+    );
 
     for (let child of this.#resourceTypeList.querySelectorAll(
       "label[data-resource-type]"



View it on GitLab: 
https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/1b9657fb3b6d8593013d11ed479c28d8784e7a52

-- 
View it on GitLab: 
https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/1b9657fb3b6d8593013d11ed479c28d8784e7a52
You're receiving this email because of your account on gitlab.torproject.org.


_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

Reply via email to