diff options
Diffstat (limited to 'android')
23 files changed, 56 insertions, 70 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/Constraint.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/Constraint.kt index 7ccb75e3c1..6d20c95dde 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/Constraint.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/Constraint.kt @@ -2,7 +2,5 @@ package net.mullvad.mullvadvpn.model sealed class Constraint<T>() { class Any<T>() : Constraint<T>() - class Only<T>(val value: T) : Constraint<T>() { - fun get0() = value - } + data class Only<T>(val value: T) : Constraint<T>() } diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/GetAccountDataResult.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/GetAccountDataResult.kt index 386288676f..cbed622df6 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/GetAccountDataResult.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/GetAccountDataResult.kt @@ -2,7 +2,7 @@ package net.mullvad.mullvadvpn.model sealed class GetAccountDataResult { class Ok(val accountData: AccountData) : GetAccountDataResult() - class InvalidAccount : GetAccountDataResult() - class RpcError : GetAccountDataResult() - class OtherError : GetAccountDataResult() + object InvalidAccount : GetAccountDataResult() + object RpcError : GetAccountDataResult() + object OtherError : GetAccountDataResult() } diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/KeygenEvent.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/KeygenEvent.kt index 8f283bdfc9..8c476ef5ff 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/KeygenEvent.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/KeygenEvent.kt @@ -16,19 +16,20 @@ sealed class KeygenEvent { this.replacementFailure = replacementFailure } } - class TooManyKeys : KeygenEvent() - class GenerationFailure : KeygenEvent() + + object TooManyKeys : KeygenEvent() + object GenerationFailure : KeygenEvent() fun failure(): KeygenFailure? { return when (this) { - is KeygenEvent.TooManyKeys -> KeygenFailure.TooManyKeys() - is KeygenEvent.GenerationFailure -> KeygenFailure.GenerationFailure() - else -> { null } + is KeygenEvent.TooManyKeys -> KeygenFailure.TooManyKeys + is KeygenEvent.GenerationFailure -> KeygenFailure.GenerationFailure + else -> null } } } -sealed class KeygenFailure() { - class TooManyKeys() : KeygenFailure() - class GenerationFailure() : KeygenFailure() +enum class KeygenFailure { + TooManyKeys, + GenerationFailure, } diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/LocationConstraint.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/LocationConstraint.kt index 039f10a411..d5eae8490f 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/LocationConstraint.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/LocationConstraint.kt @@ -1,20 +1,11 @@ package net.mullvad.mullvadvpn.model sealed class LocationConstraint(val code: Array<String>) { - class Country(var countryCode: String) : LocationConstraint(arrayOf(countryCode)) { - fun get0() = countryCode - } + data class Country(var countryCode: String) : LocationConstraint(arrayOf(countryCode)) - class City(var countryCode: String, var cityCode: String) : - LocationConstraint(arrayOf(countryCode, cityCode)) { - fun get0() = countryCode - fun get1() = cityCode - } + data class City(var countryCode: String, var cityCode: String) : + LocationConstraint(arrayOf(countryCode, cityCode)) - class Hostname(var countryCode: String, var cityCode: String, var hostname: String) : - LocationConstraint(arrayOf(countryCode, cityCode, hostname)) { - fun get0() = countryCode - fun get1() = cityCode - fun get2() = hostname - } + data class Hostname(var countryCode: String, var cityCode: String, var hostname: String) : + LocationConstraint(arrayOf(countryCode, cityCode, hostname)) } diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelaySettings.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelaySettings.kt index cb53911883..f46bd63e67 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelaySettings.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelaySettings.kt @@ -1,6 +1,6 @@ package net.mullvad.mullvadvpn.model sealed class RelaySettings { - class CustomTunnelEndpoint() : RelaySettings() + object CustomTunnelEndpoint : RelaySettings() class Normal(var relayConstraints: RelayConstraints) : RelaySettings() } diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelaySettingsUpdate.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelaySettingsUpdate.kt index 51a6e48cca..85f5de2a32 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelaySettingsUpdate.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelaySettingsUpdate.kt @@ -1,9 +1,6 @@ package net.mullvad.mullvadvpn.model sealed class RelaySettingsUpdate { - class CustomTunnelEndpoint() : RelaySettingsUpdate() - - class Normal(var constraints: RelayConstraintsUpdate) : RelaySettingsUpdate() { - fun get0() = constraints - } + object CustomTunnelEndpoint : RelaySettingsUpdate() + data class Normal(var constraints: RelayConstraintsUpdate) : RelaySettingsUpdate() } 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 e4b67e2f1b..dc5698b17a 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelState.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelState.kt @@ -6,7 +6,7 @@ import net.mullvad.talpid.tunnel.ErrorState import net.mullvad.talpid.tunnel.ErrorStateCause sealed class TunnelState() { - class Disconnected() : TunnelState() + object Disconnected : TunnelState() class Connecting(val endpoint: TunnelEndpoint?, val location: GeoIpLocation?) : TunnelState() class Connected(val endpoint: TunnelEndpoint, val location: GeoIpLocation?) : TunnelState() class Disconnecting(val actionAfterDisconnect: ActionAfterDisconnect) : TunnelState() @@ -23,18 +23,16 @@ sealed class TunnelState() { fun fromString(description: String, endpoint: TunnelEndpoint?): TunnelState { return when (description) { - DISCONNECTED -> TunnelState.Disconnected() + DISCONNECTED -> TunnelState.Disconnected CONNECTING -> TunnelState.Connecting(endpoint, null) CONNECTED -> TunnelState.Connected(endpoint!!, null) RECONNECTING -> TunnelState.Disconnecting(ActionAfterDisconnect.Reconnect) DISCONNECTING -> TunnelState.Disconnecting(ActionAfterDisconnect.Nothing) - BLOCKING -> TunnelState.Error(ErrorState(ErrorStateCause.StartTunnelError(), true)) + BLOCKING -> TunnelState.Error(ErrorState(ErrorStateCause.StartTunnelError, true)) ERROR -> { - TunnelState.Error(ErrorState(ErrorStateCause.SetFirewallPolicyError(), false)) - } - else -> { - TunnelState.Error(ErrorState(ErrorStateCause.SetFirewallPolicyError(), false)) + TunnelState.Error(ErrorState(ErrorStateCause.SetFirewallPolicyError, false)) } + else -> TunnelState.Error(ErrorState(ErrorStateCause.SetFirewallPolicyError, false)) } } } diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/VoucherSubmissionResult.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/VoucherSubmissionResult.kt index 33c57a595a..6978ebba73 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/VoucherSubmissionResult.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/VoucherSubmissionResult.kt @@ -2,8 +2,8 @@ package net.mullvad.mullvadvpn.model sealed class VoucherSubmissionResult { class Ok(val submission: VoucherSubmission) : VoucherSubmissionResult() - class InvalidVoucher : VoucherSubmissionResult() - class VoucherAlreadyUsed : VoucherSubmissionResult() - class RpcError : VoucherSubmissionResult() - class OtherError : VoucherSubmissionResult() + object InvalidVoucher : VoucherSubmissionResult() + object VoucherAlreadyUsed : VoucherSubmissionResult() + object RpcError : VoucherSubmissionResult() + object OtherError : VoucherSubmissionResult() } diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ConnectionProxy.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ConnectionProxy.kt index eda0ba6759..c21c4d54c6 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ConnectionProxy.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ConnectionProxy.kt @@ -22,7 +22,7 @@ class ConnectionProxy(val context: Context, val daemon: MullvadDaemon) { private var activeAction: Job? = null private var resetAnticipatedStateJob: Job? = null - private val initialState: TunnelState = TunnelState.Disconnected() + private val initialState: TunnelState = TunnelState.Disconnected var onStateChange = EventNotifier(initialState) var onUiStateChange = EventNotifier(initialState) diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ForegroundNotificationManager.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ForegroundNotificationManager.kt index 9ab632f017..888b0b77e6 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ForegroundNotificationManager.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ForegroundNotificationManager.kt @@ -49,7 +49,7 @@ class ForegroundNotificationManager( private var tunnelStateEvents by autoSubscribable<TunnelState>( this, - TunnelState.Disconnected() + TunnelState.Disconnected ) { newState -> updater.sendBlocking(UpdaterMessage.NewTunnelState(newState)) } @@ -63,7 +63,7 @@ class ForegroundNotificationManager( } private val tunnelState - get() = tunnelStateEvents?.latestEvent ?: TunnelState.Disconnected() + get() = tunnelStateEvents?.latestEvent ?: TunnelState.Disconnected private val shouldBeOnForeground get() = lockedToForeground || !(tunnelState is TunnelState.Disconnected) diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/KeyStatusListener.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/KeyStatusListener.kt index 8d44be4d36..2b8c2245dd 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/KeyStatusListener.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/KeyStatusListener.kt @@ -32,7 +32,7 @@ class KeyStatusListener(val daemon: MullvadDaemon) { newFailure ) } else { - keyStatus = newStatus ?: KeygenEvent.GenerationFailure() + keyStatus = newStatus ?: KeygenEvent.GenerationFailure } } diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/LocationInfoCache.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/LocationInfoCache.kt index 8ec3260680..bd45e78ce5 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/LocationInfoCache.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/LocationInfoCache.kt @@ -45,7 +45,7 @@ class LocationInfoCache( onNewLocation?.invoke(newLocation) } - var state by observable<TunnelState>(TunnelState.Disconnected()) { _, _, newState -> + var state by observable<TunnelState>(TunnelState.Disconnected) { _, _, newState -> when (newState) { is TunnelState.Disconnected -> { location = lastKnownRealLocation diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/TunnelStateNotification.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/TunnelStateNotification.kt index 8bb836f0f4..4134e08e39 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/TunnelStateNotification.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/TunnelStateNotification.kt @@ -58,7 +58,7 @@ class TunnelStateNotification(val context: Context) { var showAction by observable(false) { _, _, _ -> update() } - var tunnelState by observable<TunnelState>(TunnelState.Disconnected()) { _, _, newState -> + var tunnelState by observable<TunnelState>(TunnelState.Disconnected) { _, _, newState -> reconnecting = ( newState is TunnelState.Disconnecting && diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectActionButton.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectActionButton.kt index 5e1d50887b..7fbc0875f5 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectActionButton.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectActionButton.kt @@ -33,7 +33,7 @@ class ConnectActionButton(val parentView: View) { } } - var tunnelState: TunnelState = TunnelState.Disconnected() + var tunnelState: TunnelState = TunnelState.Disconnected set(value) { when (value) { is TunnelState.Disconnected -> disconnected() diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt index 978533643a..c4b06ebd95 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt @@ -43,7 +43,7 @@ class ConnectFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) { val view = inflater.inflate(R.layout.connect, container, false) headerBar = view.findViewById<HeaderBar>(R.id.header_bar).apply { - tunnelState = TunnelState.Disconnected() + tunnelState = TunnelState.Disconnected } notificationBanner = view.findViewById<NotificationBanner>(R.id.notification_banner).apply { diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LocationInfo.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LocationInfo.kt index 61d5bc73d3..d5bbba1915 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LocationInfo.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LocationInfo.kt @@ -37,7 +37,7 @@ class LocationInfo(val parentView: View, val context: Context) { updateOutAddress(value) } - var state: TunnelState = TunnelState.Disconnected() + var state: TunnelState = TunnelState.Disconnected set(value) { field = value diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/OutOfTimeFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/OutOfTimeFragment.kt index a077f86e18..fe70519db1 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/OutOfTimeFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/OutOfTimeFragment.kt @@ -24,7 +24,7 @@ class OutOfTimeFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) private lateinit var disconnectButton: Button private lateinit var redeemButton: RedeemVoucherButton - private var tunnelState by observable<TunnelState>(TunnelState.Disconnected()) { _, _, state -> + private var tunnelState by observable<TunnelState>(TunnelState.Disconnected) { _, _, state -> updateDisconnectButton() updateBuyButtons() headerBar.tunnelState = state diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WelcomeFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WelcomeFragment.kt index e357be1f68..a498922911 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WelcomeFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WelcomeFragment.kt @@ -30,7 +30,7 @@ class WelcomeFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) { val view = inflater.inflate(R.layout.welcome, container, false) view.findViewById<HeaderBar>(R.id.header_bar).apply { - tunnelState = TunnelState.Disconnected() + tunnelState = TunnelState.Disconnected } accountLabel = view.findViewById<TextView>(R.id.account_number).apply { diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WireguardKeyFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WireguardKeyFragment.kt index e49e60165a..09ac0caadf 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WireguardKeyFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WireguardKeyFragment.kt @@ -40,7 +40,7 @@ class WireguardKeyFragment : ServiceDependentFragment(OnNoService.GoToLaunchScre private var greenColor: Int = 0 private var redColor: Int = 0 - private var tunnelState: TunnelState = TunnelState.Disconnected() + private var tunnelState: TunnelState = TunnelState.Disconnected private var actionState: ActionState = ActionState.Idle(false) set(value) { @@ -306,8 +306,8 @@ class WireguardKeyFragment : ServiceDependentFragment(OnNoService.GoToLaunchScre private fun failureMessage(failure: KeygenFailure): Int { when (failure) { - is KeygenFailure.TooManyKeys -> return R.string.too_many_keys - is KeygenFailure.GenerationFailure -> return R.string.failed_to_generate_key + KeygenFailure.TooManyKeys -> return R.string.too_many_keys + KeygenFailure.GenerationFailure -> return R.string.failed_to_generate_key } } diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/SwitchLocationButton.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/SwitchLocationButton.kt index 9ca390b4e1..fb10816edc 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/SwitchLocationButton.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/SwitchLocationButton.kt @@ -35,7 +35,7 @@ class SwitchLocationButton : FrameLayout { buttonWithLocation.text = location?.locationName ?: "" } - var tunnelState by observable<TunnelState>(TunnelState.Disconnected()) { _, _, state -> + var tunnelState by observable<TunnelState>(TunnelState.Disconnected) { _, _, state -> when (state) { is TunnelState.Disconnected -> showLocation() is TunnelState.Disconnecting -> { diff --git a/android/src/main/kotlin/net/mullvad/talpid/CreateTunResult.kt b/android/src/main/kotlin/net/mullvad/talpid/CreateTunResult.kt index dfa82852f1..150382bb1a 100644 --- a/android/src/main/kotlin/net/mullvad/talpid/CreateTunResult.kt +++ b/android/src/main/kotlin/net/mullvad/talpid/CreateTunResult.kt @@ -19,6 +19,7 @@ sealed class CreateTunResult { get() = true } - class PermissionDenied : CreateTunResult() - class TunnelDeviceError : CreateTunResult() + object PermissionDenied : CreateTunResult() + + object TunnelDeviceError : CreateTunResult() } diff --git a/android/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt b/android/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt index 7da32ad71b..0dd94749c5 100644 --- a/android/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt +++ b/android/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt @@ -98,7 +98,7 @@ open class TalpidVpnService : VpnService() { private fun createTun(config: TunConfig): CreateTunResult { if (VpnService.prepare(this) != null) { // VPN permission wasn't granted - return CreateTunResult.PermissionDenied() + return CreateTunResult.PermissionDenied } var invalidDnsServerAddresses = ArrayList<InetAddress>() @@ -138,7 +138,7 @@ open class TalpidVpnService : VpnService() { val tunFd = vpnInterface?.detachFd() if (tunFd == null) { - return CreateTunResult.TunnelDeviceError() + return CreateTunResult.TunnelDeviceError } waitForTunnelUp(tunFd, config.routes.any { route -> route.isIpv6 }) diff --git a/android/src/main/kotlin/net/mullvad/talpid/tunnel/ErrorStateCause.kt b/android/src/main/kotlin/net/mullvad/talpid/tunnel/ErrorStateCause.kt index 22962630b6..8aa14dae1c 100644 --- a/android/src/main/kotlin/net/mullvad/talpid/tunnel/ErrorStateCause.kt +++ b/android/src/main/kotlin/net/mullvad/talpid/tunnel/ErrorStateCause.kt @@ -4,12 +4,12 @@ import java.net.InetAddress sealed class ErrorStateCause { class AuthFailed(val reason: String?) : ErrorStateCause() - class Ipv6Unavailable : ErrorStateCause() - class SetFirewallPolicyError : ErrorStateCause() - class SetDnsError : ErrorStateCause() + object Ipv6Unavailable : ErrorStateCause() + object SetFirewallPolicyError : ErrorStateCause() + object SetDnsError : ErrorStateCause() class InvalidDnsServers(val addresses: ArrayList<InetAddress>) : ErrorStateCause() - class StartTunnelError : ErrorStateCause() + object StartTunnelError : ErrorStateCause() class TunnelParameterError(val error: ParameterGenerationError) : ErrorStateCause() - class IsOffline : ErrorStateCause() - class VpnPermissionDenied : ErrorStateCause() + object IsOffline : ErrorStateCause() + object VpnPermissionDenied : ErrorStateCause() } |