diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-07-03 15:03:41 -0300 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-07-03 15:03:41 -0300 |
| commit | 01eaaf7efb685dad352b4113af4ed187fc1342da (patch) | |
| tree | 971af24289dc1952a0a05c10d77ba43dc89750e6 /android | |
| parent | 50b16479d7766e02cf36f5438866109ca1904743 (diff) | |
| parent | 2487744620686a058fbf69543f320a1262a915f9 (diff) | |
| download | mullvadvpn-01eaaf7efb685dad352b4113af4ed187fc1342da.tar.xz mullvadvpn-01eaaf7efb685dad352b4113af4ed187fc1342da.zip | |
Merge branch 'fix-unsupported-version-notification'
Diffstat (limited to 'android')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/VersionInfoNotification.kt | 22 | ||||
| -rw-r--r-- | android/src/main/res/values/strings.xml | 2 |
2 files changed, 16 insertions, 8 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/VersionInfoNotification.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/VersionInfoNotification.kt index 8c5fe7568e..942a48d792 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/VersionInfoNotification.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/VersionInfoNotification.kt @@ -29,20 +29,26 @@ class VersionInfoNotification( private fun updateVersionInfo(isOutdated: Boolean, isSupported: Boolean, upgrade: String?) { if (isOutdated || !isSupported) { - val template: Int + if (upgrade != null) { + val template: Int - if (isSupported) { - status = StatusLevel.Warning - title = updateAvailable - template = R.string.update_available_description + if (isSupported) { + status = StatusLevel.Warning + title = updateAvailable + template = R.string.update_available_description + } else { + status = StatusLevel.Error + title = unsupportedVersion + template = R.string.unsupported_version_description + } + + message = context.getString(template, upgrade) } else { status = StatusLevel.Error title = unsupportedVersion - template = R.string.unsupported_version_description + message = context.getString(R.string.unsupported_version_without_upgrade) } - message = context.getString(template, upgrade) - shouldShow = true } else { shouldShow = false diff --git a/android/src/main/res/values/strings.xml b/android/src/main/res/values/strings.xml index 28c3da48c3..1f87bdee89 100644 --- a/android/src/main/res/values/strings.xml +++ b/android/src/main/res/values/strings.xml @@ -136,6 +136,8 @@ <string name="unsupported_version">Unsupported version</string> <string name="unsupported_version_description">You are running an unsupported app version. Please upgrade to %1$s now to ensure your security</string> + <string name="unsupported_version_without_upgrade">You are running an unsupported app + version.</string> <string name="account_credit_expires_soon">Account credit expires soon</string> <string name="select_location">Select location</string> <string name="select_location_description">While connected, your real location is masked with a |