summaryrefslogtreecommitdiffhomepage
path: root/android/src
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2019-07-31 11:32:01 +0000
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2019-07-31 13:43:18 +0000
commitd5616ad65f10d5014b690f98aa201e749bd5c0d3 (patch)
tree02b129a807d14b9b0df9634c803b38e9c4c8d5a5 /android/src
parent5c1cc92f024380712f62b4d69fc3468b3e73a00e (diff)
downloadmullvadvpn-d5616ad65f10d5014b690f98aa201e749bd5c0d3.tar.xz
mullvadvpn-d5616ad65f10d5014b690f98aa201e749bd5c0d3.zip
Separate title from message for WireGuard errors
Diffstat (limited to 'android/src')
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/NotificationBanner.kt6
-rw-r--r--android/src/main/res/values/strings.xml1
2 files changed, 5 insertions, 2 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/NotificationBanner.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/NotificationBanner.kt
index 6a56d7c3e3..8834ce7ab5 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/NotificationBanner.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/NotificationBanner.kt
@@ -35,8 +35,10 @@ class NotificationBanner(val parentView: View) {
when (keyState) {
null -> return false
is KeygenEvent.NewKey -> return false
- is KeygenEvent.TooManyKeys -> show(R.string.too_many_keys, null)
- is KeygenEvent.GenerationFailure -> show(R.string.failed_to_generate_key, null)
+ is KeygenEvent.TooManyKeys -> show(R.string.wireguard_error, R.string.too_many_keys)
+ is KeygenEvent.GenerationFailure -> {
+ show(R.string.wireguard_error, R.string.failed_to_generate_key)
+ }
}
return true
diff --git a/android/src/main/res/values/strings.xml b/android/src/main/res/values/strings.xml
index 20e8a5635d..202ed57820 100644
--- a/android/src/main/res/values/strings.xml
+++ b/android/src/main/res/values/strings.xml
@@ -71,6 +71,7 @@
<string name="no_matching_relay">No relay server matches the current settings</string>
<string name="is_offline">This device is offline, no tunnels can be established</string>
<string name="tap_adapter_problem">TAP adapter error</string>
+ <string name="wireguard_error">WireGuard error</string>
<string name="too_many_keys">Too many WireGuard keys registered to account</string>
<string name="failed_to_generate_key">Failed to generate WireGuard key</string>