Remove unused CompositeDisposables

pull/1715/head
Alex Baker 4 years ago
parent c927f46bf6
commit 8181d20ff5

@ -8,7 +8,6 @@ import androidx.preference.Preference
import androidx.preference.SwitchPreferenceCompat import androidx.preference.SwitchPreferenceCompat
import com.todoroo.astrid.dao.Database import com.todoroo.astrid.dao.Database
import dagger.hilt.android.AndroidEntryPoint import dagger.hilt.android.AndroidEntryPoint
import io.reactivex.disposables.CompositeDisposable
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import org.tasks.LocalBroadcastManager import org.tasks.LocalBroadcastManager
import org.tasks.PermissionUtil import org.tasks.PermissionUtil
@ -39,7 +38,6 @@ class Advanced : InjectingPreferenceFragment() {
@Inject lateinit var permissionChecker: PermissionChecker @Inject lateinit var permissionChecker: PermissionChecker
@Inject lateinit var localBroadcastManager: LocalBroadcastManager @Inject lateinit var localBroadcastManager: LocalBroadcastManager
private lateinit var disposables: CompositeDisposable
private lateinit var calendarReminderPreference: SwitchPreferenceCompat private lateinit var calendarReminderPreference: SwitchPreferenceCompat
override fun getPreferenceXml() = R.xml.preferences_advanced override fun getPreferenceXml() = R.xml.preferences_advanced
@ -120,18 +118,6 @@ class Advanced : InjectingPreferenceFragment() {
} }
} }
override fun onResume() {
super.onResume()
disposables = CompositeDisposable()
}
override fun onPause() {
super.onPause()
disposables.dispose()
}
private fun initializeCalendarReminderPreference() { private fun initializeCalendarReminderPreference() {
calendarReminderPreference.onPreferenceChangeListener = calendarReminderPreference.onPreferenceChangeListener =
Preference.OnPreferenceChangeListener { _, newValue -> Preference.OnPreferenceChangeListener { _, newValue ->

@ -1,13 +1,14 @@
package org.tasks.ui package org.tasks.ui
import androidx.lifecycle.* import androidx.lifecycle.LifecycleOwner
import io.reactivex.disposables.CompositeDisposable import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import androidx.lifecycle.lifecycleScope
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
open class ActionViewModel : ViewModel() { open class ActionViewModel : ViewModel() {
private val completed = MutableLiveData<Boolean>() private val completed = MutableLiveData<Boolean>()
private val error = MutableLiveData<Throwable>() private val error = MutableLiveData<Throwable>()
private val disposables = CompositeDisposable()
var inProgress = false var inProgress = false
private set private set
@ -36,6 +37,4 @@ open class ActionViewModel : ViewModel() {
inProgress = false inProgress = false
} }
} }
override fun onCleared() = disposables.clear()
} }
Loading…
Cancel
Save