diff options
Diffstat (limited to 'android')
12 files changed, 14 insertions, 20 deletions
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 ca6b482a43..34fa8b9248 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelState.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelState.kt @@ -6,13 +6,7 @@ import net.mullvad.talpid.tunnel.ErrorState import net.mullvad.talpid.tunnel.ErrorStateCause sealed class TunnelState() { - class Disconnected() : TunnelState() { - companion object { - @JvmStatic - val INSTANCE = Disconnected() - } - } - + 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() @@ -29,7 +23,7 @@ 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) 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/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 edba573f54..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) { 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 -> { |