mirrors/desktop
1
0
Fork 0
mirror of https://github.com/zen-browser/desktop.git synced 2026-04-28 10:14:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: Stop using folder refs to prevent leakage, b=no-bug, c=folders

Browse Source
This commit is contained in:
mr. m
2026-02-28 11:22:55 +01:00
parent 881c411a26
commit ee3ec4c1ea
3 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/zen/live-folders/ZenLiveFoldersManager.sys.mjs
View File

@@ -39,7 +39,6 @@ class nsZenLiveFoldersManager {
this.liveFolders = new Map(); this.liveFolders = new Map();
this.registry = new Map(); this.registry = new Map();
this.dismissedItems = new Set(); this.dismissedItems = new Set();
this.folderRefs = new WeakMap();
} }
get window() { get window() {
@@ -217,7 +216,6 @@ class nsZenLiveFoldersManager {
}); });
this.liveFolders.set(folder.id, liveFolder); this.liveFolders.set(folder.id, liveFolder);
this.folderRefs.set(liveFolder, folder);
liveFolder.start(); liveFolder.start();
this.saveState(); this.saveState();
@@ -458,20 +456,14 @@ class nsZenLiveFoldersManager {
} }
getFolderForLiveFolder(liveFolder) { getFolderForLiveFolder(liveFolder) {
if (this.folderRefs.has(liveFolder)) {
return this.folderRefs.get(liveFolder);
}
if (!this.window) { if (!this.window) {
return null; return null;
} }
const folder = lazy.ZenWindowSync.getItemFromWindow(this.window, liveFolder.id); const folder = lazy.ZenWindowSync.getItemFromWindow(this.window, liveFolder.id);
if (folder?.isZenFolder) { if (folder?.isZenFolder) {
this.folderRefs.set(liveFolder, folder); return folder;
} }
return null;
return folder;
} }
#makeCompositeId(folderId, itemId) { #makeCompositeId(folderId, itemId) {
@@ -578,7 +570,6 @@ class nsZenLiveFoldersManager {
}); });
this.liveFolders.set(entry.id, liveFolder); this.liveFolders.set(entry.id, liveFolder);
this.folderRefs.set(liveFolder, folder);
liveFolder.tabsState = entry.tabsState || []; liveFolder.tabsState = entry.tabsState || [];
liveFolder.state.lastErrorId = entry.data.state.lastErrorId; liveFolder.state.lastErrorId = entry.data.state.lastErrorId;
if (entry.dismissedItems && Array.isArray(entry.dismissedItems)) { if (entry.dismissedItems && Array.isArray(entry.dismissedItems)) {

3
src/zen/live-folders/providers/GithubLiveFolder.sys.mjs
View File

@@ -78,7 +78,8 @@ export class nsGithubLiveFolderProvider extends nsZenLiveFolderProvider {
this.state.repos = activeRepos; this.state.repos = activeRepos;
return items; return items;
} catch { } catch (error) {
console.error("Error fetching or parsing GitHub issues:", error);
return "zen-live-folder-failed-fetch"; return "zen-live-folder-failed-fetch";
} }
} }

3
src/zen/live-folders/providers/RssLiveFolder.sys.mjs
View File

@@ -80,7 +80,8 @@ export class nsRssLiveFolderProvider extends nsZenLiveFolderProvider {
} }
} }
return items; return items;
} catch { } catch (error) {
console.error("Error fetching or parsing RSS feed:", error);
return "zen-live-folder-failed-fetch"; return "zen-live-folder-failed-fetch";
} }
} }