ktlint format

omnipod-dash/src/androidTest/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/DashHistoryTest.kt

@@ -30,7 +30,9 @@ class DashHistoryTest {
     fun setUp() {
         val context = ApplicationProvider.getApplicationContext<Context>()
         database = Room.inMemoryDatabaseBuilder(
-            context, DashHistoryDatabase::class.java).build()
+            context,
+            DashHistoryDatabase::class.java
+        ).build()
         dao = database.historyRecordDao()
         dashHistory = DashHistory(dao, HistoryMapper())
     }

omnipod-dash/src/androidTest/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/RxSchedulerRule.kt

@@ -26,7 +26,6 @@ class RxSchedulerRule(val scheduler: Scheduler) : TestRule {
                     RxJavaPlugins.reset()
                     RxAndroidPlugins.reset()
                 }
-
             }
         }
 }

omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/dagger/OmnipodDashHistoryModule.kt

@@ -29,5 +29,4 @@ class OmnipodDashHistoryModule {
     @Singleton
     internal fun provideDashHistory(dao: HistoryRecordDao, historyMapper: HistoryMapper) =
         DashHistory(dao, historyMapper)
-
 }

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

@@ -50,7 +50,8 @@ class OmnipodDashManagerImpl @Inject constructor(
 
     private fun observeSendProgramBolusCommand(units: Double, rateInEighthPulsesPerSeconds: Byte, confirmationBeeps: Boolean, completionBeeps: Boolean): Observable<PodEvent> {
         return Observable.defer {
-            bleManager.sendCommand(ProgramBolusCommand.Builder()
+            bleManager.sendCommand(
+                ProgramBolusCommand.Builder()
                     .setUniqueId(podStateManager.uniqueId!!.toInt())
                     .setSequenceNumber(podStateManager.messageSequenceNumber)
                     .setNonce(1229869870) // TODO
@@ -78,13 +79,15 @@ class OmnipodDashManagerImpl @Inject constructor(
         get() = Observable.defer {
             observeSendGetPodStatusCommand()
                 .ignoreElements() //
-                .andThen(Observable.defer {
+                .andThen(
+                    Observable.defer {
                         if (podStateManager.podStatus == PodStatus.RUNNING_ABOVE_MIN_VOLUME) {
                             Observable.empty()
                         } else {
                             Observable.error(IllegalStateException("Unexpected Pod status"))
                         }
-                })
+                    }
+                )
         }
 
     private fun observeSendProgramAlertsCommand(alertConfigurations: List<AlertConfiguration>, multiCommandFlag: Boolean = false): Observable<PodEvent> {
@@ -119,32 +122,38 @@ class OmnipodDashManagerImpl @Inject constructor(
         get() = Observable.defer {
             observeSendGetPodStatusCommand()
                 .ignoreElements() //
-                .andThen(Observable.defer {
+                .andThen(
+                    Observable.defer {
                         if (podStateManager.podStatus == PodStatus.CLUTCH_DRIVE_ENGAGED) {
                             Observable.empty()
                         } else {
                             Observable.error(IllegalStateException("Unexpected Pod status"))
                         }
-                })
+                    }
+                )
         }
 
     private val observeSendSetUniqueIdCommand: Observable<PodEvent>
         get() = Observable.defer {
-            bleManager.sendCommand(SetUniqueIdCommand.Builder() //
+            bleManager.sendCommand(
+                SetUniqueIdCommand.Builder() //
                     .setSequenceNumber(podStateManager.messageSequenceNumber) //
                     .setUniqueId(podStateManager.uniqueId!!.toInt()) //
                     .setLotNumber(podStateManager.lotNumber!!.toInt()) //
                     .setPodSequenceNumber(podStateManager.podSequenceNumber!!.toInt())
                     .setInitializationTime(Date())
-                .build()) //
+                    .build()
+            ) //
         }
 
     private val observeSendGetVersionCommand: Observable<PodEvent>
         get() = Observable.defer {
-            bleManager.sendCommand(GetVersionCommand.Builder() //
+            bleManager.sendCommand(
+                GetVersionCommand.Builder() //
                     .setSequenceNumber(podStateManager.messageSequenceNumber) //
                     .setUniqueId(DEFAULT_UNIQUE_ID) //
-                .build()) //
+                    .build()
+            ) //
         }
 
     override fun activatePodPart1(lowReservoirAlertTrigger: AlertTrigger.ReservoirVolumeTrigger?): Observable<PodEvent> {
@@ -277,7 +286,8 @@ class OmnipodDashManagerImpl @Inject constructor(
             )
         }
         if (podStateManager.activationProgress.isBefore(ActivationProgress.UPDATED_EXPIRATION_ALERTS)) {
-            observables.add(observeSendProgramAlertsCommand(
+            observables.add(
+                observeSendProgramAlertsCommand(
                     listOf(
                         // FIXME use user configured expiration alert
                         AlertConfiguration(
@@ -300,7 +310,8 @@ class OmnipodDashManagerImpl @Inject constructor(
                         )
                     ),
                     multiCommandFlag = true
-            ).doOnComplete(ActivationProgressUpdater(ActivationProgress.UPDATED_EXPIRATION_ALERTS)))
+                ).doOnComplete(ActivationProgressUpdater(ActivationProgress.UPDATED_EXPIRATION_ALERTS))
+            )
         }
         if (podStateManager.activationProgress.isBefore(ActivationProgress.PROGRAMMED_BASAL)) {
             observables.add(
@@ -424,7 +435,6 @@ class OmnipodDashManagerImpl @Inject constructor(
                 }
             }
         }
-
     }
 
     inner class ErrorInterceptor : Consumer<Throwable> {
@@ -432,7 +442,6 @@ class OmnipodDashManagerImpl @Inject constructor(
         override fun accept(throwable: Throwable) {
             logger.debug(LTag.PUMP, "Intercepted error in OmnipodDashManagerImpl: ${throwable.javaClass.simpleName}")
         }
-
     }
 
     inner class ActivationProgressUpdater(private val value: ActivationProgress) : Action {
@@ -440,6 +449,5 @@ class OmnipodDashManagerImpl @Inject constructor(
         override fun run() {
             podStateManager.activationProgress = value
         }
-
     }
 }

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

@@ -22,7 +22,7 @@ data class Id(val address: ByteArray) {
 
     override fun toString(): String {
         val asInt = ByteBuffer.wrap(address).int
-        return "${asInt}/${address.toHex()}"
+        return "$asInt/${address.toHex()}"
     }
 
     companion object {
@@ -33,5 +33,4 @@ data class Id(val address: ByteArray) {
             return Id(ByteBuffer.allocate(4).putInt(v).array())
         }
     }
-
 }

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

@@ -39,8 +39,10 @@ class OmnipodDashBleManagerImpl @Inject constructor(private val context: Context
         // TODO: locking?
         val podDevice = bluetoothAdapter.getRemoteDevice(podAddress)
         val incomingPackets: Map<CharacteristicType, BlockingQueue<ByteArray>> =
-            mapOf(CharacteristicType.CMD to LinkedBlockingDeque(),
+            mapOf(
-                CharacteristicType.DATA to LinkedBlockingDeque())
+                CharacteristicType.CMD to LinkedBlockingDeque(),
+                CharacteristicType.DATA to LinkedBlockingDeque()
+            )
         val bleCommCallbacks = BleCommCallbacks(aapsLogger, incomingPackets)
         aapsLogger.debug(LTag.PUMPBTCOMM, "Connecting to $podAddress")
         var autoConnect = true
@@ -118,5 +120,4 @@ class OmnipodDashBleManagerImpl @Inject constructor(private val context: Context
         private const val CONNECT_TIMEOUT_MS = 7000
         const val CONTROLLER_ID = 4242 // TODO read from preferences or somewhere else.
     }
-
 }

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

@@ -4,7 +4,6 @@ import android.bluetooth.BluetoothGatt
 import android.bluetooth.BluetoothGattCharacteristic
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.callbacks.BleCommCallbacks
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions.CharacteristicNotFoundException
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions.ServiceNotFoundException
@@ -29,8 +28,10 @@ class ServiceDiscoverer(private val logger: AAPSLogger, private val gatt: Blueto
             ?: throw CharacteristicNotFoundException(CharacteristicType.CMD.value)
         val dataChar = service.getCharacteristic(CharacteristicType.DATA.uuid) // TODO: this is never used
             ?: throw CharacteristicNotFoundException(CharacteristicType.DATA.value)
-        var chars = mapOf(CharacteristicType.CMD to cmdChar,
+        var chars = mapOf(
-            CharacteristicType.DATA to dataChar)
+            CharacteristicType.CMD to cmdChar,
+            CharacteristicType.DATA to dataChar
+        )
         return chars
     }
 

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

@@ -77,8 +77,11 @@ class BleCommCallbacks(private val aapsLogger: AAPSLogger, private val incomingP
         } else {
             CharacteristicWriteConfirmationError(status)
         }
-        aapsLogger.debug(LTag.PUMPBTCOMM, "OnCharacteristicWrite with status/char/value " +
+        aapsLogger.debug(
-            status + "/" + byValue(characteristic.uuid.toString()) + "/" + characteristic.value.toHex())
+            LTag.PUMPBTCOMM,
+            "OnCharacteristicWrite with status/char/value " +
+                status + "/" + byValue(characteristic.uuid.toString()) + "/" + characteristic.value.toHex()
+        )
         try {
             if (writeQueue.size > 0) {
                 aapsLogger.warn(LTag.PUMPBTCOMM, "Write confirm queue should be empty. found: " + writeQueue.size)
@@ -97,9 +100,12 @@ class BleCommCallbacks(private val aapsLogger: AAPSLogger, private val incomingP
         super.onCharacteristicChanged(gatt, characteristic)
         val payload = characteristic.value
         val characteristicType = byValue(characteristic.uuid.toString())
-        aapsLogger.debug(LTag.PUMPBTCOMM, "OnCharacteristicChanged with char/value " +
+        aapsLogger.debug(
+            LTag.PUMPBTCOMM,
+            "OnCharacteristicChanged with char/value " +
                 characteristicType + "/" +
-            payload.toHex())
+                payload.toHex()
+        )
         incomingPackets[characteristicType]!!.add(payload)
     }
 
@@ -109,7 +115,8 @@ class BleCommCallbacks(private val aapsLogger: AAPSLogger, private val incomingP
             ?: throw TimeoutException()
         when (confirmed) {
             is DescriptorWriteConfirmationError -> throw CouldNotConfirmWriteException(confirmed.status)
-            is DescriptorWriteConfirmationUUID -> if (confirmed.uuid != descriptorUUID) {
+            is DescriptorWriteConfirmationUUID ->
+                if (confirmed.uuid != descriptorUUID) {
                     aapsLogger.warn(LTag.PUMPBTCOMM, "Could not confirm descriptor write. Got ${confirmed.uuid}. Expected: $descriptorUUID")
                     throw CouldNotConfirmDescriptorWriteException(descriptorUUID, confirmed.uuid)
                 } else {

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

@@ -2,7 +2,8 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.command
 
 import java.nio.ByteBuffer
 
-class BleCommandHello(controllerId: Int) : BleCommand(BleCommandType.HELLO,
+class BleCommandHello(controllerId: Int) : BleCommand(
+    BleCommandType.HELLO,
     ByteBuffer.allocate(6)
         .put(1.toByte()) // TODO find the meaning of this constant
         .put(4.toByte()) // TODO find the meaning of this constant

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

@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions
 
 class CouldNotConfirmDescriptorWriteException(override val message: String?) : Exception(message) {
-    constructor(sent: String, confirmed: String) : this("Could not confirm write. Sent: {$sent} .Received: ${confirmed}")
+    constructor(sent: String, confirmed: String) : this("Could not confirm write. Sent: {$sent} .Received: $confirmed")
-    constructor(status: Int) : this("Could not confirm write. Write status: ${status}")
+    constructor(status: Int) : this("Could not confirm write. Write status: $status")
 }

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

@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions
 
 class CouldNotConfirmWriteException(override val message: String?) : Exception(message) {
-    constructor(sent: ByteArray, confirmed: ByteArray) : this("Could not confirm write. Sent: {$sent} .Received: ${confirmed}")
+    constructor(sent: ByteArray, confirmed: ByteArray) : this("Could not confirm write. Sent: {$sent} .Received: $confirmed")
-    constructor(status: Int) : this("Could not confirm write. Write status: ${status}")
+    constructor(status: Int) : this("Could not confirm write. Write status: $status")
 }

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

@@ -2,4 +2,4 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.excepti
 
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.command.BleCommand
 
-class UnexpectedCommandException(val cmd: BleCommand) : Exception("Unexpected command: ${cmd}")
+class UnexpectedCommandException(val cmd: BleCommand) : Exception("Unexpected command: $cmd")

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

@@ -3,4 +3,4 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message
 import info.nightscout.androidaps.utils.extensions.toHex
 
 class CrcMismatchException(val expected: Long, val actual: Long, val payload: ByteArray) :
-    Exception("CRC mismatch. Actual: ${actual}. Expected: ${expected}. Payload: ${payload.toHex()}")
+    Exception("CRC mismatch. Actual: $actual. Expected: $expected. Payload: ${payload.toHex()}")

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

@@ -2,4 +2,4 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message
 
 import info.nightscout.androidaps.utils.extensions.toHex
 
-class IncorrectPacketException(val expectedIndex: Byte, val payload: ByteArray) : Exception("Invalid payload: ${payload.toHex()}. Expected index: ${expectedIndex}")
+class IncorrectPacketException(val expectedIndex: Byte, val payload: ByteArray) : Exception("Invalid payload: ${payload.toHex()}. Expected index: $expectedIndex")

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

@@ -21,7 +21,8 @@ data class MessagePacket(
     val gateway: Boolean = false,
     val sas: Boolean = false, // TODO: understand
     val tfs: Boolean = false, // TODO: understand
-    val version: Short = 0.toShort()) {
+    val version: Short = 0.toShort()
+) {
 
     fun asByteArray(): ByteArray {
         val bb = ByteBuffer.allocate(16 + payload.size)
@@ -139,7 +140,6 @@ private class Flag(var value: Int = 0) {
             return 0
         }
         return 1
-
     }
 }
 

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

@@ -103,7 +103,6 @@ class PayloadJoiner(private val firstPacket: ByteArray) {
         }
         return bytes.copyOfRange(0, bytes.size)
     }
-
 }
 
 internal fun Int.toUnsignedLong() = this.toLong() and 0xffffffffL

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

@@ -15,51 +15,63 @@ internal class PayloadSplitter(private val payload: ByteArray) {
         val crc32 = payload.crc32()
         if (payload.size <= FirstBlePacket.CAPACITY_WITH_THE_OPTIONAL_PLUS_ONE_PACKET) {
             val end = min(FirstBlePacket.CAPACITY_WITHOUT_MIDDLE_PACKETS, payload.size)
-            ret.add(FirstBlePacket(
+            ret.add(
+                FirstBlePacket(
                     totalFragments = 0,
                     payload = payload.copyOfRange(0, end),
                     size = payload.size.toByte(),
                     crc32 = crc32,
-            ))
+                )
+            )
             if (payload.size > FirstBlePacket.CAPACITY_WITHOUT_MIDDLE_PACKETS) {
-                ret.add(LastOptionalPlusOneBlePacket(
+                ret.add(
+                    LastOptionalPlusOneBlePacket(
                         index = 1,
                         payload = payload.copyOfRange(end, payload.size),
                         size = (payload.size - end).toByte(),
-                ))
+                    )
+                )
             }
             return ret
         }
         val middleFragments = (payload.size - FirstBlePacket.CAPACITY_WITH_MIDDLE_PACKETS) / MiddleBlePacket.CAPACITY
         val rest = ((payload.size - middleFragments * MiddleBlePacket.CAPACITY) - FirstBlePacket.CAPACITY_WITH_MIDDLE_PACKETS).toByte()
-        ret.add(FirstBlePacket(
+        ret.add(
+            FirstBlePacket(
                 totalFragments = (middleFragments + 1).toByte(),
                 payload = payload.copyOfRange(0, FirstBlePacket.CAPACITY_WITH_MIDDLE_PACKETS),
-        ))
+            )
+        )
         for (i in 1..middleFragments) {
             val p = if (i == 1) {
                 payload.copyOfRange(FirstBlePacket.CAPACITY_WITH_MIDDLE_PACKETS, FirstBlePacket.CAPACITY_WITH_MIDDLE_PACKETS + MiddleBlePacket.CAPACITY)
             } else {
                 payload.copyOfRange(FirstBlePacket.CAPACITY_WITH_MIDDLE_PACKETS + (i - 1) * MiddleBlePacket.CAPACITY, FirstBlePacket.CAPACITY_WITH_MIDDLE_PACKETS + i * MiddleBlePacket.CAPACITY)
             }
-            ret.add(MiddleBlePacket(
+            ret.add(
+                MiddleBlePacket(
                     index = i.toByte(),
                     payload = p,
-            ))
+                )
+            )
         }
         val end = min(LastBlePacket.CAPACITY, rest.toInt())
-        ret.add(LastBlePacket(
+        ret.add(
+            LastBlePacket(
                 index = (middleFragments + 1).toByte(),
                 size = rest,
                 payload = payload.copyOfRange(middleFragments * MiddleBlePacket.CAPACITY + FirstBlePacket.CAPACITY_WITH_MIDDLE_PACKETS, middleFragments * MiddleBlePacket.CAPACITY + FirstBlePacket.CAPACITY_WITH_MIDDLE_PACKETS + end),
                 crc32 = crc32,
-        ))
+            )
+        )
         if (rest > LastBlePacket.CAPACITY) {
-            ret.add(LastOptionalPlusOneBlePacket(
+            ret.add(
+                LastOptionalPlusOneBlePacket(
                     index = (middleFragments + 2).toByte(),
                     size = (rest - LastBlePacket.CAPACITY).toByte(),
                     payload = payload.copyOfRange(middleFragments * MiddleBlePacket.CAPACITY + FirstBlePacket.CAPACITY_WITH_MIDDLE_PACKETS + LastBlePacket.CAPACITY, payload.size),
-            ))
+                )
+            )
         }
         return ret
     }

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

@@ -19,20 +19,20 @@ class StringLengthPrefixEncoding {
             for ((index, key) in keys.withIndex()) {
                 when {
                     remaining.size < key.length ->
-                        throw MessageIOException("Payload too short: ${payload.toHex()} for key: ${key}")
+                        throw MessageIOException("Payload too short: ${payload.toHex()} for key: $key")
                     !(remaining.copyOfRange(0, key.length).decodeToString() == key) ->
-                        throw MessageIOException("Key not found: ${key} in ${payload.toHex()}")
+                        throw MessageIOException("Key not found: $key in ${payload.toHex()}")
                     // last key can be empty, no length
                     index == keys.size - 1 && remaining.size == key.length ->
                         return ret
 
                     remaining.size < key.length + LENGTH_BYTES ->
-                        throw MessageIOException("Length not found: for ${key} in ${payload.toHex()}")
+                        throw MessageIOException("Length not found: for $key in ${payload.toHex()}")
                 }
                 remaining = remaining.copyOfRange(key.length, remaining.size)
                 val length = (remaining[0].toUnsignedInt() shl 1) or remaining[1].toUnsignedInt()
                 if (length > remaining.size) {
-                    throw MessageIOException("Payload too short, looking for length ${length} for ${key} in ${payload.toHex()}")
+                    throw MessageIOException("Payload too short, looking for length $length for $key in ${payload.toHex()}")
                 }
                 ret[index] = remaining.copyOfRange(LENGTH_BYTES, LENGTH_BYTES + length)
                 remaining = remaining.copyOfRange(LENGTH_BYTES + length, remaining.size)

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

@@ -92,4 +92,3 @@ data class LastOptionalPlusOneBlePacket(val index: Byte, val payload: ByteArray,
         internal const val HEADER_SIZE = 2
     }
 }
-

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

@@ -15,7 +15,6 @@ class BleDiscoveredDevice(val scanResult: ScanResult, private val scanRecord: Sc
         val serviceUuids = scanRecord.serviceUuids
         if (serviceUuids.size != 9) {
             throw DiscoveredInvalidPodException("Expected 9 service UUIDs, got" + serviceUuids.size, serviceUuids)
-
         }
         if (extractUUID16(serviceUuids[0]) != MAIN_SERVICE_UUID) {
             // this is the service that we filtered for

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

@@ -45,5 +45,4 @@ class ScanCollector(private val logger: AAPSLogger, private val podID: Long) : S
         }
         return Collections.unmodifiableList(ret)
     }
-
 }

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

@@ -20,4 +20,3 @@ sealed class 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/command/DeactivateCommand.kt

@@ -13,12 +13,14 @@ class DeactivateCommand private constructor(
 ) : NonceEnabledCommand(CommandType.DEACTIVATE, uniqueId, sequenceNumber, multiCommandFlag, nonce) {
 
     override val encoded: ByteArray
-        get() = appendCrc(ByteBuffer.allocate(LENGTH + HEADER_LENGTH) //
+        get() = appendCrc(
+            ByteBuffer.allocate(LENGTH + HEADER_LENGTH) //
                 .put(encodeHeader(uniqueId, sequenceNumber, LENGTH, multiCommandFlag)) //
                 .put(commandType.value) //
                 .put(BODY_LENGTH) //
                 .putInt(nonce) //
-            .array())
+                .array()
+        )
 
     override fun toString(): String = "DeactivateCommand{" +
         "nonce=" + nonce +

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

@@ -14,12 +14,14 @@ class GetStatusCommand private constructor(
 ) : HeaderEnabledCommand(CommandType.GET_STATUS, uniqueId, sequenceNumber, multiCommandFlag) {
 
     override val encoded: ByteArray
-        get() = appendCrc(ByteBuffer.allocate(LENGTH + HEADER_LENGTH) //
+        get() = appendCrc(
+            ByteBuffer.allocate(LENGTH + HEADER_LENGTH) //
                 .put(encodeHeader(uniqueId, sequenceNumber, LENGTH, multiCommandFlag)) //
                 .put(commandType.value) //
                 .put(BODY_LENGTH) //
                 .put(statusResponseType.value) //
-            .array())
+                .array()
+        )
 
     class Builder : HeaderEnabledCommandBuilder<Builder, GetStatusCommand>() {
 
@@ -35,7 +37,6 @@ class GetStatusCommand private constructor(
 
             return GetStatusCommand(uniqueId!!, sequenceNumber!!, multiCommandFlag, statusResponseType!!)
         }
-
     }
 
     companion object {

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

@@ -12,12 +12,14 @@ class GetVersionCommand private constructor(
 ) : HeaderEnabledCommand(CommandType.GET_VERSION, uniqueId, sequenceNumber, multiCommandFlag) {
 
     override val encoded: ByteArray
-        get() = appendCrc(ByteBuffer.allocate(LENGTH + HEADER_LENGTH) //
+        get() = appendCrc(
+            ByteBuffer.allocate(LENGTH + HEADER_LENGTH) //
                 .put(encodeHeader(uniqueId, sequenceNumber, LENGTH, multiCommandFlag)) //
                 .put(commandType.value) //
                 .put(BODY_LENGTH) //
                 .putInt(uniqueId) //
-            .array())
+                .array()
+        )
 
     override fun toString(): String {
         return "GetVersionCommand{" +

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

@@ -49,11 +49,13 @@ class ProgramBasalCommand private constructor(
             val basalCommand = buffer.array()
             val interlockCommand = interlockCommand.encoded
             val header: ByteArray = encodeHeader(uniqueId, sequenceNumber, (basalCommand.size + interlockCommand.size).toShort(), multiCommandFlag)
-            return appendCrc(ByteBuffer.allocate(basalCommand.size + interlockCommand.size + header.size) //
+            return appendCrc(
+                ByteBuffer.allocate(basalCommand.size + interlockCommand.size + header.size) //
                     .put(header) //
                     .put(interlockCommand) //
                     .put(basalCommand) //
-                .array())
+                    .array()
+            )
         }
 
     override fun toString(): String {
@@ -102,12 +104,16 @@ class ProgramBasalCommand private constructor(
             val longInsulinProgramElements: List<BasalInsulinProgramElement> = mapTenthPulsesPerSlotToLongInsulinProgramElements(ProgramBasalUtil.mapBasalProgramToTenthPulsesPerSlot(basalProgram!!))
             val shortInsulinProgramElements = ProgramBasalUtil.mapPulsesPerSlotToShortInsulinProgramElements(pulsesPerSlot)
             val currentBasalInsulinProgramElement = ProgramBasalUtil.calculateCurrentLongInsulinProgramElement(longInsulinProgramElements, currentTime)
-            val interlockCommand = ProgramInsulinCommand(uniqueId!!, sequenceNumber!!, multiCommandFlag, nonce!!,
+            val interlockCommand = ProgramInsulinCommand(
+                uniqueId!!, sequenceNumber!!, multiCommandFlag, nonce!!,
                 shortInsulinProgramElements, checksum, currentSlot.index, currentSlot.eighthSecondsRemaining,
-                currentSlot.pulsesRemaining, ProgramInsulinCommand.DeliveryType.BASAL)
+                currentSlot.pulsesRemaining, ProgramInsulinCommand.DeliveryType.BASAL
-            return ProgramBasalCommand(interlockCommand, uniqueId!!, sequenceNumber!!, multiCommandFlag,
+            )
+            return ProgramBasalCommand(
+                interlockCommand, uniqueId!!, sequenceNumber!!, multiCommandFlag,
                 longInsulinProgramElements, programReminder!!, currentBasalInsulinProgramElement.index,
-                currentBasalInsulinProgramElement.remainingTenthPulses, currentBasalInsulinProgramElement.delayUntilNextTenthPulseInUsec)
+                currentBasalInsulinProgramElement.remainingTenthPulses, currentBasalInsulinProgramElement.delayUntilNextTenthPulseInUsec
+            )
         }
     }
 

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

@@ -18,7 +18,8 @@ class ProgramBeepsCommand private constructor(
 ) : HeaderEnabledCommand(CommandType.PROGRAM_BEEPS, uniqueId, sequenceNumber, multiCommandFlag) {
 
     override val encoded: ByteArray
-        get() = appendCrc(ByteBuffer.allocate(LENGTH + HEADER_LENGTH) //
+        get() = appendCrc(
+            ByteBuffer.allocate(LENGTH + HEADER_LENGTH) //
                 .put(encodeHeader(uniqueId, sequenceNumber, LENGTH, multiCommandFlag)) //
                 .put(commandType.value) //
                 .put(BODY_LENGTH) //
@@ -26,7 +27,8 @@ class ProgramBeepsCommand private constructor(
                 .put(basalReminder.encoded) //
                 .put(tempBasalReminder.encoded) //
                 .put(bolusReminder.encoded) //
-            .array())
+                .array()
+        )
 
     class Builder : HeaderEnabledCommandBuilder<Builder, ProgramBeepsCommand>() {
 

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

@@ -32,11 +32,13 @@ class ProgramBolusCommand private constructor(
                 .array()
             val interlockCommand = interlockCommand.encoded
             val header: ByteArray = encodeHeader(uniqueId, sequenceNumber, (bolusCommand.size + interlockCommand.size).toShort(), multiCommandFlag)
-            return appendCrc(ByteBuffer.allocate(header.size + interlockCommand.size + bolusCommand.size) //
+            return appendCrc(
+                ByteBuffer.allocate(header.size + interlockCommand.size + bolusCommand.size) //
                     .put(header) //
                     .put(interlockCommand) //
                     .put(bolusCommand) //
-                .array())
+                    .array()
+            )
         }
 
     override fun toString(): String {
@@ -82,8 +84,10 @@ class ProgramBolusCommand private constructor(
 
             val numberOfPulses = Math.round(numberOfUnits!! * 20).toShort()
             val byte10And11 = (numberOfPulses * delayBetweenPulsesInEighthSeconds!!).toShort()
-            val interlockCommand = ProgramInsulinCommand(uniqueId!!, sequenceNumber!!, multiCommandFlag, nonce!!, listOf(BolusShortInsulinProgramElement(numberOfPulses)), calculateChecksum(0x01.toByte(), byte10And11, numberOfPulses),
+            val interlockCommand = ProgramInsulinCommand(
-                0x01.toByte(), byte10And11, numberOfPulses, ProgramInsulinCommand.DeliveryType.BOLUS)
+                uniqueId!!, sequenceNumber!!, multiCommandFlag, nonce!!, listOf(BolusShortInsulinProgramElement(numberOfPulses)), calculateChecksum(0x01.toByte(), byte10And11, numberOfPulses),
+                0x01.toByte(), byte10And11, numberOfPulses, ProgramInsulinCommand.DeliveryType.BOLUS
+            )
             val delayUntilFirstTenthPulseInUsec = delayBetweenPulsesInEighthSeconds!! / 8 * 100000
             return ProgramBolusCommand(interlockCommand, uniqueId!!, sequenceNumber!!, multiCommandFlag, programReminder!!, (numberOfPulses * 10).toShort(), delayUntilFirstTenthPulseInUsec)
         }
@@ -94,12 +98,14 @@ class ProgramBolusCommand private constructor(
         private const val LENGTH: Short = 15
         private const val BODY_LENGTH: Byte = 13
         private fun calculateChecksum(numberOfSlots: Byte, byte10And11: Short, numberOfPulses: Short): Short {
-            return MessageUtil.calculateChecksum(ByteBuffer.allocate(7) //
+            return MessageUtil.calculateChecksum(
+                ByteBuffer.allocate(7) //
                     .put(numberOfSlots) //
                     .putShort(byte10And11) //
                     .putShort(numberOfPulses) //
                     .putShort(numberOfPulses) //
-                .array())
+                    .array()
+            )
         }
     }
 }

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

@@ -11,7 +11,8 @@ class ProgramInsulinCommand internal constructor(
     uniqueId: Int,
     sequenceNumber: Short,
     multiCommandFlag: Boolean,
-    nonce: Int, insulinProgramElements:
+    nonce: Int,
+    insulinProgramElements:
         List<ShortInsulinProgramElement>,
     private val checksum: Short,
     private val byte9: Byte,

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

@@ -59,9 +59,11 @@ class ProgramTempBasalCommand private constructor(
             val tenthPulsesPerSlot = ProgramTempBasalUtil.mapTempBasalToTenthPulsesPerSlot(durationInSlots.toInt(), rateInUnitsPerHour!!)
             val shortInsulinProgramElements = ProgramTempBasalUtil.mapPulsesPerSlotToShortInsulinProgramElements(pulsesPerSlot)
             val insulinProgramElements = ProgramTempBasalUtil.mapTenthPulsesPerSlotToLongInsulinProgramElements(tenthPulsesPerSlot)
-            val interlockCommand = ProgramInsulinCommand(uniqueId!!, sequenceNumber!!, multiCommandFlag, nonce!!, shortInsulinProgramElements,
+            val interlockCommand = ProgramInsulinCommand(
+                uniqueId!!, sequenceNumber!!, multiCommandFlag, nonce!!, shortInsulinProgramElements,
                 ProgramTempBasalUtil.calculateChecksum(durationInSlots, pulsesPerSlot[0], pulsesPerSlot), durationInSlots,
-                0x3840.toShort(), pulsesPerSlot[0], ProgramInsulinCommand.DeliveryType.TEMP_BASAL)
+                0x3840.toShort(), pulsesPerSlot[0], ProgramInsulinCommand.DeliveryType.TEMP_BASAL
+            )
             return ProgramTempBasalCommand(interlockCommand, uniqueId!!, sequenceNumber!!, multiCommandFlag, programReminder!!, insulinProgramElements)
         }
     }
@@ -91,10 +93,12 @@ class ProgramTempBasalCommand private constructor(
             val tempBasalCommand = buffer.array()
             val interlockCommand = interlockCommand.encoded
             val header: ByteArray = encodeHeader(uniqueId, sequenceNumber, (tempBasalCommand.size + interlockCommand.size).toShort(), multiCommandFlag)
-            return appendCrc(ByteBuffer.allocate(header.size + interlockCommand.size + tempBasalCommand.size) //
+            return appendCrc(
+                ByteBuffer.allocate(header.size + interlockCommand.size + tempBasalCommand.size) //
                     .put(header) //
                     .put(interlockCommand) //
                     .put(tempBasalCommand) //
-                .array())
+                    .array()
+            )
         }
 }

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

@@ -16,7 +16,8 @@ class SetUniqueIdCommand private constructor(
 ) : HeaderEnabledCommand(CommandType.SET_UNIQUE_ID, uniqueId, sequenceNumber, multiCommandFlag) {
 
     override val encoded: ByteArray
-        get() = appendCrc(ByteBuffer.allocate(LENGTH + HEADER_LENGTH) //
+        get() = appendCrc(
+            ByteBuffer.allocate(LENGTH + HEADER_LENGTH) //
                 .put(encodeHeader(DEFAULT_UNIQUE_ID, sequenceNumber, LENGTH, multiCommandFlag)) //
                 .put(commandType.value) //
                 .put(BODY_LENGTH) //
@@ -26,7 +27,8 @@ class SetUniqueIdCommand private constructor(
                 .put(encodeInitializationTime(initializationTime)) //
                 .putInt(lotNumber) //
                 .putInt(podSequenceNumber) //
-            .array())
+                .array()
+        )
 
     override fun toString(): String {
         return "SetUniqueIdCommand{" +

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

@@ -18,13 +18,15 @@ class SilenceAlertsCommand private constructor(
 
     override val encoded: ByteArray
         get() =
-            appendCrc(ByteBuffer.allocate(LENGTH + HEADER_LENGTH) //
+            appendCrc(
+                ByteBuffer.allocate(LENGTH + HEADER_LENGTH) //
                     .put(encodeHeader(uniqueId, sequenceNumber, LENGTH, multiCommandFlag)) //
                     .put(commandType.value) //
                     .put(BODY_LENGTH) //
                     .putInt(nonce) //
                     .put(AlertUtil.encodeAlertSet(alertTypes)) //
-                .array())
+                    .array()
+            )
 
     override fun toString(): String {
         return "SilenceAlertsCommand{" +

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

@@ -19,13 +19,15 @@ class StopDeliveryCommand private constructor(
 
     override val encoded: ByteArray
         get() {
-            return appendCrc(ByteBuffer.allocate(LENGTH + HEADER_LENGTH) //
+            return appendCrc(
+                ByteBuffer.allocate(LENGTH + HEADER_LENGTH) //
                     .put(encodeHeader(uniqueId, sequenceNumber, LENGTH, multiCommandFlag)) //
                     .put(commandType.value) //
                     .put(BODY_LENGTH) //
                     .putInt(nonce) //
                     .put((beepType.value.toInt() shl 4 or deliveryType.encoded[0].toInt()).toByte()) //
-                .array())
+                    .array()
+            )
         }
 
     override fun toString(): String {

omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/BasalShortInsulinProgramElement.kt

@@ -5,15 +5,17 @@ import kotlin.experimental.and
 
 class BasalShortInsulinProgramElement(
     private val numberOfSlots: Byte, // 4 bits
-    private val pulsesPerSlot: Short, //10 bits
+    private val pulsesPerSlot: Short, // 10 bits
     private val extraAlternatePulse: Boolean
 ) : ShortInsulinProgramElement {
 
     override val encoded: ByteArray
         get() {
-            val firstByte = (numberOfSlots - 1 and 0x0f shl 4 //
+            val firstByte = (
+                numberOfSlots - 1 and 0x0f shl 4 //
                     or ((if (extraAlternatePulse) 1 else 0) shl 3) //
-                or (pulsesPerSlot.toInt() ushr 8 and 0x03)).toByte()
+                    or (pulsesPerSlot.toInt() ushr 8 and 0x03)
+                ).toByte()
             return ByteBuffer.allocate(2) //
                 .put(firstByte) //
                 .put((pulsesPerSlot and 0xff).toByte()) //

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

@@ -159,5 +159,4 @@ enum class AlarmType(override val value: Byte) : HasValue {
     ALARM_BLE_QN_EXCEED_MAX_RETRY(0xc1.toByte()),
     ALARM_BLE_QN_CRIT_VAR_FAIL(0xc2.toByte()),
     UNKNOWN(0xff.toByte());
-
 }

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

@@ -29,7 +29,8 @@ class AlertConfiguration(
             return ByteBuffer.allocate(6) //
                 .put(firstByte)
                 .put(durationInMinutes.toByte()) //
-                .putShort(when (trigger) {
+                .putShort(
+                    when (trigger) {
                         is AlertTrigger.ReservoirVolumeTrigger -> {
                             trigger.thresholdInMicroLiters
                         }
@@ -37,7 +38,8 @@ class AlertConfiguration(
                         is AlertTrigger.TimerTrigger -> {
                             trigger.offsetInMinutes
                         }
-                }) //
+                    }
+                ) //
                 .put(beepRepetition.value) //
                 .put(beepType.value) //
                 .array()

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

@@ -10,5 +10,4 @@ enum class BeepRepetitionType(
     XXX3(0x05.toByte()), // Used in user pod expiration alert
     XXX4(0x06.toByte()), // Used in pod expiration alert
     XXX5(0x08.toByte()); // Used in imminent pod expiration alert
-
 }

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

@@ -10,7 +10,11 @@ class ProgramReminder(
 ) : Encodable, Serializable {
 
     override val encoded: ByteArray
-        get() = byteArrayOf(((if (atStart) 1 else 0) shl 7
+        get() = byteArrayOf(
+            (
+                (if (atStart) 1 else 0) shl 7
                     or ((if (atEnd) 1 else 0) shl 6)
-            or ((atInterval and 0x3f).toInt())).toByte())
+                    or ((atInterval and 0x3f).toInt())
+                ).toByte()
+        )
 }

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

@@ -84,5 +84,4 @@ class AlarmStatusResponse(
     }
 
     infix fun Byte.shr(i: Int): Int = toInt() shr i
-
 }

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

@@ -34,7 +34,6 @@ class DefaultStatusResponse(
             ", minutesSinceActivation=$minutesSinceActivation" +
             ", reservoirPulsesRemaining=$reservoirPulsesRemaining)"
     }
-
 }
 
 infix fun Byte.ushr(i: Int) = toInt() ushr i

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

@@ -6,5 +6,4 @@ abstract class ResponseBase(
 ) : Response {
 
     override val encoded: ByteArray = encoded.copyOf(encoded.size)
-
 }

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

@@ -55,5 +55,4 @@ class SetUniqueIdResponse(
             ", encoded=" + encoded.contentToString() +
             '}'
     }
-
 }

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

@@ -49,5 +49,4 @@ class VersionResponse(
             ", encoded=" + Arrays.toString(encoded) +
             '}'
     }
-
 }

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

@@ -20,7 +20,8 @@ object AlertUtil {
     }
 
     fun encodeAlertSet(alertSet: EnumSet<AlertType>): Byte =
-        alertSet.fold(0,
+        alertSet.fold(
+            0,
             { out, slot ->
                 out or (slot.value.toInt() and 0xff)
             }

omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/DashHistory.kt

@@ -44,7 +44,8 @@ class DashHistory @Inject constructor(
                 return Single.error(IllegalArgumentException("tempBasalRecord missing on SET_TEMPORARY_BASAL"))
         }
 
-        return dao.save(HistoryRecordEntity(
+        return dao.save(
+            HistoryRecordEntity(
                 id = id,
                 date = date,
                 createdAt = currentTimeMillis(),
@@ -53,7 +54,8 @@ class DashHistory @Inject constructor(
                 bolusRecord = bolusRecord,
                 initialResult = initialResult,
                 resolvedResult = resolveResult,
-            resolvedAt = resolvedAt)
+                resolvedAt = resolvedAt
+            )
         ).toSingle { id }
     }
 
@@ -61,5 +63,4 @@ class DashHistory @Inject constructor(
         dao.all().map { list -> list.map(historyMapper::entityToDomain) }
 
     fun getRecordsAfter(time: Long): Single<List<HistoryRecordEntity>> = dao.allSince(time)
-
 }

omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/data/Record.kt

@@ -2,9 +2,9 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data
 
 sealed class Record
 
-data class BolusRecord(val amout: Double, val bolusType: BolusType): Record()
+data class BolusRecord(val amout: Double, val bolusType: BolusType) : Record()
 
-data class TempBasalRecord(val duration: Long, val rate: Double): Record()
+data class TempBasalRecord(val duration: Long, val rate: Double) : Record()
 
 enum class BolusType {
     DEFAULT, SMB

omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/DashHistoryDatabase.kt

@@ -5,7 +5,6 @@ import androidx.room.Database
 import androidx.room.Room
 import androidx.room.RoomDatabase
 import androidx.room.TypeConverters
-import androidx.room.migration.Migration
 
 @Database(
     entities = [HistoryRecordEntity::class],
@@ -15,7 +14,7 @@ import androidx.room.migration.Migration
 @TypeConverters(Converters::class)
 abstract class DashHistoryDatabase : RoomDatabase() {
 
-    abstract fun historyRecordDao() : HistoryRecordDao
+    abstract fun historyRecordDao(): HistoryRecordDao
 
     companion object {
 
@@ -26,5 +25,4 @@ abstract class DashHistoryDatabase : RoomDatabase() {
                 .fallbackToDestructiveMigration()
                 .build()
     }
-
 }

omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/HistoryRecordDao.kt

@@ -32,5 +32,4 @@ abstract class HistoryRecordDao {
 
     @Query("UPDATE historyrecords SET resolvedResult = :resolvedResult, resolvedAt = :resolvedAt WHERE id = :id ")
     abstract fun markResolved(id: String, resolvedResult: ResolvedResult, resolvedAt: Long): Completable
-
 }

omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/HistoryRecordEntity.kt

@@ -19,5 +19,5 @@ data class HistoryRecordEntity(
     @Embedded(prefix = "tempBasalRecord_") val tempBasalRecord: TempBasalRecord?,
     @Embedded(prefix = "bolusRecord_") val bolusRecord: BolusRecord?,
     val resolvedResult: ResolvedResult?,
-    val resolvedAt: Long?)
+    val resolvedAt: Long?
-
+)

omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/mapper/HistoryMapper.kt

@@ -21,7 +21,8 @@ class HistoryMapper {
         )
 
     fun entityToDomain(entity: HistoryRecordEntity): HistoryRecord =
-        HistoryRecord(id = entity.id,
+        HistoryRecord(
+            id = entity.id,
             createdAt = entity.createdAt,
             date = entity.date,
             initialResult = entity.initialResult,
@@ -30,5 +31,4 @@ class HistoryMapper {
             resolvedResult = entity.resolvedResult,
             resolvedAt = entity.resolvedAt
         )
-
 }

omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodManagementActivity.kt

@@ -66,10 +66,13 @@ class DashPodManagementActivity : NoSplashAppCompatActivity() {
         }
 
         binding.buttonDiscardPod.setOnClickListener {
-            OKDialog.showConfirmation(this,
+            OKDialog.showConfirmation(
-                resourceHelper.gs(R.string.omnipod_common_pod_management_discard_pod_confirmation), Thread {
+                this,
+                resourceHelper.gs(R.string.omnipod_common_pod_management_discard_pod_confirmation),
+                Thread {
                     // TODO discard Pod
-            })
+                }
+            )
         }
 
         binding.buttonPlayTestBeep.setOnClickListener {
@@ -77,13 +80,16 @@ class DashPodManagementActivity : NoSplashAppCompatActivity() {
             binding.buttonPlayTestBeep.isEnabled = false
             binding.buttonPlayTestBeep.setText(R.string.omnipod_common_pod_management_button_playing_test_beep)
 
-            commandQueue.customCommand(CommandPlayTestBeep(), object : Callback() {
+            commandQueue.customCommand(
+                CommandPlayTestBeep(),
+                object : Callback() {
                     override fun run() {
                         if (!result.success) {
                             displayErrorDialog(resourceHelper.gs(R.string.omnipod_common_warning), resourceHelper.gs(R.string.omnipod_common_two_strings_concatenated_by_colon, resourceHelper.gs(R.string.omnipod_common_error_failed_to_play_test_beep), result.comment), false)
                         }
                     }
-            })
+                }
+            )
         }
     }
 

omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt

@@ -107,38 +107,47 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
 
         buttonBinding.buttonResumeDelivery.setOnClickListener {
             disablePodActionButtons()
-            commandQueue.customCommand(CommandResumeDelivery(),
+            commandQueue.customCommand(
-                DisplayResultDialogCallback(resourceHelper.gs(R.string.omnipod_common_error_failed_to_resume_delivery), true).messageOnSuccess(resourceHelper.gs(R.string.omnipod_common_confirmation_delivery_resumed)))
+                CommandResumeDelivery(),
+                DisplayResultDialogCallback(resourceHelper.gs(R.string.omnipod_common_error_failed_to_resume_delivery), true).messageOnSuccess(resourceHelper.gs(R.string.omnipod_common_confirmation_delivery_resumed))
+            )
         }
 
         buttonBinding.buttonRefreshStatus.setOnClickListener {
             disablePodActionButtons()
-            commandQueue.readStatus("REQUESTED BY USER",
+            commandQueue.readStatus(
-                DisplayResultDialogCallback(resourceHelper.gs(R.string.omnipod_common_error_failed_to_refresh_status), false))
+                "REQUESTED BY USER",
+                DisplayResultDialogCallback(resourceHelper.gs(R.string.omnipod_common_error_failed_to_refresh_status), false)
+            )
         }
 
         buttonBinding.buttonSilenceAlerts.setOnClickListener {
             disablePodActionButtons()
-            commandQueue.customCommand(CommandAcknowledgeAlerts(),
+            commandQueue.customCommand(
+                CommandAcknowledgeAlerts(),
                 DisplayResultDialogCallback(resourceHelper.gs(R.string.omnipod_common_error_failed_to_silence_alerts), false)
                     .messageOnSuccess(resourceHelper.gs(R.string.omnipod_common_confirmation_silenced_alerts))
-                    .actionOnSuccess { rxBus.send(EventDismissNotification(Notification.OMNIPOD_POD_ALERTS)) })
+                    .actionOnSuccess { rxBus.send(EventDismissNotification(Notification.OMNIPOD_POD_ALERTS)) }
+            )
         }
 
         buttonBinding.buttonSuspendDelivery.setOnClickListener {
             disablePodActionButtons()
-            commandQueue.customCommand(CommandSuspendDelivery(),
+            commandQueue.customCommand(
+                CommandSuspendDelivery(),
                 DisplayResultDialogCallback(resourceHelper.gs(R.string.omnipod_common_error_failed_to_suspend_delivery), true)
-                    .messageOnSuccess(resourceHelper.gs(R.string.omnipod_common_confirmation_suspended_delivery)))
+                    .messageOnSuccess(resourceHelper.gs(R.string.omnipod_common_confirmation_suspended_delivery))
+            )
         }
 
         buttonBinding.buttonSetTime.setOnClickListener {
             disablePodActionButtons()
-            commandQueue.customCommand(CommandHandleTimeChange(true),
+            commandQueue.customCommand(
+                CommandHandleTimeChange(true),
                 DisplayResultDialogCallback(resourceHelper.gs(R.string.omnipod_common_error_failed_to_set_time), true)
-                    .messageOnSuccess(resourceHelper.gs(R.string.omnipod_common_confirmation_time_on_pod_updated)))
+                    .messageOnSuccess(resourceHelper.gs(R.string.omnipod_common_confirmation_time_on_pod_updated))
+            )
         }
-
     }
 
     override fun onResume() {
@@ -147,23 +156,32 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
         disposables += rxBus
             .toObservable(EventOmnipodDashPumpValuesChanged::class.java)
             .observeOn(aapsSchedulers.main)
-            .subscribe({
+            .subscribe(
+                {
                     updateOmnipodStatus()
                     updatePodActionButtons()
-            }, fabricPrivacy::logException)
+                },
+                fabricPrivacy::logException
+            )
         disposables += rxBus
             .toObservable(EventQueueChanged::class.java)
             .observeOn(aapsSchedulers.main)
-            .subscribe({
+            .subscribe(
+                {
                     updateQueueStatus()
                     updatePodActionButtons()
-            }, fabricPrivacy::logException)
+                },
+                fabricPrivacy::logException
+            )
         disposables += rxBus
             .toObservable(EventPreferenceChange::class.java)
             .observeOn(aapsSchedulers.main)
-            .subscribe({
+            .subscribe(
+                {
                     updatePodActionButtons()
-            }, fabricPrivacy::logException)
+                },
+                fabricPrivacy::logException
+            )
         updateUi()
     }
 
@@ -267,16 +285,18 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
                 podInfoBinding.reservoir.setTextColor(Color.WHITE)
             } else {
                 // TODO
-                //val lowReservoirThreshold = (omnipodAlertUtil.lowReservoirAlertUnits
+                // val lowReservoirThreshold = (omnipodAlertUtil.lowReservoirAlertUnits
                 //    ?: OmnipodConstants.DEFAULT_MAX_RESERVOIR_ALERT_THRESHOLD).toDouble()
                 val lowReservoirThreshold: Short = 20
 
                 podInfoBinding.reservoir.text = resourceHelper.gs(R.string.omnipod_common_overview_reservoir_value, podStateManager.pulsesRemaining)
-                podInfoBinding.reservoir.setTextColor(if (podStateManager.pulsesRemaining!! < lowReservoirThreshold) {
+                podInfoBinding.reservoir.setTextColor(
+                    if (podStateManager.pulsesRemaining!! < lowReservoirThreshold) {
                         Color.RED
                     } else {
                         Color.WHITE
-                })
+                    }
+                )
             }
 
             podInfoBinding.podActiveAlerts.text = if (podStateManager.activeAlerts!!.size > 0) {
@@ -345,7 +365,7 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
             }
         }
 
-        val podStatusColor = if (!podStateManager.isActivationCompleted ||/* TODO podStateManager.isPodDead || */ podStateManager.isSuspended) {
+        val podStatusColor = if (!podStateManager.isActivationCompleted || /* TODO podStateManager.isPodDead || */ podStateManager.isSuspended) {
             Color.RED
         } else {
             Color.WHITE
@@ -417,8 +437,8 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
     }
 
     private fun updateRefreshStatusButton() {
-        buttonBinding.buttonRefreshStatus.isEnabled = podStateManager.isUniqueIdSet && podStateManager.activationProgress.isAtLeast(ActivationProgress.PHASE_1_COMPLETED)
+        buttonBinding.buttonRefreshStatus.isEnabled = podStateManager.isUniqueIdSet && podStateManager.activationProgress.isAtLeast(ActivationProgress.PHASE_1_COMPLETED) &&
-            && isQueueEmpty()
+            isQueueEmpty()
     }
 
     private fun updateResumeDeliveryButton() {
@@ -576,5 +596,4 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
             return this
         }
     }
-
 }

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

@@ -12,5 +12,4 @@ class DashPodDeactivatedViewModel @Inject constructor() : PodDeactivatedViewMode
 
     @StringRes
     override fun getTextId() = R.string.omnipod_common_pod_deactivation_wizard_pod_deactivated_text
-
 }

omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramAlertsCommandTest.kt

@@ -1,8 +1,8 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command
 
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.AlertConfiguration
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.AlertType
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.AlertTrigger
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.AlertType
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.BeepRepetitionType
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.BeepType
 import org.apache.commons.codec.DecoderException

omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/NakResponseTest.kt

@@ -3,7 +3,6 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.AlarmType
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.NakErrorType
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.PodStatus
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response.ResponseType
 import org.apache.commons.codec.DecoderException
 import org.apache.commons.codec.binary.Hex
 import org.junit.Assert

omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/util/FunctionsTest.kt

@@ -26,11 +26,13 @@ class FunctionsTest {
         val value3 = Mockito.mock(ProfileValue::class.java)
         value3.timeAsSeconds = 50400
         value3.value = 3.05
-        PowerMockito.`when`(profile.basalValues).thenReturn(arrayOf(
+        PowerMockito.`when`(profile.basalValues).thenReturn(
+            arrayOf(
                 value1,
                 value2,
                 value3
-        ))
+            )
+        )
         val basalProgram: BasalProgram = mapProfileToBasalProgram(profile)
         val entries: List<BasalProgram.Segment> = basalProgram.segments
         assertEquals(3, entries.size)
@@ -69,8 +71,11 @@ class FunctionsTest {
         val value = Mockito.mock(ProfileValue::class.java)
         value.timeAsSeconds = 1800
         value.value = 0.5
-        PowerMockito.`when`(profile.basalValues).thenReturn(arrayOf(
+        PowerMockito.`when`(profile.basalValues).thenReturn(
-            value))
+            arrayOf(
+                value
+            )
+        )
         mapProfileToBasalProgram(profile)
     }
 
@@ -85,10 +90,12 @@ class FunctionsTest {
         val value2 = Mockito.mock(ProfileValue::class.java)
         value2.timeAsSeconds = 86400
         value2.value = 0.5
-        PowerMockito.`when`(profile.basalValues).thenReturn(arrayOf(
+        PowerMockito.`when`(profile.basalValues).thenReturn(
+            arrayOf(
                 value1,
                 value2
-        ))
+            )
+        )
         mapProfileToBasalProgram(profile)
     }
 
@@ -99,8 +106,11 @@ class FunctionsTest {
         val value = Mockito.mock(ProfileValue::class.java)
         value.timeAsSeconds = -1
         value.value = 0.5
-        PowerMockito.`when`(profile.basalValues).thenReturn(arrayOf(
+        PowerMockito.`when`(profile.basalValues).thenReturn(
-            value))
+            arrayOf(
+                value
+            )
+        )
         mapProfileToBasalProgram(profile)
     }
 
@@ -109,8 +119,11 @@ class FunctionsTest {
         val value = Mockito.mock(ProfileValue::class.java)
         value.timeAsSeconds = 0
         value.value = 0.04
-        PowerMockito.`when`(profile.basalValues).thenReturn(arrayOf(
+        PowerMockito.`when`(profile.basalValues).thenReturn(
-            value))
+            arrayOf(
+                value
+            )
+        )
         val basalProgram: BasalProgram = mapProfileToBasalProgram(profile)
         val basalProgramElement: BasalProgram.Segment = basalProgram.segments[0]
         assertEquals(5, basalProgramElement.basalRateInHundredthUnitsPerHour)