diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2022-04-25 15:07:03 +0200 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2022-04-25 15:07:03 +0200 |
| commit | bc686e487e4d0eb48d7d884bb74f5d30130d60d3 (patch) | |
| tree | d3f2c6af2acd9871859795b7a82c251c2d1ac9af /gui/src/main | |
| parent | 3df0b46aef719777e72641c59f3dac0f5be754a3 (diff) | |
| parent | 1457595ef6ab9ea7acd29c2be915b99c14c12fd1 (diff) | |
| download | mullvadvpn-bc686e487e4d0eb48d7d884bb74f5d30130d60d3.tar.xz mullvadvpn-bc686e487e4d0eb48d7d884bb74f5d30130d60d3.zip | |
Merge branch 'extend-dns-blocking'
Diffstat (limited to 'gui/src/main')
| -rw-r--r-- | gui/src/main/daemon-rpc.ts | 4 | ||||
| -rw-r--r-- | gui/src/main/index.ts | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/gui/src/main/daemon-rpc.ts b/gui/src/main/daemon-rpc.ts index 52c43441a6..029936093f 100644 --- a/gui/src/main/daemon-rpc.ts +++ b/gui/src/main/daemon-rpc.ts @@ -463,6 +463,8 @@ export class DaemonRpc { defaultOptions.setBlockAds(dns.defaultOptions.blockAds); defaultOptions.setBlockTrackers(dns.defaultOptions.blockTrackers); defaultOptions.setBlockMalware(dns.defaultOptions.blockMalware); + defaultOptions.setBlockAdultContent(dns.defaultOptions.blockAdultContent); + defaultOptions.setBlockGambling(dns.defaultOptions.blockGambling); dnsOptions.setDefaultOptions(defaultOptions); const customOptions = new grpcTypes.CustomDnsOptions(); @@ -1131,6 +1133,8 @@ function convertFromTunnelOptions(tunnelOptions: grpcTypes.TunnelOptions.AsObjec blockAds: tunnelOptions.dnsOptions?.defaultOptions?.blockAds ?? false, blockTrackers: tunnelOptions.dnsOptions?.defaultOptions?.blockTrackers ?? false, blockMalware: tunnelOptions.dnsOptions?.defaultOptions?.blockMalware ?? false, + blockAdultContent: tunnelOptions.dnsOptions?.defaultOptions?.blockAdultContent ?? false, + blockGambling: tunnelOptions.dnsOptions?.defaultOptions?.blockGambling ?? false, }, customOptions: { addresses: tunnelOptions.dnsOptions?.customOptions?.addressesList ?? [], diff --git a/gui/src/main/index.ts b/gui/src/main/index.ts index 8acdac16a0..c1fb5407f7 100644 --- a/gui/src/main/index.ts +++ b/gui/src/main/index.ts @@ -197,6 +197,8 @@ class ApplicationMain { blockAds: false, blockTrackers: false, blockMalware: false, + blockAdultContent: false, + blockGambling: false, }, customOptions: { addresses: [], |