diff options
| author | David Lönnhager <david.l@mullvad.net> | 2020-04-30 12:24:17 +0200 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2020-04-30 12:24:17 +0200 |
| commit | 7d24eb34141c05a4b59ab20ebb51667c3fdab828 (patch) | |
| tree | fe82e554446ecf61ebc58c884b604689d161b080 | |
| parent | ffc2c7f10ead032d7b2d27e1a353e3ad7ece25a7 (diff) | |
| download | mullvadvpn-7d24eb34141c05a4b59ab20ebb51667c3fdab828.tar.xz mullvadvpn-7d24eb34141c05a4b59ab20ebb51667c3fdab828.zip | |
Fix deserialization of AppVersionInfo in GUI
| -rw-r--r-- | gui/src/main/daemon-rpc.ts | 5 | ||||
| -rw-r--r-- | gui/src/main/index.ts | 5 | ||||
| -rw-r--r-- | gui/src/shared/daemon-rpc-types.ts | 5 |
3 files changed, 9 insertions, 6 deletions
diff --git a/gui/src/main/daemon-rpc.ts b/gui/src/main/daemon-rpc.ts index 5db6f621c2..42403e8987 100644 --- a/gui/src/main/daemon-rpc.ts +++ b/gui/src/main/daemon-rpc.ts @@ -293,9 +293,10 @@ const tunnelStateSchema = oneOf( ); const appVersionInfoSchema = partialObject({ - current_is_supported: boolean, - latest_stable: string, + supported: boolean, latest: string, + latest_stable: string, + latest_beta: string, }); export class ConnectionObserver { diff --git a/gui/src/main/index.ts b/gui/src/main/index.ts index b8c49d6a21..93ccb3c751 100644 --- a/gui/src/main/index.ts +++ b/gui/src/main/index.ts @@ -139,8 +139,9 @@ class ApplicationMain { }; private upgradeVersion: IAppUpgradeInfo = { - currentIsSupported: true, + supported: true, latestStable: '', + latestBeta: '', latest: '', nextUpgrade: undefined, }; @@ -781,7 +782,7 @@ class ApplicationMain { process.env.NODE_ENV !== 'development' && !this.shouldSuppressNotifications(true) && currentVersionInfo.isConsistent && - !latestVersionInfo.currentIsSupported && + !latestVersionInfo.supported && upgradeVersion ) { this.notificationController.notifyUnsupportedVersion(upgradeVersion); diff --git a/gui/src/shared/daemon-rpc-types.ts b/gui/src/shared/daemon-rpc-types.ts index 661250c5f5..baf084c554 100644 --- a/gui/src/shared/daemon-rpc-types.ts +++ b/gui/src/shared/daemon-rpc-types.ts @@ -278,9 +278,10 @@ export interface IShadowsocksProxySettings { } export interface IAppVersionInfo { - currentIsSupported: boolean; - latestStable: string; + supported: boolean; latest: string; + latestStable: string; + latestBeta: string; } export interface ISettings { |