caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Replace subscribe with subscribeBy

Browse source
This commit is contained in:
Bart Sopers 2021-02-28 15:45:50 +01:00
parent 5c8ba98682
commit 513ac9b0f4
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/viewmodel/ActionViewModelBase.kt
View file

@ -7,6 +7,7 @@ import info.nightscout.androidaps.data.PumpEnactResult
import info.nightscout.androidaps.logging.AAPSLogger import info.nightscout.androidaps.logging.AAPSLogger
import info.nightscout.androidaps.logging.LTag import info.nightscout.androidaps.logging.LTag
import io.reactivex.Single import io.reactivex.Single
import io.reactivex.rxkotlin.subscribeBy
abstract class ActionViewModelBase( abstract class ActionViewModelBase(
protected val injector: HasAndroidInjector, protected val injector: HasAndroidInjector,
@ -21,14 +22,16 @@ abstract class ActionViewModelBase(
fun executeAction() { fun executeAction() {
_isActionExecutingLiveData.postValue(true) _isActionExecutingLiveData.postValue(true)
val disposable = doExecuteAction().subscribe({ result -> val disposable = doExecuteAction().subscribeBy(
_isActionExecutingLiveData.postValue(false) onSuccess = { result ->
_actionResultLiveData.postValue(result) _isActionExecutingLiveData.postValue(false)
}, { throwable -> _actionResultLiveData.postValue(result)
logger.error(LTag.PUMP, "Caught exception in while executing action in ActionViewModelBase", throwable) },
_isActionExecutingLiveData.postValue(false) onError = { throwable ->
_actionResultLiveData.postValue(PumpEnactResult(injector).success(false).comment(throwable.message)) logger.error(LTag.PUMP, "Caught exception in while executing action in ActionViewModelBase", throwable)
}) _isActionExecutingLiveData.postValue(false)
_actionResultLiveData.postValue(PumpEnactResult(injector).success(false).comment(throwable.message))
})
} }
protected abstract fun doExecuteAction(): Single<PumpEnactResult> protected abstract fun doExecuteAction(): Single<PumpEnactResult>