summaryrefslogtreecommitdiffhomepage
path: root/gui/src/renderer/components
diff options
context:
space:
mode:
authorDavid Lönnhager <david.l@mullvad.net>2024-10-02 11:25:04 +0200
committerDavid Lönnhager <david.l@mullvad.net>2024-10-04 09:54:18 +0200
commitee849a47cd5bda0db5cafef15e4679d1ddd173d2 (patch)
treefaeecfe212216380d4b859fb62c49e0371da7647 /gui/src/renderer/components
parentb71ec360998a29f08c1220de627d078fac575b7c (diff)
downloadmullvadvpn-ee849a47cd5bda0db5cafef15e4679d1ddd173d2.tar.xz
mullvadvpn-ee849a47cd5bda0db5cafef15e4679d1ddd173d2.zip
Remove setting to leak traffic to apple networks
Diffstat (limited to 'gui/src/renderer/components')
-rw-r--r--gui/src/renderer/components/Settings.tsx68
1 files changed, 1 insertions, 67 deletions
diff --git a/gui/src/renderer/components/Settings.tsx b/gui/src/renderer/components/Settings.tsx
index d76ebb242e..0a691d340f 100644
--- a/gui/src/renderer/components/Settings.tsx
+++ b/gui/src/renderer/components/Settings.tsx
@@ -7,20 +7,10 @@ import { useAppContext } from '../context';
import { useHistory } from '../lib/history';
import { RoutePath } from '../lib/routes';
import { useSelector } from '../redux/store';
-import {
- AriaDescribed,
- AriaDescription,
- AriaDescriptionGroup,
- AriaDetails,
- AriaInput,
- AriaInputGroup,
- AriaLabel,
-} from './AriaGroup';
+import { AriaDescribed, AriaDescription, AriaDescriptionGroup } from './AriaGroup';
import * as Cell from './cell';
-import InfoButton from './InfoButton';
import { BackAction } from './KeyboardNavigation';
import { Layout, SettingsContainer } from './Layout';
-import { ModalMessage } from './Modal';
import { NavigationBar, NavigationContainer, NavigationItems, TitleBarItem } from './NavigationBar';
import SettingsHeader, { HeaderTitle } from './SettingsHeader';
import {
@@ -38,8 +28,6 @@ export default function Support() {
const connectedToDaemon = useSelector((state) => state.userInterface.connectedToDaemon);
const isMacOs13OrNewer = useSelector((state) => state.userInterface.isMacOs13OrNewer);
- const isMacOs14p6OrNewer = useSelector((state) => state.userInterface.isMacOs14p6OrNewer);
-
const showSubSettings = loginState.type === 'ok' && connectedToDaemon;
const showSplitTunneling = window.env.platform !== 'darwin' || isMacOs13OrNewer;
@@ -91,12 +79,6 @@ export default function Support() {
<ApiAccessMethodsButton />
</Cell.Group>
- {isMacOs14p6OrNewer ? (
- <Cell.Group>
- <AppleServicesBypass />
- </Cell.Group>
- ) : null}
-
<Cell.Group>
<SupportButton />
<AppVersionButton />
@@ -283,54 +265,6 @@ function SupportButton() {
);
}
-function AppleServicesBypass() {
- const { setAppleServicesBypass } = useAppContext();
- const appleServicesBypass = useSelector((state) => state.settings.appleServicesBypass);
-
- return (
- <AriaInputGroup>
- <Cell.Container>
- <AriaLabel>
- <Cell.InputLabel>
- {messages.pgettext('settings-view', 'Apple services bypass')}
- </Cell.InputLabel>
- </AriaLabel>
- <AriaDetails>
- <InfoButton>
- <ModalMessage>
- {messages.pgettext(
- 'settings-view',
- 'Some Apple services have an issue where the network settings set by Mullvad get ignored, this in turn blocks certain apps.',
- )}
- </ModalMessage>
- <ModalMessage>
- {messages.pgettext(
- 'settings-view',
- 'Enabling this setting allows traffic to specific Apple-owned networks to go outside of the VPN tunnel, allowing services like iMessage and FaceTime to work whilst using Mullvad.',
- )}
- </ModalMessage>
- <ModalMessage>
- {messages.pgettext(
- 'settings-view',
- 'Attention: this traffic will go outside of the VPN tunnel. Any application that tries to can bypass the VPN tunnel and send traffic to these Apple networks.',
- )}
- </ModalMessage>
- <ModalMessage>
- {messages.pgettext(
- 'settings-view',
- 'This a temporary fix and we are currently working on a long-term solution.',
- )}
- </ModalMessage>
- </InfoButton>
- </AriaDetails>
- <AriaInput>
- <Cell.Switch isOn={appleServicesBypass} onChange={setAppleServicesBypass} />
- </AriaInput>
- </Cell.Container>
- </AriaInputGroup>
- );
-}
-
function DebugButton() {
const history = useHistory();
const navigate = useCallback(() => history.push(RoutePath.debug), [history]);