summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-05-22 15:29:06 +0000
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-05-25 11:51:59 +0000
commitfb0463ac1825e3eb0d67196fb620e0400632b1c6 (patch)
treedfe37d50baa9e2664df7c71038dad600a2150988
parentb9166285fd3afbde8637d8582859c0926a370d42 (diff)
downloadmullvadvpn-fb0463ac1825e3eb0d67196fb620e0400632b1c6.tar.xz
mullvadvpn-fb0463ac1825e3eb0d67196fb620e0400632b1c6.zip
Use new API in `AdvancedFragment`
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt7
1 files changed, 4 insertions, 3 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt
index 1921546951..e070f5443c 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt
@@ -20,7 +20,6 @@ class AdvancedFragment : ServiceDependentFragment(OnNoService.GoBack) {
private lateinit var wireguardMtuInput: CellInput
private lateinit var wireguardKeysMenu: View
- private var subscriptionId: Int? = null
private var updateUiJob: Job? = null
override fun onSafelyCreateView(
@@ -53,7 +52,9 @@ class AdvancedFragment : ServiceDependentFragment(OnNoService.GoBack) {
}
}
- settingsListener.subscribe({ settings -> updateUi(settings) })
+ settingsListener.subscribe(this) { settings ->
+ updateUi(settings)
+ }
return view
}
@@ -68,7 +69,7 @@ class AdvancedFragment : ServiceDependentFragment(OnNoService.GoBack) {
}
override fun onSafelyDestroyView() {
- subscriptionId?.let { id -> settingsListener.unsubscribe(id) }
+ settingsListener.unsubscribe(this)
updateUiJob?.cancel()
}