diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-11-21 10:38:32 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-11-21 12:54:33 +0000 |
| commit | 1bed86f9034149caa363bf870704b52c1e86fe5b (patch) | |
| tree | cedc5e59026d5ae4f7b8071caf831c8471bcbcb1 /android | |
| parent | 7210338220b5003af82bdf04143e69616cb2ff27 (diff) | |
| download | mullvadvpn-1bed86f9034149caa363bf870704b52c1e86fe5b.tar.xz mullvadvpn-1bed86f9034149caa363bf870704b52c1e86fe5b.zip | |
Move `BlockReason` to Talpid package
Diffstat (limited to 'android')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/NotificationBanner.kt | 2 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelState.kt | 1 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/talpid/tunnel/BlockReason.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/model/BlockReason.kt) | 4 |
3 files changed, 3 insertions, 4 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/NotificationBanner.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/NotificationBanner.kt index 63f4401a7e..352fe4dd71 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/NotificationBanner.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/NotificationBanner.kt @@ -13,11 +13,11 @@ import kotlinx.coroutines.Job import kotlinx.coroutines.launch import net.mullvad.mullvadvpn.dataproxy.AppVersionInfoCache import net.mullvad.mullvadvpn.dataproxy.WwwAuthTokenRetriever -import net.mullvad.mullvadvpn.model.BlockReason import net.mullvad.mullvadvpn.model.KeygenEvent import net.mullvad.mullvadvpn.model.KeygenFailure import net.mullvad.mullvadvpn.model.TunnelState import net.mullvad.talpid.tunnel.ActionAfterDisconnect +import net.mullvad.talpid.tunnel.BlockReason import net.mullvad.talpid.tunnel.ParameterGenerationError class NotificationBanner( diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelState.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelState.kt index 0c65f4754a..c91497ce03 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelState.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelState.kt @@ -1,6 +1,7 @@ package net.mullvad.mullvadvpn.model import net.mullvad.talpid.tunnel.ActionAfterDisconnect +import net.mullvad.talpid.tunnel.BlockReason sealed class TunnelState() { class Disconnected() : TunnelState() diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/BlockReason.kt b/android/src/main/kotlin/net/mullvad/talpid/tunnel/BlockReason.kt index bce1dd94f5..758e81dfba 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/BlockReason.kt +++ b/android/src/main/kotlin/net/mullvad/talpid/tunnel/BlockReason.kt @@ -1,6 +1,4 @@ -package net.mullvad.mullvadvpn.model - -import net.mullvad.talpid.tunnel.ParameterGenerationError +package net.mullvad.talpid.tunnel sealed class BlockReason { class AuthFailed(val reason: String?) : BlockReason() |