diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-05-22 15:14:54 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-05-25 11:51:59 +0000 |
| commit | a3e0daf5cc77c71ae7e62e16b60ce469afbf75c4 (patch) | |
| tree | 9c1af9b2f82061bcbf8d1601ce6ec81a5a8b6db2 /android | |
| parent | 2cab7c6f9c123426f17d3951b916f7975d9694b4 (diff) | |
| download | mullvadvpn-a3e0daf5cc77c71ae7e62e16b60ce469afbf75c4.tar.xz mullvadvpn-a3e0daf5cc77c71ae7e62e16b60ce469afbf75c4.zip | |
Use new API in `WireguardKeyFragment`
Diffstat (limited to 'android')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WireguardKeyFragment.kt | 15 |
1 files changed, 4 insertions, 11 deletions
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 68e381d948..933c5bc9a4 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WireguardKeyFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WireguardKeyFragment.kt @@ -39,8 +39,6 @@ class WireguardKeyFragment : ServiceDependentFragment(OnNoService.GoToLaunchScre private var greenColor: Int = 0 private var redColor: Int = 0 - private var keyStatusListenerId: Int? = null - private var tunnelStateListener: Int? = null private var tunnelState: TunnelState = TunnelState.Disconnected() private var actionState: ActionState = ActionState.Idle(false) @@ -144,7 +142,7 @@ class WireguardKeyFragment : ServiceDependentFragment(OnNoService.GoToLaunchScre } override fun onSafelyResume() { - tunnelStateListener = connectionProxy.onUiStateChange.subscribe { uiState -> + connectionProxy.onUiStateChange.subscribe(this) { uiState -> jobTracker.newUiJob("tunnelStateUpdate") { synchronized(this@WireguardKeyFragment) { tunnelState = uiState @@ -162,7 +160,7 @@ class WireguardKeyFragment : ServiceDependentFragment(OnNoService.GoToLaunchScre } } - keyStatusListenerId = keyStatusListener.onKeyStatusChange.subscribe { newKeyStatus -> + keyStatusListener.onKeyStatusChange.subscribe(this) { newKeyStatus -> jobTracker.newUiJob("keyStatusUpdate") { keyStatus = newKeyStatus } @@ -172,13 +170,8 @@ class WireguardKeyFragment : ServiceDependentFragment(OnNoService.GoToLaunchScre } override fun onSafelyPause() { - tunnelStateListener?.let { listener -> - connectionProxy.onUiStateChange.unsubscribe(listener) - } - - keyStatusListenerId?.let { listener -> - keyStatusListener.onKeyStatusChange.unsubscribe(listener) - } + connectionProxy.onUiStateChange.unsubscribe(this) + keyStatusListener.onKeyStatusChange.unsubscribe(this) if (!(actionState is ActionState.Idle)) { actionState = ActionState.Idle(false) |