summaryrefslogtreecommitdiffhomepage
path: root/android/src
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-02-24 18:31:35 +0000
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-02-27 12:15:21 +0000
commit90695708458d760e3b9ada639686c8ba845ce22f (patch)
tree2c398cda16d9ff07d50241320e4c3bc188c1ce5a /android/src
parent17d43c56835bc6b892db84a09cfce4c466ba4700 (diff)
downloadmullvadvpn-90695708458d760e3b9ada639686c8ba845ce22f.tar.xz
mullvadvpn-90695708458d760e3b9ada639686c8ba845ce22f.zip
Change notification banner for non-blocking error
Diffstat (limited to 'android/src')
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/ui/NotificationBanner.kt12
-rw-r--r--android/src/main/res/values/strings.xml7
2 files changed, 10 insertions, 9 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/NotificationBanner.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/NotificationBanner.kt
index 3214248f3d..83cc14b738 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/NotificationBanner.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/NotificationBanner.kt
@@ -196,13 +196,11 @@ class NotificationBanner(
}
// if the error state is null, we can assume that we are secure
- val blockMessage = if (errorState?.isBlocking ?: true) {
- R.string.blocking_internet
- } else {
- R.string.not_blocking_internet
- }
-
- showError(blockMessage, messageText)
+ if (errorState?.isBlocking ?: true) {
+ showError(R.string.blocking_internet, messageText)
+ } else {
+ showError(R.string.not_blocking_internet, R.string.failed_to_block_internet)
+ }
}
private fun showError(titleText: Int, messageText: Int?) {
diff --git a/android/src/main/res/values/strings.xml b/android/src/main/res/values/strings.xml
index 4294c0f868..93fc45ad30 100644
--- a/android/src/main/res/values/strings.xml
+++ b/android/src/main/res/values/strings.xml
@@ -99,8 +99,11 @@
<string name="in_address">In %1$s:%2$d %3$s</string>
<string name="out_address">Out %1$s</string>
<string name="blocking_internet">Blocking internet</string>
- <string name="not_blocking_internet">Failed to block
- internet</string>
+ <string name="not_blocking_internet">You might be leaking
+ network traffic</string>
+ <string name="failed_to_block_internet">Failed to block all
+ network traffic. Please troubleshoot or report the problem to
+ us.</string>
<string name="auth_failed">Account authentication
failed.</string>
<string name="ipv6_unavailable">Could not configure