diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2023-09-28 13:10:32 +0200 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2023-09-28 13:10:32 +0200 |
| commit | f5eaa62914c0353c7c6920b2881ada004fb76658 (patch) | |
| tree | aaae7dd7294bbde3ff3f9710b81777e142b3b5c7 /gui/src/shared | |
| parent | 8943529291df32a7ed4a35304f972b1d66860d22 (diff) | |
| parent | 11942b1d08285aad439fd40a4a4806815e740cad (diff) | |
| download | mullvadvpn-f5eaa62914c0353c7c6920b2881ada004fb76658.tar.xz mullvadvpn-f5eaa62914c0353c7c6920b2881ada004fb76658.zip | |
Merge branch 'open-download-urls-for-correct-platform-des-372'
Diffstat (limited to 'gui/src/shared')
| -rw-r--r-- | gui/src/shared/notifications/unsupported-version.ts | 6 | ||||
| -rw-r--r-- | gui/src/shared/notifications/update-available.ts | 6 | ||||
| -rw-r--r-- | gui/src/shared/version.ts | 22 |
3 files changed, 28 insertions, 6 deletions
diff --git a/gui/src/shared/notifications/unsupported-version.ts b/gui/src/shared/notifications/unsupported-version.ts index 8c2f87460b..9d41bc268c 100644 --- a/gui/src/shared/notifications/unsupported-version.ts +++ b/gui/src/shared/notifications/unsupported-version.ts @@ -1,5 +1,5 @@ -import { links } from '../../config.json'; import { messages } from '../../shared/gettext'; +import { getDownloadUrl } from '../version'; import { InAppNotification, InAppNotificationProvider, @@ -31,7 +31,7 @@ export class UnsupportedVersionNotificationProvider severity: SystemNotificationSeverityType.high, action: { type: 'open-url', - url: this.context.suggestedIsBeta ? links.betaDownload : links.download, + url: getDownloadUrl(this.context.suggestedIsBeta ?? false), text: messages.pgettext('notifications', 'Upgrade'), }, presentOnce: { value: true, name: this.constructor.name }, @@ -46,7 +46,7 @@ export class UnsupportedVersionNotificationProvider subtitle: this.getMessage(), action: { type: 'open-url', - url: this.context.suggestedIsBeta ? links.betaDownload : links.download, + url: getDownloadUrl(this.context.suggestedIsBeta ?? false), }, }; } diff --git a/gui/src/shared/notifications/update-available.ts b/gui/src/shared/notifications/update-available.ts index 0394ef15a5..6f63bafd89 100644 --- a/gui/src/shared/notifications/update-available.ts +++ b/gui/src/shared/notifications/update-available.ts @@ -1,7 +1,7 @@ import { sprintf } from 'sprintf-js'; -import { links } from '../../config.json'; import { messages } from '../../shared/gettext'; +import { getDownloadUrl } from '../version'; import { InAppNotification, InAppNotificationProvider, @@ -33,7 +33,7 @@ export class UpdateAvailableNotificationProvider subtitle: this.inAppMessage(), action: { type: 'open-url', - url: this.context.suggestedIsBeta ? links.betaDownload : links.download, + url: getDownloadUrl(this.context.suggestedIsBeta ?? false), }, }; } @@ -45,7 +45,7 @@ export class UpdateAvailableNotificationProvider severity: SystemNotificationSeverityType.medium, action: { type: 'open-url', - url: this.context.suggestedIsBeta ? links.betaDownload : links.download, + url: getDownloadUrl(this.context.suggestedIsBeta ?? false), text: messages.pgettext('notifications', 'Upgrade'), }, presentOnce: { value: true, name: this.constructor.name }, diff --git a/gui/src/shared/version.ts b/gui/src/shared/version.ts new file mode 100644 index 0000000000..dc87afaae0 --- /dev/null +++ b/gui/src/shared/version.ts @@ -0,0 +1,22 @@ +import { links } from '../config.json'; + +export function getDownloadUrl(suggestedIsBeta: boolean): string { + let url = links.download; + switch (process.platform ?? window.env.platform) { + case 'win32': + url += 'windows/'; + break; + case 'linux': + url += 'linux/'; + break; + case 'darwin': + url += 'macos/'; + break; + } + + if (suggestedIsBeta) { + url += 'beta/'; + } + + return url; +} |