diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-05-22 15:13:04 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-05-25 11:51:59 +0000 |
| commit | 84d21acf2312f51be09e23964113b652e7ea9b28 (patch) | |
| tree | 433d3cb16eed28451f426496430b1bf24170acdd | |
| parent | 1df086144b208e4baf811bc042e201a919037127 (diff) | |
| download | mullvadvpn-84d21acf2312f51be09e23964113b652e7ea9b28.tar.xz mullvadvpn-84d21acf2312f51be09e23964113b652e7ea9b28.zip | |
Use new `EventNotifier` API in `OutOfTimeFragment`
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/OutOfTimeFragment.kt | 9 |
1 files changed, 2 insertions, 7 deletions
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 007589f13f..a89d4e45c5 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/OutOfTimeFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/OutOfTimeFragment.kt @@ -22,8 +22,6 @@ class OutOfTimeFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) private lateinit var disconnectButton: Button private lateinit var redeemButton: Button - private var tunnelStateListener: Int? = null - private var tunnelState: TunnelState = TunnelState.Disconnected() set(value) { field = value @@ -61,7 +59,7 @@ class OutOfTimeFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) } } - tunnelStateListener = connectionProxy.onStateChange.subscribe() { newState -> + connectionProxy.onStateChange.subscribe(this) { newState -> jobTracker.newUiJob("updateTunnelState") { tunnelState = newState } @@ -90,10 +88,7 @@ class OutOfTimeFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) override fun onSafelyDestroyView() { jobTracker.cancelAllJobs() - - tunnelStateListener?.let { id -> - connectionProxy.onStateChange.unsubscribe(id) - } + connectionProxy.onStateChange.unsubscribe(this) } private fun showRedeemVoucherDialog() { |