summaryrefslogtreecommitdiffhomepage
path: root/android/lib/model/src/main
diff options
context:
space:
mode:
authorDavid Göransson <david.goransson90@gmail.com>2023-09-29 20:09:39 +0200
committerDavid Göransson <david.goransson90@gmail.com>2023-10-02 16:06:03 +0200
commit5052cdea50ce6d00a444dfd4c3811cf1dadaeb25 (patch)
treea2d916b2b8e6d715fbcd0ade05bf7d2b44785dc0 /android/lib/model/src/main
parente51bb93ed06366a9922700e7bb3c8129b5974a31 (diff)
downloadmullvadvpn-5052cdea50ce6d00a444dfd4c3811cf1dadaeb25.tar.xz
mullvadvpn-5052cdea50ce6d00a444dfd4c3811cf1dadaeb25.zip
Add class test and fix issues
Diffstat (limited to 'android/lib/model/src/main')
-rw-r--r--android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelState.kt42
1 files changed, 21 insertions, 21 deletions
diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelState.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelState.kt
index c3d58d2ca7..364c8861ce 100644
--- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelState.kt
+++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelState.kt
@@ -34,6 +34,27 @@ sealed class TunnelState : Parcelable {
}
}
+ override fun toString(): String =
+ when (this) {
+ is Disconnected -> DISCONNECTED
+ is Connecting -> CONNECTING
+ is Connected -> CONNECTED
+ is Disconnecting -> {
+ if (actionAfterDisconnect == ActionAfterDisconnect.Reconnect) {
+ RECONNECTING
+ } else {
+ DISCONNECTING
+ }
+ }
+ is Error -> {
+ if (errorState.isBlocking) {
+ BLOCKING
+ } else {
+ ERROR
+ }
+ }
+ }
+
companion object {
const val DISCONNECTED = "disconnected"
const val CONNECTING = "connecting"
@@ -58,25 +79,4 @@ sealed class TunnelState : Parcelable {
}
}
}
-
- override fun toString(): String =
- when (this) {
- is Disconnected -> DISCONNECTED
- is Connecting -> CONNECTING
- is Connected -> CONNECTED
- is Disconnecting -> {
- if (actionAfterDisconnect == ActionAfterDisconnect.Reconnect) {
- RECONNECTING
- } else {
- DISCONNECTING
- }
- }
- is Error -> {
- if (errorState.isBlocking) {
- BLOCKING
- } else {
- ERROR
- }
- }
- }
}