From 513ac9b0f4776d75db9f20983ffad72b744af179 Mon Sep 17 00:00:00 2001 From: Bart Sopers Date: Sun, 28 Feb 2021 15:45:50 +0100 Subject: [PATCH] Replace subscribe with subscribeBy --- .../common/viewmodel/ActionViewModelBase.kt | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/viewmodel/ActionViewModelBase.kt b/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/viewmodel/ActionViewModelBase.kt index 23f175ae1d..807cfc1aec 100644 --- a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/viewmodel/ActionViewModelBase.kt +++ b/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/viewmodel/ActionViewModelBase.kt @@ -7,6 +7,7 @@ import info.nightscout.androidaps.data.PumpEnactResult import info.nightscout.androidaps.logging.AAPSLogger import info.nightscout.androidaps.logging.LTag import io.reactivex.Single +import io.reactivex.rxkotlin.subscribeBy abstract class ActionViewModelBase( protected val injector: HasAndroidInjector, @@ -21,14 +22,16 @@ abstract class ActionViewModelBase( fun executeAction() { _isActionExecutingLiveData.postValue(true) - val disposable = doExecuteAction().subscribe({ result -> - _isActionExecutingLiveData.postValue(false) - _actionResultLiveData.postValue(result) - }, { throwable -> - 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)) - }) + val disposable = doExecuteAction().subscribeBy( + onSuccess = { result -> + _isActionExecutingLiveData.postValue(false) + _actionResultLiveData.postValue(result) + }, + onError = { throwable -> + 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