summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2019-07-23 19:27:19 +0000
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2019-07-24 12:42:43 +0000
commite54ffecb123377f013cef6be2ba8756a27312a6c (patch)
tree356bba6b5777a1d518fc8586373a5d756b4887ee
parent10dd93721ae6ebef99de497ff5fc678bc1257879 (diff)
downloadmullvadvpn-e54ffecb123377f013cef6be2ba8756a27312a6c.tar.xz
mullvadvpn-e54ffecb123377f013cef6be2ba8756a27312a6c.zip
Handle after disconnect in `NotificationBanner`
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/NotificationBanner.kt13
1 files changed, 11 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 b90b3aa251..f6e50fd94e 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/NotificationBanner.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/NotificationBanner.kt
@@ -3,6 +3,7 @@ package net.mullvad.mullvadvpn
import android.widget.TextView
import android.view.View
+import net.mullvad.mullvadvpn.model.ActionAfterDisconnect
import net.mullvad.mullvadvpn.model.KeygenEvent
import net.mullvad.mullvadvpn.model.TunnelState
@@ -40,8 +41,16 @@ class NotificationBanner(val parentView: View) {
}
private fun updateBasedOnTunnelState(): Boolean {
- when (tunnelState) {
- is TunnelState.Disconnecting -> hide()
+ val state = tunnelState
+
+ when (state) {
+ is TunnelState.Disconnecting -> {
+ when (state.actionAfterDisconnect) {
+ is ActionAfterDisconnect.Nothing -> hide()
+ is ActionAfterDisconnect.Block -> show(R.string.blocking_internet)
+ is ActionAfterDisconnect.Reconnect -> show(R.string.blocking_internet)
+ }
+ }
is TunnelState.Disconnected -> hide()
is TunnelState.Connecting -> show(R.string.blocking_internet)
is TunnelState.Connected -> hide()