forked from ZenBrowserMirrors/zen-desktop
Merge pull request #7901 from zen-browser/maximise-privacy
This commit is contained in:
commit
b51c205538
5 changed files with 74 additions and 21 deletions
|
@ -107,6 +107,9 @@ mk_add_options MOZ_DATA_REPORTING=
|
|||
mk_add_options MOZ_SERVICES_HEALTHREPORT=
|
||||
mk_add_options MOZ_TELEMETRY_REPORTING=
|
||||
|
||||
ac_add_options MOZ_DATA_REPORTING=
|
||||
ac_add_options MOZ_TELEMETRY_REPORTING=
|
||||
|
||||
# Allow loading unsigned extensions
|
||||
export MOZ_REQUIRE_SIGNING=
|
||||
mk_add_options MOZ_REQUIRE_SIGNING=
|
||||
|
|
|
@ -279,9 +279,6 @@ pref('browser.download.open_pdf_attachments_inline', true);
|
|||
pref('browser.download.alwaysOpenPanel', false);
|
||||
|
||||
// Tracking protection
|
||||
pref("urlclassifier.trackingSkipURLs", "*.reddit.com, *.x.com, *.twimg.com, *.tiktok.com");
|
||||
pref("urlclassifier.features.socialtracking.skipURLs", "*.instagram.com, *.x.com, *.twimg.com");
|
||||
pref("network.cookie.sameSite.noneRequiresSecure", true);
|
||||
pref("browser.helperApps.deleteTempFileOnExit", true);
|
||||
pref("browser.uitour.enabled", false);
|
||||
|
||||
|
|
|
@ -631,7 +631,7 @@ var gZenVerticalTabsManager = {
|
|||
try {
|
||||
gURLBar.zenUpdateLayoutBreakout();
|
||||
} catch (e) {
|
||||
console.error(e);
|
||||
console.warn(e);
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
|
@ -290,7 +290,7 @@
|
|||
container.insertBefore(newTab, container.lastChild);
|
||||
}
|
||||
} else {
|
||||
document.getElementById('zen-essentials-container').appendChild(newTab);
|
||||
ZenWorkspaces.getEssentialsSection(pin.containerTabId).appendChild(newTab);
|
||||
}
|
||||
gBrowser.tabContainer._invalidateCachedTabs();
|
||||
newTab.initialize();
|
||||
|
@ -1008,6 +1008,7 @@
|
|||
if (!pin) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (pin.url === 'about:blank' && tab.linkedBrowser.currentURI.spec !== 'about:blank') {
|
||||
await this.replacePinnedUrlWithCurrent(tab);
|
||||
}
|
||||
|
|
|
@ -42,13 +42,57 @@
|
|||
window.MozXULElement.insertFTLIfNeeded('browser/zen-welcome.ftl');
|
||||
}
|
||||
|
||||
function openInitialPinTab() {
|
||||
const tabs = ['https://reddit.com/r/zen_browser', 'https://x.com/zen_browser'];
|
||||
for (const url of tabs) {
|
||||
const tab = window.gBrowser.addTrustedTab(url, {
|
||||
var _iconToData = {};
|
||||
|
||||
async function getIconData(iconURL) {
|
||||
if (_iconToData[iconURL]) {
|
||||
return _iconToData[iconURL];
|
||||
}
|
||||
const response = await fetch(iconURL);
|
||||
if (!response.ok) {
|
||||
console.error(`Failed to fetch icon: ${iconURL}`);
|
||||
return null;
|
||||
}
|
||||
const blob = await response.blob();
|
||||
const reader = new FileReader();
|
||||
const data = await new Promise((resolve) => {
|
||||
reader.onloadend = () => {
|
||||
const base64Data = reader.result.split(',')[1];
|
||||
_iconToData[iconURL] = `data:${blob.type};base64,${base64Data}`;
|
||||
resolve(_iconToData[iconURL]);
|
||||
};
|
||||
reader.readAsDataURL(blob);
|
||||
});
|
||||
return data;
|
||||
}
|
||||
|
||||
async function setCachedFaviconForURL(pageUrl, iconURL) {
|
||||
try {
|
||||
// TODO: This always return "NS_ERROR_NOT_AVAILABLE" for some reason, figure out why
|
||||
await PlacesUtils.favicons.setFaviconForPage(
|
||||
Services.io.newURI(pageUrl),
|
||||
Services.io.newURI('fake-favicon-uri:' + pageUrl),
|
||||
Services.io.newURI(iconURL)
|
||||
);
|
||||
} catch (ex) {
|
||||
console.error(`Failed to set cached favicon for ${pageUrl}: ${ex}`);
|
||||
}
|
||||
}
|
||||
|
||||
async function openInitialPinTab() {
|
||||
const tabs = [
|
||||
['https://reddit.com/r/zen_browser', 'Zen on Reddit', 'https://zen-browser.github.io/static-cdn/reddit.png'],
|
||||
['https://x.com/zen_browser', 'Zen on Twitter', 'https://zen-browser.github.io/static-cdn/x.png'],
|
||||
];
|
||||
for (const site of tabs) {
|
||||
const tab = window.gBrowser.addTrustedTab(site[0], {
|
||||
inBackground: true,
|
||||
skipAnimation: true,
|
||||
createLazyBrowser: true,
|
||||
lazyTabTitle: site[1],
|
||||
});
|
||||
const iconData = await getIconData(site[2]);
|
||||
await setCachedFaviconForURL(site[0], iconData);
|
||||
gBrowser.setIcon(tab, iconData);
|
||||
_tabsToPin.push(tab);
|
||||
}
|
||||
}
|
||||
|
@ -188,6 +232,7 @@
|
|||
}
|
||||
|
||||
async finish() {
|
||||
_iconToData = undefined; // Unload icon data
|
||||
ZenWorkspaces.reorganizeTabsAfterWelcome();
|
||||
await animate('#zen-welcome-page-content', { x: [0, '100%'] }, { bounce: 0 });
|
||||
document.getElementById('zen-welcome-page-content').remove();
|
||||
|
@ -329,47 +374,47 @@
|
|||
<html:div></html:div>
|
||||
</hbox>
|
||||
<html:div id="zen-welcome-initial-essentials-browser-sidebar-essentials">
|
||||
<html:div class="tabbrowser-tab" fadein="" data-url="https://web.whatsapp.com" style="--zen-tab-icon: url('https://web.whatsapp.com/favicon.ico');">
|
||||
<html:div class="tabbrowser-tab" fadein="" data-url="https://obsidian.md" style="--zen-tab-icon: url('https://zen-browser.github.io/static-cdn/obsidian.ico');">
|
||||
<stack class="tab-stack">
|
||||
<html:div class="tab-background"></html:div>
|
||||
</stack>
|
||||
</html:div>
|
||||
<html:div class="tabbrowser-tab" fadein="" visuallyselected="" data-url="https://discord.com" style="--zen-tab-icon: url('https://www.google.com/s2/favicons?domain=discord.com');">
|
||||
<html:div class="tabbrowser-tab" fadein="" visuallyselected="" data-url="https://discord.com" style="--zen-tab-icon: url('https://zen-browser.github.io/static-cdn/discord.png');">
|
||||
<stack class="tab-stack">
|
||||
<html:div class="tab-background"></html:div>
|
||||
</stack>
|
||||
</html:div>
|
||||
<html:div class="tabbrowser-tab" fadein="" data-url="https://trello.com" style="--zen-tab-icon: url('https://trello.com/favicon.ico');">
|
||||
<html:div class="tabbrowser-tab" fadein="" data-url="https://trello.com" style="--zen-tab-icon: url('https://zen-browser.github.io/static-cdn/trello.ico');">
|
||||
<stack class="tab-stack">
|
||||
<html:div class="tab-background"></html:div>
|
||||
</stack>
|
||||
</html:div>
|
||||
<html:div class="tabbrowser-tab" fadein="" data-url="https://slack.com/" style="--zen-tab-icon: url('https://a.slack-edge.com/80588/marketing/img/meta/favicon-32.png');">
|
||||
<html:div class="tabbrowser-tab" fadein="" data-url="https://slack.com/" style="--zen-tab-icon: url('https://zen-browser.github.io/static-cdn/slack.png');">
|
||||
<stack class="tab-stack">
|
||||
<html:div class="tab-background"></html:div>
|
||||
</stack>
|
||||
</html:div>
|
||||
<html:div class="tabbrowser-tab" fadein="" data-url="https://github.com" style="--zen-tab-icon: url('https://github.githubassets.com/favicons/favicon-dark.png');">
|
||||
<html:div class="tabbrowser-tab" fadein="" visuallyselected="" data-url="https://github.com" style="--zen-tab-icon: url('https://zen-browser.github.io/static-cdn/github.png');">
|
||||
<stack class="tab-stack">
|
||||
<html:div class="tab-background"></html:div>
|
||||
</stack>
|
||||
</html:div>
|
||||
<html:div class="tabbrowser-tab" fadein="" data-url="https://twitter.com" style="--zen-tab-icon: url('https://abs.twimg.com/favicons/twitter.ico');">
|
||||
<html:div class="tabbrowser-tab" fadein="" data-url="https://twitter.com" style="--zen-tab-icon: url('https://zen-browser.github.io/static-cdn/x.png');">
|
||||
<stack class="tab-stack">
|
||||
<html:div class="tab-background"></html:div>
|
||||
</stack>
|
||||
</html:div>
|
||||
<html:div class="tabbrowser-tab" fadein="" visuallyselected="" data-url="https://notion.com" style="--zen-tab-icon: url('https://www.notion.so/front-static/favicon.ico');">
|
||||
<html:div class="tabbrowser-tab" fadein="" visuallyselected="" data-url="https://notion.com" style="--zen-tab-icon: url('https://zen-browser.github.io/static-cdn/notion.ico');">
|
||||
<stack class="tab-stack">
|
||||
<html:div class="tab-background"></html:div>
|
||||
</stack>
|
||||
</html:div>
|
||||
<html:div class="tabbrowser-tab" fadein="" visuallyselected="" data-url="https://calendar.google.com" style="--zen-tab-icon: url('https://calendar.google.com/googlecalendar/images/favicons_2020q4/calendar_6.ico');">
|
||||
<html:div class="tabbrowser-tab" fadein="" data-url="https://calendar.google.com" style="--zen-tab-icon: url('https://zen-browser.github.io/static-cdn/calendar.ico');">
|
||||
<stack class="tab-stack">
|
||||
<html:div class="tab-background"></html:div>
|
||||
</stack>
|
||||
</html:div>
|
||||
<html:div class="tabbrowser-tab" fadein="" data-url="https://youtube.com" style="--zen-tab-icon: url('https://www.youtube.com/favicon.ico');">
|
||||
<html:div class="tabbrowser-tab" fadein="" data-url="https://youtube.com" style="--zen-tab-icon: url('https://zen-browser.github.io/static-cdn/youtube.ico');">
|
||||
<stack class="tab-stack">
|
||||
<html:div class="tab-background"></html:div>
|
||||
</stack>
|
||||
|
@ -392,7 +437,7 @@
|
|||
tab.toggleAttribute('visuallyselected');
|
||||
});
|
||||
},
|
||||
fadeOut() {
|
||||
async fadeOut() {
|
||||
const selectedTabs = document
|
||||
.getElementById('zen-welcome-initial-essentials-browser-sidebar-essentials')
|
||||
.querySelectorAll('.tabbrowser-tab[visuallyselected]');
|
||||
|
@ -400,10 +445,17 @@
|
|||
const url = tab.getAttribute('data-url');
|
||||
const createdTab = window.gBrowser.addTrustedTab(url, {
|
||||
inBackground: true,
|
||||
createLazyBrowser: true,
|
||||
});
|
||||
let essentialIconUrl = tab.style.getPropertyValue('--zen-tab-icon');
|
||||
// Remove url() from the icon URL
|
||||
essentialIconUrl = essentialIconUrl.replace(/url\(['"]?/, '').replace(/['"]?\)/, '');
|
||||
essentialIconUrl = await getIconData(essentialIconUrl);
|
||||
await setCachedFaviconForURL(url, essentialIconUrl);
|
||||
gBrowser.setIcon(createdTab, essentialIconUrl);
|
||||
_tabsToPinEssentials.push(createdTab);
|
||||
}
|
||||
openInitialPinTab();
|
||||
await openInitialPinTab();
|
||||
},
|
||||
},
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue