diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-11-21 10:23:56 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-11-21 12:54:33 +0000 |
| commit | 7210338220b5003af82bdf04143e69616cb2ff27 (patch) | |
| tree | 736e13b9e81744051a323a603b0b945aae71281b /android/src | |
| parent | 5f0f5a38d5430c64f7153558edbd0da58e497170 (diff) | |
| download | mullvadvpn-7210338220b5003af82bdf04143e69616cb2ff27.tar.xz mullvadvpn-7210338220b5003af82bdf04143e69616cb2ff27.zip | |
Move `ParameterGenerationError` to Talpid package
Diffstat (limited to 'android/src')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/NotificationBanner.kt | 2 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/model/BlockReason.kt | 2 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/talpid/tunnel/ParameterGenerationError.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/model/ParameterGenerationError.kt) | 2 |
3 files changed, 4 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 7fb3beda55..63f4401a7e 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/NotificationBanner.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/NotificationBanner.kt @@ -16,9 +16,9 @@ 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.ParameterGenerationError import net.mullvad.mullvadvpn.model.TunnelState import net.mullvad.talpid.tunnel.ActionAfterDisconnect +import net.mullvad.talpid.tunnel.ParameterGenerationError class NotificationBanner( val parentView: View, diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/BlockReason.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/BlockReason.kt index 21cf01f0ef..bce1dd94f5 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/BlockReason.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/BlockReason.kt @@ -1,5 +1,7 @@ package net.mullvad.mullvadvpn.model +import net.mullvad.talpid.tunnel.ParameterGenerationError + sealed class BlockReason { class AuthFailed(val reason: String?) : BlockReason() class Ipv6Unavailable : BlockReason() diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/ParameterGenerationError.kt b/android/src/main/kotlin/net/mullvad/talpid/tunnel/ParameterGenerationError.kt index ffc159b952..92547a02b4 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/ParameterGenerationError.kt +++ b/android/src/main/kotlin/net/mullvad/talpid/tunnel/ParameterGenerationError.kt @@ -1,4 +1,4 @@ -package net.mullvad.mullvadvpn.model +package net.mullvad.talpid.tunnel sealed class ParameterGenerationError { class NoMatchingRelay : ParameterGenerationError() |