summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorOskar Nyberg <oskar@mullvad.net>2023-10-26 17:39:12 +0200
committerDavid Lönnhager <david.l@mullvad.net>2023-10-31 00:45:17 +0100
commitff3459efc81c198be2ea665919412d1332b116f3 (patch)
tree4d8716f652fce56e1f259802b2680002b321becc
parent6a2384c13c52820a198f338b3774ab4205b8ce71 (diff)
downloadmullvadvpn-ff3459efc81c198be2ea665919412d1332b116f3.tar.xz
mullvadvpn-ff3459efc81c198be2ea665919412d1332b116f3.zip
Rename updateRelaySettings to setRelaySettings
-rw-r--r--gui/src/main/daemon-rpc.ts2
-rw-r--r--gui/src/main/settings.ts4
-rw-r--r--gui/src/renderer/app.tsx8
-rw-r--r--gui/src/renderer/components/select-location/select-location-hooks.ts4
-rw-r--r--gui/src/renderer/lib/constraint-updater.ts2
-rw-r--r--gui/src/shared/ipc-schema.ts2
6 files changed, 11 insertions, 11 deletions
diff --git a/gui/src/main/daemon-rpc.ts b/gui/src/main/daemon-rpc.ts
index f1fba53d55..65ad96519c 100644
--- a/gui/src/main/daemon-rpc.ts
+++ b/gui/src/main/daemon-rpc.ts
@@ -298,7 +298,7 @@ export class DaemonRpc {
}
// TODO: Custom tunnel configurations are not supported by the GUI.
- public async updateRelaySettings(relaySettings: RelaySettings): Promise<void> {
+ public async setRelaySettings(relaySettings: RelaySettings): Promise<void> {
if ('normal' in relaySettings) {
const normalSettings = relaySettings.normal;
const grpcRelaySettings = new grpcTypes.RelaySettings();
diff --git a/gui/src/main/settings.ts b/gui/src/main/settings.ts
index 3f04666df6..fc2450581f 100644
--- a/gui/src/main/settings.ts
+++ b/gui/src/main/settings.ts
@@ -56,8 +56,8 @@ export default class Settings implements Readonly<ISettings> {
IpcMainEventChannel.settings.handleSetWireguardQuantumResistant((quantumResistant?: boolean) =>
this.daemonRpc.setWireguardQuantumResistant(quantumResistant),
);
- IpcMainEventChannel.settings.handleUpdateRelaySettings((relaySettings) =>
- this.daemonRpc.updateRelaySettings(relaySettings),
+ IpcMainEventChannel.settings.handleSetRelaySettings((relaySettings) =>
+ this.daemonRpc.setRelaySettings(relaySettings),
);
IpcMainEventChannel.settings.handleUpdateBridgeSettings((bridgeSettings) => {
return this.daemonRpc.setBridgeSettings(bridgeSettings);
diff --git a/gui/src/renderer/app.tsx b/gui/src/renderer/app.tsx
index bdfe272061..584e80ed4f 100644
--- a/gui/src/renderer/app.tsx
+++ b/gui/src/renderer/app.tsx
@@ -303,8 +303,8 @@ export default class AppRenderer {
public connectTunnel = () => IpcRendererEventChannel.tunnel.connect();
public disconnectTunnel = () => IpcRendererEventChannel.tunnel.disconnect();
public reconnectTunnel = () => IpcRendererEventChannel.tunnel.reconnect();
- public updateRelaySettings = (relaySettings: RelaySettings) =>
- IpcRendererEventChannel.settings.updateRelaySettings(relaySettings);
+ public setRelaySettings = (relaySettings: RelaySettings) =>
+ IpcRendererEventChannel.settings.setRelaySettings(relaySettings);
public updateBridgeSettings = (bridgeSettings: BridgeSettings) =>
IpcRendererEventChannel.settings.updateBridgeSettings(bridgeSettings);
public setDnsOptions = (dnsOptions: IDnsOptions) =>
@@ -574,7 +574,7 @@ export default class AppRenderer {
this.reduxActions.userInterface.updateLocale(locale);
}
- private setRelaySettings(relaySettings: RelaySettings) {
+ private setReduxRelaySettings(relaySettings: RelaySettings) {
const actions = this.reduxActions;
if ('normal' in relaySettings) {
@@ -789,7 +789,7 @@ export default class AppRenderer {
reduxSettings.updateObfuscationSettings(newSettings.obfuscationSettings);
reduxSettings.updateCustomLists(newSettings.customLists);
- this.setRelaySettings(newSettings.relaySettings);
+ this.setReduxRelaySettings(newSettings.relaySettings);
this.setBridgeSettings(newSettings.bridgeSettings);
}
diff --git a/gui/src/renderer/components/select-location/select-location-hooks.ts b/gui/src/renderer/components/select-location/select-location-hooks.ts
index 0490799123..48d81e594c 100644
--- a/gui/src/renderer/components/select-location/select-location-hooks.ts
+++ b/gui/src/renderer/components/select-location/select-location-hooks.ts
@@ -73,11 +73,11 @@ export function useOnSelectEntryLocation() {
}
function useOnSelectLocation() {
- const { updateRelaySettings } = useAppContext();
+ const { setRelaySettings } = useAppContext();
return useCallback(async (relaySettings: RelaySettings) => {
try {
- await updateRelaySettings(relaySettings);
+ await setRelaySettings(relaySettings);
} catch (e) {
const error = e as Error;
log.error(`Failed to select the location: ${error.message}`);
diff --git a/gui/src/renderer/lib/constraint-updater.ts b/gui/src/renderer/lib/constraint-updater.ts
index 4acb351335..af70237126 100644
--- a/gui/src/renderer/lib/constraint-updater.ts
+++ b/gui/src/renderer/lib/constraint-updater.ts
@@ -76,7 +76,7 @@ export function useRelaySettingsModifier() {
}
export function useRelaySettingsUpdater() {
- const { updateRelaySettings } = useAppContext();
+ const { setRelaySettings: updateRelaySettings } = useAppContext();
const modifyRelaySettings = useRelaySettingsModifier();
return useCallback(
diff --git a/gui/src/shared/ipc-schema.ts b/gui/src/shared/ipc-schema.ts
index 7981250c88..994bacdcd6 100644
--- a/gui/src/shared/ipc-schema.ts
+++ b/gui/src/shared/ipc-schema.ts
@@ -172,7 +172,7 @@ export const ipcSchema = {
setOpenVpnMssfix: invoke<number | undefined, void>(),
setWireguardMtu: invoke<number | undefined, void>(),
setWireguardQuantumResistant: invoke<boolean | undefined, void>(),
- updateRelaySettings: invoke<RelaySettings, void>(),
+ setRelaySettings: invoke<RelaySettings, void>(),
updateBridgeSettings: invoke<BridgeSettings, void>(),
setDnsOptions: invoke<IDnsOptions, void>(),
setObfuscationSettings: invoke<ObfuscationSettings, void>(),