([]);
+
+ const forceUpdate = useUpdate();
+
+ const hasAtLeastOneSelected = Boolean(selectedHostnames.length);
+ const trustedWebsites = TrustedWebsitesController.getTrustedWebsites();
+ const noTrustedWebsites = !trustedWebsites.length;
+
+ function toggleTrustedWebsitesList() {
+ if (trustedWebsites.length) {
+ setExpanded(!expanded);
+ }
+ }
+
+ async function removeTrustedWebsites() {
+ if (selectedHostnames.length) {
+ await TrustedWebsitesController.removeFromTrusted(selectedHostnames);
+ emptySelected();
+ ToastUtils.pushToastSuccess('removed', window.i18n('removed'));
+ forceUpdate();
+ }
+ }
+
+ return (
+
+
+
+
+ {noTrustedWebsites ? (
+
+ ) : (
+
+ {hasAtLeastOneSelected && expanded ? (
+
+ ) : null}
+
+
+
+ )}
+
+
+ {expanded && !noTrustedWebsites ? (
+ <>
+
+
+
+ ) : null}
+
+ );
+};
+
+const NoTrustedWebsites = () => {
+ return {window.i18n('noTrustedWebsitesEntries')}
;
+};
diff --git a/ts/components/settings/section/CategoryPrivacy.tsx b/ts/components/settings/section/CategoryPrivacy.tsx
index 4c48f54267..0400810705 100644
--- a/ts/components/settings/section/CategoryPrivacy.tsx
+++ b/ts/components/settings/section/CategoryPrivacy.tsx
@@ -19,6 +19,7 @@ import {
import { Storage } from '../../../util/storage';
import { SessionSettingButtonItem, SessionToggleWithDescription } from '../SessionSettingListItem';
import { displayPasswordModal } from '../SessionSettings';
+import { TrustedWebsitesList } from '../TrustedWebsitesList';
async function toggleLinkPreviews(isToggleOn: boolean, forceUpdate: () => void) {
if (!isToggleOn) {
@@ -142,6 +143,8 @@ export const SettingsCategoryPrivacy = (props: {
/>
)}
+
+
);
};
diff --git a/ts/types/LocalizerKeys.ts b/ts/types/LocalizerKeys.ts
index 14aa1aba96..a895d4c3cf 100644
--- a/ts/types/LocalizerKeys.ts
+++ b/ts/types/LocalizerKeys.ts
@@ -337,6 +337,7 @@ export type LocalizerKeys =
| 'noModeratorsToRemove'
| 'noNameOrMessage'
| 'noSearchResults'
+ | 'noTrustedWebsitesEntries'
| 'notApplicable'
| 'noteToSelf'
| 'notificationForConvo'
@@ -425,6 +426,7 @@ export type LocalizerKeys =
| 'removePasswordTitle'
| 'removePasswordToastDescription'
| 'removeResidueMembers'
+ | 'removed'
| 'replyToMessage'
| 'replyingToMessage'
| 'reportIssue'
@@ -527,8 +529,11 @@ export type LocalizerKeys =
| 'trimDatabase'
| 'trimDatabaseConfirmationBody'
| 'trimDatabaseDescription'
+ | 'trustHostname'
| 'trustThisContactDialogDescription'
| 'trustThisContactDialogTitle'
+ | 'trustedWebsites'
+ | 'trustedWebsitesDescription'
| 'tryAgain'
| 'typeInOldPassword'
| 'typingAlt'
diff --git a/ts/util/index.ts b/ts/util/index.ts
index 83d746404a..7778a8b22e 100644
--- a/ts/util/index.ts
+++ b/ts/util/index.ts
@@ -5,5 +5,6 @@ import * as AttachmentUtil from './attachmentsUtil';
import * as LinkPreviewUtil from './linkPreviewFetch';
export * from './blockedNumberController';
+export * from './trustedWebsitesController';
export { arrayBufferToObjectURL, GoogleChrome, missingCaseError, AttachmentUtil, LinkPreviewUtil };
diff --git a/ts/util/trustedWebsitesController.ts b/ts/util/trustedWebsitesController.ts
new file mode 100644
index 0000000000..ee3082639b
--- /dev/null
+++ b/ts/util/trustedWebsitesController.ts
@@ -0,0 +1,67 @@
+import { Data } from '../data/data';
+import { Storage } from './storage';
+
+const TRUSTED_WEBSITES_ID = 'trusted-websites';
+
+export class TrustedWebsitesController {
+ private static loaded: boolean = false;
+ private static trustedWebsites: Set = new Set();
+
+ public static isTrusted(hostname: string): boolean {
+ return this.trustedWebsites.has(hostname);
+ }
+
+ public static async addToTrusted(hostname: string): Promise {
+ await this.load();
+ if (!this.trustedWebsites.has(hostname)) {
+ this.trustedWebsites.add(hostname);
+ await this.saveToDB(TRUSTED_WEBSITES_ID, this.trustedWebsites);
+ }
+ }
+
+ public static async removeFromTrusted(hostnames: Array): Promise {
+ await this.load();
+ let changes = false;
+ hostnames.forEach(hostname => {
+ if (this.trustedWebsites.has(hostname)) {
+ this.trustedWebsites.delete(hostname);
+ changes = true;
+ }
+ });
+
+ if (changes) {
+ await this.saveToDB(TRUSTED_WEBSITES_ID, this.trustedWebsites);
+ }
+ }
+
+ public static getTrustedWebsites(): Array {
+ return [...this.trustedWebsites];
+ }
+
+ // ---- DB
+
+ public static async load() {
+ if (!this.loaded) {
+ this.trustedWebsites = await this.getTrustedWebsitesFromDB(TRUSTED_WEBSITES_ID);
+ this.loaded = true;
+ }
+ }
+
+ public static reset() {
+ this.loaded = false;
+ this.trustedWebsites = new Set();
+ }
+
+ private static async getTrustedWebsitesFromDB(id: string): Promise> {
+ const data = await Data.getItemById(id);
+ if (!data || !data.value) {
+ return new Set();
+ }
+
+ return new Set(data.value);
+ }
+
+ private static async saveToDB(id: string, hostnames: Set): Promise {
+ await Storage.put(id, [...hostnames]);
+ }
+}