summaryrefslogtreecommitdiffhomepage
path: root/gui/src/main
diff options
context:
space:
mode:
authorDavid Lönnhager <david.l@mullvad.net>2023-09-29 13:49:06 +0200
committerDavid Lönnhager <david.l@mullvad.net>2023-09-29 14:34:59 +0200
commite67ded577e10355b115b78600924bba797afabc9 (patch)
tree37867cd80dda649ce3aba9f970f19ab618e15745 /gui/src/main
parent4065b91a915853548f3ba4799e5b01e40381cc4d (diff)
downloadmullvadvpn-e67ded577e10355b115b78600924bba797afabc9.tar.xz
mullvadvpn-e67ded577e10355b115b78600924bba797afabc9.zip
Add social media blocking server
Diffstat (limited to 'gui/src/main')
-rw-r--r--gui/src/main/daemon-rpc.ts2
-rw-r--r--gui/src/main/default-settings.ts1
2 files changed, 3 insertions, 0 deletions
diff --git a/gui/src/main/daemon-rpc.ts b/gui/src/main/daemon-rpc.ts
index ed9fb77b48..fbaa2fe9d9 100644
--- a/gui/src/main/daemon-rpc.ts
+++ b/gui/src/main/daemon-rpc.ts
@@ -539,6 +539,7 @@ export class DaemonRpc {
defaultOptions.setBlockMalware(dns.defaultOptions.blockMalware);
defaultOptions.setBlockAdultContent(dns.defaultOptions.blockAdultContent);
defaultOptions.setBlockGambling(dns.defaultOptions.blockGambling);
+ defaultOptions.setBlockSocialMedia(dns.defaultOptions.blockSocialMedia);
dnsOptions.setDefaultOptions(defaultOptions);
const customOptions = new grpcTypes.CustomDnsOptions();
@@ -1272,6 +1273,7 @@ function convertFromTunnelOptions(tunnelOptions: grpcTypes.TunnelOptions.AsObjec
blockMalware: tunnelOptions.dnsOptions?.defaultOptions?.blockMalware ?? false,
blockAdultContent: tunnelOptions.dnsOptions?.defaultOptions?.blockAdultContent ?? false,
blockGambling: tunnelOptions.dnsOptions?.defaultOptions?.blockGambling ?? false,
+ blockSocialMedia: tunnelOptions.dnsOptions?.defaultOptions?.blockSocialMedia ?? false,
},
customOptions: {
addresses: tunnelOptions.dnsOptions?.customOptions?.addressesList ?? [],
diff --git a/gui/src/main/default-settings.ts b/gui/src/main/default-settings.ts
index 9989575f80..40c75042f8 100644
--- a/gui/src/main/default-settings.ts
+++ b/gui/src/main/default-settings.ts
@@ -55,6 +55,7 @@ export function getDefaultSettings(): ISettings {
blockMalware: false,
blockAdultContent: false,
blockGambling: false,
+ blockSocialMedia: false,
},
customOptions: {
addresses: [],