summaryrefslogtreecommitdiffhomepage
path: root/gui/src/shared
diff options
context:
space:
mode:
authorOskar Nyberg <oskar@mullvad.net>2020-12-18 13:49:05 +0100
committerOskar Nyberg <oskar@mullvad.net>2020-12-21 15:44:34 +0100
commit6cc06d0ae697569c56f18b740f3e8a3a1d5e8415 (patch)
tree6e2902ba0653b97ebe2ff07bf260acf704cdd4f6 /gui/src/shared
parentfad33b93c1677cef630423715141389eabf837b5 (diff)
downloadmullvadvpn-6cc06d0ae697569c56f18b740f3e8a3a1d5e8415.tar.xz
mullvadvpn-6cc06d0ae697569c56f18b740f3e8a3a1d5e8415.zip
Refactor Linux desktop entry helpers into its own file
Diffstat (limited to 'gui/src/shared')
-rw-r--r--gui/src/shared/application-types.ts22
-rw-r--r--gui/src/shared/ipc-event-channel.ts6
-rw-r--r--gui/src/shared/linux-split-tunneling-application.ts9
3 files changed, 25 insertions, 12 deletions
diff --git a/gui/src/shared/application-types.ts b/gui/src/shared/application-types.ts
new file mode 100644
index 0000000000..91b8068072
--- /dev/null
+++ b/gui/src/shared/application-types.ts
@@ -0,0 +1,22 @@
+type Warning = 'launches-in-existing-process' | 'launches-elsewhere';
+
+export interface IApplication {
+ absolutepath: string;
+ name: string;
+ icon?: string;
+}
+
+export interface ILinuxApplication extends IApplication {
+ exec: string;
+ type: string;
+ terminal?: string;
+ noDisplay?: string;
+ hidden?: string;
+ onlyShowIn?: string | string[];
+ notShowIn?: string | string[];
+ tryExec?: string;
+}
+
+export interface ILinuxSplitTunnelingApplication extends ILinuxApplication {
+ warning?: Warning;
+}
diff --git a/gui/src/shared/ipc-event-channel.ts b/gui/src/shared/ipc-event-channel.ts
index 1524e24bba..58186a822d 100644
--- a/gui/src/shared/ipc-event-channel.ts
+++ b/gui/src/shared/ipc-event-channel.ts
@@ -1,6 +1,6 @@
import { ICurrentAppVersionInfo } from '../main/index';
import { IWindowShapeParameters } from '../main/window-controller';
-import ISplitTunnelingApplication from '../shared/linux-split-tunneling-application';
+import { ILinuxSplitTunnelingApplication } from '../shared/application-types';
import {
AccountToken,
BridgeSettings,
@@ -175,8 +175,8 @@ const ipc = {
verifyKey: invoke<void, boolean>(),
},
splitTunneling: {
- getApplications: invoke<void, ISplitTunnelingApplication[]>(),
- launchApplication: invoke<ISplitTunnelingApplication | string, void>(),
+ getApplications: invoke<void, ILinuxSplitTunnelingApplication[]>(),
+ launchApplication: invoke<ILinuxSplitTunnelingApplication | string, void>(),
},
problemReport: {
collectLogs: invoke<string[], string>(),
diff --git a/gui/src/shared/linux-split-tunneling-application.ts b/gui/src/shared/linux-split-tunneling-application.ts
deleted file mode 100644
index a96152b70d..0000000000
--- a/gui/src/shared/linux-split-tunneling-application.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-type Warning = 'launches-in-existing-process' | 'launches-elsewhere';
-
-export default interface ISplitTunnelingApplication {
- absolutepath: string;
- name: string;
- exec: string;
- icon?: string;
- warning?: Warning;
-}