diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2021-03-03 11:18:47 +0100 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2021-03-03 11:18:47 +0100 |
| commit | 51f65df92aa311f934ce0d642dd5fa6a0cf934e5 (patch) | |
| tree | 2ba685f3d459dd0bd84bfd1e468724df9d22935b /gui/src/shared | |
| parent | 8bb44773424a1139dc7e72a804899ea877b9ff3e (diff) | |
| parent | 8f48eb4bc95a1439644936214c849573234fe7a7 (diff) | |
| download | mullvadvpn-51f65df92aa311f934ce0d642dd5fa6a0cf934e5.tar.xz mullvadvpn-51f65df92aa311f934ce0d642dd5fa6a0cf934e5.zip | |
Merge branch 'improve-linux-split-tunnel'
Diffstat (limited to 'gui/src/shared')
| -rw-r--r-- | gui/src/shared/application-types.ts | 4 | ||||
| -rw-r--r-- | gui/src/shared/ipc-schema.ts | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/gui/src/shared/application-types.ts b/gui/src/shared/application-types.ts index 91b8068072..07cea190e3 100644 --- a/gui/src/shared/application-types.ts +++ b/gui/src/shared/application-types.ts @@ -12,8 +12,8 @@ export interface ILinuxApplication extends IApplication { terminal?: string; noDisplay?: string; hidden?: string; - onlyShowIn?: string | string[]; - notShowIn?: string | string[]; + onlyShowIn?: string[]; + notShowIn?: string[]; tryExec?: string; } diff --git a/gui/src/shared/ipc-schema.ts b/gui/src/shared/ipc-schema.ts index a31745c01f..62a3afc948 100644 --- a/gui/src/shared/ipc-schema.ts +++ b/gui/src/shared/ipc-schema.ts @@ -37,6 +37,8 @@ export interface IRelayListPair { bridges: IRelayList; } +export type LaunchApplicationResult = { success: true } | { error: string }; + export interface IAppStateSnapshot { locale: string; isConnected: boolean; @@ -181,7 +183,7 @@ export const ipcSchema = { }, splitTunneling: { getApplications: invoke<void, ILinuxSplitTunnelingApplication[]>(), - launchApplication: invoke<ILinuxSplitTunnelingApplication | string, void>(), + launchApplication: invoke<ILinuxSplitTunnelingApplication | string, LaunchApplicationResult>(), }, problemReport: { collectLogs: invoke<string[], string>(), |