diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-07-31 15:16:32 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-07-31 15:32:33 +0000 |
| commit | 777f47011c8cc557d72d643af2fcff449b9d2808 (patch) | |
| tree | 23e07a715f320632e37e59d690a112fdc79e66b8 /android | |
| parent | f233f8531a837c883e7e163ba26fd254b81af2b9 (diff) | |
| download | mullvadvpn-777f47011c8cc557d72d643af2fcff449b9d2808.tar.xz mullvadvpn-777f47011c8cc557d72d643af2fcff449b9d2808.zip | |
Show which version to upgrade to
Diffstat (limited to 'android')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/NotificationBanner.kt | 12 | ||||
| -rw-r--r-- | android/src/main/res/values/strings.xml | 3 |
2 files changed, 12 insertions, 3 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/NotificationBanner.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/NotificationBanner.kt index 6fd013f0b1..89424f156d 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/NotificationBanner.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/NotificationBanner.kt @@ -91,8 +91,12 @@ class NotificationBanner( if (versionInfoCache.isLatest) { hide() } else { + val template = R.string.unsupported_version_description + val parameter = versionInfoCache.upgradeVersion + val description = context.getString(template, parameter) + externalLink = downloadUrl - showError(R.string.unsupported_version, R.string.unsupported_version_description) + showError(R.string.unsupported_version, description) } return true @@ -115,10 +119,14 @@ class NotificationBanner( } private fun showError(titleText: Int, messageText: Int?) { + showError(titleText, messageText?.let { context.getString(it) }) + } + + private fun showError(titleText: Int, messageText: String?) { show(R.drawable.icon_notification_error, titleText, messageText) } - private fun show(statusImage: Int, titleText: Int, messageText: Int?) { + private fun show(statusImage: Int, titleText: Int, messageText: String?) { if (!visible) { visible = true banner.visibility = View.VISIBLE diff --git a/android/src/main/res/values/strings.xml b/android/src/main/res/values/strings.xml index cf534053ad..5083aa5850 100644 --- a/android/src/main/res/values/strings.xml +++ b/android/src/main/res/values/strings.xml @@ -77,7 +77,8 @@ <string name="failed_to_generate_key">Failed to generate WireGuard key</string> <string name="unsupported_version">Unsupported version</string> <string name="unsupported_version_description"> - You are running an unsupported app version. Please upgrade now to ensure your security + You are running an unsupported app version. Please upgrade to %1$s now to ensure your + security </string> <string name="select_location">Select location</string> |
