Merge pull request #11 from 0pen-dash/bart/observable-connect

Make OmnipodDashBleManager.connect() return an Observable of PodEvents

omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/viewmodel/action/InitializePodViewModel.kt

@@ -1,3 +1,9 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.viewmodel.action
 
-abstract class InitializePodViewModel : PodActivationActionViewModelBase()
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.logging.AAPSLogger
+
+abstract class InitializePodViewModel(
+    injector: HasAndroidInjector,
+    logger: AAPSLogger
+) : PodActivationActionViewModelBase(injector, logger)

omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/viewmodel/action/InsertCannulaViewModel.kt

@@ -1,3 +1,9 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.viewmodel.action
 
-abstract class InsertCannulaViewModel : PodActivationActionViewModelBase()
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.logging.AAPSLogger
+
+abstract class InsertCannulaViewModel(
+    injector: HasAndroidInjector,
+    logger: AAPSLogger
+) : PodActivationActionViewModelBase(injector, logger)

omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/viewmodel/action/PodActivationActionViewModelBase.kt

@@ -1,8 +1,13 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.viewmodel.action
 
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.common.viewmodel.ActionViewModelBase
 
-abstract class PodActivationActionViewModelBase : ActionViewModelBase() {
+abstract class PodActivationActionViewModelBase(
+    injector: HasAndroidInjector,
+    logger: AAPSLogger
+) : ActionViewModelBase(injector, logger) {
 
     abstract fun isPodInAlarm(): Boolean
 

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

@@ -2,11 +2,17 @@ package info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.common.
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.data.PumpEnactResult
-import io.reactivex.schedulers.Schedulers
+import info.nightscout.androidaps.logging.AAPSLogger
-import io.reactivex.subjects.SingleSubject
+import info.nightscout.androidaps.logging.LTag
+import io.reactivex.Single
+import io.reactivex.rxkotlin.subscribeBy
 
-abstract class ActionViewModelBase : ViewModelBase() {
+abstract class ActionViewModelBase(
+    protected val injector: HasAndroidInjector,
+    protected val logger: AAPSLogger
+) : ViewModelBase() {
 
     private val _isActionExecutingLiveData = MutableLiveData(false)
     val isActionExecutingLiveData: LiveData<Boolean> = _isActionExecutingLiveData
@@ -16,14 +22,17 @@ abstract class ActionViewModelBase : ViewModelBase() {
 
     fun executeAction() {
         _isActionExecutingLiveData.postValue(true)
-        SingleSubject.fromCallable(this::doExecuteAction)
+        val disposable = doExecuteAction().subscribeBy(
-            .subscribeOn(Schedulers.io())
+            onSuccess = { result ->
-            .doOnSuccess { result ->
                 _isActionExecutingLiveData.postValue(false)
                 _actionResultLiveData.postValue(result)
-            }
+            },
-            .subscribe()
+            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(): PumpEnactResult
+    protected abstract fun doExecuteAction(): Single<PumpEnactResult>
 }

omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/deactivation/viewmodel/action/DeactivatePodViewModel.kt

@@ -1,8 +1,13 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.deactivation.viewmodel.action
 
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.common.viewmodel.ActionViewModelBase
 
-abstract class DeactivatePodViewModel : ActionViewModelBase() {
+abstract class DeactivatePodViewModel(
+    injector: HasAndroidInjector,
+    logger: AAPSLogger
+) : ActionViewModelBase(injector, logger) {
 
     abstract fun discardPod()
 }

omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/OmnipodDashManagerImpl.kt

@@ -1,6 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver
 
 import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.OmnipodDashBleManager
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.event.PodEvent
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.GetVersionCommand
@@ -9,50 +10,58 @@ import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definitio
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.AlertConfiguration
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.AlertSlot
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.BasalProgram
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response.AlarmStatusResponse
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response.DefaultStatusResponse
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response.Response
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response.SetUniqueIdResponse
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response.VersionResponse
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.state.OmnipodDashPodStateManager
+import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import io.reactivex.Observable
+import io.reactivex.functions.Consumer
 import java.util.*
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class OmnipodDashManagerImpl @Inject constructor(
-    private val aapsLogger: AAPSLogger,
+    private val logger: AAPSLogger,
     private val podStateManager: OmnipodDashPodStateManager,
-    private val bleManager: OmnipodDashBleManager
+    private val bleManager: OmnipodDashBleManager,
+    private val aapsSchedulers: AapsSchedulers
 ) : OmnipodDashManager {
 
     private val observePodReadyForActivationPart1: Observable<PodEvent>
-        get() {
+        get() = Observable.defer {
             if (podStateManager.activationProgress.isBefore(ActivationProgress.PHASE_1_COMPLETED)) {
-                return Observable.empty()
+                Observable.empty()
+            } else {
+                Observable.error(IllegalStateException("Pod is in an incorrect state"))
             }
-            return Observable.error(IllegalStateException("Pod is in an incorrect state"))
         }
 
     private val observeConnectToPod: Observable<PodEvent>
-        get() {
+        get() = Observable.defer { bleManager.connect() }
-            return Observable.defer {
+
-                bleManager.connect()
+    private val observeSendGetVersionCommand: Observable<PodEvent>
-                Observable.just(PodEvent.Connected(0)) // TODO should be returned in BleManager
+        get() = Observable.defer {
-            }
+            bleManager.sendCommand(GetVersionCommand.Builder() //
+                .setSequenceNumber(podStateManager.messageSequenceNumber) //
+                .setUniqueId(DEFAULT_UNIQUE_ID) //
+                .build()) //
         }
 
     override fun activatePodPart1(): Observable<PodEvent> {
-        val command = GetVersionCommand.Builder() //
-            .setSequenceNumber(podStateManager.messageSequenceNumber) //
-            .setUniqueId(DEFAULT_UNIQUE_ID) //
-            .build()
-
         return Observable.concat(
             observePodReadyForActivationPart1,
             observeConnectToPod,
-            Observable.defer {
+            observeSendGetVersionCommand
-                bleManager.sendCommand(command)
-                Observable.just(PodEvent.CommandSent(command)) // TODO should be returned in BleManager
-            }
             // ... Send more commands
-        )
+        ) //
+            // TODO these would be common for any observable returned in a public function in this class
+            .doOnNext(PodEventInterceptor()) //
+            .doOnError(ErrorInterceptor())
+            .subscribeOn(aapsSchedulers.io)
     }
 
     override fun activatePodPart2(): Observable<PodEvent> {
@@ -119,4 +128,63 @@ class OmnipodDashManagerImpl @Inject constructor(
         // TODO
         return Observable.empty()
     }
+
+    inner class PodEventInterceptor : Consumer<PodEvent> {
+
+        override fun accept(event: PodEvent) {
+            logger.debug(LTag.PUMP, "Intercepted PodEvent in OmnipodDashManagerImpl: ${event.javaClass.simpleName}")
+            when (event) {
+                is PodEvent.AlreadyConnected -> {
+                    podStateManager.bluetoothAddress = event.bluetoothAddress
+                    podStateManager.uniqueId = event.uniqueId
+                }
+
+                is PodEvent.BluetoothConnected -> {
+                    podStateManager.bluetoothAddress = event.address
+                }
+
+                is PodEvent.Connected -> {
+                    podStateManager.uniqueId = event.uniqueId
+                }
+
+                is PodEvent.ResponseReceived -> {
+                    podStateManager.increaseMessageSequenceNumber()
+                    handleResponse(event.response)
+                }
+
+                else                           -> {
+                    // Do nothing
+                }
+            }
+        }
+
+        private fun handleResponse(response: Response) {
+            when (response) {
+                is VersionResponse -> {
+                    podStateManager.updateFromVersionResponse(response)
+                }
+
+                is SetUniqueIdResponse -> {
+                    podStateManager.updateFromSetUniqueIdResponse(response)
+                }
+
+                is DefaultStatusResponse -> {
+                    podStateManager.updateFromDefaultStatusResponse(response)
+                }
+
+                is AlarmStatusResponse -> {
+                    podStateManager.updateFromAlarmStatusResponse(response)
+                }
+            }
+        }
+
+    }
+
+    inner class ErrorInterceptor : Consumer<Throwable> {
+
+        override fun accept(throwable: Throwable) {
+            logger.debug(LTag.PUMP, "Intercepted error in OmnipodDashManagerImpl: ${throwable.javaClass.simpleName}")
+        }
+
+    }
 }

omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/OmnipodDashBleManager.kt

@@ -1,18 +1,17 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm
 
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.status.ConnectionStatus
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.event.PodEvent
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.Command
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response.Response
+import io.reactivex.Observable
 
 interface OmnipodDashBleManager {
 
-    fun sendCommand(cmd: Command): Response
+    fun sendCommand(cmd: Command): Observable<PodEvent>
 
     fun getStatus(): ConnectionStatus
 
-    fun connect()
+    fun connect(): Observable<PodEvent>
 
     fun disconnect()
-
-    fun getPodId(): Id
 }

omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/OmnipodDashBleManagerImpl.kt

@@ -17,8 +17,10 @@ import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.ltk.LTKE
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message.MessageIO
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.scan.PodScanner
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.status.ConnectionStatus
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.event.PodEvent
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.Command
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response.Response
+import io.reactivex.Observable
+import org.apache.commons.lang3.NotImplementedException
 import java.util.concurrent.BlockingQueue
 import java.util.concurrent.LinkedBlockingDeque
 import java.util.concurrent.TimeoutException
@@ -62,8 +64,9 @@ class OmnipodDashBleManagerImpl @Inject constructor(private val context: Context
         return bleIO
     }
 
-    override fun sendCommand(cmd: Command): Response {
+    override fun sendCommand(cmd: Command): Observable<PodEvent> {
-        TODO("not implemented")
+        // TODO
+        return Observable.error(NotImplementedException("sendCommand is not yet implemented"))
     }
 
     override fun getStatus(): ConnectionStatus {
@@ -71,30 +74,42 @@ class OmnipodDashBleManagerImpl @Inject constructor(private val context: Context
     }
 
     @Throws(InterruptedException::class, ScanFailException::class, FailedToConnectException::class, CouldNotSendBleException::class, BleIOBusyException::class, TimeoutException::class, CouldNotConfirmWriteException::class, CouldNotEnableNotifications::class, DescriptorNotFoundException::class, CouldNotConfirmDescriptorWriteException::class)
-    override fun connect() {
+    override fun connect(): Observable<PodEvent> = Observable.create { emitter ->
-        // TODO: this is wrong and I know it
+        // TODO: when we are already connected,
-        aapsLogger.info(LTag.PUMPBTCOMM, "starting new pod activation")
+        //  emit PodEvent.AlreadyConnected, complete the observable and return from this method
-        val podScanner = PodScanner(aapsLogger, bluetoothAdapter)
-        val podAddress = podScanner.scanForPod(PodScanner.SCAN_FOR_SERVICE_UUID, PodScanner.POD_ID_NOT_ACTIVATED).scanResult.device.address
-        // For tests: this.podAddress = "B8:27:EB:1D:7E:BB";
-        val bleIO = connect(podAddress)
-        val msgIO = MessageIO(aapsLogger, bleIO)
-        val ltkExchanger = LTKExchanger(aapsLogger, msgIO)
-        val ltk = ltkExchanger.negociateLTKAndNonce()
 
-        aapsLogger.info(LTag.PUMPCOMM, "Got LTK and Nonce Prefix: ${ltk}")
+        try {
+            // TODO: this is wrong and I know it
+            aapsLogger.info(LTag.PUMPBTCOMM, "starting new pod activation")
+
+            val podScanner = PodScanner(aapsLogger, bluetoothAdapter)
+            emitter.onNext(PodEvent.Scanning)
+
+            val podAddress = podScanner.scanForPod(PodScanner.SCAN_FOR_SERVICE_UUID, PodScanner.POD_ID_NOT_ACTIVATED).scanResult.device.address
+            // For tests: this.podAddress = "B8:27:EB:1D:7E:BB";
+            emitter.onNext(PodEvent.BluetoothConnecting)
+
+            val bleIO = connect(podAddress)
+            emitter.onNext(PodEvent.BluetoothConnected(podAddress))
+
+            val msgIO = MessageIO(aapsLogger, bleIO)
+            val ltkExchanger = LTKExchanger(aapsLogger, msgIO)
+            emitter.onNext(PodEvent.Pairing)
+
+            val ltk = ltkExchanger.negotiateLTKAndNonce()
+            aapsLogger.info(LTag.PUMPCOMM, "Got LTK and Nonce Prefix: ${ltk}")
+            emitter.onNext(PodEvent.Connected(PodScanner.POD_ID_NOT_ACTIVATED)) // TODO supply actual pod id
+
+            emitter.onComplete()
+        } catch (ex: Exception) {
+            emitter.tryOnError(ex)
+        }
     }
 
     override fun disconnect() {
         TODO("not implemented")
     }
 
-
-    override fun getPodId(): Id {
-        // TODO: return something meaningful here
-        return Id.fromInt(4243);
-    }
-
     companion object {
 
         private const val CONNECT_TIMEOUT_MS = 5000

omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/ScanFailException.kt

@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions
 
 open class ScanFailException : Exception {
-    constructor()
+    constructor(message: String) : super(message)
     constructor(errorCode: Int) : super("errorCode$errorCode")
 }

omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/ScanFailFoundTooManyException.kt

@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.excepti
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.scan.BleDiscoveredDevice
 import java.util.*
 
-class ScanFailFoundTooManyException(devices: List<BleDiscoveredDevice>) : ScanFailException() {
+class ScanFailFoundTooManyException(devices: List<BleDiscoveredDevice>) : ScanFailException("Found more than one Pod") {
 
     private val devices: List<BleDiscoveredDevice> = ArrayList(devices)
     val discoveredDevices: List<BleDiscoveredDevice>

omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/ScanFailNotFoundException.kt

@@ -1,3 +1,3 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions
 
-class ScanFailNotFoundException : ScanFailException()
+class ScanFailNotFoundException : ScanFailException("No Pod found")

omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/ltk/LTKExchanger.kt

@@ -9,7 +9,7 @@ import info.nightscout.androidaps.utils.extensions.hexStringToByteArray
 
 internal class LTKExchanger(private val aapsLogger: AAPSLogger, private val msgIO: MessageIO) {
 
-    fun negociateLTKAndNonce(): LTK? {
+    fun negotiateLTKAndNonce(): LTK? {
         // send SP1, SP2
         // TODO: get this from somewhere(preferences?)
         var seq: Byte = 1

omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/scan/PodScanner.kt

@@ -42,7 +42,7 @@ class PodScanner(private val logger: AAPSLogger, private val bluetoothAdapter: B
     companion object {
 
         const val SCAN_FOR_SERVICE_UUID = "00004024-0000-1000-8000-00805F9B34FB"
-        const val POD_ID_NOT_ACTIVATED = 4294967294L
+        const val POD_ID_NOT_ACTIVATED = 0xFFFFFFFFL
         private const val SCAN_DURATION_MS = 5000
     }
 }

omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/scan/ScanCollector.kt

@@ -34,7 +34,7 @@ class ScanCollector(private val logger: AAPSLogger, private val podID: Long) : S
         for (result in found.values) {
             try {
                 result.scanRecord?.let {
-                    val device = BleDiscoveredDevice(result, result.scanRecord, podID)
+                    val device = BleDiscoveredDevice(result, it, podID)
                     ret.add(device)
                     logger.debug(LTag.PUMPBTCOMM, "ScanCollector found: " + result.toString() + "Pod ID: " + podID)
                 }

omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/event/PodEvent.kt

@@ -5,10 +5,17 @@ import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response.
 
 sealed class PodEvent {
 
+    /* BT connection events */
+    class AlreadyConnected(val bluetoothAddress: String, val uniqueId: Long) : PodEvent()
     object Scanning : PodEvent()
+    object BluetoothConnecting : PodEvent()
+    class BluetoothConnected(val address: String) : PodEvent()
     object Pairing : PodEvent()
-    object Connecting : PodEvent()
+    object Paired : PodEvent()
-    class Connected(val uniqueId: Int) : PodEvent()
+    object EstablishingSession : PodEvent()
+    class Connected(val uniqueId: Long) : PodEvent()
+
+    /* Message exchange events */
     class CommandSending(val command: Command) : PodEvent()
     class CommandSent(val command: Command) : PodEvent()
     class ResponseReceived(val response: Response) : PodEvent()

omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManager.kt

@@ -21,8 +21,8 @@ interface OmnipodDashPodStateManager {
     val messageSequenceNumber: Short
     val sequenceNumberOfLastProgrammingCommand: Short?
     val activationTime: Long?
-    val uniqueId: Long?
+    var uniqueId: Long?
-    val bluetoothAddress: String?
+    var bluetoothAddress: String?
 
     val bluetoothVersion: SoftwareVersion?
     val firmwareVersion: SoftwareVersion?

omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt

@@ -34,8 +34,6 @@ class OmnipodDashPodStateManagerImpl @Inject constructor(
             store()
         }
 
-    // TODO: dynamic get() fun instead of assignment
-
     override val isUniqueIdSet: Boolean
         get() = activationProgress.isAtLeast(ActivationProgress.SET_UNIQUE_ID)
 
@@ -68,11 +66,27 @@ class OmnipodDashPodStateManagerImpl @Inject constructor(
     override val activationTime: Long?
         get() = podState.activationTime
 
-    override val uniqueId: Long?
+    override var uniqueId: Long?
         get() = podState.uniqueId
+        set(uniqueId) {
+            if (podState.uniqueId == null) {
+                podState.uniqueId = uniqueId
+                store()
+            } else if (uniqueId != podState.uniqueId) {
+                throw IllegalStateException("Trying to set Unique ID to $uniqueId, but it is already set to ${podState.uniqueId}")
+            }
+        }
 
-    override val bluetoothAddress: String?
+    override var bluetoothAddress: String?
         get() = podState.bluetoothAddress
+        set(bluetoothAddress) {
+            if (podState.bluetoothAddress == null) {
+                podState.bluetoothAddress = bluetoothAddress
+                store()
+            } else if (bluetoothAddress != podState.bluetoothAddress) {
+                throw IllegalStateException("Trying to set Bluetooth Address to $bluetoothAddress, but it is already set to ${podState.bluetoothAddress}")
+            }
+        }
 
     override val bluetoothVersion: SoftwareVersion?
         get() = podState.bleVersion

omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInitializePodViewModel.kt

@@ -8,11 +8,15 @@ import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.viewmodel.action.InitializePodViewModel
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.R
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.OmnipodDashManager
+import io.reactivex.Single
+import io.reactivex.rxkotlin.subscribeBy
 import javax.inject.Inject
 
-class DashInitializePodViewModel @Inject constructor(private val aapsLogger: AAPSLogger,
+class DashInitializePodViewModel @Inject constructor(
-                                                     private val injector: HasAndroidInjector,
+    private val omnipodManager: OmnipodDashManager,
-                                                     private val omnipodManager: OmnipodDashManager) : InitializePodViewModel() {
+    injector: HasAndroidInjector,
+    logger: AAPSLogger
+) : InitializePodViewModel(injector, logger) {
 
     override fun isPodInAlarm(): Boolean = false // TODO
 
@@ -20,16 +24,20 @@ class DashInitializePodViewModel @Inject constructor(private val aapsLogger: AAP
 
     override fun isPodDeactivatable(): Boolean = true // TODO
 
-    override fun doExecuteAction(): PumpEnactResult {
+    override fun doExecuteAction(): Single<PumpEnactResult> =
-        // TODO FIRST STEP OF ACTIVATION
+        Single.create { source ->
-        val disposable = omnipodManager.activatePodPart1().subscribe(
+            val disposable = omnipodManager.activatePodPart1().subscribeBy(
-            { podEvent -> aapsLogger.debug(LTag.PUMP, "Received PodEvent in Pod activation part 1: $podEvent") },
+                onNext = { podEvent -> logger.debug(LTag.PUMP, "Received PodEvent in Pod activation part 1: $podEvent") },
-            { throwable -> aapsLogger.error(LTag.PUMP, "Error in Pod activation part 1: $throwable") },
+                onError = { throwable ->
-            { aapsLogger.debug("Pod activation part 1 completed") }
+                    logger.error(LTag.PUMP, "Error in Pod activation part 1", throwable)
-        )
+                    source.onSuccess(PumpEnactResult(injector).success(false).comment(throwable.message))
-
+                },
-        return PumpEnactResult(injector).success(false).comment("not implemented")
+                onComplete = {
-    }
+                    logger.debug("Pod activation part 1 completed")
+                    source.onSuccess(PumpEnactResult(injector).success(true))
+                }
+            )
+        }
 
     @StringRes
     override fun getTitleId(): Int = R.string.omnipod_common_pod_activation_wizard_initialize_pod_title

omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInsertCannulaViewModel.kt

@@ -4,11 +4,17 @@ import androidx.annotation.StringRes
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.data.PumpEnactResult
 import info.nightscout.androidaps.interfaces.ProfileFunction
+import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.viewmodel.action.InsertCannulaViewModel
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.R
+import io.reactivex.Single
 import javax.inject.Inject
 
-class DashInsertCannulaViewModel @Inject constructor(private val injector: HasAndroidInjector, private val profileFunction: ProfileFunction) : InsertCannulaViewModel() {
+class DashInsertCannulaViewModel @Inject constructor(
+    private val profileFunction: ProfileFunction,
+    injector: HasAndroidInjector,
+    logger: AAPSLogger
+) : InsertCannulaViewModel(injector, logger) {
 
     override fun isPodInAlarm(): Boolean = false // TODO
 
@@ -16,7 +22,7 @@ class DashInsertCannulaViewModel @Inject constructor(private val injector: HasAn
 
     override fun isPodDeactivatable(): Boolean = true // TODO
 
-    override fun doExecuteAction(): PumpEnactResult = PumpEnactResult(injector) // TODO
+    override fun doExecuteAction(): Single<PumpEnactResult> = Single.just(PumpEnactResult(injector).success(false).comment("TODO")) // TODO
 
     @StringRes
     override fun getTitleId(): Int = R.string.omnipod_common_pod_activation_wizard_insert_cannula_title

omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/action/DashDeactivatePodViewModel.kt

@@ -3,13 +3,18 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.deactivat
 import androidx.annotation.StringRes
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.data.PumpEnactResult
+import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.pump.omnipod.common.R
 import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.deactivation.viewmodel.action.DeactivatePodViewModel
+import io.reactivex.Single
 import javax.inject.Inject
 
-class DashDeactivatePodViewModel @Inject constructor(private val injector: HasAndroidInjector) : DeactivatePodViewModel() {
+class DashDeactivatePodViewModel @Inject constructor(
+    injector: HasAndroidInjector,
+    logger: AAPSLogger
+) : DeactivatePodViewModel(injector, logger) {
 
-    override fun doExecuteAction(): PumpEnactResult = PumpEnactResult(injector) // TODO
+    override fun doExecuteAction(): Single<PumpEnactResult> = Single.just(PumpEnactResult(injector).success(false).comment("TODO")) // TODO
 
     override fun discardPod() {
         // TODO

omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/viewmodel/action/ErosInitializePodViewModel.kt

@@ -1,15 +1,23 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.activation.viewmodel.action
 
 import androidx.annotation.StringRes
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.data.PumpEnactResult
+import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.viewmodel.action.InitializePodViewModel
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.R
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.ActivationProgress
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.manager.AapsErosPodStateManager
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.manager.AapsOmnipodErosManager
+import io.reactivex.Single
 import javax.inject.Inject
 
-class ErosInitializePodViewModel @Inject constructor(private val aapsOmnipodManager: AapsOmnipodErosManager, private val podStateManager: AapsErosPodStateManager) : InitializePodViewModel() {
+class ErosInitializePodViewModel @Inject constructor(
+    private val aapsOmnipodManager: AapsOmnipodErosManager,
+    private val podStateManager: AapsErosPodStateManager,
+    injector: HasAndroidInjector,
+    logger: AAPSLogger
+) : InitializePodViewModel(injector, logger) {
 
     override fun isPodInAlarm(): Boolean = podStateManager.isPodFaulted
 
@@ -17,7 +25,7 @@ class ErosInitializePodViewModel @Inject constructor(private val aapsOmnipodMana
 
     override fun isPodDeactivatable(): Boolean = podStateManager.activationProgress.isAtLeast(ActivationProgress.PAIRING_COMPLETED)
 
-    override fun doExecuteAction(): PumpEnactResult = aapsOmnipodManager.initializePod()
+    override fun doExecuteAction(): Single<PumpEnactResult> = Single.just(aapsOmnipodManager.initializePod())
 
     @StringRes
     override fun getTitleId(): Int = R.string.omnipod_common_pod_activation_wizard_initialize_pod_title

omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/viewmodel/action/ErosInsertCannulaViewModel.kt

@@ -1,16 +1,25 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.activation.viewmodel.action
 
 import androidx.annotation.StringRes
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.data.PumpEnactResult
 import info.nightscout.androidaps.interfaces.ProfileFunction
+import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.viewmodel.action.InsertCannulaViewModel
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.R
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.ActivationProgress
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.manager.AapsErosPodStateManager
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.manager.AapsOmnipodErosManager
+import io.reactivex.Single
 import javax.inject.Inject
 
-class ErosInsertCannulaViewModel @Inject constructor(private val aapsOmnipodManager: AapsOmnipodErosManager, private val podStateManager: AapsErosPodStateManager, private val profileFunction: ProfileFunction) : InsertCannulaViewModel() {
+class ErosInsertCannulaViewModel @Inject constructor(
+    private val aapsOmnipodManager: AapsOmnipodErosManager,
+    private val podStateManager: AapsErosPodStateManager,
+    private val profileFunction: ProfileFunction,
+    injector: HasAndroidInjector,
+    logger: AAPSLogger
+) : InsertCannulaViewModel(injector, logger) {
 
     override fun isPodInAlarm(): Boolean = podStateManager.isPodFaulted
 
@@ -18,7 +27,7 @@ class ErosInsertCannulaViewModel @Inject constructor(private val aapsOmnipodMana
 
     override fun isPodDeactivatable(): Boolean = podStateManager.activationProgress.isAtLeast(ActivationProgress.PAIRING_COMPLETED)
 
-    override fun doExecuteAction(): PumpEnactResult = aapsOmnipodManager.insertCannula(profileFunction.getProfile())
+    override fun doExecuteAction(): Single<PumpEnactResult> = Single.just(aapsOmnipodManager.insertCannula(profileFunction.getProfile()))
 
     @StringRes
     override fun getTitleId(): Int = R.string.omnipod_common_pod_activation_wizard_insert_cannula_title

omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/deactivation/viewmodel/action/ErosDeactivatePodViewModel.kt

@@ -1,27 +1,33 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.deactivation.viewmodel.action
 
 import androidx.annotation.StringRes
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.data.PumpEnactResult
 import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.pump.omnipod.common.R
 import info.nightscout.androidaps.plugins.pump.omnipod.common.queue.command.CommandDeactivatePod
 import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.deactivation.viewmodel.action.DeactivatePodViewModel
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.manager.AapsOmnipodErosManager
 import info.nightscout.androidaps.queue.Callback
-import io.reactivex.subjects.SingleSubject
+import io.reactivex.Single
 import javax.inject.Inject
 
-class ErosDeactivatePodViewModel @Inject constructor(private val aapsOmnipodManager: AapsOmnipodErosManager, private val commandQueueProvider: CommandQueueProvider) : DeactivatePodViewModel() {
+class ErosDeactivatePodViewModel @Inject constructor(
+    private val aapsOmnipodManager: AapsOmnipodErosManager,
+    private val commandQueueProvider: CommandQueueProvider,
+    injector: HasAndroidInjector,
+    logger: AAPSLogger
+) : DeactivatePodViewModel(injector, logger) {
 
-    override fun doExecuteAction(): PumpEnactResult {
+    override fun doExecuteAction(): Single<PumpEnactResult> =
-        val singleSubject = SingleSubject.create<PumpEnactResult>()
+        Single.create { source ->
-        commandQueueProvider.customCommand(CommandDeactivatePod(), object : Callback() {
+            commandQueueProvider.customCommand(CommandDeactivatePod(), object : Callback() {
-            override fun run() {
+                override fun run() {
-                singleSubject.onSuccess(result)
+                    source.onSuccess(result)
-            }
+                }
-        })
+            })
-        return singleSubject.blockingGet()
+        }
-    }
 
     override fun discardPod() {
         aapsOmnipodManager.discardPodState()