From b1b4052ac667558087863a9a6aed89a4dc328dea Mon Sep 17 00:00:00 2001 From: Prem Nirmal Date: Tue, 18 Aug 2026 13:28:34 +0100 Subject: [PATCH 01/85] Add Omnipod 5 pump support. New pump:omnipod:omnipod5 module (Omnipod 5 driver, extracted alongside the existing eros/dash modules) --- .../kotlin/app/aaps/di/PumpDriversModule.kt | 2 + .../app/aaps/core/data/pump/defs/PumpType.kt | 20 + .../kotlin/app/aaps/core/data/ue/Sources.kt | 1 + .../app/aaps/database/entities/UserEntry.kt | 1 + .../entities/embedments/InterfaceIDs.kt | 1 + .../converters/PumpTypeExtension.kt | 2 + .../converters/SourcesExtension.kt | 2 + .../UserEntryPresentationHelperImpl.kt | 2 + .../implementation/utils/TranslatorImpl.kt | 1 + pump/omnipod/common/build.gradle.kts | 2 + .../pump/omnipod/common/bledriver/comm/Ids.kt | 24 +- .../bledriver/comm/command/BleCommand.kt | 5 + .../bledriver/comm/command/BleCommandType.kt | 6 + .../comm/interfaces/io/CharacteristicType.kt | 13 +- .../comm/legacy/callbacks/BleCommCallbacks.kt | 42 +- .../common/bledriver/comm/legacy/io/BleIO.kt | 45 +- .../bledriver/comm/legacy/io/CmdBleIO.kt | 47 +- .../bledriver/comm/legacy/io/DataBleIO.kt | 5 +- .../comm/legacy/io/IncomingPackets.kt | 5 +- .../comm/legacy/session/ServiceDiscoverer.kt | 18 +- .../bledriver/comm/message/MessageIO.kt | 62 +- .../bledriver/comm/message/MessagePacket.kt | 20 +- .../bledriver/comm/message/MessageType.kt | 11 +- .../message/StringLengthPrefixEncoding.kt | 2 +- .../common/bledriver/comm/packet/BlePacket.kt | 77 +- .../bledriver/comm/packet/BlePacketLayout.kt | 77 + .../bledriver/comm/packet/PayloadJoiner.kt | 12 +- .../bledriver/comm/packet/PayloadSplitter.kt | 40 +- .../bledriver/comm/pair/CommandSigner.kt | 13 + .../bledriver/comm/session/ResponseUtil.kt | 12 +- .../common/bledriver/comm/session/Session.kt | 256 +++- .../comm/session/SessionEstablisher.kt | 4 + .../pod/command/ProgramBolusCommand.kt | 51 +- .../pod/command/SetUniqueIdCommand.kt | 6 +- .../insulin/program/util/ProgramBasalUtil.kt | 2 +- .../pod/definition/ActivationProgress.kt | 13 + .../bledriver/pod/definition/BasalProgram.kt | 9 +- .../bledriver/pod/definition/PodType.kt | 86 ++ .../bledriver/pod/definition/PulseLogEntry.kt | 95 ++ .../response/PodInfoActivationTimeResponse.kt | 46 + .../response/PodInfoPulseLogPlusResponse.kt | 52 + .../PodInfoPulseLogPreviousResponse.kt | 48 + .../response/PodInfoPulseLogRecentResponse.kt | 41 + .../PodInfoTriggeredAlertsResponse.kt | 41 + .../bledriver/pod/response/PulseLogUtil.kt | 13 + .../bledriver/pod/response/ResponseType.kt | 2 - .../pod/util/BluetoothServiceUuids.kt | 66 + .../common/src/main/res/values/strings.xml | 34 + .../bledriver/comm/legacy/io/BleIOTest.kt | 52 + .../comm/message/MessagePacketTest.kt | 57 + .../comm/packet/BlePacketLayoutTest.kt | 48 + .../comm/packet/PayloadSplitterJoinerTest.kt | 190 +++ .../comm/session/SessionResponseCrcTest.kt | 163 +++ .../session/SessionResponseValidationTest.kt | 112 ++ .../pod/command/CommandEncodingTest.kt | 365 +++++ .../program/util/ProgramBasalUtilTest.kt | 22 + .../pod/definition/AlertConfigurationTest.kt | 71 + .../pod/definition/BasalProgramTest.kt | 126 ++ .../pod/definition/PulseLogEntryTest.kt | 73 + .../state/UpdatePodStateBolusTrackingTest.kt | 2 +- pump/omnipod/omnipod5/build.gradle.kts | 35 + pump/omnipod/omnipod5/consumer-rules.pro | 0 pump/omnipod/omnipod5/proguard-rules.pro | 21 + .../security/AndroidKeystoreAesCipherTest.kt | 86 ++ .../omnipod5/src/main/AndroidManifest.xml | 11 + .../pump/omnipod/omnipod5/O5PumpPlugin.kt | 1270 +++++++++++++++++ .../omnipod5/bledriver/comm/O5BleManager.kt | 39 + .../bledriver/comm/O5BleManagerImpl.kt | 347 +++++ .../omnipod5/bledriver/comm/O5IdRotation.kt | 33 + .../bledriver/comm/O5PairingCoordinator.kt | 110 ++ .../comm/legacy/O5BleConnectionFactory.kt | 49 + .../comm/legacy/session/O5Connection.kt | 305 ++++ .../bledriver/comm/pair/O5CertificateStore.kt | 324 +++++ .../bledriver/comm/pair/O5KeyExchange.kt | 255 ++++ .../bledriver/comm/pair/O5LTKExchanger.kt | 441 ++++++ .../bledriver/comm/pair/O5RegistrationData.kt | 245 ++++ .../pod/command/aid/O5AidSetupCommands.kt | 95 ++ .../bledriver/pod/definition/O5Protocol.kt | 12 + .../pod/security/AndroidKeystoreAesCipher.kt | 104 ++ .../security/SecureO5RegistrationStorage.kt | 141 ++ .../bledriver/pod/state/O5PodStateManager.kt | 520 +++++++ .../pod/state/O5PodStateManagerExtensions.kt | 115 ++ .../pod/state/PersistedO5PodStateManager.kt | 475 ++++++ .../omnipod5/bledriver/pod/util/LotDecode.kt | 113 ++ .../pod/util/O5AlertConfigBuilder.kt | 91 ++ .../omnipod5/bledriver/pod/util/P256Codec.kt | 93 ++ .../bledriver/pod/util/P256KeyGenerator.kt | 103 ++ .../bledriver/pod/util/PodAdvertisement.kt | 116 ++ .../pod/util/PodTypeAwarePodScanner.kt | 135 ++ .../aaps/pump/omnipod/omnipod5/di/O5Module.kt | 60 + .../pump/omnipod/omnipod5/keys/O5IntentKey.kt | 28 + .../omnipod5/keys/O5StringNonPreferenceKey.kt | 19 + .../queue/command/CommandPairNewPod.kt | 13 + .../omnipod5/ui/O5CertificateStoreScreen.kt | 49 + .../omnipod5/ui/O5CredentialImportScreen.kt | 130 ++ .../ui/O5CredentialImportViewModel.kt | 155 ++ .../ui/compose/O5OverviewViewModel.kt | 505 +++++++ .../ui/compose/OmnipodO5ComposeContent.kt | 208 +++ .../compose/O5OmnipodWizardViewModel.kt | 424 ++++++ .../omnipod5/util/ProfileToBasalProgram.kt | 69 + .../pump/omnipod/omnipod5/O5PumpPluginTest.kt | 771 ++++++++++ .../bledriver/comm/O5BleManagerImplTest.kt | 141 ++ .../bledriver/comm/O5IdRotationTest.kt | 57 + .../comm/O5PairingCoordinatorTest.kt | 70 + .../comm/legacy/session/O5ConnectionTest.kt | 219 +++ .../comm/pair/O5CertificateStoreTest.kt | 250 ++++ .../bledriver/comm/pair/O5KeyExchangeTest.kt | 170 +++ .../bledriver/comm/pair/O5LTKExchangerTest.kt | 297 ++++ .../comm/session/SessionSigningTest.kt | 137 ++ .../pod/command/aid/O5AidSetupCommandsTest.kt | 82 ++ .../state/InMemoryO5PodStateManagerTest.kt | 73 + .../state/O5PodStateManagerExtensionsTest.kt | 243 ++++ .../state/PersistedO5PodStateManagerTest.kt | 368 +++++ .../ui/O5CredentialImportViewModelTest.kt | 117 ++ .../ui/compose/O5OverviewViewModelTest.kt | 150 ++ .../compose/O5OmnipodWizardViewModelTest.kt | 192 +++ settings.gradle | 1 + 117 files changed, 13226 insertions(+), 172 deletions(-) create mode 100644 pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/packet/BlePacketLayout.kt create mode 100644 pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/pair/CommandSigner.kt create mode 100644 pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/definition/PodType.kt create mode 100644 pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/definition/PulseLogEntry.kt create mode 100644 pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/response/PodInfoActivationTimeResponse.kt create mode 100644 pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/response/PodInfoPulseLogPlusResponse.kt create mode 100644 pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/response/PodInfoPulseLogPreviousResponse.kt create mode 100644 pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/response/PodInfoPulseLogRecentResponse.kt create mode 100644 pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/response/PodInfoTriggeredAlertsResponse.kt create mode 100644 pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/response/PulseLogUtil.kt create mode 100644 pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/util/BluetoothServiceUuids.kt create mode 100644 pump/omnipod/common/src/test/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/legacy/io/BleIOTest.kt create mode 100644 pump/omnipod/common/src/test/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/message/MessagePacketTest.kt create mode 100644 pump/omnipod/common/src/test/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/packet/BlePacketLayoutTest.kt create mode 100644 pump/omnipod/common/src/test/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/packet/PayloadSplitterJoinerTest.kt create mode 100644 pump/omnipod/common/src/test/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/session/SessionResponseCrcTest.kt create mode 100644 pump/omnipod/common/src/test/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/session/SessionResponseValidationTest.kt create mode 100644 pump/omnipod/common/src/test/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/command/CommandEncodingTest.kt create mode 100644 pump/omnipod/common/src/test/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/command/insulin/program/util/ProgramBasalUtilTest.kt create mode 100644 pump/omnipod/common/src/test/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/definition/AlertConfigurationTest.kt create mode 100644 pump/omnipod/common/src/test/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/definition/BasalProgramTest.kt create mode 100644 pump/omnipod/common/src/test/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/definition/PulseLogEntryTest.kt create mode 100644 pump/omnipod/omnipod5/build.gradle.kts create mode 100644 pump/omnipod/omnipod5/consumer-rules.pro create mode 100644 pump/omnipod/omnipod5/proguard-rules.pro create mode 100644 pump/omnipod/omnipod5/src/androidTest/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/security/AndroidKeystoreAesCipherTest.kt create mode 100644 pump/omnipod/omnipod5/src/main/AndroidManifest.xml create mode 100644 pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/O5PumpPlugin.kt create mode 100644 pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/O5BleManager.kt create mode 100644 pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/O5BleManagerImpl.kt create mode 100644 pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/O5IdRotation.kt create mode 100644 pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/O5PairingCoordinator.kt create mode 100644 pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/legacy/O5BleConnectionFactory.kt create mode 100644 pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/legacy/session/O5Connection.kt create mode 100644 pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/pair/O5CertificateStore.kt create mode 100644 pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/pair/O5KeyExchange.kt create mode 100644 pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/pair/O5LTKExchanger.kt create mode 100644 pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/pair/O5RegistrationData.kt create mode 100644 pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/command/aid/O5AidSetupCommands.kt create mode 100644 pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/definition/O5Protocol.kt create mode 100644 pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/security/AndroidKeystoreAesCipher.kt create mode 100644 pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/security/SecureO5RegistrationStorage.kt create mode 100644 pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/state/O5PodStateManager.kt create mode 100644 pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/state/O5PodStateManagerExtensions.kt create mode 100644 pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/state/PersistedO5PodStateManager.kt create mode 100644 pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/util/LotDecode.kt create mode 100644 pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/util/O5AlertConfigBuilder.kt create mode 100644 pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/util/P256Codec.kt create mode 100644 pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/util/P256KeyGenerator.kt create mode 100644 pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/util/PodAdvertisement.kt create mode 100644 pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/util/PodTypeAwarePodScanner.kt create mode 100644 pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/di/O5Module.kt create mode 100644 pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/keys/O5IntentKey.kt create mode 100644 pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/keys/O5StringNonPreferenceKey.kt create mode 100644 pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/queue/command/CommandPairNewPod.kt create mode 100644 pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/O5CertificateStoreScreen.kt create mode 100644 pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/O5CredentialImportScreen.kt create mode 100644 pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/O5CredentialImportViewModel.kt create mode 100644 pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/O5OverviewViewModel.kt create mode 100644 pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/OmnipodO5ComposeContent.kt create mode 100644 pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/wizard/compose/O5OmnipodWizardViewModel.kt create mode 100644 pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/util/ProfileToBasalProgram.kt create mode 100644 pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/O5PumpPluginTest.kt create mode 100644 pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/O5BleManagerImplTest.kt create mode 100644 pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/O5IdRotationTest.kt create mode 100644 pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/O5PairingCoordinatorTest.kt create mode 100644 pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/legacy/session/O5ConnectionTest.kt create mode 100644 pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/pair/O5CertificateStoreTest.kt create mode 100644 pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/pair/O5KeyExchangeTest.kt create mode 100644 pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/pair/O5LTKExchangerTest.kt create mode 100644 pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/session/SessionSigningTest.kt create mode 100644 pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/command/aid/O5AidSetupCommandsTest.kt create mode 100644 pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/state/InMemoryO5PodStateManagerTest.kt create mode 100644 pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/state/O5PodStateManagerExtensionsTest.kt create mode 100644 pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/state/PersistedO5PodStateManagerTest.kt create mode 100644 pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/ui/O5CredentialImportViewModelTest.kt create mode 100644 pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/O5OverviewViewModelTest.kt create mode 100644 pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/ui/wizard/compose/O5OmnipodWizardViewModelTest.kt diff --git a/app/src/withPumps/kotlin/app/aaps/di/PumpDriversModule.kt b/app/src/withPumps/kotlin/app/aaps/di/PumpDriversModule.kt index b73ec1e8f5c8..9c3d749fe726 100644 --- a/app/src/withPumps/kotlin/app/aaps/di/PumpDriversModule.kt +++ b/app/src/withPumps/kotlin/app/aaps/di/PumpDriversModule.kt @@ -8,6 +8,7 @@ import app.aaps.pump.equil.di.EquilModule import app.aaps.pump.insight.di.InsightModule import app.aaps.pump.medtronic.di.MedtronicModule import app.aaps.pump.medtrum.di.MedtrumModule +import app.aaps.pump.omnipod.omnipod5.di.O5Module import app.aaps.pump.omnipod.dash.di.OmnipodDashModule import app.aaps.pump.omnipod.eros.di.OmnipodErosModule import dagger.Module @@ -23,6 +24,7 @@ import info.nightscout.pump.combov2.di.ComboV2Module EopatchModule::class, InsightModule::class, MedtronicModule::class, + O5Module::class, OmnipodDashModule::class, OmnipodErosModule::class, PumpCommonModule::class, diff --git a/core/data/src/main/kotlin/app/aaps/core/data/pump/defs/PumpType.kt b/core/data/src/main/kotlin/app/aaps/core/data/pump/defs/PumpType.kt index 81d1d68283c2..74033c321701 100644 --- a/core/data/src/main/kotlin/app/aaps/core/data/pump/defs/PumpType.kt +++ b/core/data/src/main/kotlin/app/aaps/core/data/pump/defs/PumpType.kt @@ -251,6 +251,26 @@ enum class PumpType( hasCustomUnreachableAlertCheck = false, supportBatteryLevel = false ), + OMNIPOD_5( + description = "Omnipod 5", + manufacturer = ManufacturerType.Insulet, + model = "5", + bolusSize = 0.05, + specialBolusSize = null, + extendedBolusSettings = DoseSettings(0.05, 30, 8 * 60, 0.05), + pumpTempBasalType = PumpTempBasalType.Absolute, + tbrSettings = DoseSettings(0.05, 30, 12 * 60, 0.0, 30.0), + specialBasalDurations = arrayOf(Capability.BasalRate_Duration30minAllowed), + baseBasalMinValue = 0.05, + baseBasalMaxValue = null, + baseBasalStep = 0.05, + baseBasalSpecialSteps = null, + isPatchPump = true, + maxReservoirReading = 50, + pumpCapability = PumpCapability.OmnipodCapabilities, + hasCustomUnreachableAlertCheck = false, + supportBatteryLevel = false + ), MEDTRONIC_512_712( description = "Medtronic 512/712", manufacturer = ManufacturerType.Medtronic, diff --git a/core/data/src/main/kotlin/app/aaps/core/data/ue/Sources.kt b/core/data/src/main/kotlin/app/aaps/core/data/ue/Sources.kt index e0e79baf5805..ba2d7a70a7cc 100644 --- a/core/data/src/main/kotlin/app/aaps/core/data/ue/Sources.kt +++ b/core/data/src/main/kotlin/app/aaps/core/data/ue/Sources.kt @@ -65,6 +65,7 @@ enum class Sources { Omnipod, //No entry currently OmnipodEros, OmnipodDash, //No entry currently + Omnipod5, EOPatch2, Equil, Medtrum, diff --git a/database/impl/src/main/kotlin/app/aaps/database/entities/UserEntry.kt b/database/impl/src/main/kotlin/app/aaps/database/entities/UserEntry.kt index 8916473378c2..16a2cc07cee7 100644 --- a/database/impl/src/main/kotlin/app/aaps/database/entities/UserEntry.kt +++ b/database/impl/src/main/kotlin/app/aaps/database/entities/UserEntry.kt @@ -191,6 +191,7 @@ data class UserEntry( Omnipod, //No entry currently OmnipodEros, OmnipodDash, //No entry currently + Omnipod5, EOPatch2, Equil, Medtrum, diff --git a/database/impl/src/main/kotlin/app/aaps/database/entities/embedments/InterfaceIDs.kt b/database/impl/src/main/kotlin/app/aaps/database/entities/embedments/InterfaceIDs.kt index 078c6cb40ca6..2fbceb1bc42f 100644 --- a/database/impl/src/main/kotlin/app/aaps/database/entities/embedments/InterfaceIDs.kt +++ b/database/impl/src/main/kotlin/app/aaps/database/entities/embedments/InterfaceIDs.kt @@ -34,6 +34,7 @@ data class InterfaceIDs @Ignore constructor( DANA_RS_KOREAN, OMNIPOD_EROS, OMNIPOD_DASH, + OMNIPOD_5, MEDTRONIC_512_517, MEDTRONIC_515_715, MEDTRONIC_522_722, diff --git a/database/persistence/src/main/kotlin/app/aaps/database/persistence/converters/PumpTypeExtension.kt b/database/persistence/src/main/kotlin/app/aaps/database/persistence/converters/PumpTypeExtension.kt index e17b554e168d..19cc63874c65 100644 --- a/database/persistence/src/main/kotlin/app/aaps/database/persistence/converters/PumpTypeExtension.kt +++ b/database/persistence/src/main/kotlin/app/aaps/database/persistence/converters/PumpTypeExtension.kt @@ -22,6 +22,7 @@ fun InterfaceIDs.PumpType.fromDb(): PumpType = InterfaceIDs.PumpType.DANA_I -> PumpType.DANA_I InterfaceIDs.PumpType.OMNIPOD_EROS -> PumpType.OMNIPOD_EROS InterfaceIDs.PumpType.OMNIPOD_DASH -> PumpType.OMNIPOD_DASH + InterfaceIDs.PumpType.OMNIPOD_5 -> PumpType.OMNIPOD_5 InterfaceIDs.PumpType.MEDTRONIC_512_517 -> PumpType.MEDTRONIC_512_712 InterfaceIDs.PumpType.MEDTRONIC_515_715 -> PumpType.MEDTRONIC_515_715 InterfaceIDs.PumpType.MEDTRONIC_522_722 -> PumpType.MEDTRONIC_522_722 @@ -63,6 +64,7 @@ fun PumpType.toDb(): InterfaceIDs.PumpType = PumpType.DANA_I -> InterfaceIDs.PumpType.DANA_I PumpType.OMNIPOD_EROS -> InterfaceIDs.PumpType.OMNIPOD_EROS PumpType.OMNIPOD_DASH -> InterfaceIDs.PumpType.OMNIPOD_DASH + PumpType.OMNIPOD_5 -> InterfaceIDs.PumpType.OMNIPOD_5 PumpType.MEDTRONIC_512_712 -> InterfaceIDs.PumpType.MEDTRONIC_512_517 PumpType.MEDTRONIC_515_715 -> InterfaceIDs.PumpType.MEDTRONIC_515_715 PumpType.MEDTRONIC_522_722 -> InterfaceIDs.PumpType.MEDTRONIC_522_722 diff --git a/database/persistence/src/main/kotlin/app/aaps/database/persistence/converters/SourcesExtension.kt b/database/persistence/src/main/kotlin/app/aaps/database/persistence/converters/SourcesExtension.kt index c84dedfd19e7..b890fe500a4e 100644 --- a/database/persistence/src/main/kotlin/app/aaps/database/persistence/converters/SourcesExtension.kt +++ b/database/persistence/src/main/kotlin/app/aaps/database/persistence/converters/SourcesExtension.kt @@ -69,6 +69,7 @@ fun UserEntry.Sources.fromDb(): Sources = UserEntry.Sources.Omnipod -> Sources.Omnipod UserEntry.Sources.OmnipodEros -> Sources.OmnipodEros UserEntry.Sources.OmnipodDash -> Sources.OmnipodDash + UserEntry.Sources.Omnipod5 -> Sources.Omnipod5 UserEntry.Sources.EOPatch2 -> Sources.EOPatch2 UserEntry.Sources.Equil -> Sources.Equil UserEntry.Sources.Medtrum -> Sources.Medtrum @@ -155,6 +156,7 @@ fun Sources.toDb(): UserEntry.Sources = Sources.Omnipod -> UserEntry.Sources.Omnipod Sources.OmnipodEros -> UserEntry.Sources.OmnipodEros Sources.OmnipodDash -> UserEntry.Sources.OmnipodDash + Sources.Omnipod5 -> UserEntry.Sources.Omnipod5 Sources.EOPatch2 -> UserEntry.Sources.EOPatch2 Sources.Equil -> UserEntry.Sources.Equil Sources.Medtrum -> UserEntry.Sources.Medtrum diff --git a/implementation/src/main/kotlin/app/aaps/implementation/userEntry/UserEntryPresentationHelperImpl.kt b/implementation/src/main/kotlin/app/aaps/implementation/userEntry/UserEntryPresentationHelperImpl.kt index faeaa91d4f94..f56abe209e80 100644 --- a/implementation/src/main/kotlin/app/aaps/implementation/userEntry/UserEntryPresentationHelperImpl.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/userEntry/UserEntryPresentationHelperImpl.kt @@ -153,6 +153,7 @@ class UserEntryPresentationHelperImpl @Inject constructor( Sources.Omnipod -> IcPatchPump Sources.OmnipodDash -> IcPatchPump Sources.OmnipodEros -> IcPatchPump + Sources.Omnipod5 -> IcPatchPump Sources.Ottai -> IcPluginSyai Sources.Overview -> Icons.Default.Home Sources.PocTech -> IcPluginPocTec @@ -240,6 +241,7 @@ class UserEntryPresentationHelperImpl @Inject constructor( Sources.Omnipod -> ElementType.PUMP.color() Sources.OmnipodDash -> ElementType.PUMP.color() Sources.OmnipodEros -> ElementType.PUMP.color() + Sources.Omnipod5 -> ElementType.PUMP.color() Sources.Ottai -> ElementType.CGM_DEX.color() Sources.Overview -> ElementType.AAPS.color() Sources.PocTech -> ElementType.CGM_DEX.color() diff --git a/implementation/src/main/kotlin/app/aaps/implementation/utils/TranslatorImpl.kt b/implementation/src/main/kotlin/app/aaps/implementation/utils/TranslatorImpl.kt index b0e40f65b824..ae20e3f4438c 100644 --- a/implementation/src/main/kotlin/app/aaps/implementation/utils/TranslatorImpl.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/utils/TranslatorImpl.kt @@ -334,6 +334,7 @@ class TranslatorImpl @Inject internal constructor( Sources.Omnipod -> TODO() Sources.OmnipodEros -> TODO() Sources.OmnipodDash -> TODO() + Sources.Omnipod5 -> TODO() Sources.MDI -> TODO() Sources.VirtualPump -> TODO() Sources.Treatments -> TODO() diff --git a/pump/omnipod/common/build.gradle.kts b/pump/omnipod/common/build.gradle.kts index 56b088f66a1d..99cd142d67e4 100644 --- a/pump/omnipod/common/build.gradle.kts +++ b/pump/omnipod/common/build.gradle.kts @@ -20,6 +20,8 @@ dependencies { implementation(libs.androidx.compose.ui.tooling.preview) debugImplementation(libs.androidx.compose.ui.tooling) + implementation(libs.androidx.hilt.navigation.compose) + implementation(libs.kotlinx.coroutines.rx3) testImplementation(project(":shared:tests")) diff --git a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/Ids.kt b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/Ids.kt index ca65d55a27d5..96087040aba2 100644 --- a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/Ids.kt +++ b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/Ids.kt @@ -3,12 +3,23 @@ package app.aaps.pump.omnipod.common.bledriver.comm import app.aaps.pump.omnipod.common.bledriver.comm.interfaces.scan.PodScanner import app.aaps.pump.omnipod.common.bledriver.pod.state.OmnipodDashPodStateManager -class Ids(podState: OmnipodDashPodStateManager) { +/** + * The controller/pod identity pair used throughout pairing and session establishment. + * + * The primary constructor (from [OmnipodDashPodStateManager]) is unchanged from before - + * every existing Dash call site behaves identically. [forController] is an additive + * factory for pod types (e.g. Omnipod 5) that don't have a Dash-style pod state manager + * to derive their controller/pod ids from - O5 derives its controller id from + * [app.aaps.pump.omnipod.common.bledriver.comm.pair.O5CertificateStore.controllerId] + * instead. + */ +class Ids private constructor(val myId: Id, val podId: Id) { - val myId = Id.fromInt(OmnipodDashBleManagerImpl.CONTROLLER_ID) - private val uniqueId = podState.uniqueId - val podId = uniqueId?.let(Id::fromLong) - ?: myId.increment() // pod not activated + constructor(podState: OmnipodDashPodStateManager) : this( + myId = Id.fromInt(OmnipodDashBleManagerImpl.CONTROLLER_ID), + podId = podState.uniqueId?.let(Id::fromLong) + ?: Id.fromInt(OmnipodDashBleManagerImpl.CONTROLLER_ID).increment() + ) companion object { @@ -17,5 +28,8 @@ class Ids(podState: OmnipodDashPodStateManager) { PodScanner.POD_ID_NOT_ACTIVATED ) } + + /** For pod types without a Dash-style pod state manager to derive ids from. */ + fun forController(myId: Id, podId: Id): Ids = Ids(myId, podId) } } diff --git a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/command/BleCommand.kt b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/command/BleCommand.kt index cd9c654a890e..9c1c162f033d 100644 --- a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/command/BleCommand.kt +++ b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/command/BleCommand.kt @@ -13,6 +13,8 @@ object BleCommandSuccess : BleCommand(BleCommandType.SUCCESS) object BleCommandFail : BleCommand(BleCommandType.FAIL) +object BleCommandPairStatus : BleCommand(BleCommandType.PAIR_STATUS) + data class BleCommandNack(val idx: Byte) : BleCommand(BleCommandType.NACK, byteArrayOf(idx)) { companion object { @@ -93,6 +95,9 @@ sealed class BleCommand(val data: ByteArray) { BleCommandType.FAIL -> BleCommandFail + BleCommandType.PAIR_STATUS -> + BleCommandPairStatus + BleCommandType.HELLO -> BleCommandIncorrect("Incorrect hello command received", payload) diff --git a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/command/BleCommandType.kt b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/command/BleCommandType.kt index 76e137311b12..6a13d233589a 100644 --- a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/command/BleCommandType.kt +++ b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/command/BleCommandType.kt @@ -8,6 +8,12 @@ enum class BleCommandType(val value: Byte) { SUCCESS(0x04.toByte()), FAIL(0x05.toByte()), HELLO(0x06.toByte()), + + /** O5-only: an intermediate "still working" status the pod can send on the CMD + * characteristic while preparing a response, before the real expected command + * (e.g. SUCCESS). Matches OmnipodKit's PodCommand.PAIR_STATUS - see + * PeripheralManager.waitForCommand(), which loops past it instead of failing. */ + PAIR_STATUS(0x08.toByte()), INCORRECT(0x09.toByte()); companion object { diff --git a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/interfaces/io/CharacteristicType.kt b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/interfaces/io/CharacteristicType.kt index 763897a41bea..a8bce0d6ec20 100644 --- a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/interfaces/io/CharacteristicType.kt +++ b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/interfaces/io/CharacteristicType.kt @@ -4,7 +4,18 @@ import java.math.BigInteger import java.util.* enum class CharacteristicType(val value: String) { - CMD("1a7e2441-e3ed-4464-8b7e-751e03d0dc5f"), DATA("1a7e2442-e3ed-4464-8b7e-751e03d0dc5f"); + CMD("1a7e2441-e3ed-4464-8b7e-751e03d0dc5f"), + DATA("1a7e2442-e3ed-4464-8b7e-751e03d0dc5f"), + + /** + * Omnipod 5's data characteristic. O5 shares Dash's CMD characteristic (and GATT + * service) but uses a different DATA characteristic - see + * [app.aaps.pump.omnipod.common.bledriver.pod.util.BluetoothServiceUuids] for the + * canonical source of these UUIDs (this enum predates that file and is left as the + * existing GATT-wiring mechanism rather than migrated wholesale, to avoid touching + * more of the working Dash connection path than necessary). + */ + DATA_O5("1a7e2443-e3ed-4464-8b7e-751e03d0dc5f"); val uuid: UUID get() = UUID( diff --git a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/legacy/callbacks/BleCommCallbacks.kt b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/legacy/callbacks/BleCommCallbacks.kt index f223b207cea2..6c4b2958a2ab 100644 --- a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/legacy/callbacks/BleCommCallbacks.kt +++ b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/legacy/callbacks/BleCommCallbacks.kt @@ -11,6 +11,7 @@ import app.aaps.core.utils.toHex import app.aaps.pump.omnipod.common.bledriver.comm.interfaces.io.CharacteristicType.Companion.byValue import app.aaps.pump.omnipod.common.bledriver.comm.legacy.io.IncomingPackets import app.aaps.pump.omnipod.common.bledriver.comm.session.DisconnectHandler +import app.aaps.pump.omnipod.common.bledriver.pod.util.BluetoothServiceUuids import java.util.UUID import java.util.concurrent.BlockingQueue import java.util.concurrent.CountDownLatch @@ -32,8 +33,16 @@ class BleCommCallbacks( private var connected: CountDownLatch = CountDownLatch(1) @Synchronized get @Synchronized set + private var mtuNegotiationComplete: CountDownLatch = CountDownLatch(1) + @Synchronized get + @Synchronized set private val writeQueue: BlockingQueue = LinkedBlockingQueue() + /** The ATT MTU last confirmed via [onMtuChanged]; the BLE-spec default until negotiated. */ + @Volatile + var negotiatedMtu: Int = DEFAULT_ATT_MTU + private set + override fun onConnectionStateChange(gatt: BluetoothGatt, status: Int, newState: Int) { aapsLogger.debug(LTag.PUMPBTCOMM, "OnConnectionStateChange with status/state: $status/$newState") super.onConnectionStateChange(gatt, status, newState) @@ -120,7 +129,14 @@ class BleCommCallbacks( super.onCharacteristicChanged(gatt, characteristic) val payload = characteristic.value - val characteristicType = byValue(characteristic.uuid.toString()) + val uuid = characteristic.uuid.toString() + + if (uuid.equals(BluetoothServiceUuids.O5_HEARTBEAT_CHARACTERISTIC_UUID, ignoreCase = true)) { + aapsLogger.debug(LTag.PUMPBTCOMM, "Received O5 heartbeat: ${payload.toHex()}") + return + } + + val characteristicType = byValue(uuid) aapsLogger.debug( LTag.PUMPBTCOMM, @@ -153,6 +169,24 @@ class BleCommCallbacks( LTag.PUMPBTCOMM, "onMtuChanged with MTU/status: $mtu/$status " ) + if (status == BluetoothGatt.GATT_SUCCESS) { + negotiatedMtu = mtu + } + mtuNegotiationComplete.countDown() + } + + /** + * @return true once [onMtuChanged] has fired (successfully or not); false on timeout. + * Callers should check [negotiatedMtu] afterwards to see what was actually granted. + */ + fun waitForMtuChange(timeoutMs: Long): Boolean { + val latch = mtuNegotiationComplete + try { + latch.await(timeoutMs, TimeUnit.MILLISECONDS) + } catch (e: InterruptedException) { + aapsLogger.warn(LTag.PUMPBTCOMM, "Interrupted while waiting for MTU negotiation") + } + return latch.count == 0L } override fun onReadRemoteRssi(gatt: BluetoothGatt?, rssi: Int, status: Int) { @@ -210,13 +244,19 @@ class BleCommCallbacks( aapsLogger.debug(LTag.PUMPBTCOMM, "Reset connection") connected.countDown() serviceDiscoveryComplete.countDown() + mtuNegotiationComplete.countDown() connected = CountDownLatch(1) serviceDiscoveryComplete = CountDownLatch(1) + mtuNegotiationComplete = CountDownLatch(1) + negotiatedMtu = DEFAULT_ATT_MTU flushConfirmationQueue() } companion object { // the confirmation queue should be empty anyway private const val WRITE_CONFIRM_TIMEOUT_MS = 10 + + /** BLE-spec default ATT MTU (23 bytes total, 20 usable payload) before any negotiation. */ + const val DEFAULT_ATT_MTU = 23 } } diff --git a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/legacy/io/BleIO.kt b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/legacy/io/BleIO.kt index ef7402c09526..40e774e4e2e5 100644 --- a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/legacy/io/BleIO.kt +++ b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/legacy/io/BleIO.kt @@ -96,8 +96,24 @@ open class BleIO( } /** - * Enable indications on the characteristic. - * This will signal the pod it can start sending back data. + * Enable notifications/indications on the characteristic, whichever it actually + * declares support for. This will signal the pod it can start sending back data. + * + * Unlike iOS's CoreBluetooth (where `setNotifyValue` picks the correct CCCD value + * for you automatically, based on the characteristic's own properties - the app + * never has to choose), Android's BluetoothGatt API requires the caller to inspect + * `characteristic.properties` and write the matching CCCD value itself. This used + * to unconditionally write ENABLE_INDICATION_VALUE - correct for Dash's hardware + * (years of real-hardware use back that up), but never verified against O5's, which + * may only declare PROPERTY_NOTIFY for these characteristics. A pod whose firmware + * never receives the CCCD value matching what it actually supports can accept the + * write without error yet never deliver anything the way it's being asked to - + * consistent with real O5 pairing attempts consistently disconnecting a few seconds + * after SPS0 is sent, with no response ever received. Mirrors the same dynamic + * check [app.aaps.pump.omnipod.common.bledriver.comm.legacy.session.O5Connection + * .enableHeartbeatNotifications] already uses for the heartbeat characteristic - + * this is the same decision, just never applied here too, where it actually matters + * for pairing. * @return */ @Suppress("DEPRECATION") @@ -110,13 +126,19 @@ open class BleIO( throw ConnectException("Expecting one descriptor, found: ${descriptors.size}") } val descriptor = descriptors[0] - descriptor.value = BluetoothGattDescriptor.ENABLE_INDICATION_VALUE + val usesIndicate = usesIndicate(characteristic) + val enableValue = if (usesIndicate) BluetoothGattDescriptor.ENABLE_INDICATION_VALUE else BluetoothGattDescriptor.ENABLE_NOTIFICATION_VALUE + aapsLogger.debug( + LTag.PUMPBTCOMM, + "$type characteristic properties: ${characteristic.properties} (using ${if (usesIndicate) "INDICATE" else "NOTIFY"})" + ) + descriptor.value = enableValue gatt.writeDescriptor(descriptor) - .assertTrue("enable indications on descriptor") + .assertTrue("enable ${if (usesIndicate) "indications" else "notifications"} on descriptor") - aapsLogger.debug(LTag.PUMPBTCOMM, "Enabling indications for $type") + aapsLogger.debug(LTag.PUMPBTCOMM, "Enabling ${if (usesIndicate) "indications" else "notifications"} for $type") val confirmation = bleCommCallbacks.confirmWrite( - BluetoothGattDescriptor.ENABLE_INDICATION_VALUE, + enableValue, descriptor.uuid.toString(), DEFAULT_IO_TIMEOUT_MS ) @@ -131,6 +153,17 @@ open class BleIO( companion object { const val DEFAULT_IO_TIMEOUT_MS = BleCharacteristicIO.DEFAULT_IO_TIMEOUT_MS + + /** + * Isolated from [readyToRead]'s GATT calls so this decision is directly unit + * testable, without needing the full connect()/readyToRead() mock chain - and + * the real Android framework's null ENABLE_INDICATION_VALUE/ + * ENABLE_NOTIFICATION_VALUE static-field environment boundary that chain hits in + * pure-JVM tests (see O5ConnectionTest's documented stopping point) - just to + * verify which branch gets picked. + */ + internal fun usesIndicate(characteristic: BluetoothGattCharacteristic): Boolean = + characteristic.properties and BluetoothGattCharacteristic.PROPERTY_INDICATE != 0 } } diff --git a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/legacy/io/CmdBleIO.kt b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/legacy/io/CmdBleIO.kt index aa29f3d456bb..e66a5bc88e9c 100644 --- a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/legacy/io/CmdBleIO.kt +++ b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/legacy/io/CmdBleIO.kt @@ -2,10 +2,13 @@ package app.aaps.pump.omnipod.common.bledriver.comm.legacy.io import android.bluetooth.BluetoothGatt import android.bluetooth.BluetoothGattCharacteristic +import android.os.SystemClock import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag import app.aaps.pump.omnipod.common.bledriver.comm.OmnipodDashBleManagerImpl import app.aaps.pump.omnipod.common.bledriver.comm.command.BleCommand import app.aaps.pump.omnipod.common.bledriver.comm.command.BleCommandHello +import app.aaps.pump.omnipod.common.bledriver.comm.command.BleCommandType import app.aaps.pump.omnipod.common.bledriver.comm.interfaces.io.BleConfirmError import app.aaps.pump.omnipod.common.bledriver.comm.interfaces.io.BleConfirmIncorrectData import app.aaps.pump.omnipod.common.bledriver.comm.interfaces.io.BleConfirmResult @@ -16,13 +19,13 @@ import app.aaps.pump.omnipod.common.bledriver.comm.legacy.callbacks.BleCommCallb import java.util.concurrent.BlockingQueue class CmdBleIO( - logger: AAPSLogger, + private val aapsLogger: AAPSLogger, characteristic: BluetoothGattCharacteristic, private val incomingPackets: BlockingQueue, gatt: BluetoothGatt, bleCommCallbacks: BleCommCallbacks ) : BleIO( - logger, + aapsLogger, characteristic, incomingPackets, gatt, @@ -34,15 +37,41 @@ class CmdBleIO( return incomingPackets.peek() } - override fun hello() = sendAndConfirmPacket(BleCommandHello(OmnipodDashBleManagerImpl.CONTROLLER_ID).data) + override fun hello() = hello(OmnipodDashBleManagerImpl.CONTROLLER_ID) + + /** + * O5 sends its own certificate-derived controller id here (not the Dash + * [OmnipodDashBleManagerImpl.CONTROLLER_ID]). The id announced in this handshake must + * match the source id used later in the pairing messages (SP1/SP2), or the pod aborts + * the pairing. + */ + fun hello(controllerId: Int) = sendAndConfirmPacket(BleCommandHello(controllerId).data) override fun expectCommandType(expected: BleCommand, timeoutMs: Long): BleConfirmResult { - return receivePacket(timeoutMs)?.let { - if (it.isNotEmpty() && it[0] == expected.data[0]) - BleConfirmSuccess - else - BleConfirmIncorrectData(it) + val deadlineMs = SystemClock.elapsedRealtime() + timeoutMs + while (true) { + val remainingMs = deadlineMs - SystemClock.elapsedRealtime() + if (remainingMs <= 0) { + return BleConfirmError("Error reading packet") + } + val received = receivePacket(remainingMs) ?: return BleConfirmError("Error reading packet") + when { + received.isEmpty() -> + return BleConfirmIncorrectData(received) + + received[0] == expected.data[0] -> + return BleConfirmSuccess + + received[0] == BleCommandType.PAIR_STATUS.value -> { + aapsLogger.debug( + LTag.PUMPBTCOMM, + "expectCommandType: skipping intermediate PAIR_STATUS while waiting for $expected" + ) + } + + else -> + return BleConfirmIncorrectData(received) + } } - ?: BleConfirmError("Error reading packet") } } diff --git a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/legacy/io/DataBleIO.kt b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/legacy/io/DataBleIO.kt index 5e8e2430a323..824a27b7ff72 100644 --- a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/legacy/io/DataBleIO.kt +++ b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/legacy/io/DataBleIO.kt @@ -13,12 +13,13 @@ class DataBleIO( characteristic: BluetoothGattCharacteristic, incomingPackets: BlockingQueue, gatt: BluetoothGatt, - bleCommCallbacks: BleCommCallbacks + bleCommCallbacks: BleCommCallbacks, + type: CharacteristicType = CharacteristicType.DATA ) : BleIO( logger, characteristic, incomingPackets, gatt, bleCommCallbacks, - CharacteristicType.DATA + type ), DataBleIOInterface diff --git a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/legacy/io/IncomingPackets.kt b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/legacy/io/IncomingPackets.kt index 674242f51a95..15fab709054d 100644 --- a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/legacy/io/IncomingPackets.kt +++ b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/legacy/io/IncomingPackets.kt @@ -11,8 +11,9 @@ class IncomingPackets { fun byCharacteristicType(char: CharacteristicType): BlockingQueue { return when (char) { - CharacteristicType.DATA -> dataQueue - CharacteristicType.CMD -> cmdQueue + CharacteristicType.DATA -> dataQueue + CharacteristicType.DATA_O5 -> dataQueue + CharacteristicType.CMD -> cmdQueue } } } diff --git a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/legacy/session/ServiceDiscoverer.kt b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/legacy/session/ServiceDiscoverer.kt index 6287335e2472..8de6bb30f85d 100644 --- a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/legacy/session/ServiceDiscoverer.kt +++ b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/legacy/session/ServiceDiscoverer.kt @@ -11,6 +11,7 @@ import app.aaps.pump.omnipod.common.bledriver.comm.session.STOP_CONNECTING_CHECK import app.aaps.pump.omnipod.common.bledriver.comm.legacy.callbacks.BleCommCallbacks import app.aaps.pump.omnipod.common.bledriver.comm.session.Connected import app.aaps.pump.omnipod.common.bledriver.comm.session.ConnectionWaitCondition +import app.aaps.pump.omnipod.common.bledriver.pod.definition.PodType import java.math.BigInteger import java.util.UUID @@ -22,9 +23,17 @@ class ServiceDiscoverer( ) { /** - * This is first step after connection establishment + * This is first step after connection establishment. + * + * [podType] defaults to [PodType.DASH], preserving existing behavior for every call + * site that doesn't pass it explicitly. Dash and Omnipod 5 share the same GATT + * service and CMD characteristic; only the DATA characteristic differs (see + * [app.aaps.pump.omnipod.common.bledriver.pod.util.BluetoothServiceUuids]). */ - fun discoverServices(connectionWaitCond: ConnectionWaitCondition): Map { + fun discoverServices( + connectionWaitCond: ConnectionWaitCondition, + podType: PodType = PodType.DASH + ): Map { logger.debug(LTag.PUMPBTCOMM, "Discovering services") bleCallbacks.startServiceDiscovery() try { @@ -55,8 +64,9 @@ class ServiceDiscoverer( } val cmdChar = service.getCharacteristic(CharacteristicType.CMD.uuid) ?: throw ConnectException("Characteristic not found: ${CharacteristicType.CMD.value}") - val dataChar = service.getCharacteristic(CharacteristicType.DATA.uuid) - ?: throw ConnectException("Characteristic not found: ${CharacteristicType.DATA.value}") + val dataCharacteristicType = if (podType == PodType.OMNIPOD_5) CharacteristicType.DATA_O5 else CharacteristicType.DATA + val dataChar = service.getCharacteristic(dataCharacteristicType.uuid) + ?: throw ConnectException("Characteristic not found: ${dataCharacteristicType.value}") return mapOf( CharacteristicType.CMD to cmdChar, CharacteristicType.DATA to dataChar diff --git a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/message/MessageIO.kt b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/message/MessageIO.kt index a5331e807906..dd5970aade1b 100644 --- a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/message/MessageIO.kt +++ b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/message/MessageIO.kt @@ -10,6 +10,7 @@ import app.aaps.pump.omnipod.common.bledriver.comm.command.BleCommandFail import app.aaps.pump.omnipod.common.bledriver.comm.command.BleCommandNack import app.aaps.pump.omnipod.common.bledriver.comm.command.BleCommandRTS import app.aaps.pump.omnipod.common.bledriver.comm.command.BleCommandSuccess +import app.aaps.pump.omnipod.common.bledriver.comm.interfaces.io.BleCharacteristicIO import app.aaps.pump.omnipod.common.bledriver.comm.interfaces.io.BleConfirmError import app.aaps.pump.omnipod.common.bledriver.comm.interfaces.io.BleConfirmIncorrectData import app.aaps.pump.omnipod.common.bledriver.comm.interfaces.io.BleConfirmSuccess @@ -20,8 +21,11 @@ import app.aaps.pump.omnipod.common.bledriver.comm.interfaces.io.BleSendSuccess import app.aaps.pump.omnipod.common.bledriver.comm.interfaces.io.CmdBleIO import app.aaps.pump.omnipod.common.bledriver.comm.interfaces.io.DataBleIO import app.aaps.pump.omnipod.common.bledriver.comm.packet.BlePacket +import app.aaps.pump.omnipod.common.bledriver.comm.packet.BlePacketLayout import app.aaps.pump.omnipod.common.bledriver.comm.packet.PayloadJoiner import app.aaps.pump.omnipod.common.bledriver.comm.packet.PayloadSplitter +import app.aaps.pump.omnipod.common.bledriver.comm.packet.blePacketLayout +import app.aaps.pump.omnipod.common.bledriver.pod.definition.PodType sealed class MessageSendResult object MessageSendSuccess : MessageSendResult() @@ -41,12 +45,18 @@ class MessageIO( private val aapsLogger: AAPSLogger, private val cmdBleIO: CmdBleIO, private val dataBleIO: DataBleIO, + private val podType: PodType = PodType.DASH, ) { private val receivedOutOfOrder = LinkedHashMap() var maxMessageReadTries = 3 var messageReadTries = 0 + private val packetLayout: BlePacketLayout = podType.blePacketLayout + + private val readTimeoutMs: Long = + if (podType.isO5) MESSAGE_READ_TIMEOUT_MS else BleCharacteristicIO.DEFAULT_IO_TIMEOUT_MS + @Suppress("ReturnCount") fun sendMessage(msg: MessagePacket): MessageSendResult { val foundRTS = cmdBleIO.flushIncomingQueue() @@ -57,23 +67,25 @@ class MessageIO( } dataBleIO.flushIncomingQueue() - val rtsSendResult = cmdBleIO.sendAndConfirmPacket(BleCommandRTS.data) - if (rtsSendResult is BleSendErrorSending) { - return MessageSendErrorSending(rtsSendResult) - } - val expectCTS = cmdBleIO.expectCommandType(BleCommandCTS) - if (expectCTS !is BleConfirmSuccess) { - return MessageSendErrorSending(expectCTS.toString()) + if (podType.isDash) { + val rtsSendResult = cmdBleIO.sendAndConfirmPacket(BleCommandRTS.data) + if (rtsSendResult is BleSendErrorSending) { + return MessageSendErrorSending(rtsSendResult) + } + val expectCTS = cmdBleIO.expectCommandType(BleCommandCTS) + if (expectCTS !is BleConfirmSuccess) { + return MessageSendErrorSending(expectCTS.toString()) + } } val payload = msg.asByteArray() aapsLogger.debug(LTag.PUMPBTCOMM, "Sending message: ${payload.toHex()}") - val splitter = PayloadSplitter(payload) + val splitter = PayloadSplitter(payload, packetLayout) val packets = splitter.splitInPackets() for ((index, packet) in packets.withIndex()) { - aapsLogger.debug(LTag.PUMPBTCOMM, "Sending DATA: ${packet.toByteArray().toHex()}") - val sendResult = dataBleIO.sendAndConfirmPacket(packet.toByteArray()) + aapsLogger.debug(LTag.PUMPBTCOMM, "Sending DATA: ${packet.toByteArray(packetLayout).toHex()}") + val sendResult = dataBleIO.sendAndConfirmPacket(packet.toByteArray(packetLayout)) val ret = handleSendResult(sendResult, index, packets) if (ret !is MessageSendSuccess) { return ret @@ -87,7 +99,7 @@ class MessageIO( } } - return when (val expectSuccess = cmdBleIO.expectCommandType(BleCommandSuccess)) { + return when (val expectSuccess = cmdBleIO.expectCommandType(BleCommandSuccess, readTimeoutMs)) { is BleConfirmSuccess -> MessageSendSuccess @@ -108,18 +120,20 @@ class MessageIO( @Suppress("ReturnCount") fun receiveMessage(readRTS: Boolean = true): MessagePacket? { - if (readRTS) { - val expectRTS = cmdBleIO.expectCommandType(BleCommandRTS, MESSAGE_READ_TIMEOUT_MS) - if (expectRTS !is BleConfirmSuccess) { - aapsLogger.warn(LTag.PUMPBTCOMM, "Error reading RTS: $expectRTS") - return null + if (podType.isDash) { + if (readRTS) { + val expectRTS = cmdBleIO.expectCommandType(BleCommandRTS, MESSAGE_READ_TIMEOUT_MS) + if (expectRTS !is BleConfirmSuccess) { + aapsLogger.warn(LTag.PUMPBTCOMM, "Error reading RTS: $expectRTS") + return null + } } - } - val sendResult = cmdBleIO.sendAndConfirmPacket(BleCommandCTS.data) - if (sendResult !is BleSendSuccess) { - aapsLogger.warn(LTag.PUMPBTCOMM, "Error sending CTS: $sendResult") - return null + val sendResult = cmdBleIO.sendAndConfirmPacket(BleCommandCTS.data) + if (sendResult !is BleSendSuccess) { + aapsLogger.warn(LTag.PUMPBTCOMM, "Error sending CTS: $sendResult") + return null + } } readReset() var expected: Byte = 0 @@ -129,7 +143,7 @@ class MessageIO( aapsLogger.warn(LTag.PUMPBTCOMM, "Error reading first packet:$firstPacket") return null } - val joiner = PayloadJoiner(firstPacket.payload) + val joiner = PayloadJoiner(firstPacket.payload, packetLayout) maxMessageReadTries = joiner.fullFragments * 2 + 2 for (i in 1 until joiner.fullFragments + 1) { expected++ @@ -190,7 +204,7 @@ class MessageIO( if (received == null) { MessageSendErrorSending(received.toString()) } else { - val sendResult = dataBleIO.sendAndConfirmPacket(packets[receivedCmd.idx.toInt()].toByteArray()) + val sendResult = dataBleIO.sendAndConfirmPacket(packets[receivedCmd.idx.toInt()].toByteArray(packetLayout)) handleSendResult(sendResult, index, packets) } } @@ -216,7 +230,7 @@ class MessageIO( while (messageReadTries < maxMessageReadTries && packetTries < MAX_PACKET_READ_TRIES) { messageReadTries++ packetTries++ - val received = dataBleIO.receivePacket() + val received = dataBleIO.receivePacket(readTimeoutMs) if (received == null || received.isEmpty()) { if (nackOnTimeout) cmdBleIO.sendAndConfirmPacket(BleCommandNack(index).data) diff --git a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/message/MessagePacket.kt b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/message/MessagePacket.kt index 4540e3370edc..d4ba0fe08561 100644 --- a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/message/MessagePacket.kt +++ b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/message/MessagePacket.kt @@ -22,11 +22,18 @@ data class MessagePacket( val gateway: Boolean = false, val sas: Boolean = true, // TODO: understand, seems to always be true val tfs: Boolean = false, // TODO: understand, seems to be false - val version: Short = 0.toShort() + val version: Short = 0.toShort(), + /** O5-only: raw (r||s, 64-byte) P-256 ECDSA signature for [MessageType.ENCRYPTED_SIGNED] + * messages - set only after [payload] has already been AES-CCM encrypted (see + * [app.aaps.pump.omnipod.common.bledriver.comm.session.Session]'s signing step). + * Appended to the wire bytes after [payload] but - matching OmnipodKit's + * MessagePacket.swift exactly - deliberately excluded from the size field computed + * in [asByteArray], since the pod doesn't count it as part of the message body. */ + val signatureData: ByteArray? = null ) { fun asByteArray(forEncryption: Boolean = false): ByteArray { - val bb = ByteBuffer.allocate(16 + payload.size) + val bb = ByteBuffer.allocate(16 + payload.size + (signatureData?.size ?: 0)) bb.put(MAGIC_PATTERN.toByteArray()) val f1 = Flag() @@ -53,8 +60,9 @@ data class MessagePacket( bb.put(f2.value.toByte()) bb.put(this.sequenceNumber) bb.put(this.ackNumber) + val hasTag = type == MessageType.ENCRYPTED || type == MessageType.ENCRYPTED_SIGNED val size = payload.size - - if (type == MessageType.ENCRYPTED && !forEncryption) 8 else 0 + if (hasTag && !forEncryption) 8 else 0 bb.put((size ushr 3).toByte()) bb.put((size shl 5).toByte()) @@ -62,6 +70,7 @@ data class MessagePacket( bb.put(this.destination.address) bb.put(this.payload) + signatureData?.let { bb.put(it) } val ret = ByteArray(bb.position()) bb.flip() @@ -93,7 +102,7 @@ data class MessagePacket( val lastMessage = f2.get(2) != 0 val gateway = f2.get(3) != 0 val type = - MessageType.byValue((f1.get(7) or (f1.get(6) shl 1) or (f1.get(5) shl 2) or (f1.get(4) shl 3)).toByte()) + MessageType.byValue((f2.get(7) or (f2.get(6) shl 1) or (f2.get(5) shl 2) or (f2.get(4) shl 3)).toByte()) if (version.toInt() != 0) { throw CouldNotParseMessageException(payload) } @@ -102,8 +111,9 @@ data class MessagePacket( val size = (payload[6].toInt() shl 3) or (payload[7].toUnsignedInt() ushr 5) payload.assertSizeAtLeast(size + HEADER_SIZE) + val hasTag = type == MessageType.ENCRYPTED || type == MessageType.ENCRYPTED_SIGNED val payloadEnd = 16 + size + - if (type == MessageType.ENCRYPTED) 8 // TAG + if (hasTag) 8 // TAG else 0 return MessagePacket( diff --git a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/message/MessageType.kt b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/message/MessageType.kt index 1674f9682eb7..d82dc2b367f7 100644 --- a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/message/MessageType.kt +++ b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/message/MessageType.kt @@ -4,7 +4,16 @@ enum class MessageType(val value: Byte) { CLEAR(0), ENCRYPTED(1), SESSION_ESTABLISHMENT(2), - PAIRING(3); + PAIRING(3), + + /** + * Signed + encrypted messages (post-pairing signed pod commands). Not yet used by any + * caller in this codebase - there's no signed-command layer built yet (Swift's + * O5AidCommands.swift equivalent) - but MessagePacket's tag-size handling below already + * accounts for it, matching Swift's MessagePacket.swift exactly, so the wire format is + * correct from the moment this type does get a caller. + */ + ENCRYPTED_SIGNED(4); companion object { diff --git a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/message/StringLengthPrefixEncoding.kt b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/message/StringLengthPrefixEncoding.kt index 3e74287a2a53..2638d9afb131 100644 --- a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/message/StringLengthPrefixEncoding.kt +++ b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/message/StringLengthPrefixEncoding.kt @@ -28,7 +28,7 @@ class StringLengthPrefixEncoding private constructor() { remaining.assertSizeAtLeast(key.length + LENGTH_BYTES) remaining = remaining.copyOfRange(key.length, remaining.size) - val length = (remaining[0].toUnsignedInt() shl 1) or remaining[1].toUnsignedInt() + val length = (remaining[0].toUnsignedInt() shl 8) or remaining[1].toUnsignedInt() remaining.assertSizeAtLeast(length) ret[index] = remaining.copyOfRange(LENGTH_BYTES, LENGTH_BYTES + length) remaining = remaining.copyOfRange(LENGTH_BYTES + length, remaining.size) diff --git a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/packet/BlePacket.kt b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/packet/BlePacket.kt index 8c26214d4b80..d74277e6bdda 100644 --- a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/packet/BlePacket.kt +++ b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/packet/BlePacket.kt @@ -6,12 +6,7 @@ import java.nio.ByteBuffer sealed class BlePacket { abstract val payload: ByteArray - abstract fun toByteArray(): ByteArray - - companion object { - - const val MAX_SIZE = 20 - } + abstract fun toByteArray(layout: BlePacketLayout): ByteArray } data class FirstBlePacket( @@ -22,9 +17,9 @@ data class FirstBlePacket( val oneExtraPacket: Boolean = false ) : BlePacket() { - override fun toByteArray(): ByteArray { + override fun toByteArray(layout: BlePacketLayout): ByteArray { val bb = ByteBuffer - .allocate(MAX_SIZE) + .allocate(layout.maxPayloadSize) .put(0) // index .put(fullFragments.toByte()) // # of fragments except FirstBlePacket and LastOptionalPlusOneBlePacket crc32?.let { @@ -36,7 +31,7 @@ data class FirstBlePacket( bb.put(payload) val pos = bb.position() - val ret = ByteArray(MAX_SIZE) + val ret = ByteArray(if (layout.padToMaxPayloadSize) layout.maxPayloadSize else pos) bb.flip() bb.get(ret, 0, pos) @@ -45,15 +40,15 @@ data class FirstBlePacket( companion object { - fun parse(payload: ByteArray): FirstBlePacket { + fun parse(payload: ByteArray, layout: BlePacketLayout): FirstBlePacket { payload.assertSizeAtLeast(HEADER_SIZE_WITH_MIDDLE_PACKETS, 0) if (payload[0].toInt() != 0) { // most likely we lost the first packet. throw IncorrectPacketException(payload, 0) } - val fullFragments = payload[1].toInt() - require(fullFragments < MAX_FRAGMENTS) { "Received more than $MAX_FRAGMENTS fragments" } + val fullFragments = payload[1].toUnsignedInt() + require(fullFragments < layout.maxFragments) { "Received more than ${layout.maxFragments} fragments" } payload.assertSizeAtLeast(HEADER_SIZE_WITHOUT_MIDDLE_PACKETS, 0) @@ -61,25 +56,26 @@ data class FirstBlePacket( fullFragments == 0 -> { val rest = payload[6] - val end = Integer.min(rest + HEADER_SIZE_WITHOUT_MIDDLE_PACKETS, payload.size) + val restUnsigned = rest.toUnsignedInt() + val end = Integer.min(restUnsigned + HEADER_SIZE_WITHOUT_MIDDLE_PACKETS, payload.size) payload.assertSizeAtLeast(end, 0) FirstBlePacket( fullFragments = fullFragments, payload = payload.copyOfRange(HEADER_SIZE_WITHOUT_MIDDLE_PACKETS, end), crc32 = ByteBuffer.wrap(payload.copyOfRange(2, 6)).int.toUnsignedLong(), size = rest, - oneExtraPacket = rest + HEADER_SIZE_WITHOUT_MIDDLE_PACKETS > end + oneExtraPacket = restUnsigned + HEADER_SIZE_WITHOUT_MIDDLE_PACKETS > end ) } // With middle packets - payload.size < MAX_SIZE -> + payload.size < layout.maxPayloadSize -> throw IncorrectPacketException(payload, 0) else -> { FirstBlePacket( fullFragments = fullFragments, - payload = payload.copyOfRange(HEADER_SIZE_WITH_MIDDLE_PACKETS, MAX_SIZE) + payload = payload.copyOfRange(HEADER_SIZE_WITH_MIDDLE_PACKETS, layout.maxPayloadSize) ) } } @@ -87,34 +83,24 @@ data class FirstBlePacket( private const val HEADER_SIZE_WITHOUT_MIDDLE_PACKETS = 7 // we are using all fields private const val HEADER_SIZE_WITH_MIDDLE_PACKETS = 2 - - internal const val CAPACITY_WITHOUT_MIDDLE_PACKETS = - MAX_SIZE - HEADER_SIZE_WITHOUT_MIDDLE_PACKETS // we are using all fields - internal const val CAPACITY_WITH_MIDDLE_PACKETS = - MAX_SIZE - HEADER_SIZE_WITH_MIDDLE_PACKETS // we are not using crc32 or size - internal const val CAPACITY_WITH_THE_OPTIONAL_PLUS_ONE_PACKET = 18 - - private const val MAX_FRAGMENTS = 15 // 15*20=300 bytes } } data class MiddleBlePacket(val index: Byte, override val payload: ByteArray) : BlePacket() { - override fun toByteArray(): ByteArray { + override fun toByteArray(layout: BlePacketLayout): ByteArray { return byteArrayOf(index) + payload } companion object { - fun parse(payload: ByteArray): MiddleBlePacket { - payload.assertSizeAtLeast(MAX_SIZE) + fun parse(payload: ByteArray, layout: BlePacketLayout): MiddleBlePacket { + payload.assertSizeAtLeast(layout.maxPayloadSize) return MiddleBlePacket( index = payload[0], - payload.copyOfRange(1, MAX_SIZE) + payload.copyOfRange(1, layout.maxPayloadSize) ) } - - internal const val CAPACITY = 19 } } @@ -126,15 +112,15 @@ data class LastBlePacket( val oneExtraPacket: Boolean = false ) : BlePacket() { - override fun toByteArray(): ByteArray { + override fun toByteArray(layout: BlePacketLayout): ByteArray { val bb = ByteBuffer - .allocate(MAX_SIZE) + .allocate(layout.maxPayloadSize) .put(index) .put(size) .putInt(crc32.toInt()) .put(payload) val pos = bb.position() - val ret = ByteArray(MAX_SIZE) + val ret = ByteArray(if (layout.padToMaxPayloadSize) layout.maxPayloadSize else pos) bb.flip() bb.get(ret, 0, pos) return ret @@ -142,25 +128,25 @@ data class LastBlePacket( companion object { - fun parse(payload: ByteArray): LastBlePacket { + fun parse(payload: ByteArray, layout: BlePacketLayout): LastBlePacket { payload.assertSizeAtLeast(HEADER_SIZE) val rest = payload[1] - val end = Integer.min(rest + HEADER_SIZE, payload.size) + val restUnsigned = rest.toUnsignedInt() + val end = Integer.min(restUnsigned + HEADER_SIZE, payload.size) payload.assertSizeAtLeast(end) return LastBlePacket( index = payload[0], crc32 = ByteBuffer.wrap(payload.copyOfRange(2, 6)).int.toUnsignedLong(), - oneExtraPacket = rest + HEADER_SIZE > end, + oneExtraPacket = restUnsigned + HEADER_SIZE > end, size = rest, payload = payload.copyOfRange(HEADER_SIZE, end) ) } private const val HEADER_SIZE = 6 - internal const val CAPACITY = MAX_SIZE - HEADER_SIZE } } @@ -170,15 +156,16 @@ data class LastOptionalPlusOneBlePacket( val size: Byte ) : BlePacket() { - override fun toByteArray(): ByteArray { - return byteArrayOf(index, size) + payload + ByteArray(MAX_SIZE - payload.size - 2) + override fun toByteArray(layout: BlePacketLayout): ByteArray { + val exact = byteArrayOf(index, size) + payload + return if (layout.padToMaxPayloadSize) exact + ByteArray(layout.maxPayloadSize - exact.size) else exact } companion object { - fun parse(payload: ByteArray): LastOptionalPlusOneBlePacket { + fun parse(payload: ByteArray, layout: BlePacketLayout): LastOptionalPlusOneBlePacket { payload.assertSizeAtLeast(2) - val size = payload[1].toInt() + val size = payload[1].toUnsignedInt() payload.assertSizeAtLeast(HEADER_SIZE + size) return LastOptionalPlusOneBlePacket( @@ -200,3 +187,11 @@ private fun ByteArray.assertSizeAtLeast(size: Int, index: Byte? = null) { throw IncorrectPacketException(this, index) } } + +/** + * Reinterprets this Byte's bit pattern as an unsigned value (0..255), matching the on-wire + * meaning of every size/count/index byte in this protocol. Kotlin's Byte is signed, so plain + * arithmetic/comparison on it silently sign-extends (e.g. wire value 200 reads back as -56) - + * this is needed anywhere such a byte feeds into arithmetic or a comparison, not just storage. + */ +internal fun Byte.toUnsignedInt(): Int = this.toInt() and 0xFF diff --git a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/packet/BlePacketLayout.kt b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/packet/BlePacketLayout.kt new file mode 100644 index 000000000000..25887bba402a --- /dev/null +++ b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/packet/BlePacketLayout.kt @@ -0,0 +1,77 @@ +package app.aaps.pump.omnipod.common.bledriver.comm.packet + +import app.aaps.pump.omnipod.common.bledriver.pod.definition.PodType + +/** + * BLE packet framing parameters. Dash and Omnipod 5 share the same header byte layout but + * use different maximum payload sizes per packet (Dash: 20 bytes, O5: 244 bytes), which in + * turn changes every derived fragment capacity used when splitting/joining message payloads. + * + * Ported from OmnipodKit's BlePodProfile.swift (loopandlearn/OmnipodKit) `BlePacketLayout` + * struct and its `omnipodDash`/`omnipod5` presets. + */ +data class BlePacketLayout( + val maxPayloadSize: Int, + val maxFragments: Int, + val firstPacketHeaderSizeWithoutMiddlePackets: Int, + val firstPacketHeaderSizeWithMiddlePackets: Int, + val lastPacketHeaderSize: Int, + /** + * Whether [BlePacket.toByteArray] zero-pads every packet out to [maxPayloadSize]. + * + * OmnipodKit's BLEPacket.swift never pads - it writes exactly the bytes it built (its + * `Data(capacity:)` is only an allocation hint, not a length). This codebase's Dash + * path has always padded, and since Dash's [maxPayloadSize] is 20 that only ever added + * a few trailing zero bytes to the final packet of a message; it's proven correct + * against real Dash hardware over years of use, so it stays enabled there rather than + * being "fixed" to match Swift. + * + * For O5 the same behavior is materially different: [maxPayloadSize] is 244, so a + * 44-byte pairing message went out as a 244-byte BLE write with 193 bytes of zero + * padding, where a real PDM sends 51. Real-hardware logs show a pod does still ACK + * those (it reads the packet's own length field and ignores the tail), so this was not + * what broke pairing - but it is a genuine divergence from the reference on every + * single write, and the multi-packet path it also affects (SPS2.1, ~642 bytes) has + * never yet run against a real pod. Disabled for O5 to match Swift byte-for-byte. + */ + val padToMaxPayloadSize: Boolean +) { + val firstPacketCapacityWithoutMiddlePackets: Int + get() = maxPayloadSize - firstPacketHeaderSizeWithoutMiddlePackets + + val firstPacketCapacityWithMiddlePackets: Int + get() = maxPayloadSize - firstPacketHeaderSizeWithMiddlePackets + + val firstPacketCapacityWithOptionalPlusOnePacket: Int + get() = firstPacketCapacityWithMiddlePackets + + val middlePacketCapacity: Int + get() = maxPayloadSize - 1 + + val lastPacketCapacity: Int + get() = maxPayloadSize - lastPacketHeaderSize + + companion object { + + val DASH = BlePacketLayout( + maxPayloadSize = 20, + maxFragments = 15, + firstPacketHeaderSizeWithoutMiddlePackets = 7, + firstPacketHeaderSizeWithMiddlePackets = 2, + lastPacketHeaderSize = 6, + padToMaxPayloadSize = true + ) + + val OMNIPOD_5 = BlePacketLayout( + maxPayloadSize = 244, + maxFragments = 15, + firstPacketHeaderSizeWithoutMiddlePackets = 7, + firstPacketHeaderSizeWithMiddlePackets = 2, + lastPacketHeaderSize = 6, + padToMaxPayloadSize = false + ) + } +} + +val PodType.blePacketLayout: BlePacketLayout + get() = if (isO5) BlePacketLayout.OMNIPOD_5 else BlePacketLayout.DASH diff --git a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/packet/PayloadJoiner.kt b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/packet/PayloadJoiner.kt index eb527ff56480..ea35995b212b 100644 --- a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/packet/PayloadJoiner.kt +++ b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/packet/PayloadJoiner.kt @@ -5,7 +5,7 @@ import app.aaps.pump.omnipod.common.bledriver.comm.message.IncorrectPacketExcept import java.nio.ByteBuffer import java.util.* -class PayloadJoiner(firstPacket: ByteArray) { +class PayloadJoiner(firstPacket: ByteArray, private val layout: BlePacketLayout = BlePacketLayout.DASH) { var oneExtraPacket: Boolean val fullFragments: Int @@ -14,7 +14,7 @@ class PayloadJoiner(firstPacket: ByteArray) { private val fragments: MutableList = LinkedList() init { - val firstPacket = FirstBlePacket.parse(firstPacket) + val firstPacket = FirstBlePacket.parse(firstPacket, layout) fragments.add(firstPacket) fullFragments = firstPacket.fullFragments crc = firstPacket.crc32 ?: 0 @@ -25,25 +25,25 @@ class PayloadJoiner(firstPacket: ByteArray) { if (packet.size < 3) { // idx, size, at least 1 byte of payload throw IncorrectPacketException(packet, (expectedIndex + 1).toByte()) } - val idx = packet[0].toInt() + val idx = packet[0].toUnsignedInt() if (idx != expectedIndex + 1) { throw IncorrectPacketException(packet, (expectedIndex + 1).toByte()) } expectedIndex++ when { idx < fullFragments -> { - fragments.add(MiddleBlePacket.parse(packet)) + fragments.add(MiddleBlePacket.parse(packet, layout)) } idx == fullFragments -> { - val lastPacket = LastBlePacket.parse(packet) + val lastPacket = LastBlePacket.parse(packet, layout) fragments.add(lastPacket) crc = lastPacket.crc32 oneExtraPacket = lastPacket.oneExtraPacket } idx == fullFragments + 1 && oneExtraPacket -> { - fragments.add(LastOptionalPlusOneBlePacket.parse(packet)) + fragments.add(LastOptionalPlusOneBlePacket.parse(packet, layout)) } idx > fullFragments -> { diff --git a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/packet/PayloadSplitter.kt b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/packet/PayloadSplitter.kt index 01f5382fad6a..376166cdae4f 100644 --- a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/packet/PayloadSplitter.kt +++ b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/packet/PayloadSplitter.kt @@ -3,30 +3,28 @@ package app.aaps.pump.omnipod.common.bledriver.comm.packet import java.lang.Integer.min import java.util.zip.CRC32 -class PayloadSplitter(private val payload: ByteArray) { +class PayloadSplitter(private val payload: ByteArray, private val layout: BlePacketLayout = BlePacketLayout.DASH) { fun splitInPackets(): List { - if (payload.size <= FirstBlePacket.CAPACITY_WITH_THE_OPTIONAL_PLUS_ONE_PACKET) { + if (payload.size <= layout.firstPacketCapacityWithOptionalPlusOnePacket) { return splitInOnePacket() } val ret = ArrayList() val crc32 = payload.crc32() - val middleFragments = (payload.size - FirstBlePacket.CAPACITY_WITH_MIDDLE_PACKETS) / MiddleBlePacket.CAPACITY + val middleFragments = (payload.size - layout.firstPacketCapacityWithMiddlePackets) / layout.middlePacketCapacity val rest = - ( - (payload.size - middleFragments * MiddleBlePacket.CAPACITY) - - FirstBlePacket.CAPACITY_WITH_MIDDLE_PACKETS - ).toByte() + (payload.size - middleFragments * layout.middlePacketCapacity) - + layout.firstPacketCapacityWithMiddlePackets ret.add( FirstBlePacket( fullFragments = middleFragments + 1, - payload = payload.copyOfRange(0, FirstBlePacket.CAPACITY_WITH_MIDDLE_PACKETS) + payload = payload.copyOfRange(0, layout.firstPacketCapacityWithMiddlePackets) ) ) for (i in 1..middleFragments) { val p = payload.copyOfRange( - FirstBlePacket.CAPACITY_WITH_MIDDLE_PACKETS + (i - 1) * MiddleBlePacket.CAPACITY, - FirstBlePacket.CAPACITY_WITH_MIDDLE_PACKETS + i * MiddleBlePacket.CAPACITY + layout.firstPacketCapacityWithMiddlePackets + (i - 1) * layout.middlePacketCapacity, + layout.firstPacketCapacityWithMiddlePackets + i * layout.middlePacketCapacity ) ret.add( MiddleBlePacket( @@ -35,27 +33,27 @@ class PayloadSplitter(private val payload: ByteArray) { ) ) } - val end = min(LastBlePacket.CAPACITY, rest.toInt()) + val end = min(layout.lastPacketCapacity, rest) ret.add( LastBlePacket( index = (middleFragments + 1).toByte(), - size = rest, + size = rest.toByte(), payload = payload.copyOfRange( - middleFragments * MiddleBlePacket.CAPACITY + FirstBlePacket.CAPACITY_WITH_MIDDLE_PACKETS, - middleFragments * MiddleBlePacket.CAPACITY + FirstBlePacket.CAPACITY_WITH_MIDDLE_PACKETS + end + middleFragments * layout.middlePacketCapacity + layout.firstPacketCapacityWithMiddlePackets, + middleFragments * layout.middlePacketCapacity + layout.firstPacketCapacityWithMiddlePackets + end ), crc32 = crc32 ) ) - if (rest > LastBlePacket.CAPACITY) { + if (rest > layout.lastPacketCapacity) { ret.add( LastOptionalPlusOneBlePacket( index = (middleFragments + 2).toByte(), - size = (rest - LastBlePacket.CAPACITY).toByte(), + size = (rest - layout.lastPacketCapacity).toByte(), payload = payload.copyOfRange( - middleFragments * MiddleBlePacket.CAPACITY + - FirstBlePacket.CAPACITY_WITH_MIDDLE_PACKETS + - LastBlePacket.CAPACITY, + middleFragments * layout.middlePacketCapacity + + layout.firstPacketCapacityWithMiddlePackets + + layout.lastPacketCapacity, payload.size ) ) @@ -67,7 +65,7 @@ class PayloadSplitter(private val payload: ByteArray) { private fun splitInOnePacket(): List { val ret = ArrayList() val crc32 = payload.crc32() - val end = min(FirstBlePacket.CAPACITY_WITHOUT_MIDDLE_PACKETS, payload.size) + val end = min(layout.firstPacketCapacityWithoutMiddlePackets, payload.size) ret.add( FirstBlePacket( fullFragments = 0, @@ -76,7 +74,7 @@ class PayloadSplitter(private val payload: ByteArray) { crc32 = crc32 ) ) - if (payload.size > FirstBlePacket.CAPACITY_WITHOUT_MIDDLE_PACKETS) { + if (payload.size > layout.firstPacketCapacityWithoutMiddlePackets) { ret.add( LastOptionalPlusOneBlePacket( index = 1, diff --git a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/pair/CommandSigner.kt b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/pair/CommandSigner.kt new file mode 100644 index 000000000000..d981396aee52 --- /dev/null +++ b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/pair/CommandSigner.kt @@ -0,0 +1,13 @@ +package app.aaps.pump.omnipod.common.bledriver.comm.pair + +/** + * Signs a command payload for the shared BLE [app.aaps.pump.omnipod.common.bledriver.comm + * .session.Session]. This keeps the shared driver free of any Omnipod 5 type: only O5 + * connections pass a non-null signer (Dash never signs), and the O5 module supplies the + * concrete implementation (`O5CertificateStore`). + */ +interface CommandSigner { + + /** Sign [data] with the secondary key; returns the raw signature (r || s, 64 bytes). */ + fun signRaw(data: ByteArray): ByteArray +} diff --git a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/session/ResponseUtil.kt b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/session/ResponseUtil.kt index 8c9ac6e3a4fc..0411d5c7d7ee 100644 --- a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/session/ResponseUtil.kt +++ b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/session/ResponseUtil.kt @@ -30,14 +30,12 @@ object ResponseUtil { private fun parseAdditionalStatusResponse(payload: ByteArray): Response { return when (byValue(payload[2], ResponseType.StatusResponseType.UNKNOWN)) { ResponseType.StatusResponseType.DEFAULT_STATUS_RESPONSE -> DefaultStatusResponse(payload) // Unreachable; this response type is only used for requesting a default status response - ResponseType.StatusResponseType.STATUS_RESPONSE_PAGE_1 -> throw UnsupportedOperationException("Status response page 1 is not (yet) implemented") + ResponseType.StatusResponseType.STATUS_RESPONSE_PAGE_1 -> PodInfoTriggeredAlertsResponse(payload) ResponseType.StatusResponseType.ALARM_STATUS -> AlarmStatusResponse(payload) - ResponseType.StatusResponseType.STATUS_RESPONSE_PAGE_3 -> throw UnsupportedOperationException("Status response page 3 is not (yet) implemented") - ResponseType.StatusResponseType.STATUS_RESPONSE_PAGE_5 -> throw UnsupportedOperationException("Status response page 5 is not (yet) implemented") - ResponseType.StatusResponseType.STATUS_RESPONSE_PAGE_6 -> throw UnsupportedOperationException("Status response page 6 is not (yet) implemented") - ResponseType.StatusResponseType.STATUS_RESPONSE_PAGE_70 -> throw UnsupportedOperationException("Status response page 70 is not (yet) implemented") - ResponseType.StatusResponseType.STATUS_RESPONSE_PAGE_80 -> throw UnsupportedOperationException("Status response page 80 is not (yet) implemented") - ResponseType.StatusResponseType.STATUS_RESPONSE_PAGE_81 -> throw UnsupportedOperationException("Status response page 81 is not (yet) implemented") + ResponseType.StatusResponseType.STATUS_RESPONSE_PAGE_3 -> PodInfoPulseLogPlusResponse(payload) + ResponseType.StatusResponseType.STATUS_RESPONSE_PAGE_5 -> PodInfoActivationTimeResponse(payload) + ResponseType.StatusResponseType.STATUS_RESPONSE_PAGE_80 -> PodInfoPulseLogRecentResponse(payload) + ResponseType.StatusResponseType.STATUS_RESPONSE_PAGE_81 -> PodInfoPulseLogPreviousResponse(payload) ResponseType.StatusResponseType.UNKNOWN -> throw CouldNotParseResponseException("Unrecognized additional status response type: ${payload[2]}") } } diff --git a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/session/Session.kt b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/session/Session.kt index 54035701a1ed..6bf1572ebcd5 100644 --- a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/session/Session.kt +++ b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/session/Session.kt @@ -6,16 +6,24 @@ import app.aaps.core.utils.toHex import app.aaps.pump.omnipod.common.bledriver.comm.Ids import app.aaps.pump.omnipod.common.bledriver.comm.endecrypt.EnDecrypt import app.aaps.pump.omnipod.common.bledriver.comm.exceptions.CouldNotParseResponseException +import app.aaps.pump.omnipod.common.bledriver.comm.exceptions.MessageIOException import app.aaps.pump.omnipod.common.bledriver.comm.message.MessageIO import app.aaps.pump.omnipod.common.bledriver.comm.message.MessagePacket import app.aaps.pump.omnipod.common.bledriver.comm.message.MessageSendErrorConfirming import app.aaps.pump.omnipod.common.bledriver.comm.message.MessageSendErrorSending +import app.aaps.pump.omnipod.common.bledriver.comm.message.MessageSendResult import app.aaps.pump.omnipod.common.bledriver.comm.message.MessageSendSuccess import app.aaps.pump.omnipod.common.bledriver.comm.message.MessageType import app.aaps.pump.omnipod.common.bledriver.comm.message.StringLengthPrefixEncoding import app.aaps.pump.omnipod.common.bledriver.comm.message.StringLengthPrefixEncoding.Companion.parseKeys +import app.aaps.pump.omnipod.common.bledriver.comm.pair.CommandSigner import app.aaps.pump.omnipod.common.bledriver.pod.command.base.Command +import app.aaps.pump.omnipod.common.bledriver.pod.command.base.CommandType +import app.aaps.pump.omnipod.common.bledriver.pod.response.AlarmStatusResponse +import app.aaps.pump.omnipod.common.bledriver.pod.response.NakResponse import app.aaps.pump.omnipod.common.bledriver.pod.response.Response +import app.aaps.pump.omnipod.common.bledriver.pod.util.MessageUtil +import java.nio.ByteBuffer sealed class CommandSendResult object CommandSendSuccess : CommandSendResult() @@ -26,7 +34,17 @@ data class CommandSendErrorConfirming(val msg: String) : CommandSendResult() sealed class CommandReceiveResult data class CommandReceiveSuccess(val result: Response) : CommandReceiveResult() -data class CommandReceiveError(val msg: String) : CommandReceiveResult() + +/** + * The command failed, but [result] is non-null when the pod still sent a well-formed reply + * saying so - a NAK, or an alarm-status response reporting a fault. + * + * Carrying it matters: a fault arrives *as* a failed command, so discarding the response + * discards the only notice that the pod has faulted. Callers should still report the command + * as failed, but record the pod state the reply carries first (see + * `O5BleManagerImpl.sendCommand`). + */ +data class CommandReceiveError(val msg: String, val result: Response? = null) : CommandReceiveResult() data class CommandAckError(val result: Response, val msg: String) : CommandReceiveResult() class Session( @@ -34,11 +52,24 @@ class Session( private val msgIO: MessageIO, private val ids: Ids, val sessionKeys: SessionKeys, - val enDecrypt: EnDecrypt + val enDecrypt: EnDecrypt, + /** Non-null only for O5 connections (see [app.aaps.pump.omnipod.common.bledriver.comm + * .legacy.session.O5Connection.establishSession]) - Dash has no certificate/ECDSA + * pairing infrastructure and never signs commands, so its `Connection + * .establishSession` leaves this at its default null. */ + private val commandSigner: CommandSigner? = null ) { + /** The 4-bit command-header sequence number (see [app.aaps.pump.omnipod.common + * .bledriver.pod.command.base.HeaderEnabledCommand.encodeHeader]) of the last command + * sent - the response envelope must echo this back (see [parseResponse]'s O5-only + * validation). Distinct from [SessionKeys.msgSequenceNumber], the outer BLE + * MessagePacket-level sequence number this class manages separately. */ + private var lastSentCommandSequenceNumber: Short? = null + fun sendCommand(cmd: Command): CommandSendResult { sessionKeys.msgSequenceNumber++ + lastSentCommandSequenceNumber = cmd.sequenceNumber aapsLogger.debug(LTag.PUMPBTCOMM, "Sending command: ${cmd.encoded.toHex()} in packet $cmd") val msg = getCmdMessage(cmd) @@ -83,18 +114,6 @@ class Session( val response = parseResponse(decrypted) - /*if (!responseType.isInstance(response)) { - if (response is AlarmStatusResponse) { - throw PodAlarmException(response) - } - if (response is NakResponse) { - throw NakResponseException(response) - } - throw IllegalResponseException(responseType, response) - } - - */ - sessionKeys.msgSequenceNumber++ val ack = getAck(responseMsgPacket) aapsLogger.debug(LTag.PUMPBTCOMM, "Sending ACK: ${ack.payload.toHex()} in packet $ack") @@ -102,6 +121,9 @@ class Session( if (sendResult !is MessageSendSuccess) { return CommandAckError(response, "Could not ACK the response: $sendResult") } + if (response is NakResponse || response is AlarmStatusResponse) { + return CommandReceiveError("Pod rejected command or reported a fault: $response", response) + } return CommandReceiveSuccess(response) } @@ -111,18 +133,97 @@ class Session( val data = parseKeys(arrayOf(RESPONSE_PREFIX), decrypted.payload)[0] aapsLogger.info(LTag.PUMPBTCOMM, "Received decrypted response: ${data.toHex()} in packet: $decrypted") - // TODO verify length - - // val uniqueId = data.copyOfRange(0, 4) - // val lenghtAndSequenceNumber = data.copyOfRange(4, 6) + if (data.size < RESPONSE_ENVELOPE_MIN_SIZE) { + aapsLogger.warn(LTag.PUMPBTCOMM, "Response envelope shorter than expected (${data.size} bytes): ${data.toHex()}") + } else { + val uniqueId = data.copyOfRange(0, 4) + val lengthAndSequenceNumber = data.copyOfRange(4, 6) + val crc = data.copyOfRange(data.size - 2, data.size) + aapsLogger.debug( + LTag.PUMPBTCOMM, + "Response envelope fields: uniqueId=${uniqueId.toHex()}, lengthAndSequenceNumber=${lengthAndSequenceNumber.toHex()}, " + + "crc=${crc.toHex()}" + ) + if (commandSigner != null) { + validateCrc(data) + lastSentCommandSequenceNumber?.let { validateSequenceNumber(lengthAndSequenceNumber, it) } + } + } val payload = data.copyOfRange(6, data.size - 2) - // val crc = data.copyOfRange(data.size - 2, data.size) - - // TODO validate uniqueId, sequenceNumber and crc return ResponseUtil.parseResponse(payload) } + /** + * Checks the response envelope's trailing CRC, which an Omnipod 5 pod computes over + * everything preceding it with the same [MessageUtil.createCrc] this driver already uses + * for outgoing messages. + * + * Rejecting a mismatch matters more than it looks: a badly mangled response would fail to + * parse anyway (`ResponseUtil.parseResponse` throws on an unrecognized type), so the case + * this actually catches is a *subtly* corrupted status response that still parses - wrong + * insulin-delivered counters, reservoir level, or delivery-status bits silently entering + * pod state and IOB. Throwing here routes the command into the existing undefined-state + * path ([CommandSendErrorConfirming]) instead of confirming it with corrupt data. + * + * O5-only, and that restriction is load-bearing. Pinned against captured traffic from two + * pods of each generation: + * - Omnipod 5 (`002a1c6e`, from a Trio installation that hit a real transient corruption + * incident): 495 of 495 pod-generated responses satisfy this CRC, as do all 518 outgoing + * messages - 1013 of 1013 overall. + * - Dash (`1749dbcb`, `podTypeValue: 4` in a Loop Report): outgoing messages satisfy it, + * pod responses never do. No initial value in the whole 16-bit space and no byte range + * reproduces them, which is why this must not run on a Dash connection. + * + * Community confirmation of the same split, from the Omnipod 5 testing discussion: "The + * DASH pods do not check the CRC... The Eros and Omnipod 5 pods both do apply the CRC + * check before accepting a command." + */ + @Throws(CouldNotParseResponseException::class) + internal fun validateCrc(data: ByteArray) { + val actual = ByteBuffer.wrap(data, data.size - 2, 2).short.toInt() and 0xffff + val expected = MessageUtil.createCrc(data.copyOfRange(0, data.size - 2)).toInt() and 0xffff + if (actual != expected) { + throw CouldNotParseResponseException( + "Response CRC mismatch: expected %04x, got %04x".format(expected, actual) + ) + } + } + + /** + * Checks that the pod echoed back the sequence number this protocol expects for a + * response: **the request's sequence number plus one**, wrapped to 4 bits - not the + * request's own number. OmnipodKit does the same, explicitly, in + * BleMessageTransport.sendMessage(): it sets `messageNumber = message.sequenceNum` and + * then calls `incrementMessageNumber()` with the comment "bump to match expected + * Omnipod message # in response", before readAndAckResponse() compares against it. + * + * Confirmed against real Omnipod 5 traffic (a working Loop/Trio installation's Device + * Communication Log): every request/response pair shows response == request + 1, e.g. + * requests with sequence 1/2/3/14 drew responses with sequence 2/3/4/15. An earlier + * revision of this method compared against the request's own number and so would have + * rejected every response the pod ever sent. + * + * [lengthAndSequenceNumber] packs the number the same way + * [app.aaps.pump.omnipod.common.bledriver.pod.command.base.HeaderEnabledCommand + * .encodeHeader] does for outgoing commands - bits 13-10 of the big-endian short + * (bit 15 = multi-command flag, bits 9-0 = body length). + * + * Internal (rather than private) to allow unit testing within this module against + * captured byte arrays, without simulating a full encrypted round trip. + */ + @Throws(CouldNotParseResponseException::class) + internal fun validateSequenceNumber(lengthAndSequenceNumber: ByteArray, sentSequenceNumber: Short) { + val packed = ByteBuffer.wrap(lengthAndSequenceNumber).short.toInt() + val actual = (packed shr 10) and 0x0f + val expected = (sentSequenceNumber.toInt() + 1) and 0x0f + if (actual != expected) { + throw CouldNotParseResponseException( + "Response sequence number mismatch: expected $expected (sent ${sentSequenceNumber.toInt() and 0x0f} + 1), got $actual" + ) + } + } + private fun getAck(response: MessagePacket): MessagePacket { val msg = MessagePacket( type = MessageType.ENCRYPTED, @@ -145,8 +246,9 @@ class Session( aapsLogger.debug(LTag.PUMPBTCOMM, "Sending command: ${wrapped.toHex()}") + val needsSigning = commandSigner != null && cmd.commandType in SIGNED_COMMAND_TYPES val msg = MessagePacket( - type = MessageType.ENCRYPTED, + type = if (needsSigning) MessageType.ENCRYPTED_SIGNED else MessageType.ENCRYPTED, sequenceNumber = sessionKeys.msgSequenceNumber, source = ids.myId, destination = ids.podId, @@ -154,7 +256,95 @@ class Session( eqos = 1 ) - return enDecrypt.encrypt(msg) + val encrypted = enDecrypt.encrypt(msg) + return if (needsSigning) sign(encrypted) else encrypted + } + + /** + * Appends a raw (r||s, 64-byte) P-256 ECDSA signature to an already AES-CCM-encrypted + * O5 command - confirmed against OmnipodKit's BleMessageTransport.swift getCmdMessage(): + * real O5 pod firmware rejects insulin-schedule/deactivate/cancel-delivery commands + * (this codebase's [CommandType.PROGRAM_BASAL]/[CommandType.PROGRAM_TEMP_BASAL]/ + * [CommandType.PROGRAM_BOLUS]/[CommandType.PROGRAM_INSULIN]/[CommandType.DEACTIVATE]/ + * [CommandType.STOP_DELIVERY] - the first four always embed a + * [app.aaps.pump.omnipod.common.bledriver.pod.command.ProgramInsulinCommand] interlock + * block, which is why the Swift original's block-list check treats them the same as a + * standalone [CommandType.PROGRAM_INSULIN]) without this signature, even though every + * other command type is accepted unsigned. The signed byte range is the 16-byte AAD + * header plus the ciphertext+tag - i.e. everything [enDecrypt]'s AES-CCM authenticates, + * signed on top for an extra pod-side check that the command really came from the + * paired controller identity. Matches [EnDecrypt.decrypt]'s own AAD extraction + * (`asByteArray().copyOfRange(0, 16)`), so a receiver reconstructing this input from the + * wire bytes gets byte-identical input to what was signed here. + */ + private fun sign(encrypted: MessagePacket): MessagePacket { + val aad = encrypted.asByteArray(forEncryption = false).copyOfRange(0, 16) + val signature = requireNotNull(commandSigner) { "sign() called without a commandSigner" } + .signRaw(aad + encrypted.payload) + return encrypted.copy(signatureData = signature) + } + + /** + * Sends a raw O5 "AID setup" command payload (see [app.aaps.pump.omnipod.common + * .bledriver.pod.command.aid.O5AidSetupCommands]) and returns the decrypted response + * with [expectedResponsePrefix] stripped. Distinct from [sendCommand]/ + * [readAndAckResponse]: AID setup commands use a plain ASCII `key=value` wire format, + * not the `"S0.0=...,G0.0"` SLPE envelope [getCmdMessage] builds for ordinary + * [Command]s, and their responses aren't the binary [app.aaps.pump.omnipod.common + * .bledriver.pod.response.ResponseUtil] envelope either - just an ASCII prefix + * followed by raw bytes. Always sent as plain [MessageType.ENCRYPTED], never signed - + * confirmed against OmnipodKit's own sendO5AidCommand(), which never takes the + * Type-4-signing path (only the commands [sign] handles do). Throws on any protocol + * failure rather than returning a result type, matching the reference's + * o5SendAidSetupCommands(): any failure here must abort pod activation outright rather + * than silently continuing with a pod that never received this data. + */ + @Suppress("ThrowsCount") + fun sendAidSetupCommand(payload: ByteArray, expectedResponsePrefix: String): ByteArray { + sessionKeys.msgSequenceNumber++ + val msg = MessagePacket( + type = MessageType.ENCRYPTED, + sequenceNumber = sessionKeys.msgSequenceNumber, + source = ids.myId, + destination = ids.podId, + payload = payload, + eqos = 1 + ) + val encrypted = enDecrypt.encrypt(msg) + + var sendResult: MessageSendResult = MessageSendErrorSending("AID setup command not sent") + for (i in 0..MAX_TRIES) { + sendResult = msgIO.sendMessage(encrypted) + if (sendResult is MessageSendSuccess) break + } + if (sendResult !is MessageSendSuccess) { + throw MessageIOException("Could not send AID setup command: $sendResult") + } + + var responseMsgPacket: MessagePacket? = null + for (i in 0..MAX_TRIES) { + responseMsgPacket = msgIO.receiveMessage() + if (responseMsgPacket != null) break + } + val received = responseMsgPacket ?: throw MessageIOException("Could not read AID setup response") + + val decrypted = enDecrypt.decrypt(received) + sessionKeys.msgSequenceNumber++ + val ack = getAck(received) + val ackResult = msgIO.sendMessage(ack) + if (ackResult !is MessageSendSuccess) { + throw MessageIOException("Could not ACK AID setup response: $ackResult") + } + + val prefixBytes = expectedResponsePrefix.toByteArray(Charsets.US_ASCII) + if (decrypted.payload.size < prefixBytes.size || + !decrypted.payload.copyOfRange(0, prefixBytes.size).contentEquals(prefixBytes) + ) { + throw MessageIOException( + "AID setup response missing expected prefix '$expectedResponsePrefix': ${decrypted.payload.toHex()}" + ) + } + return decrypted.payload.copyOfRange(prefixBytes.size, decrypted.payload.size) } companion object { @@ -163,6 +353,26 @@ class Session( private const val COMMAND_SUFFIX = ",G0.0" private const val RESPONSE_PREFIX = "0.0=" + /** 4-byte uniqueId + 2-byte length/sequence + 2-byte CRC surrounding the payload. */ + private const val RESPONSE_ENVELOPE_MIN_SIZE = 8 + private const val MAX_TRIES = 4 + + /** + * O5-only command types that real pod firmware rejects unless sent as + * [MessageType.ENCRYPTED_SIGNED] - see [sign]'s doc comment for why + * [CommandType.PROGRAM_BASAL]/[CommandType.PROGRAM_TEMP_BASAL]/ + * [CommandType.PROGRAM_BOLUS] are included alongside the standalone + * [CommandType.PROGRAM_INSULIN]/[CommandType.DEACTIVATE]/[CommandType.STOP_DELIVERY] + * types the Swift reference's own block-list check names directly. + */ + private val SIGNED_COMMAND_TYPES = setOf( + CommandType.PROGRAM_BASAL, + CommandType.PROGRAM_TEMP_BASAL, + CommandType.PROGRAM_BOLUS, + CommandType.PROGRAM_INSULIN, + CommandType.DEACTIVATE, + CommandType.STOP_DELIVERY + ) } } diff --git a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/session/SessionEstablisher.kt b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/session/SessionEstablisher.kt index 47d0da2d4b30..81c3c151f347 100644 --- a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/session/SessionEstablisher.kt +++ b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/session/SessionEstablisher.kt @@ -44,11 +44,14 @@ class SessionEstablisher( if (sendResult !is MessageSendSuccess) { throw SessionEstablishmentException("Could not send the EAP AKA challenge: $sendResult") } + aapsLogger.debug(LTag.PUMPBTCOMM, "EAP-AKA: challenge sent (seq=$msgSeq), awaiting response") val challengeResponse = msgIO.receiveMessage() ?: throw SessionEstablishmentException("Could not establish session") + aapsLogger.debug(LTag.PUMPBTCOMM, "EAP-AKA: challenge response received (${challengeResponse.payload.size} bytes)") val newSqn = processChallengeResponse(challengeResponse) if (newSqn != null) { + aapsLogger.debug(LTag.PUMPBTCOMM, "EAP-AKA: resynchronization required, new SQN=$newSqn") return SessionNegotiationResynchronization( synchronizedEapSqn = newSqn, msgSequenceNumber = msgSeq @@ -58,6 +61,7 @@ class SessionEstablisher( msgSeq++ val success = eapSuccess() msgIO.sendMessage(success) + aapsLogger.debug(LTag.PUMPBTCOMM, "EAP-AKA: session keys negotiated, EAP-Success sent (seq=$msgSeq)") return SessionKeys( ck = milenage.ck, diff --git a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/command/ProgramBolusCommand.kt b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/command/ProgramBolusCommand.kt index 0446fa6b6a2c..a879123a8bb6 100644 --- a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/command/ProgramBolusCommand.kt +++ b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/command/ProgramBolusCommand.kt @@ -16,20 +16,38 @@ class ProgramBolusCommand private constructor( multiCommandFlag: Boolean, private val programReminder: ProgramReminder, private val numberOfTenthPulses: Short, - private val delayUntilFirstTenthPulseInUsec: Int + private val delayUntilFirstTenthPulseInUsec: Int, + private val o5BolusInfo: O5BolusInfo? ) : HeaderEnabledCommand(CommandType.PROGRAM_BOLUS, uniqueId, sequenceNumber, multiCommandFlag) { + /** The O5-only trailing fields - see this class's doc comment. [bolusSource] is + * "typically 1" per OmnipodKit's own comment; [mealUnitsTenthPulses]/ + * [correctionUnitsTenthPulses] are 0 for prime/cannula-insertion boluses. */ + class O5BolusInfo( + val bolusSource: Byte, + val mealUnitsTenthPulses: Short, + val correctionUnitsTenthPulses: Short + ) + override val encoded: ByteArray get() { - val bolusCommand = ByteBuffer.allocate(LENGTH.toInt()) + val length = if (o5BolusInfo != null) O5_LENGTH else LENGTH + val bodyLength = if (o5BolusInfo != null) O5_BODY_LENGTH else BODY_LENGTH + val bolusCommandBuffer = ByteBuffer.allocate(length.toInt()) .put(commandType.value) - .put(BODY_LENGTH) + .put(bodyLength) .put(programReminder.encoded) .putShort(numberOfTenthPulses) .putInt(delayUntilFirstTenthPulseInUsec) .putShort(0.toShort()) // Extended bolus pulses .putInt(0) // Delay between tenth extended pulses in usec - .array() + if (o5BolusInfo != null) { + bolusCommandBuffer + .put(o5BolusInfo.bolusSource) + .putShort(o5BolusInfo.mealUnitsTenthPulses) + .putShort(o5BolusInfo.correctionUnitsTenthPulses) + } + val bolusCommand = bolusCommandBuffer.array() val interlockCommand = interlockCommand.encoded val header: ByteArray = encodeHeader( uniqueId, @@ -52,6 +70,7 @@ class ProgramBolusCommand private constructor( ", programReminder=" + programReminder + ", numberOfTenthPulses=" + numberOfTenthPulses + ", delayUntilFirstTenthPulseInUsec=" + delayUntilFirstTenthPulseInUsec + + ", o5BolusInfo=" + (o5BolusInfo != null) + ", commandType=" + commandType + ", uniqueId=" + uniqueId + ", sequenceNumber=" + sequenceNumber + @@ -64,6 +83,8 @@ class ProgramBolusCommand private constructor( private var numberOfUnits: Double? = null private var delayBetweenPulsesInEighthSeconds: Byte? = null private var programReminder: ProgramReminder? = null + private var mealUnits: Double? = null + private var correctionUnits: Double? = null fun setNumberOfUnits(numberOfUnits: Double): Builder { require(numberOfUnits > 0.0) { "Number of units should be greater than zero" } @@ -82,6 +103,14 @@ class ProgramBolusCommand private constructor( return this } + /** O5 only - selects the O5 wire format (see this class's doc comment). Must NOT be + * called for Dash/Eros, which use the original, shorter format instead. */ + fun setO5BolusInfo(mealUnits: Double, correctionUnits: Double): Builder { + this.mealUnits = mealUnits + this.correctionUnits = correctionUnits + return this + } + override fun buildCommand(): ProgramBolusCommand { requireNotNull(numberOfUnits) { "numberOfUnits can not be null" } requireNotNull(delayBetweenPulsesInEighthSeconds) { "delayBetweenPulsesInEighthSeconds can not be null" } @@ -102,6 +131,13 @@ class ProgramBolusCommand private constructor( ProgramInsulinCommand.DeliveryType.BOLUS ) val delayUntilFirstTenthPulseInUsec = delayBetweenPulsesInEighthSeconds!! / 8 * 100000 + val o5BolusInfo = mealUnits?.let { meal -> + O5BolusInfo( + bolusSource = O5_BOLUS_SOURCE, + mealUnitsTenthPulses = Math.round(meal * 200).toShort(), + correctionUnitsTenthPulses = Math.round((correctionUnits ?: 0.0) * 200).toShort() + ) + } return ProgramBolusCommand( interlockCommand, uniqueId!!, @@ -109,7 +145,8 @@ class ProgramBolusCommand private constructor( multiCommandFlag, programReminder!!, (numberOfPulses * 10).toShort(), - delayUntilFirstTenthPulseInUsec + delayUntilFirstTenthPulseInUsec, + o5BolusInfo ) } } @@ -118,6 +155,10 @@ class ProgramBolusCommand private constructor( private const val LENGTH: Short = 15 private const val BODY_LENGTH: Byte = 13 + private const val O5_LENGTH: Short = 20 + private const val O5_BODY_LENGTH: Byte = 18 + private const val O5_BOLUS_SOURCE: Byte = 1 + private fun calculateChecksum(numberOfSlots: Byte, byte10And11: Short, numberOfPulses: Short): Short { return MessageUtil.calculateChecksum( ByteBuffer.allocate(7) diff --git a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/command/SetUniqueIdCommand.kt b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/command/SetUniqueIdCommand.kt index 3fcbb611e7b3..cd9891e786cb 100644 --- a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/command/SetUniqueIdCommand.kt +++ b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/command/SetUniqueIdCommand.kt @@ -23,7 +23,7 @@ class SetUniqueIdCommand private constructor( .put(BODY_LENGTH) .putInt(uniqueId) .put(0x14.toByte()) // FIXME ?? - .put(0x04.toByte()) // FIXME ?? + .put(PACKET_TIMEOUT_LIMIT) // FIXME ?? .put(encodeInitializationTime(initializationTime)) .putInt(lotNumber) .putInt(podSequenceNumber) @@ -83,6 +83,10 @@ class SetUniqueIdCommand private constructor( private const val DEFAULT_UNIQUE_ID = -1 private const val LENGTH: Short = 21 private const val BODY_LENGTH: Byte = 19 + + /** Identified via OmnipodKit's SetupPodCommand.swift, where the equivalent byte is a + * named `packetTimeoutLimit` field (default 4) rather than an unexplained constant. */ + private const val PACKET_TIMEOUT_LIMIT: Byte = 0x04 private fun encodeInitializationTime(date: Date): ByteArray { val instance = Calendar.getInstance() instance.time = date diff --git a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/command/insulin/program/util/ProgramBasalUtil.kt b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/command/insulin/program/util/ProgramBasalUtil.kt index 2e6af90f5ab2..9503ca6a2682 100644 --- a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/command/insulin/program/util/ProgramBasalUtil.kt +++ b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/command/insulin/program/util/ProgramBasalUtil.kt @@ -37,9 +37,9 @@ object ProgramBasalUtil { (previousTenthPulsesPerSlot * numberOfSlotsInCurrentElement).toShort() ) ) + startSlotIndex = (numberOfSlotsInCurrentElement + startSlotIndex).toByte() previousTenthPulsesPerSlot = tenthPulsesPerSlot[i] numberOfSlotsInCurrentElement = 1 - startSlotIndex = (numberOfSlotsInCurrentElement + startSlotIndex).toByte() } else { numberOfSlotsInCurrentElement++ } diff --git a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/definition/ActivationProgress.kt b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/definition/ActivationProgress.kt index 93b43ee81a0f..43add1bbc45f 100644 --- a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/definition/ActivationProgress.kt +++ b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/definition/ActivationProgress.kt @@ -3,6 +3,19 @@ package app.aaps.pump.omnipod.common.bledriver.pod.definition enum class ActivationProgress { NOT_STARTED, GOT_POD_VERSION, + + /** O5-only: the AID setup command batch (see [app.aaps.pump.omnipod.common.bledriver + * .pod.command.aid.O5AidSetupCommands]) has been sent. Confirmed directly against + * OmnipodKit's BlePodComms.swift: pairPod() sends AssignAddressCommand (opcode 0x07 - + * the exact same wire command as [app.aaps.pump.omnipod.common.bledriver.pod.command + * .GetVersionCommand] here, just kept under its historical Eros-era name upstream) + * and only *after* that completes does handleO5Setup() run the AID batch, immediately + * before SetupPod (0x03, [app.aaps.pump.omnipod.common.bledriver.pod.command + * .SetUniqueIdCommand] here). Must come after [GOT_POD_VERSION], not before it - an + * earlier version of this code had it reversed. Dash's activation flow skips straight + * past this state (it has no such requirement), so it costs Dash nothing to have this + * ordinal exist. */ + AID_SETUP, SET_UNIQUE_ID, PROGRAMMED_LOW_RESERVOIR_ALERTS, REPROGRAMMED_LUMP_OF_COAL_ALERT, diff --git a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/definition/BasalProgram.kt b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/definition/BasalProgram.kt index cfaef788fd7b..31d27558e46c 100644 --- a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/definition/BasalProgram.kt +++ b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/definition/BasalProgram.kt @@ -6,11 +6,14 @@ class BasalProgram( segments: List ) { - val segments: MutableList = segments.toMutableList() - get() = Collections.unmodifiableList(field) + private var mutableSegmentsOrNull: MutableList? = segments.toMutableList() + private val mutableSegments: MutableList + get() = mutableSegmentsOrNull ?: mutableListOf().also { mutableSegmentsOrNull = it } + + val segments: MutableList get() = Collections.unmodifiableList(mutableSegments) fun addSegment(segment: Segment) { - segments.add(segment) + mutableSegments.add(segment) } fun hasZeroUnitSegments() = segments.any { it.basalRateInHundredthUnitsPerHour == 0 } diff --git a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/definition/PodType.kt b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/definition/PodType.kt new file mode 100644 index 000000000000..dd649de4b0f3 --- /dev/null +++ b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/definition/PodType.kt @@ -0,0 +1,86 @@ +package app.aaps.pump.omnipod.common.bledriver.pod.definition + +/** + * Unified pod type, identified by the productId byte returned in a pod's VersionResponse. + * + * Ported from OmnipodKit's PodType.swift (loopandlearn/OmnipodKit) to support Eros, Dash, + * and Omnipod 5 pods under a single model so BLE scanning/pairing/command logic can branch + * on pod type instead of assuming Dash-only, as the existing bledriver package did. + */ +enum class PodType(val value: Int) { + + /** Can be used before the actual pod type is known. */ + UNKNOWN(0x0), + + /** Omnipod Eros (PM=PI=2.x.y), AKA "Omnipod Classic (gen 3)". Uses RileyLink. */ + EROS(0x2), + + + /** Omnipod DASH: either TWI board (firmware 4.x.y) or NXP BLE (firmware 3.x.y). */ + DASH(0x4), + + /** Omnipod 5. Value still needs independent verification against real pod hardware. */ + OMNIPOD_5(0x5); + + companion object { + + private const val NEAR_ZERO_BASAL_RATE = 0.01 + + fun fromValue(value: Int): PodType = + entries.firstOrNull { it.value == value } ?: UNKNOWN + } + + val briefName: String + get() = when (this) { + UNKNOWN -> "" + EROS -> "Eros" + DASH -> "DASH" + OMNIPOD_5 -> "O5" + } + + val fullName: String + get() = when (this) { + UNKNOWN -> "Omnipod" + EROS -> "Omnipod Classic" + DASH -> "Omnipod DASH" + OMNIPOD_5 -> "Omnipod 5" + } + + /** DASH uses a blue needle tab; both Eros and O5 pods use a clear tab. */ + val tabColor: String + get() = if (this == DASH) "blue" else "clear" + + /** Only Eros pods use a RileyLink for communication. */ + val usesRileyLink: Boolean + get() = this == EROS + + /** Only Eros pods report an RSSI value in DetailedStatus. */ + val reportsRSSI: Boolean + get() = this == EROS + + /** + * Non-Eros pods use a small near-zero basal rate for pulse timing purposes + * when the actual programmed basal rate is zero. + */ + val zeroBasalRate: Double + get() = if (this == EROS) 0.0 else NEAR_ZERO_BASAL_RATE + + /** + * Top byte used when constructing the fixed 32-bit controller Id: + * - Eros PDMs use 0x1F for the top byte. + * - Dash PDMs use 0x17, with the bottom 5 nibbles derived from the PDM serial number << 2. + * - Omnipod 5 PDMs appear to follow the same SN-based scheme as Dash; the top byte value + * below is a placeholder pending confirmation against real O5 pairing traffic. + */ + val topIdByte: Int + get() = when (this) { + EROS -> 0x1F + DASH -> 0x17 + OMNIPOD_5 -> 0x00 + UNKNOWN -> 0x00 + } + + val isEros: Boolean get() = this == EROS + val isDash: Boolean get() = this == DASH + val isO5: Boolean get() = this == OMNIPOD_5 +} diff --git a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/definition/PulseLogEntry.kt b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/definition/PulseLogEntry.kt new file mode 100644 index 000000000000..124ba7864854 --- /dev/null +++ b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/definition/PulseLogEntry.kt @@ -0,0 +1,95 @@ +package app.aaps.pump.omnipod.common.bledriver.pod.definition + +/** + * What kind of delivery activity a [PulseLogEntry] represents - the `ppp` bit-field + * documented on the openaps/openomni wiki's "Pulse Log Entry" page. + */ +enum class PulseLogEntryType(val value: Int) { + + NONE(0), + BASAL(1), + TEMP_BASAL(2), + BOLUS(3), + EXTENDED_BOLUS(4), + UNKNOWN(-1); + + companion object { + + fun fromValue(value: Int): PulseLogEntryType = entries.firstOrNull { it.value == value } ?: UNKNOWN + } +} + +/** + * A single decoded pulse-log dword, as returned in status pages 3/80/81 ([PodInfoPulseLogPlusResponse] + * /[PodInfoPulseLogRecentResponse]/[PodInfoPulseLogPreviousResponse] - see + * `app.aaps.pump.omnipod.common.bledriver.pod.response`). Bit layout ("eeeeee0a pppliiib + * cccccccc dfgggggg") and field meanings are documented on the openaps/openomni project's + * wiki (github.com/openaps/openomni/wiki/Pulse-Log-Entry) - the only place either OmnipodKit + * or this codebase's own (production) Eros pulse-log classes turned out to have any semantic + * decoding at all; both of those just store/display the raw dwords. + * + * [loadCountVal] is deliberately NOT converted to an insulin-unit amount here - the wiki + * documents it as a motor-load measurement (`LoadCountVal = (((LOADCNT & 0x1FF) * 1000) + + * 488) / 976`), not a pulse count, and no source found ties it to a confirmed units-per-count + * scaling factor. Treat it as a diagnostic/relative value, not a dose quantity - asserting a + * specific insulin amount here without that confirmation would be actively misleading in a + * dosing-history context. + * + * Verified against the wiki's own worked example: dword `0x51213E00` decodes to + * encoder=20, drivingFlag=LOAD2, pulseMode=BASAL, immediateBolusTick=0, loadCountVal=125, + * faultFlag=false - matching this class's [PulseLogEntryTest] golden-value test exactly. + */ +data class PulseLogEntry( + /** 6-bit encoder count (`eeeeee`, bits 31-26). */ + val encoder: Int, + /** Which of the two drive coils is active (`a`, bit 24) - false = LOAD1, true = LOAD2. */ + val load2Active: Boolean, + /** What kind of delivery this entry represents (`ppp`, bits 23-21). */ + val pulseMode: PulseLogEntryType, + /** Low-reservoir signal at the time of this entry (`l`, bit 20). */ + val lowReservoir: Boolean, + /** Immediate-bolus tick counter, in quarter-seconds (`iii`, bits 19-17). */ + val immediateBolusTick: Int, + /** Motor-load measurement for this entry (`b`+`cccccccc`, bits 16-8) - see this class's + * doc comment for why this is not converted to an insulin-unit amount. */ + val loadCountVal: Int, + /** Last analog comparator read (`d`, bit 7) - motor-diagnostic bit. */ + val lastComparatorRead: Boolean, + /** Encoder-validation fault flag (`f`, bit 6). */ + val faultFlag: Boolean, + /** Signed 6-bit last computed encoder value (`gggggg`, bits 5-0) - 0 is nominal. */ + val lastEncoderValue: Int +) { + + companion object { + + fun decode(dword: Int): PulseLogEntry { + val encoder = (dword ushr 26) and 0x3F + val load2Active = ((dword ushr 24) and 0x1) != 0 + val pulseMode = PulseLogEntryType.fromValue((dword ushr 21) and 0x7) + val lowReservoir = ((dword ushr 20) and 0x1) != 0 + val immediateBolusTick = (dword ushr 17) and 0x7 + val loadCountValHigh = (dword ushr 8) and 0xFF + val loadCountValLow = (dword ushr 16) and 0x1 + val loadCountVal = (loadCountValHigh shl 1) or loadCountValLow + val lastComparatorRead = ((dword ushr 7) and 0x1) != 0 + val faultFlag = ((dword ushr 6) and 0x1) != 0 + val encoderRaw = dword and 0x3F + val lastEncoderValue = if (encoderRaw and 0x20 != 0) encoderRaw - 64 else encoderRaw + + return PulseLogEntry( + encoder = encoder, + load2Active = load2Active, + pulseMode = pulseMode, + lowReservoir = lowReservoir, + immediateBolusTick = immediateBolusTick, + loadCountVal = loadCountVal, + lastComparatorRead = lastComparatorRead, + faultFlag = faultFlag, + lastEncoderValue = lastEncoderValue + ) + } + + fun decodeAll(dwords: List): List = dwords.map { decode(it) } + } +} diff --git a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/response/PodInfoActivationTimeResponse.kt b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/response/PodInfoActivationTimeResponse.kt new file mode 100644 index 000000000000..3fdb95d60fef --- /dev/null +++ b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/response/PodInfoActivationTimeResponse.kt @@ -0,0 +1,46 @@ +package app.aaps.pump.omnipod.common.bledriver.pod.response + +import app.aaps.pump.omnipod.common.bledriver.pod.definition.AlarmType +import app.aaps.pump.omnipod.common.bledriver.pod.response.ResponseType.StatusResponseType +import app.aaps.pump.omnipod.common.bledriver.pod.util.byValue +import java.nio.ByteBuffer + +/** + * Status page 5 - pod activation date/time plus fault event code & fault time (same + * fault info [AlarmStatusResponse] reports, available here even without a live alarm + * status query). [year] is the raw 2-digit value the pod reports (e.g. 26 for 2026) - + * converting to a full year/epoch timestamp is left to the caller. + * + * Byte layout ported from OmnipodKit's PodInfoActivationTime.swift - see + * [PodInfoTriggeredAlertsResponse]'s doc comment for the +2 offset-mapping rationale. + */ +class PodInfoActivationTimeResponse( + encoded: ByteArray +) : AdditionalStatusResponseBase(StatusResponseType.STATUS_RESPONSE_PAGE_5, encoded) { + + val messageType: Byte = encoded[0] + val messageLength: Short = (encoded[1].toInt() and 0xff).toShort() + val additionalStatusResponseType: Byte = encoded[2] + val faultEventCode: AlarmType = byValue(encoded[3], AlarmType.UNKNOWN) + val faultTime: Short = ByteBuffer.wrap(byteArrayOf(encoded[4], encoded[5])).short + val month: Int = encoded[14].toInt() and 0xff + val day: Int = encoded[15].toInt() and 0xff + val year: Int = encoded[16].toInt() and 0xff + val hour: Int = encoded[17].toInt() and 0xff + val minute: Int = encoded[18].toInt() and 0xff + + override fun toString(): String { + return "PodInfoActivationTimeResponse(" + + "messageType=$messageType, " + + "messageLength=$messageLength, " + + "additionalStatusResponseType=$additionalStatusResponseType, " + + "faultEventCode=$faultEventCode, " + + "faultTime=$faultTime, " + + "month=$month, " + + "day=$day, " + + "year=$year, " + + "hour=$hour, " + + "minute=$minute" + + ")" + } +} diff --git a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/response/PodInfoPulseLogPlusResponse.kt b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/response/PodInfoPulseLogPlusResponse.kt new file mode 100644 index 000000000000..c95063b83c1f --- /dev/null +++ b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/response/PodInfoPulseLogPlusResponse.kt @@ -0,0 +1,52 @@ +package app.aaps.pump.omnipod.common.bledriver.pod.response + +import app.aaps.pump.omnipod.common.bledriver.pod.definition.AlarmType +import app.aaps.pump.omnipod.common.bledriver.pod.definition.PulseLogEntry +import app.aaps.pump.omnipod.common.bledriver.pod.response.ResponseType.StatusResponseType +import app.aaps.pump.omnipod.common.bledriver.pod.util.byValue +import java.nio.ByteBuffer + +/** + * Status page 3 - up to the last 60 pulse-log entries plus fault/activation-time + * info. Byte layout ported from OmnipodKit's PodInfoPulseLogPlus.swift - see + * [PodInfoTriggeredAlertsResponse]'s doc comment for the +2 offset-mapping rationale. + */ +class PodInfoPulseLogPlusResponse( + encoded: ByteArray +) : AdditionalStatusResponseBase(StatusResponseType.STATUS_RESPONSE_PAGE_3, encoded) { + + val messageType: Byte = encoded[0] + val messageLength: Short = (encoded[1].toInt() and 0xff).toShort() + val additionalStatusResponseType: Byte = encoded[2] + val faultEventCode: AlarmType = byValue(encoded[3], AlarmType.UNKNOWN) + val faultTime: Short = ByteBuffer.wrap(byteArrayOf(encoded[4], encoded[5])).short + val activationTime: Short = ByteBuffer.wrap(byteArrayOf(encoded[6], encoded[7])).short + val entrySize: Int = encoded[8].toInt() and 0xff + val maxEntries: Int = encoded[9].toInt() and 0xff + val pulseLog: List + + /** [pulseLog] decoded per-entry - see [PulseLogEntry]'s doc comment for what's confirmed + * vs. left as raw diagnostic values. */ + val decodedPulseLog: List by lazy { PulseLogEntry.decodeAll(pulseLog) } + + init { + require(entrySize == 4) { "Unexpected pulseLogPlus entry size: $entrySize" } + val logStartOffset = 10 + val nEntries = (encoded.size - logStartOffset) / 4 + pulseLog = parsePulseLog(encoded, logStartOffset, nEntries) + } + + override fun toString(): String { + return "PodInfoPulseLogPlusResponse(" + + "messageType=$messageType, " + + "messageLength=$messageLength, " + + "additionalStatusResponseType=$additionalStatusResponseType, " + + "faultEventCode=$faultEventCode, " + + "faultTime=$faultTime, " + + "activationTime=$activationTime, " + + "entrySize=$entrySize, " + + "maxEntries=$maxEntries, " + + "pulseLog=$pulseLog" + + ")" + } +} diff --git a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/response/PodInfoPulseLogPreviousResponse.kt b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/response/PodInfoPulseLogPreviousResponse.kt new file mode 100644 index 000000000000..2c0cfe5c0bea --- /dev/null +++ b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/response/PodInfoPulseLogPreviousResponse.kt @@ -0,0 +1,48 @@ +package app.aaps.pump.omnipod.common.bledriver.pod.response + +import app.aaps.pump.omnipod.common.bledriver.pod.definition.PulseLogEntry +import app.aaps.pump.omnipod.common.bledriver.pod.response.ResponseType.StatusResponseType +import java.nio.ByteBuffer + +/** + * Status page 81 (0x51) - like page 80, but the (up to) 50 pulse-log entries + * preceding the "recent" window. Byte layout ported from OmnipodKit's + * PodInfoPulseLog.swift (`PodInfoPulseLogPrevious`) - see + * [PodInfoTriggeredAlertsResponse]'s doc comment for the +2 offset-mapping rationale. + */ +class PodInfoPulseLogPreviousResponse( + encoded: ByteArray +) : AdditionalStatusResponseBase(StatusResponseType.STATUS_RESPONSE_PAGE_81, encoded) { + + val messageType: Byte = encoded[0] + val messageLength: Short = (encoded[1].toInt() and 0xff).toShort() + val additionalStatusResponseType: Byte = encoded[2] + + /** Entry count the pod reports; may exceed the number of entries actually + * returned in this payload, matching OmnipodKit's own cross-check. */ + val nEntries: Int = ByteBuffer.wrap(byteArrayOf(encoded[3], encoded[4])).short.toInt() and 0xffff + val pulseLog: List + + /** [pulseLog] decoded per-entry - see [PulseLogEntry]'s doc comment for what's confirmed + * vs. left as raw diagnostic values. */ + val decodedPulseLog: List by lazy { PulseLogEntry.decodeAll(pulseLog) } + + init { + val logStartOffset = 5 + val nEntriesCalculated = (encoded.size - logStartOffset) / 4 + require(nEntries <= nEntriesCalculated) { + "PulseLogPrevious reports $nEntries entries but only $nEntriesCalculated fit in ${encoded.size} bytes" + } + pulseLog = parsePulseLog(encoded, logStartOffset, nEntries) + } + + override fun toString(): String { + return "PodInfoPulseLogPreviousResponse(" + + "messageType=$messageType, " + + "messageLength=$messageLength, " + + "additionalStatusResponseType=$additionalStatusResponseType, " + + "nEntries=$nEntries, " + + "pulseLog=$pulseLog" + + ")" + } +} diff --git a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/response/PodInfoPulseLogRecentResponse.kt b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/response/PodInfoPulseLogRecentResponse.kt new file mode 100644 index 000000000000..d17bbc4ba11a --- /dev/null +++ b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/response/PodInfoPulseLogRecentResponse.kt @@ -0,0 +1,41 @@ +package app.aaps.pump.omnipod.common.bledriver.pod.response + +import app.aaps.pump.omnipod.common.bledriver.pod.definition.PulseLogEntry +import app.aaps.pump.omnipod.common.bledriver.pod.response.ResponseType.StatusResponseType +import java.nio.ByteBuffer + +/** + * Status page 80 (0x50) - the most recent (up to) 50 pulse-log entries. Byte layout + * ported from OmnipodKit's PodInfoPulseLog.swift (`PodInfoPulseLogRecent`) - see + * [PodInfoTriggeredAlertsResponse]'s doc comment for the +2 offset-mapping rationale. + */ +class PodInfoPulseLogRecentResponse( + encoded: ByteArray +) : AdditionalStatusResponseBase(StatusResponseType.STATUS_RESPONSE_PAGE_80, encoded) { + + val messageType: Byte = encoded[0] + val messageLength: Short = (encoded[1].toInt() and 0xff).toShort() + val additionalStatusResponseType: Byte = encoded[2] + val indexLastEntry: Int = ByteBuffer.wrap(byteArrayOf(encoded[3], encoded[4])).short.toInt() and 0xffff + val pulseLog: List + + /** [pulseLog] decoded per-entry - see [PulseLogEntry]'s doc comment for what's confirmed + * vs. left as raw diagnostic values. */ + val decodedPulseLog: List by lazy { PulseLogEntry.decodeAll(pulseLog) } + + init { + val logStartOffset = 5 + val nEntries = (encoded.size - logStartOffset) / 4 + pulseLog = parsePulseLog(encoded, logStartOffset, nEntries) + } + + override fun toString(): String { + return "PodInfoPulseLogRecentResponse(" + + "messageType=$messageType, " + + "messageLength=$messageLength, " + + "additionalStatusResponseType=$additionalStatusResponseType, " + + "indexLastEntry=$indexLastEntry, " + + "pulseLog=$pulseLog" + + ")" + } +} diff --git a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/response/PodInfoTriggeredAlertsResponse.kt b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/response/PodInfoTriggeredAlertsResponse.kt new file mode 100644 index 000000000000..845c1a29ee84 --- /dev/null +++ b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/response/PodInfoTriggeredAlertsResponse.kt @@ -0,0 +1,41 @@ +package app.aaps.pump.omnipod.common.bledriver.pod.response + +import app.aaps.pump.omnipod.common.bledriver.pod.definition.AlertType +import app.aaps.pump.omnipod.common.bledriver.pod.response.ResponseType.StatusResponseType +import java.nio.ByteBuffer + +/** + * Status page 1 - unacknowledged triggered-alert values, one per [AlertType] slot + * (pod-clock minutes-since-activation each alert fired, or 0 if never triggered). + * Byte layout ported from OmnipodKit's PodInfoTriggeredAlerts.swift; that reference + * implementation's `init` operates on a Data slice with the subtype byte already at + * index 0, so its documented offsets are shifted by +2 here to match this codebase's + * convention (used by [AlarmStatusResponse] etc.) of indexing the full response, + * including the messageType/length prefix. + */ +class PodInfoTriggeredAlertsResponse( + encoded: ByteArray +) : AdditionalStatusResponseBase(StatusResponseType.STATUS_RESPONSE_PAGE_1, encoded) { + + val messageType: Byte = encoded[0] + val messageLength: Short = (encoded[1].toInt() and 0xff).toShort() + val additionalStatusResponseType: Byte = encoded[2] + val unknownWord: Short = ByteBuffer.wrap(byteArrayOf(encoded[3], encoded[4])).short + val alertActivations: Map = AlertType.entries + .filter { it != AlertType.UNKNOWN } + .sortedBy { it.index } + .mapIndexed { i, slot -> + val offset = 5 + 2 * i + slot to ByteBuffer.wrap(byteArrayOf(encoded[offset], encoded[offset + 1])).short + }.toMap() + + override fun toString(): String { + return "PodInfoTriggeredAlertsResponse(" + + "messageType=$messageType, " + + "messageLength=$messageLength, " + + "additionalStatusResponseType=$additionalStatusResponseType, " + + "unknownWord=$unknownWord, " + + "alertActivations=$alertActivations" + + ")" + } +} diff --git a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/response/PulseLogUtil.kt b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/response/PulseLogUtil.kt new file mode 100644 index 000000000000..2c5826acabf7 --- /dev/null +++ b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/response/PulseLogUtil.kt @@ -0,0 +1,13 @@ +package app.aaps.pump.omnipod.common.bledriver.pod.response + +import java.nio.ByteBuffer + +/** Parses a trailing run of big-endian 32-bit pulse-log entries, shared by the + * status-page responses that carry one (types 3/80/81) - each entry is opaque, + * bit-packed telemetry, not a plain counter (see OmnipodKit's PodInfoPulseLog.swift + * `binaryDescription` debug helper), so no further interpretation happens here. */ +internal fun parsePulseLog(encoded: ByteArray, startOffset: Int, entryCount: Int): List = + (0 until entryCount).map { i -> + val base = startOffset + i * 4 + ByteBuffer.wrap(byteArrayOf(encoded[base], encoded[base + 1], encoded[base + 2], encoded[base + 3])).int + } diff --git a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/response/ResponseType.kt b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/response/ResponseType.kt index 180b8037ffe4..b397e3c4a4e8 100644 --- a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/response/ResponseType.kt +++ b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/response/ResponseType.kt @@ -17,8 +17,6 @@ enum class ResponseType(override val value: Byte) : HasValue { ALARM_STATUS(0x02.toByte()), STATUS_RESPONSE_PAGE_3(0x03.toByte()), STATUS_RESPONSE_PAGE_5(0x05.toByte()), - STATUS_RESPONSE_PAGE_6(0x06.toByte()), - STATUS_RESPONSE_PAGE_70(0x46.toByte()), STATUS_RESPONSE_PAGE_80(0x50.toByte()), STATUS_RESPONSE_PAGE_81(0x51.toByte()), UNKNOWN(0xff.toByte()); diff --git a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/util/BluetoothServiceUuids.kt b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/util/BluetoothServiceUuids.kt new file mode 100644 index 000000000000..ef85f7ceba95 --- /dev/null +++ b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/util/BluetoothServiceUuids.kt @@ -0,0 +1,66 @@ +package app.aaps.pump.omnipod.common.bledriver.pod.util + +import app.aaps.pump.omnipod.common.bledriver.pod.definition.PodType + +/** + * Centralized BLE service/characteristic UUIDs for Dash and Omnipod 5 pods, ported from + * OmnipodKit's BluetoothServices.swift (loopandlearn/OmnipodKit). + * + * Dash and O5 share the same GATT *service* UUID and *command* characteristic UUID - + * only the *data* characteristic and the pre-pairing advertisement UUID scheme differ. + * This is additive, standalone infrastructure: existing Dash code paths + * ([app.aaps.pump.omnipod.common.bledriver.comm.legacy.scan.BleDiscoveredDevice], + * [app.aaps.pump.omnipod.common.bledriver.comm.interfaces.scan.PodScanner]) still use + * their own inline UUID string literals and are untouched by this file; it exists so new + * pod-type-aware scanning code has one correct place to read these values from instead of + * re-deriving them. + */ +object BluetoothServiceUuids { + + /** GATT service UUID, identical for Dash and O5. */ + const val SERVICE_UUID = "1A7E4024-E3ED-4464-8B7E-751E03D0DC5F" + + /** Command ("CMD") characteristic UUID, identical for Dash and O5. */ + const val COMMAND_CHARACTERISTIC_UUID = "1A7E2441-E3ED-4464-8B7E-751E03D0DC5F" + + /** Dash's data characteristic UUID. */ + const val DASH_DATA_CHARACTERISTIC_UUID = "1A7E2442-E3ED-4464-8B7E-751E03D0DC5F" + + /** O5's data characteristic UUID (differs from Dash's only in this one segment). */ + const val O5_DATA_CHARACTERISTIC_UUID = "1A7E2443-E3ED-4464-8B7E-751E03D0DC5F" + + /** Dash's 16-bit advertisement service UUID, used as a BLE scan filter. */ + const val DASH_ADVERTISEMENT_UUID = "00004024-0000-1000-8000-00805f9b34fb" + + /** + * O5's 128-bit advertisement service UUID *before pairing* (embeds a placeholder + * PDM id of 0xFFFFFFFE), used as a BLE scan filter. After pairing, a real pod's + * advertisement embeds the actual PDM id in the same position instead - see + * [o5AdvertisementUuidForPdmId]. + */ + const val O5_UNPAIRED_ADVERTISEMENT_UUID = "CE1F923D-C539-48EA-7300-0AFFFFFFFE00" + + /** + * O5 Heartbeat service, used for pod keep-alive. Distinct from the main pod + * service/characteristics above. + */ + const val O5_HEARTBEAT_SERVICE_UUID = "7DED7A6C-CA72-46A7-A3A2-6061F6FDCAEB" + const val O5_HEARTBEAT_ADVERTISEMENT_UUID = "ECF301E2-674B-4474-94D0-364F3AA653E6" + const val O5_HEARTBEAT_CHARACTERISTIC_UUID = "7DED7A6D-CA72-46A7-A3A2-6061F6FDCAEB" + + /** Builds the O5 advertisement UUID embedding a specific (already-paired) PDM id. */ + fun o5AdvertisementUuidForPdmId(pdmId: Long): String = + "CE1F923D-C539-48EA-7300-0A%08X00".format(pdmId and 0xFFFFFFFFL) + + /** The data characteristic UUID to use for a given [podType] (Dash or O5). */ + fun dataCharacteristicUuid(podType: PodType): String = when (podType) { + PodType.OMNIPOD_5 -> O5_DATA_CHARACTERISTIC_UUID + else -> DASH_DATA_CHARACTERISTIC_UUID + } + + /** The pre-pairing advertisement UUID to scan for, for a given [podType]. */ + fun unpairedAdvertisementUuid(podType: PodType): String = when (podType) { + PodType.OMNIPOD_5 -> O5_UNPAIRED_ADVERTISEMENT_UUID + else -> DASH_ADVERTISEMENT_UUID + } +} diff --git a/pump/omnipod/common/src/main/res/values/strings.xml b/pump/omnipod/common/src/main/res/values/strings.xml index 2a379d474c0a..5ab574a68b2a 100644 --- a/pump/omnipod/common/src/main/res/values/strings.xml +++ b/pump/omnipod/common/src/main/res/values/strings.xml @@ -52,6 +52,7 @@ Active Pod Alerts Firmware Version Time on Pod + Pod Activated At uncertain @@ -117,6 +118,7 @@ Pod Fault Inactive Pod Fault: %1$03d %2$s + Fault Occurred Pod will expire soon @@ -180,5 +182,37 @@ Pod Alert: %1$s Pod Alerts: %1$s + + + Omnipod 5 + O5 + Unconfirmed command + Omnipod 5 patch pump, running as a manual pod under AAPS\'s control. + Certificate store + Import and manage the Omnipod 5 pairing credential. + Not enough insulin left in the reservoir for this bolus. + A bolus is already in progress. + Setting the new basal profile might have failed. Refresh pod status to confirm or deny this. + Unable to verify whether the SMB bolus (%1$s U) succeeded. Refresh pod status to confirm or deny this command. + Bolus delivery status is uncertain. Refresh pod status to confirm or deny this command. + Setting the temp basal might have failed. Refresh pod status to confirm or deny this. + Cancelling the temp basal result is uncertain. Refresh pod status to confirm or deny this. + An earlier dose could not be confirmed with the pod, so a new one was not sent. Refresh pod status once the pod is reachable again. + Omnipod 5 driver does not support extended boluses + Omnipod 5 driver does not support TDD + No active alerts + No profile active + Fill a new Pod + with enough insulin for 3 days.\n\nListen for two beeps from the Pod during the filling process. These indicate that the minimum amount of 80U has been inserted. Be sure to completely empty the fill syringe, even after hearing the two beeps.\n\nAfter filling the Pod, please press Next.\n\nNote: do not remove the Pod\'s needle cap at this time. + Trying to pair with the new Pod and prime it.\n\nWhen the initialization process has successfully been completed, you can press Next. + + + Bluetooth Address + Connection quality + Delivery Status + Firmware %1$s / Bluetooth %2$s + Insulin delivery is suspended Pod Hard End \ No newline at end of file diff --git a/pump/omnipod/common/src/test/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/legacy/io/BleIOTest.kt b/pump/omnipod/common/src/test/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/legacy/io/BleIOTest.kt new file mode 100644 index 000000000000..ea20d45ec574 --- /dev/null +++ b/pump/omnipod/common/src/test/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/legacy/io/BleIOTest.kt @@ -0,0 +1,52 @@ +package app.aaps.pump.omnipod.common.bledriver.comm.legacy.io + +import android.bluetooth.BluetoothGattCharacteristic +import com.google.common.truth.Truth.assertThat +import org.junit.jupiter.api.Test +import org.mockito.kotlin.mock +import org.mockito.kotlin.whenever + +/** + * [BleIO.usesIndicate] - the notify-vs-indicate CCCD decision `readyToRead()` uses to set + * up the CMD/DATA characteristics. Real O5 pairing attempts consistently disconnect a few + * seconds after SPS0 is sent with no response ever received - this used to unconditionally + * assume indicate (correct for Dash, never verified for O5), so this pins the fix: the + * choice must follow the characteristic's own declared properties, the same way + * [app.aaps.pump.omnipod.common.bledriver.comm.legacy.session.O5Connection + * .enableHeartbeatNotifications] already does for the heartbeat characteristic. + */ +class BleIOTest { + + @Test + fun `usesIndicate is true when the characteristic declares PROPERTY_INDICATE`() { + val characteristic = mock() + whenever(characteristic.properties).thenReturn(BluetoothGattCharacteristic.PROPERTY_INDICATE) + + assertThat(BleIO.usesIndicate(characteristic)).isTrue() + } + + @Test + fun `usesIndicate is false when the characteristic only declares PROPERTY_NOTIFY`() { + val characteristic = mock() + whenever(characteristic.properties).thenReturn(BluetoothGattCharacteristic.PROPERTY_NOTIFY) + + assertThat(BleIO.usesIndicate(characteristic)).isFalse() + } + + @Test + fun `usesIndicate is true when the characteristic declares both properties - indicate is chosen`() { + val characteristic = mock() + whenever(characteristic.properties) + .thenReturn(BluetoothGattCharacteristic.PROPERTY_NOTIFY or BluetoothGattCharacteristic.PROPERTY_INDICATE) + + assertThat(BleIO.usesIndicate(characteristic)).isTrue() + } + + @Test + fun `usesIndicate is false when the characteristic declares neither property`() { + val characteristic = mock() + whenever(characteristic.properties).thenReturn(0) + + assertThat(BleIO.usesIndicate(characteristic)).isFalse() + } +} diff --git a/pump/omnipod/common/src/test/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/message/MessagePacketTest.kt b/pump/omnipod/common/src/test/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/message/MessagePacketTest.kt new file mode 100644 index 000000000000..df6506ef48b4 --- /dev/null +++ b/pump/omnipod/common/src/test/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/message/MessagePacketTest.kt @@ -0,0 +1,57 @@ +package app.aaps.pump.omnipod.common.bledriver.comm.message + +import app.aaps.pump.omnipod.common.bledriver.comm.Id +import com.google.common.truth.Truth.assertThat +import org.junit.jupiter.api.Test + +/** + * [MessagePacket.signatureData] (O5 Type-4/ENCRYPTED_SIGNED commands, see + * `Session.sign()`) must be appended after the payload on the wire but stay outside the + * 16-byte header's size field - the exact subtlety that would otherwise make a + * receiver's AAD reconstruction disagree with the sender's, silently breaking every + * signed command's AES-CCM tag. + */ +class MessagePacketTest { + + private fun packet(payload: ByteArray, signatureData: ByteArray? = null) = MessagePacket( + type = MessageType.ENCRYPTED_SIGNED, + source = Id.fromInt(1), + destination = Id.fromInt(2), + payload = payload, + sequenceNumber = 1, + signatureData = signatureData + ) + + @Test + fun `signatureData is appended after the payload on the wire`() { + val payload = byteArrayOf(0x01, 0x02, 0x03) + val signature = ByteArray(64) { 0x7F } + + val bytes = packet(payload, signature).asByteArray() + + assertThat(bytes.size).isEqualTo(16 + payload.size + signature.size) + assertThat(bytes.copyOfRange(16, 16 + payload.size)).isEqualTo(payload) + assertThat(bytes.copyOfRange(16 + payload.size, bytes.size)).isEqualTo(signature) + } + + @Test + fun `the header's size field is unaffected by a trailing signature - only payload counts`() { + val payload = byteArrayOf(0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08) + val signature = ByteArray(64) { 0x11 } + + val unsigned = packet(payload, signatureData = null).asByteArray() + val signed = packet(payload, signatureData = signature).asByteArray() + + assertThat(signed.copyOfRange(6, 8)).isEqualTo(unsigned.copyOfRange(6, 8)) + assertThat(signed.copyOfRange(0, 16)).isEqualTo(unsigned.copyOfRange(0, 16)) + } + + @Test + fun `no signatureData means nothing extra is appended`() { + val payload = byteArrayOf(0x0A, 0x0B) + + val bytes = packet(payload, signatureData = null).asByteArray() + + assertThat(bytes.size).isEqualTo(16 + payload.size) + } +} diff --git a/pump/omnipod/common/src/test/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/packet/BlePacketLayoutTest.kt b/pump/omnipod/common/src/test/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/packet/BlePacketLayoutTest.kt new file mode 100644 index 000000000000..d5893d525938 --- /dev/null +++ b/pump/omnipod/common/src/test/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/packet/BlePacketLayoutTest.kt @@ -0,0 +1,48 @@ +package app.aaps.pump.omnipod.common.bledriver.comm.packet + +import app.aaps.pump.omnipod.common.bledriver.pod.definition.PodType +import app.aaps.shared.tests.TestBase +import com.google.common.truth.Truth.assertThat +import org.junit.jupiter.api.Test + +/** + * Pins [BlePacketLayout]'s derived capacities against the values that used to be hardcoded + * constants in [BlePacket] (Dash) and against OmnipodKit's BlePodProfile.swift (O5), so a + * future edit to the formulas can't silently drift from either. + */ +class BlePacketLayoutTest : TestBase() { + + @Test + fun `Dash layout reproduces the previously-hardcoded packet constants exactly`() { + val layout = BlePacketLayout.DASH + + assertThat(layout.maxPayloadSize).isEqualTo(20) + assertThat(layout.maxFragments).isEqualTo(15) + assertThat(layout.firstPacketCapacityWithoutMiddlePackets).isEqualTo(13) + assertThat(layout.firstPacketCapacityWithMiddlePackets).isEqualTo(18) + assertThat(layout.firstPacketCapacityWithOptionalPlusOnePacket).isEqualTo(18) + assertThat(layout.middlePacketCapacity).isEqualTo(19) + assertThat(layout.lastPacketCapacity).isEqualTo(14) + } + + @Test + fun `O5 layout matches OmnipodKit's BlePodProfile omnipod5 preset`() { + val layout = BlePacketLayout.OMNIPOD_5 + + assertThat(layout.maxPayloadSize).isEqualTo(244) + assertThat(layout.maxFragments).isEqualTo(15) + assertThat(layout.firstPacketCapacityWithoutMiddlePackets).isEqualTo(237) + assertThat(layout.firstPacketCapacityWithMiddlePackets).isEqualTo(242) + assertThat(layout.firstPacketCapacityWithOptionalPlusOnePacket).isEqualTo(242) + assertThat(layout.middlePacketCapacity).isEqualTo(243) + assertThat(layout.lastPacketCapacity).isEqualTo(238) + } + + @Test + fun `PodType blePacketLayout picks OMNIPOD_5 only for the O5 pod type`() { + assertThat(PodType.OMNIPOD_5.blePacketLayout).isEqualTo(BlePacketLayout.OMNIPOD_5) + assertThat(PodType.DASH.blePacketLayout).isEqualTo(BlePacketLayout.DASH) + assertThat(PodType.EROS.blePacketLayout).isEqualTo(BlePacketLayout.DASH) + assertThat(PodType.UNKNOWN.blePacketLayout).isEqualTo(BlePacketLayout.DASH) + } +} diff --git a/pump/omnipod/common/src/test/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/packet/PayloadSplitterJoinerTest.kt b/pump/omnipod/common/src/test/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/packet/PayloadSplitterJoinerTest.kt new file mode 100644 index 000000000000..b442ebe9a947 --- /dev/null +++ b/pump/omnipod/common/src/test/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/packet/PayloadSplitterJoinerTest.kt @@ -0,0 +1,190 @@ +package app.aaps.pump.omnipod.common.bledriver.comm.packet + +import app.aaps.pump.omnipod.common.bledriver.comm.message.CrcMismatchException +import app.aaps.shared.tests.TestBase +import com.google.common.truth.Truth.assertThat +import org.junit.jupiter.api.Assertions.assertThrows +import org.junit.jupiter.api.Test +import kotlin.random.Random + +/** + * Round-trips payloads through [PayloadSplitter] -> [BlePacket.toByteArray] -> [PayloadJoiner] + * for both [BlePacketLayout.DASH] and [BlePacketLayout.OMNIPOD_5]. + * + * The O5 sweep in particular targets the bug fixed alongside the O5 layout support: packet + * "rest"/size fields are on-wire unsigned bytes (0..255), but Kotlin's Byte is signed, so any + * payload whose last-packet remainder exceeds 127 previously sign-extended into a negative + * length and broke [PayloadJoiner] parsing. Dash never produced a remainder over 127 (its + * packets max out at 20 bytes), so this was unreachable there - O5's 244-byte packets reach it + * routinely for realistic message sizes (e.g. certificate-carrying pairing messages). + */ +class PayloadSplitterJoinerTest : TestBase() { + + private fun payloadOf(size: Int, seed: Int): ByteArray = Random(seed).nextBytes(size) + + private fun roundTrip(payload: ByteArray, layout: BlePacketLayout): ByteArray { + val packets = PayloadSplitter(payload, layout).splitInPackets() + val encoded = packets.map { it.toByteArray(layout) } + + val joiner = PayloadJoiner(encoded.first(), layout) + for (packetBytes in encoded.drop(1)) { + joiner.accumulate(packetBytes) + } + return joiner.finalize() + } + + @Test + fun `Dash round-trip holds for every supported payload size`() { + for (size in 1..283) { + val payload = payloadOf(size, seed = size) + val result = roundTrip(payload, BlePacketLayout.DASH) + assertThat(result).isEqualTo(payload) + } + } + + @Test + fun `O5 round-trip holds for every payload size from 1 to 2000 bytes`() { + for (size in 1..2000) { + val payload = payloadOf(size, seed = size) + val result = roundTrip(payload, BlePacketLayout.OMNIPOD_5) + assertThat(result).isEqualTo(payload) + } + } + + + @Test + fun `O5 layout constants match OmnipodKit's asserted values`() { + val layout = BlePacketLayout.OMNIPOD_5 + assertThat(layout.maxPayloadSize).isEqualTo(244) + assertThat(layout.maxFragments).isEqualTo(15) + assertThat(layout.firstPacketCapacityWithoutMiddlePackets).isEqualTo(237) + assertThat(layout.firstPacketCapacityWithMiddlePackets).isEqualTo(242) + assertThat(layout.firstPacketCapacityWithOptionalPlusOnePacket).isEqualTo(242) + assertThat(layout.middlePacketCapacity).isEqualTo(243) + assertThat(layout.lastPacketCapacity).isEqualTo(238) + } + + @Test + fun `O5 split produces the same packet counts OmnipodKit asserts`() { + val expected = mapOf( + 0 to 1, + 100 to 1, + 300 to 2, + 242 to 2, + 243 to 2, + 500 to 3, + 641 to 3, + 642 to 3, + 893 to 4, + 953 to 4, + 18 to 1, + 15 to 1, + 11 to 1, + 17 to 1, + 204 to 1, + 176 to 1, + 20 to 1 + ) + + for ((size, packetCount) in expected) { + val packets = PayloadSplitter(payloadOf(size, seed = size), BlePacketLayout.OMNIPOD_5).splitInPackets() + assertThat(packets).hasSize(packetCount) + } + } + + @Test + fun `O5 953-byte payload reports three full fragments, as OmnipodKit asserts`() { + val packets = PayloadSplitter(payloadOf(953, seed = 2), BlePacketLayout.OMNIPOD_5).splitInPackets() + + assertThat(packets).hasSize(4) + assertThat(packets.filterIsInstance().single().fullFragments).isEqualTo(3) + } + + @Test + fun `O5 last-packet remainder over 127 round-trips correctly (regression for the signed-Byte bug)`() { + val size = 242 + 2 * 243 + 200 + val payload = payloadOf(size, seed = 4242) + + val packets = PayloadSplitter(payload, BlePacketLayout.OMNIPOD_5).splitInPackets() + val lastPacket = packets.filterIsInstance().single() + assertThat(lastPacket.size.toUnsignedInt()).isEqualTo(200) + + val result = roundTrip(payload, BlePacketLayout.OMNIPOD_5) + assertThat(result).isEqualTo(payload) + } + + @Test + fun `LastOptionalPlusOneBlePacket round-trips a size byte over 127`() { + val layout = BlePacketLayout.OMNIPOD_5 + val payload = payloadOf(200, seed = 55) + val packet = LastOptionalPlusOneBlePacket(index = 5, payload = payload, size = 200.toByte()) + + val encoded = packet.toByteArray(layout) + val parsed = LastOptionalPlusOneBlePacket.parse(encoded, layout) + + assertThat(parsed.size.toUnsignedInt()).isEqualTo(200) + assertThat(parsed.payload).isEqualTo(payload) + } + + + @Test + fun `O5 packets are written at their exact length, not padded to the 244-byte MTU`() { + val payload = payloadOf(44, seed = 7) + + val packets = PayloadSplitter(payload, BlePacketLayout.OMNIPOD_5).splitInPackets() + val encoded = packets.single().toByteArray(BlePacketLayout.OMNIPOD_5) + + assertThat(encoded.size).isEqualTo(51) + } + + @Test + fun `O5 multi-packet messages pad no packet, including the last`() { + val payload = payloadOf(642, seed = 8) + + val packets = PayloadSplitter(payload, BlePacketLayout.OMNIPOD_5).splitInPackets() + val encoded = packets.map { it.toByteArray(BlePacketLayout.OMNIPOD_5) } + + assertThat(encoded.last().size).isLessThan(BlePacketLayout.OMNIPOD_5.maxPayloadSize) + val headerBytes = encoded.size * 1 + 1 + 4 + 1 + assertThat(encoded.sumOf { it.size }).isEqualTo(payload.size + headerBytes) + assertThat(roundTrip(payload, BlePacketLayout.OMNIPOD_5)).isEqualTo(payload) + } + + @Test + fun `Dash packets keep their existing full-length padding`() { + val payload = payloadOf(5, seed = 9) + + val encoded = PayloadSplitter(payload, BlePacketLayout.DASH) + .splitInPackets().single().toByteArray(BlePacketLayout.DASH) + + assertThat(encoded.size).isEqualTo(BlePacketLayout.DASH.maxPayloadSize) + } + + @Test + fun `Byte toUnsignedInt reinterprets the full 0-255 range correctly`() { + assertThat(0.toByte().toUnsignedInt()).isEqualTo(0) + assertThat(127.toByte().toUnsignedInt()).isEqualTo(127) + assertThat(128.toByte().toUnsignedInt()).isEqualTo(128) + assertThat(200.toByte().toUnsignedInt()).isEqualTo(200) + assertThat(255.toByte().toUnsignedInt()).isEqualTo(255) + } + + @Test + fun `corrupted payload is still detected via CRC mismatch after joining (O5)`() { + val payload = payloadOf(500, seed = 99) + val packets = PayloadSplitter(payload, BlePacketLayout.OMNIPOD_5).splitInPackets() + val encoded = packets.map { it.toByteArray(BlePacketLayout.OMNIPOD_5) }.toMutableList() + + val corruptIndex = 6 + encoded[encoded.lastIndex][corruptIndex] = (encoded.last()[corruptIndex] + 1).toByte() + + val joiner = PayloadJoiner(encoded.first(), BlePacketLayout.OMNIPOD_5) + for (packetBytes in encoded.drop(1)) { + joiner.accumulate(packetBytes) + } + + assertThrows(CrcMismatchException::class.java) { + joiner.finalize() + } + } +} diff --git a/pump/omnipod/common/src/test/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/session/SessionResponseCrcTest.kt b/pump/omnipod/common/src/test/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/session/SessionResponseCrcTest.kt new file mode 100644 index 000000000000..f5fbd68c6b37 --- /dev/null +++ b/pump/omnipod/common/src/test/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/session/SessionResponseCrcTest.kt @@ -0,0 +1,163 @@ +package app.aaps.pump.omnipod.common.bledriver.comm.session + +import app.aaps.pump.omnipod.common.bledriver.comm.Id +import app.aaps.pump.omnipod.common.bledriver.comm.Ids +import app.aaps.pump.omnipod.common.bledriver.comm.endecrypt.EnDecrypt +import app.aaps.pump.omnipod.common.bledriver.comm.endecrypt.Nonce +import app.aaps.pump.omnipod.common.bledriver.comm.exceptions.CouldNotParseResponseException +import app.aaps.pump.omnipod.common.bledriver.comm.message.MessageIO +import app.aaps.shared.tests.AAPSLoggerTest +import com.google.common.truth.Truth.assertThat +import org.junit.jupiter.api.Assertions.assertThrows +import org.junit.jupiter.api.Test +import org.mockito.kotlin.mock + +/** + * [Session.validateCrc] - the O5-only response-envelope CRC check. + * + * Every vector below is real captured traffic, not synthesised, because the point of the test + * is that the CRC is genuinely computable on Omnipod 5 responses. An earlier revision of the + * driver asserted the opposite in a code comment and skipped the check entirely, on the + * strength of Dash traffic that had been mistaken for O5. + */ +class SessionResponseCrcTest { + + private fun session(): Session { + val ids = Ids.forController(Id.fromInt(1), Id.fromInt(2)) + val nonce = Nonce(ByteArray(8), 0) + val sessionKeys = SessionKeys(ck = ByteArray(16), nonce = nonce, msgSequenceNumber = 1) + val enDecrypt = EnDecrypt(AAPSLoggerTest(), nonce, sessionKeys.ck) + return Session(AAPSLoggerTest(), mock(), ids, sessionKeys, enDecrypt) + } + + private fun hex(s: String): ByteArray = ByteArray(s.length / 2) { s.substring(it * 2, it * 2 + 2).toInt(16).toByte() } + + /** + * Omnipod 5 pod `002a1c6e`, captured from a Trio installation. Pod-generated responses - + * the direction that matters, since these are what the driver acts on. + */ + private val podResponses = listOf( + "002a1c6e300a1d2803f04000001d83ff83db", + "002a1c6e380a1d1803f06800001d83ff036a", + "002a1c6e000a1d2803f07800001d83ff03eb", + "002a1c6e301802160209020000010c92000000030d0cc8000000000070410258" + ) + + /** Same pod, phone-generated. This driver builds these itself, so they close the loop. */ + private val outgoingMessages = listOf( + "002a1c6e2c030e0100802f", + "002a1c6e34071f05494e532e02818b", + "002a1c6e3c201a0e494e532e010091013840000c000c160e0000007d00dbba00007d00dbba008103" + ) + + /** + * The two envelopes logged either side of a real `MessageError.invalidCrc` incident, where + * five minutes of corrupted comms cost the user a loop cycle and raised a critical + * delivery-uncertain alert. Both are well formed - the corrupt frames never reached the + * log - so they belong with the passing vectors. + */ + private val incidentEnvelopes = listOf( + "002a1c6e08030e010002b6", + "002a1c6e08030e010782a7" + ) + + @Test + fun `real captured O5 pod responses all satisfy the envelope CRC`() { + val session = session() + for (message in podResponses) { + session.validateCrc(hex(message)) + } + } + + @Test + fun `real captured O5 outgoing messages all satisfy the envelope CRC`() { + val session = session() + for (message in outgoingMessages) { + session.validateCrc(hex(message)) + } + } + + @Test + fun `envelopes captured around a real invalidCrc incident are themselves valid`() { + val session = session() + for (message in incidentEnvelopes) { + session.validateCrc(hex(message)) + } + } + + @Test + fun `a single flipped bit anywhere in the envelope is rejected`() { + val session = session() + val original = hex(podResponses.first()) + + for (index in 0 until original.size - 2) { + val corrupted = original.copyOf() + corrupted[index] = (corrupted[index].toInt() xor 0x01).toByte() + assertThrows(CouldNotParseResponseException::class.java) { + session.validateCrc(corrupted) + } + } + } + + @Test + fun `a corrupted CRC field itself is rejected`() { + val session = session() + val corrupted = hex(podResponses.first()) + corrupted[corrupted.size - 1] = (corrupted[corrupted.size - 1].toInt() xor 0x01).toByte() + + assertThrows(CouldNotParseResponseException::class.java) { + session.validateCrc(corrupted) + } + } + + @Test + fun `the failure message reports both the expected and the received CRC`() { + val session = session() + val corrupted = hex(podResponses.first()) + corrupted[corrupted.size - 1] = 0x00 + + val thrown = assertThrows(CouldNotParseResponseException::class.java) { + session.validateCrc(corrupted) + } + assertThat(thrown.message).contains("83db") + assertThat(thrown.message).contains("8300") + } + + /** + * Why [Session.parseResponse] gates this check on an O5 connection. These are Dash + * responses (pod `1749dbcb`, `podTypeValue: 4` in the Loop Report they came from) and they + * satisfy no CRC this driver can compute - no initial value in the entire 16-bit space and + * no byte range reproduces their trailer. Running the check on a Dash connection would + * reject every response the pod sends, which is exactly the regression this test guards. + */ + @Test + fun `Dash pod responses do NOT satisfy this CRC - hence the O5-only gate`() { + val session = session() + val dashResponses = listOf( + "1749dbcb3c0a1d180403700000472fff0310", + "1749dbcb040a1d280403000000472fff83db", + "1749dbcb080a1d280403000000473bff8219", + "1749dbcb0c0a1d280403800000474bff03c9", + "1749dbcb100a1d2804038000004757ff0192" + ) + for (message in dashResponses) { + assertThrows(CouldNotParseResponseException::class.java) { + session.validateCrc(hex(message)) + } + } + } + + /** Dash *outgoing* messages do satisfy it - this driver wrote them with the same function. */ + @Test + fun `Dash outgoing messages satisfy the CRC even though its responses do not`() { + val session = session() + val dashRequests = listOf( + "1749dbcb38071f05494e532e028173", + "1749dbcb04030e010782e2", + "1749dbcb08030e010700e7" + ) + for (message in dashRequests) { + session.validateCrc(hex(message)) + } + } +} diff --git a/pump/omnipod/common/src/test/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/session/SessionResponseValidationTest.kt b/pump/omnipod/common/src/test/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/session/SessionResponseValidationTest.kt new file mode 100644 index 000000000000..36910c13f478 --- /dev/null +++ b/pump/omnipod/common/src/test/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/session/SessionResponseValidationTest.kt @@ -0,0 +1,112 @@ +package app.aaps.pump.omnipod.common.bledriver.comm.session + +import app.aaps.pump.omnipod.common.bledriver.comm.Id +import app.aaps.pump.omnipod.common.bledriver.comm.Ids +import app.aaps.pump.omnipod.common.bledriver.comm.endecrypt.EnDecrypt +import app.aaps.pump.omnipod.common.bledriver.comm.endecrypt.Nonce +import app.aaps.pump.omnipod.common.bledriver.comm.exceptions.CouldNotParseResponseException +import app.aaps.pump.omnipod.common.bledriver.comm.message.MessageIO +import app.aaps.shared.tests.AAPSLoggerTest +import com.google.common.truth.Truth.assertThat +import org.junit.jupiter.api.Assertions.assertThrows +import org.junit.jupiter.api.Test +import org.mockito.kotlin.mock +import java.nio.ByteBuffer + +/** + * [Session.validateSequenceNumber] - the O5-only response-envelope sequence check that runs + * alongside `Session.validateCrc` (covered separately in [SessionResponseCrcTest]). + * + * The rule under test is that a pod's response carries the request's sequence number **plus + * one**, which is pinned below against real request/response pairs captured from a working + * Loop/Trio installation's Device Communication Log. An earlier revision compared against the + * request's own sequence number and would have rejected every response a real pod ever sent. + * + * Note these particular pairs are **Dash** traffic (`podTypeValue: 4` in the source report) - + * the sequence rule is identical on both pod generations, unlike the CRC. + */ +class SessionResponseValidationTest { + + private fun session(): Session { + val ids = Ids.forController(Id.fromInt(1), Id.fromInt(2)) + val nonce = Nonce(ByteArray(8), 0) + val sessionKeys = SessionKeys(ck = ByteArray(16), nonce = nonce, msgSequenceNumber = 1) + val enDecrypt = EnDecrypt(AAPSLoggerTest(), nonce, sessionKeys.ck) + return Session(AAPSLoggerTest(), mock(), ids, sessionKeys, enDecrypt) + } + + private fun hex(s: String): ByteArray = ByteArray(s.length / 2) { s.substring(it * 2, it * 2 + 2).toInt(16).toByte() } + + /** Bytes 4..6 of an inner Omnipod message: uniqueId(4) + length/sequence(2) + body + CRC(2). */ + private fun lengthAndSequenceBytesOf(message: String): ByteArray = hex(message).copyOfRange(4, 6) + + private fun sequenceNumberOf(message: String): Short = + (((ByteBuffer.wrap(lengthAndSequenceBytesOf(message)).short.toInt() shr 10) and 0x0f)).toShort() + + /** + * Real Omnipod 5 traffic (pod address 1749dbcb), request paired with the response it drew. + * Includes a request at sequence 14 so the pairing is pinned near the 4-bit wrap, not only + * for small numbers. + */ + private val capturedPairs = listOf( + "1749dbcb38071f05494e532e028173" to "1749dbcb3c0a1d180403700000472fff0310", + "1749dbcb00201a0e494e532e01008501384000060006160e0000003c01c9c380003c01c9c380010c" to + "1749dbcb040a1d280403000000472fff83db", + "1749dbcb04030e010782e2" to "1749dbcb080a1d280403000000473bff8219", + "1749dbcb08030e010700e7" to "1749dbcb0c0a1d280403800000474bff03c9", + "1749dbcb0c030e010781ec" to "1749dbcb100a1d2804038000004757ff0192" + ) + + @Test + fun `real captured O5 traffic - every response carries the request sequence number plus one`() { + val session = session() + for ((request, response) in capturedPairs) { + val sent = sequenceNumberOf(request) + assertThat(sequenceNumberOf(response).toInt()).isEqualTo((sent.toInt() + 1) and 0x0f) + session.validateSequenceNumber(lengthAndSequenceBytesOf(response), sent) + } + } + + @Test + fun `a response echoing the request's own sequence number is rejected`() { + val session = session() + val (request, _) = capturedPairs.first() + val sent = sequenceNumberOf(request) + + assertThrows(CouldNotParseResponseException::class.java) { + session.validateSequenceNumber(lengthAndSequenceBytesOf(request), sent) + } + } + + @Test + fun `sequence numbers wrap at 4 bits - a request at 15 expects a response at 0`() { + val session = session() + val response = packedLengthAndSequenceNumber(sequenceNumber = 0, length = 10, multiCommandFlag = false) + + session.validateSequenceNumber(response, sentSequenceNumber = 15) + } + + @Test + fun `the length and multiCommandFlag bits sharing the field are ignored`() { + val session = session() + val response = packedLengthAndSequenceNumber(sequenceNumber = 4, length = 1000, multiCommandFlag = true) + + session.validateSequenceNumber(response, sentSequenceNumber = 3) + } + + @Test + fun `a genuinely out-of-order response is rejected`() { + val session = session() + val response = packedLengthAndSequenceNumber(sequenceNumber = 9, length = 10, multiCommandFlag = false) + + assertThrows(CouldNotParseResponseException::class.java) { + session.validateSequenceNumber(response, sentSequenceNumber = 3) + } + } + + /** Mirrors HeaderEnabledCommand.encodeHeader()'s second Short, minus the leading uniqueId. */ + private fun packedLengthAndSequenceNumber(sequenceNumber: Short, length: Short, multiCommandFlag: Boolean): ByteArray { + val packed = (sequenceNumber.toInt() and 0x0f shl 10 or length.toInt() or ((if (multiCommandFlag) 1 else 0) shl 15)).toShort() + return ByteBuffer.allocate(2).putShort(packed).array() + } +} diff --git a/pump/omnipod/common/src/test/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/command/CommandEncodingTest.kt b/pump/omnipod/common/src/test/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/command/CommandEncodingTest.kt new file mode 100644 index 000000000000..2f5a2766375f --- /dev/null +++ b/pump/omnipod/common/src/test/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/command/CommandEncodingTest.kt @@ -0,0 +1,365 @@ +package app.aaps.pump.omnipod.common.bledriver.pod.command + +import app.aaps.pump.omnipod.common.bledriver.pod.definition.AlertConfiguration +import app.aaps.pump.omnipod.common.bledriver.pod.definition.AlertTrigger +import app.aaps.pump.omnipod.common.bledriver.pod.definition.AlertType +import app.aaps.pump.omnipod.common.bledriver.pod.definition.BeepRepetitionType +import app.aaps.pump.omnipod.common.bledriver.pod.definition.BeepType +import app.aaps.pump.omnipod.common.bledriver.pod.response.ResponseType +import app.aaps.pump.omnipod.common.bledriver.pod.util.AlertUtil +import app.aaps.pump.omnipod.common.bledriver.pod.util.MessageUtil +import app.aaps.shared.tests.TestBase +import com.google.common.truth.Truth.assertThat +import org.junit.jupiter.api.Test +import java.util.EnumSet + +/** + * Byte-level encoding checks for a handful of read-only / non-dosing commands, each + * verified against the real, production [MessageUtil.createCrc] rather than a + * re-implementation of it. These commands ([GetVersionCommand], [GetStatusCommand], + * [SilenceAlertsCommand]) are built on [app.aaps.pump.omnipod.common.bledriver.pod.command + * .base.HeaderEnabledCommand] / [app.aaps.pump.omnipod.common.bledriver.pod.command.base + * .NonceEnabledCommand], which have no pod-type-specific assumptions - these tests exist + * to pin that down with concrete byte checks, not just an architectural argument. + * + * Deliberately excludes anything with dosing-affecting logic (bolus, basal, temp basal) - + * that's out of scope for this test's purpose. + */ +class CommandEncodingTest : TestBase() { + + + @Test + fun `GetVersionCommand encodes to the documented 14-byte layout`() { + val uniqueId = 0x12345678 + val sequenceNumber: Short = 5 + val cmd = GetVersionCommand.Builder() + .setUniqueId(uniqueId) + .setSequenceNumber(sequenceNumber) + .build() + + val encoded = cmd.encoded + + assertThat(encoded.size).isEqualTo(14) + + val headerUniqueId = readInt(encoded, 0) + assertThat(headerUniqueId).isEqualTo(uniqueId) + + val bodyUniqueId = readInt(encoded, 8) + assertThat(bodyUniqueId).isEqualTo(uniqueId) + + assertCrcMatches(encoded, crcOffset = 12) + } + + @Test + fun `GetVersionCommand with different sequence numbers produces different encodings`() { + val uniqueId = 0x12345678 + val cmd1 = GetVersionCommand.Builder().setUniqueId(uniqueId).setSequenceNumber(1).build() + val cmd2 = GetVersionCommand.Builder().setUniqueId(uniqueId).setSequenceNumber(2).build() + + assertThat(cmd1.encoded).isNotEqualTo(cmd2.encoded) + } + + + @Test + fun `GetStatusCommand encodes to the documented 11-byte layout`() { + val uniqueId = 0x0A0B0C0D + val sequenceNumber: Short = 2 + + val cmd = GetStatusCommand.Builder() + .setUniqueId(uniqueId) + .setSequenceNumber(sequenceNumber) + .setStatusResponseType(ResponseType.StatusResponseType.DEFAULT_STATUS_RESPONSE) + .build() + + val encoded = cmd.encoded + + assertThat(encoded.size).isEqualTo(11) + assertThat(encoded[8]).isEqualTo(ResponseType.StatusResponseType.DEFAULT_STATUS_RESPONSE.value) + + assertCrcMatches(encoded, crcOffset = 9) + } + + @Test + fun `GetStatusCommand reflects a different requested status page in its encoding`() { + val uniqueId = 0x0A0B0C0D + val sequenceNumber: Short = 2 + + val defaultPage = GetStatusCommand.Builder() + .setUniqueId(uniqueId).setSequenceNumber(sequenceNumber) + .setStatusResponseType(ResponseType.StatusResponseType.DEFAULT_STATUS_RESPONSE) + .build() + val alarmPage = GetStatusCommand.Builder() + .setUniqueId(uniqueId).setSequenceNumber(sequenceNumber) + .setStatusResponseType(ResponseType.StatusResponseType.ALARM_STATUS) + .build() + + assertThat(defaultPage.encoded).isNotEqualTo(alarmPage.encoded) + assertThat(alarmPage.encoded[8]).isEqualTo(ResponseType.StatusResponseType.ALARM_STATUS.value) + } + + + @Test + fun `SilenceAlertsCommand encodes to the documented 15-byte layout`() { + val uniqueId = 0x2233AABB.toInt() + val sequenceNumber: Short = 9 + val nonce = 0x0A0B0C0D + val alertTypes = EnumSet.of(AlertType.LOW_RESERVOIR, AlertType.SUSPEND_ENDED) + + val cmd = SilenceAlertsCommand.Builder() + .setUniqueId(uniqueId) + .setSequenceNumber(sequenceNumber) + .setNonce(nonce) + .setAlertTypes(alertTypes) + .build() + + val encoded = cmd.encoded + + assertThat(encoded.size).isEqualTo(15) + + val encodedNonce = readInt(encoded, 8) + assertThat(encodedNonce).isEqualTo(nonce) + + assertCrcMatches(encoded, crcOffset = 13) + } + + @Test + fun `SilenceAlertsCommand alert byte round-trips through AlertUtil`() { + val alertTypes = EnumSet.of(AlertType.LOW_RESERVOIR, AlertType.SUSPEND_ENDED) + val cmd = SilenceAlertsCommand.Builder() + .setUniqueId(0x2233AABB.toInt()) + .setSequenceNumber(9) + .setNonce(0x0A0B0C0D) + .setAlertTypes(alertTypes) + .build() + + val decoded = AlertUtil.decodeAlertSet(cmd.encoded[12]) + + assertThat(decoded).isEqualTo(alertTypes) + } + + @Test + fun `SilenceAlertsCommand with an empty alert set encodes to zero`() { + val cmd = SilenceAlertsCommand.Builder() + .setUniqueId(0x2233AABB.toInt()) + .setSequenceNumber(9) + .setNonce(0x0A0B0C0D) + .setAlertTypes(EnumSet.noneOf(AlertType::class.java)) + .build() + + assertThat(cmd.encoded[12]).isEqualTo(0.toByte()) + assertThat(AlertUtil.decodeAlertSet(cmd.encoded[12])).isEmpty() + } + + + @Test + fun `DeactivateCommand encodes to the documented 14-byte layout`() { + val uniqueId = 0x33445566.toInt() + val sequenceNumber: Short = 3 + val nonce = 0x0F0E0D0C + + val cmd = DeactivateCommand.Builder() + .setUniqueId(uniqueId) + .setSequenceNumber(sequenceNumber) + .setNonce(nonce) + .build() + + val encoded = cmd.encoded + + assertThat(encoded.size).isEqualTo(14) + assertThat(encoded[6]).isEqualTo(0x1c.toByte()) + + val encodedNonce = readInt(encoded, 8) + assertThat(encodedNonce).isEqualTo(nonce) + + assertCrcMatches(encoded, crcOffset = 12) + } + + @Test + fun `DeactivateCommand with different nonces produces different encodings`() { + val uniqueId = 0x33445566.toInt() + val cmd1 = DeactivateCommand.Builder().setUniqueId(uniqueId).setSequenceNumber(1).setNonce(100).build() + val cmd2 = DeactivateCommand.Builder().setUniqueId(uniqueId).setSequenceNumber(1).setNonce(101).build() + + assertThat(cmd1.encoded).isNotEqualTo(cmd2.encoded) + } + + + @Test + fun `StopDeliveryCommand encodes ALL plus LONG_SINGLE_BEEP to the documented 15-byte layout`() { + val uniqueId = 0x11223344.toInt() + val sequenceNumber: Short = 4 + val nonce = 0x0A0B0C0D + + val cmd = StopDeliveryCommand.Builder() + .setUniqueId(uniqueId) + .setSequenceNumber(sequenceNumber) + .setNonce(nonce) + .setDeliveryType(StopDeliveryCommand.DeliveryType.ALL) + .setBeepType(BeepType.LONG_SINGLE_BEEP) + .build() + + val encoded = cmd.encoded + + assertThat(encoded.size).isEqualTo(15) + assertThat(encoded[6]).isEqualTo(0x1f.toByte()) + + val encodedNonce = readInt(encoded, 8) + assertThat(encodedNonce).isEqualTo(nonce) + + assertThat(encoded[12]).isEqualTo(0x67.toByte()) + + assertCrcMatches(encoded, crcOffset = 13) + } + + @Test + fun `StopDeliveryCommand DeliveryType BASAL produces a different, correctly-masked encoding`() { + val uniqueId = 0x11223344.toInt() + val nonce = 0x0A0B0C0D + + val allCmd = StopDeliveryCommand.Builder() + .setUniqueId(uniqueId).setSequenceNumber(4).setNonce(nonce) + .setDeliveryType(StopDeliveryCommand.DeliveryType.ALL).setBeepType(BeepType.LONG_SINGLE_BEEP) + .build() + val basalOnlyCmd = StopDeliveryCommand.Builder() + .setUniqueId(uniqueId).setSequenceNumber(4).setNonce(nonce) + .setDeliveryType(StopDeliveryCommand.DeliveryType.BASAL).setBeepType(BeepType.SILENT) + .build() + + assertThat(basalOnlyCmd.encoded[12]).isEqualTo(0x01.toByte()) + assertThat(allCmd.encoded).isNotEqualTo(basalOnlyCmd.encoded) + } + + + @Test + fun `ProgramAlertsCommand encodes a single AlertConfiguration to the documented 20-byte layout`() { + val uniqueId = 0x22334455.toInt() + val sequenceNumber: Short = 6 + val nonce = 0x01020304 + + val alertConfig = AlertConfiguration( + type = AlertType.SUSPEND_ENDED, + enabled = true, + durationInMinutes = 0, + autoOff = false, + trigger = AlertTrigger.TimerTrigger(20), + beepType = BeepType.FOUR_TIMES_BIP_BEEP, + beepRepetition = BeepRepetitionType.EVERY_MINUTE_AND_EVERY_15_MIN + ) + + val cmd = ProgramAlertsCommand.Builder() + .setUniqueId(uniqueId) + .setSequenceNumber(sequenceNumber) + .setNonce(nonce) + .setAlertConfigurations(listOf(alertConfig)) + .build() + + val encoded = cmd.encoded + + assertThat(encoded.size).isEqualTo(20) + assertThat(encoded[6]).isEqualTo(0x19.toByte()) + assertThat(encoded[7]).isEqualTo(10.toByte()) + + assertThat(readInt(encoded, 8)).isEqualTo(nonce) + + assertThat(encoded[12]).isEqualTo(0x68.toByte()) + assertThat(encoded[13]).isEqualTo(0.toByte()) + assertThat(encoded[14]).isEqualTo(0.toByte()) + assertThat(encoded[15]).isEqualTo(20.toByte()) + assertThat(encoded[16]).isEqualTo(BeepRepetitionType.EVERY_MINUTE_AND_EVERY_15_MIN.value) + assertThat(encoded[17]).isEqualTo(BeepType.FOUR_TIMES_BIP_BEEP.value) + + assertCrcMatches(encoded, crcOffset = 18) + } + + + @Test + fun `SuspendDeliveryCommand composes StopDelivery ALL plus embedded ProgramAlerts correctly`() { + val uniqueId = 0x22334455.toInt() + val sequenceNumber: Short = 6 + val nonce = 0x01020304 + + val cmd = SuspendDeliveryCommand.Builder() + .setUniqueId(uniqueId) + .setSequenceNumber(sequenceNumber) + .setNonce(nonce) + .setBeepType(BeepType.LONG_SINGLE_BEEP) + .build() + + val encoded = cmd.encoded + + assertThat(encoded.size).isEqualTo(27) + assertThat(encoded[6]).isEqualTo(0x1f.toByte()) + + assertThat(readInt(encoded, 8)).isEqualTo(nonce) + + assertThat(encoded[12]).isEqualTo(0x67.toByte()) + + assertThat(encoded[13]).isEqualTo(0x19.toByte()) + assertThat(encoded[14]).isEqualTo(10.toByte()) + assertThat(readInt(encoded, 15)).isEqualTo(nonce) + assertThat(encoded[19]).isEqualTo(0x68.toByte()) + + assertCrcMatches(encoded, crcOffset = 25) + } + + + @Test + fun `SetUniqueIdCommand encodes to the documented 29-byte layout`() { + val targetUniqueId = 0x12345678 + val sequenceNumber: Short = 7 + val lotNumber = 123456 + val podSequenceNumber = 654321 + + val cal = java.util.Calendar.getInstance() + cal.set(2024, java.util.Calendar.MARCH, 15, 10, 30, 0) + + val cmd = SetUniqueIdCommand.Builder() + .setUniqueId(targetUniqueId) + .setSequenceNumber(sequenceNumber) + .setLotNumber(lotNumber) + .setPodSequenceNumber(podSequenceNumber) + .setInitializationTime(cal.time) + .build() + + val encoded = cmd.encoded + + assertThat(encoded.size).isEqualTo(29) + + assertThat(readInt(encoded, 0)).isEqualTo(-1) + + assertThat(encoded[6]).isEqualTo(0x03.toByte()) + + assertThat(readInt(encoded, 8)).isEqualTo(targetUniqueId) + + assertThat(encoded[12]).isEqualTo(0x14.toByte()) + assertThat(encoded[13]).isEqualTo(0x04.toByte()) + + assertThat(encoded[14]).isEqualTo(3.toByte()) + assertThat(encoded[15]).isEqualTo(15.toByte()) + assertThat(encoded[16]).isEqualTo(24.toByte()) + assertThat(encoded[17]).isEqualTo(10.toByte()) + assertThat(encoded[18]).isEqualTo(30.toByte()) + + assertThat(readInt(encoded, 19)).isEqualTo(lotNumber) + assertThat(readInt(encoded, 23)).isEqualTo(podSequenceNumber) + + assertCrcMatches(encoded, crcOffset = 27) + } + + + private fun readInt(bytes: ByteArray, offset: Int): Int = + ((bytes[offset].toInt() and 0xFF) shl 24) or + ((bytes[offset + 1].toInt() and 0xFF) shl 16) or + ((bytes[offset + 2].toInt() and 0xFF) shl 8) or + (bytes[offset + 3].toInt() and 0xFF) + + /** Recomputes the CRC over everything before [crcOffset] using the real, production + * [MessageUtil.createCrc] and checks it matches the two CRC bytes at [crcOffset]. */ + private fun assertCrcMatches(encoded: ByteArray, crcOffset: Int) { + val withoutCrc = encoded.copyOfRange(0, crcOffset) + val expectedCrc = MessageUtil.createCrc(withoutCrc) + val embeddedCrc = (((encoded[crcOffset].toInt() and 0xFF) shl 8) or + (encoded[crcOffset + 1].toInt() and 0xFF)).toShort() + assertThat(embeddedCrc).isEqualTo(expectedCrc) + } +} diff --git a/pump/omnipod/common/src/test/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/command/insulin/program/util/ProgramBasalUtilTest.kt b/pump/omnipod/common/src/test/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/command/insulin/program/util/ProgramBasalUtilTest.kt new file mode 100644 index 000000000000..5b0860f7f0af --- /dev/null +++ b/pump/omnipod/common/src/test/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/command/insulin/program/util/ProgramBasalUtilTest.kt @@ -0,0 +1,22 @@ +package app.aaps.pump.omnipod.common.bledriver.pod.command.insulin.program.util + +import com.google.common.truth.Truth.assertThat +import org.junit.jupiter.api.Test + +class ProgramBasalUtilTest { + + @Test + fun `mapTenthPulsesPerSlotToLongInsulinProgramElements advances startSlotIndex by the finished element's slot count`() { + val tenthPulsesPerSlot = shortArrayOf(10, 10, 10, 20, 20, 30, 30, 30, 30) + + val elements = ProgramBasalUtil.mapTenthPulsesPerSlotToLongInsulinProgramElements(tenthPulsesPerSlot) + + assertThat(elements).hasSize(3) + assertThat(elements[0].startSlotIndex).isEqualTo(0) + assertThat(elements[0].numberOfSlots).isEqualTo(3) + assertThat(elements[1].startSlotIndex).isEqualTo(3) + assertThat(elements[1].numberOfSlots).isEqualTo(2) + assertThat(elements[2].startSlotIndex).isEqualTo(5) + assertThat(elements[2].numberOfSlots).isEqualTo(4) + } +} diff --git a/pump/omnipod/common/src/test/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/definition/AlertConfigurationTest.kt b/pump/omnipod/common/src/test/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/definition/AlertConfigurationTest.kt new file mode 100644 index 000000000000..b81abc271955 --- /dev/null +++ b/pump/omnipod/common/src/test/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/definition/AlertConfigurationTest.kt @@ -0,0 +1,71 @@ +package app.aaps.pump.omnipod.common.bledriver.pod.definition + +import com.google.common.truth.Truth.assertThat +import org.junit.jupiter.api.Test + +/** + * [AlertConfiguration]'s 6-byte bit-packed encoding, verified by hand against the field + * layout in [AlertConfiguration.encoded] - see this file's two test cases for the full + * worked byte-by-byte derivation (one per [AlertTrigger] variant). + */ +class AlertConfigurationTest { + + @Test + fun `encodes a TimerTrigger alert with all flag bits set`() { + val config = AlertConfiguration( + type = AlertType.LOW_RESERVOIR, + enabled = true, + durationInMinutes = 300, + autoOff = true, + trigger = AlertTrigger.TimerTrigger(offsetInMinutes = 500), + beepType = BeepType.FOUR_TIMES_BIP_BEEP, + beepRepetition = BeepRepetitionType.XXX + ) + + assertThat(config.encoded).isEqualTo( + byteArrayOf(0x4B, 0x2C, 0x01, 0xF4.toByte(), 0x01, 0x02) + ) + } + + @Test + fun `encodes a ReservoirVolumeTrigger alert with all flag bits clear`() { + val config = AlertConfiguration( + type = AlertType.EXPIRATION, + enabled = false, + durationInMinutes = 0, + autoOff = false, + trigger = AlertTrigger.ReservoirVolumeTrigger(thresholdInMicroLiters = 1000), + beepType = BeepType.SILENT, + beepRepetition = BeepRepetitionType.EVERY_MINUTE_AND_EVERY_15_MIN + ) + + assertThat(config.encoded).isEqualTo( + byteArrayOf(0x74, 0x00, 0x03, 0xE8.toByte(), 0x03, 0x00) + ) + } + + @Test + fun `the reservoir-trigger flag bit distinguishes trigger type independent of other flags`() { + val timerBased = AlertConfiguration( + type = AlertType.AUTO_OFF, + enabled = false, + durationInMinutes = 0, + autoOff = false, + trigger = AlertTrigger.TimerTrigger(offsetInMinutes = 0), + beepType = BeepType.SILENT, + beepRepetition = BeepRepetitionType.XXX + ) + val reservoirBased = AlertConfiguration( + type = AlertType.AUTO_OFF, + enabled = false, + durationInMinutes = 0, + autoOff = false, + trigger = AlertTrigger.ReservoirVolumeTrigger(thresholdInMicroLiters = 0), + beepType = BeepType.SILENT, + beepRepetition = BeepRepetitionType.XXX + ) + + assertThat(timerBased.encoded[0]).isEqualTo(0x00.toByte()) + assertThat(reservoirBased.encoded[0]).isEqualTo(0x04.toByte()) + } +} diff --git a/pump/omnipod/common/src/test/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/definition/BasalProgramTest.kt b/pump/omnipod/common/src/test/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/definition/BasalProgramTest.kt new file mode 100644 index 000000000000..68e6a67987fb --- /dev/null +++ b/pump/omnipod/common/src/test/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/definition/BasalProgramTest.kt @@ -0,0 +1,126 @@ +package app.aaps.pump.omnipod.common.bledriver.pod.definition + +import com.google.common.truth.Truth.assertThat +import com.google.gson.Gson +import org.junit.jupiter.api.Assertions.assertThrows +import org.junit.jupiter.api.Test +import java.util.Calendar + +/** + * [BasalProgram] - dosing-schedule encode/query logic. [rateAt] reads the local default + * timezone via `Calendar.getInstance()`, so test timestamps are built the same way (rather + * than hardcoded epoch millis) to stay timezone-independent - see this codebase's own + * O5PodStateManagerExtensionsTest doc comment for the same caution about a previous flaky + * test caused by exactly this pattern. + */ +class BasalProgramTest { + + private fun millisAt(hour: Int, minute: Int): Long { + val calendar = Calendar.getInstance() + calendar.set(Calendar.HOUR_OF_DAY, hour) + calendar.set(Calendar.MINUTE, minute) + calendar.set(Calendar.SECOND, 0) + return calendar.timeInMillis + } + + @Test + fun `rateAt returns the rate of the segment covering that half-hour slot`() { + val program = BasalProgram( + listOf( + BasalProgram.Segment(0, 24, 100), + BasalProgram.Segment(24, 48, 150) + ) + ) + + assertThat(program.rateAt(millisAt(10, 15))).isEqualTo(1.0) + assertThat(program.rateAt(millisAt(14, 45))).isEqualTo(1.5) + } + + @Test + fun `rateAt treats startSlotIndex as inclusive and endSlotIndex as exclusive`() { + val program = BasalProgram(listOf(BasalProgram.Segment(20, 22, 200))) + + assertThat(program.rateAt(millisAt(10, 0))).isEqualTo(2.0) + assertThat(program.rateAt(millisAt(10, 29))).isEqualTo(2.0) + assertThat(program.rateAt(millisAt(11, 0))).isEqualTo(0.0) + } + + @Test + fun `rateAt returns zero when no segment covers the slot`() { + val program = BasalProgram(listOf(BasalProgram.Segment(0, 10, 100))) + + assertThat(program.rateAt(millisAt(23, 0))).isEqualTo(0.0) + } + + @Test + fun `hasZeroUnitSegments is true only when some segment has a zero rate`() { + val withZero = BasalProgram(listOf(BasalProgram.Segment(0, 24, 0), BasalProgram.Segment(24, 48, 100))) + val withoutZero = BasalProgram(listOf(BasalProgram.Segment(0, 48, 50))) + + assertThat(withZero.hasZeroUnitSegments()).isTrue() + assertThat(withoutZero.hasZeroUnitSegments()).isFalse() + } + + @Test + fun `addSegment appends to the segment list`() { + val program = BasalProgram(listOf(BasalProgram.Segment(0, 24, 100))) + + program.addSegment(BasalProgram.Segment(24, 48, 200)) + + assertThat(program.segments).hasSize(2) + assertThat(program.segments[1].basalRateInHundredthUnitsPerHour).isEqualTo(200) + } + + @Test + fun `segments is unmodifiable from the outside`() { + val program = BasalProgram(listOf(BasalProgram.Segment(0, 24, 100))) + + assertThrows(UnsupportedOperationException::class.java) { + program.segments.add(BasalProgram.Segment(24, 48, 200)) + } + } + + @Test + fun `Segment getPulsesPerHour converts hundredth-units-per-hour to pulses using the 0-05U pulse size`() { + val segment = BasalProgram.Segment(0, 48, 100) + + assertThat(segment.getPulsesPerHour()).isEqualTo(20.toShort()) + } + + @Test + fun `Segment getNumberOfSlots is the half-open slot range width`() { + val segment = BasalProgram.Segment(10, 34, 100) + + assertThat(segment.getNumberOfSlots()).isEqualTo(24.toShort()) + } + + @Test + fun `Segment equals and hashCode are structural`() { + val a = BasalProgram.Segment(0, 24, 100) + val b = BasalProgram.Segment(0, 24, 100) + val different = BasalProgram.Segment(0, 24, 150) + + assertThat(a).isEqualTo(b) + assertThat(a.hashCode()).isEqualTo(b.hashCode()) + assertThat(a).isNotEqualTo(different) + } + + @Test + fun `segments self-heals instead of crashing when Gson deserialization bypasses the constructor`() { + val deserialized = Gson().fromJson("{}", BasalProgram::class.java) + + assertThat(deserialized.segments).isEmpty() + assertThat(deserialized.rateAt(millisAt(10, 0))).isEqualTo(0.0) + } + + @Test + fun `BasalProgram equals and hashCode compare by segment list`() { + val a = BasalProgram(listOf(BasalProgram.Segment(0, 48, 100))) + val b = BasalProgram(listOf(BasalProgram.Segment(0, 48, 100))) + val different = BasalProgram(listOf(BasalProgram.Segment(0, 48, 200))) + + assertThat(a).isEqualTo(b) + assertThat(a.hashCode()).isEqualTo(b.hashCode()) + assertThat(a).isNotEqualTo(different) + } +} diff --git a/pump/omnipod/common/src/test/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/definition/PulseLogEntryTest.kt b/pump/omnipod/common/src/test/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/definition/PulseLogEntryTest.kt new file mode 100644 index 000000000000..b2a64069ed88 --- /dev/null +++ b/pump/omnipod/common/src/test/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/definition/PulseLogEntryTest.kt @@ -0,0 +1,73 @@ +package app.aaps.pump.omnipod.common.bledriver.pod.definition + +import com.google.common.truth.Truth.assertThat +import org.junit.jupiter.api.Test + +/** + * [PulseLogEntry.decode] against the openaps/openomni wiki's documented bit layout - see + * [PulseLogEntry]'s class doc for the source and the manual bit-by-bit verification this + * golden value was checked against. + */ +class PulseLogEntryTest { + + @Test + fun `decodes the openomni wiki's own worked example`() { + val entry = PulseLogEntry.decode(0x51213E00.toInt()) + + assertThat(entry.encoder).isEqualTo(20) + assertThat(entry.load2Active).isTrue() + assertThat(entry.pulseMode).isEqualTo(PulseLogEntryType.BASAL) + assertThat(entry.lowReservoir).isFalse() + assertThat(entry.immediateBolusTick).isEqualTo(0) + assertThat(entry.loadCountVal).isEqualTo(125) + assertThat(entry.lastComparatorRead).isFalse() + assertThat(entry.faultFlag).isFalse() + assertThat(entry.lastEncoderValue).isEqualTo(0) + } + + @Test + fun `decodes a synthetic entry exercising every field`() { + val entry = PulseLogEntry.decode(0x147C96FB.toInt()) + + assertThat(entry.encoder).isEqualTo(5) + assertThat(entry.load2Active).isFalse() + assertThat(entry.pulseMode).isEqualTo(PulseLogEntryType.BOLUS) + assertThat(entry.lowReservoir).isTrue() + assertThat(entry.immediateBolusTick).isEqualTo(6) + assertThat(entry.loadCountVal).isEqualTo(300) + assertThat(entry.lastComparatorRead).isTrue() + assertThat(entry.faultFlag).isTrue() + assertThat(entry.lastEncoderValue).isEqualTo(-5) + } + + @Test + fun `pulseMode covers every documented mode`() { + assertThat(PulseLogEntry.decode(0x00000000.toInt()).pulseMode).isEqualTo(PulseLogEntryType.NONE) + assertThat(PulseLogEntry.decode(0x00200000.toInt()).pulseMode).isEqualTo(PulseLogEntryType.BASAL) + assertThat(PulseLogEntry.decode(0x00400000.toInt()).pulseMode).isEqualTo(PulseLogEntryType.TEMP_BASAL) + assertThat(PulseLogEntry.decode(0x00600000.toInt()).pulseMode).isEqualTo(PulseLogEntryType.BOLUS) + assertThat(PulseLogEntry.decode(0x00800000.toInt()).pulseMode).isEqualTo(PulseLogEntryType.EXTENDED_BOLUS) + } + + @Test + fun `pulseMode falls back to UNKNOWN for undefined raw values`() { + assertThat(PulseLogEntry.decode(0x00E00000.toInt()).pulseMode).isEqualTo(PulseLogEntryType.UNKNOWN) + } + + @Test + fun `lastEncoderValue sign-extends the 6-bit field correctly`() { + assertThat(PulseLogEntry.decode(0x00000000.toInt()).lastEncoderValue).isEqualTo(0) + assertThat(PulseLogEntry.decode(0x0000001F.toInt()).lastEncoderValue).isEqualTo(31) + assertThat(PulseLogEntry.decode(0x00000020.toInt()).lastEncoderValue).isEqualTo(-32) + assertThat(PulseLogEntry.decode(0x0000003F.toInt()).lastEncoderValue).isEqualTo(-1) + } + + @Test + fun `decodeAll maps a list of dwords in order`() { + val entries = PulseLogEntry.decodeAll(listOf(0x00000000.toInt(), 0x00600000.toInt())) + + assertThat(entries).hasSize(2) + assertThat(entries[0].pulseMode).isEqualTo(PulseLogEntryType.NONE) + assertThat(entries[1].pulseMode).isEqualTo(PulseLogEntryType.BOLUS) + } +} diff --git a/pump/omnipod/common/src/test/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/state/UpdatePodStateBolusTrackingTest.kt b/pump/omnipod/common/src/test/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/state/UpdatePodStateBolusTrackingTest.kt index 7c2ba7335380..86e3704637e0 100644 --- a/pump/omnipod/common/src/test/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/state/UpdatePodStateBolusTrackingTest.kt +++ b/pump/omnipod/common/src/test/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/state/UpdatePodStateBolusTrackingTest.kt @@ -24,7 +24,7 @@ import java.util.TimeZone * - a basal correction is NOT currently delivering ([PodState.basalCorrectionInProgress] == false). * * When a basal correction is in progress its pulses must NOT be counted as bolus pulses, - * otherwise [basalDelivered] (= total − bolus) would decrease and mask the correction + * otherwise `basalDelivered` (= total − bolus) would decrease and mask the correction * against [basalExpected], corrupting the drift calculation. */ class UpdatePodStateBolusTrackingTest : TestBase() { diff --git a/pump/omnipod/omnipod5/build.gradle.kts b/pump/omnipod/omnipod5/build.gradle.kts new file mode 100644 index 000000000000..8a35d01807b2 --- /dev/null +++ b/pump/omnipod/omnipod5/build.gradle.kts @@ -0,0 +1,35 @@ +plugins { + alias(libs.plugins.android.library) + alias(libs.plugins.ksp) + alias(libs.plugins.compose.compiler) + alias(libs.plugins.hilt) + id("android-module-dependencies") + id("test-module-dependencies") + id("jacoco-module-dependencies") +} + +android { + namespace = "app.aaps.pump.omnipod.omnipod5" +} + +dependencies { + implementation(project(":core:data")) + implementation(project(":core:interfaces")) + implementation(project(":core:keys")) + implementation(project(":core:utils")) + implementation(project(":core:ui")) + implementation(project(":pump:omnipod:common")) + + implementation(libs.kotlinx.coroutines.rx3) + + implementation(libs.com.google.dagger.hilt.android) + implementation(libs.androidx.hilt.navigation.compose) + implementation(libs.androidx.compose.ui.tooling.preview) + debugImplementation(libs.androidx.compose.ui.tooling) + + testImplementation(project(":shared:tests")) + + ksp(libs.com.google.dagger.compiler) + ksp(libs.com.google.dagger.hilt.compiler) + ksp(libs.com.google.dagger.android.processor) +} diff --git a/pump/omnipod/omnipod5/consumer-rules.pro b/pump/omnipod/omnipod5/consumer-rules.pro new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/pump/omnipod/omnipod5/proguard-rules.pro b/pump/omnipod/omnipod5/proguard-rules.pro new file mode 100644 index 000000000000..f1b424510da5 --- /dev/null +++ b/pump/omnipod/omnipod5/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile diff --git a/pump/omnipod/omnipod5/src/androidTest/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/security/AndroidKeystoreAesCipherTest.kt b/pump/omnipod/omnipod5/src/androidTest/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/security/AndroidKeystoreAesCipherTest.kt new file mode 100644 index 000000000000..78e563c81319 --- /dev/null +++ b/pump/omnipod/omnipod5/src/androidTest/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/security/AndroidKeystoreAesCipherTest.kt @@ -0,0 +1,86 @@ +package app.aaps.pump.omnipod.omnipod5.bledriver.pod.security + +import androidx.test.ext.junit.runners.AndroidJUnit4 +import com.google.common.truth.Truth.assertThat +import org.junit.Test +import org.junit.runner.RunWith +import java.security.SecureRandom + +/** + * Real instrumented test for [AndroidKeystoreAesCipher] - the one piece of cryptography + * built this session that genuinely could not be verified in the development sandbox, + * since `AndroidKeyStore` is a real Android OS provider that only exists on an actual + * device or emulator. Run this via Android Studio's test runner (or + * `./gradlew :pump:omnipod:omnipod5:connectedFullDebugAndroidTest`) against a real device or + * emulator to close that gap for real, rather than relying on code review alone for a class + * that handles actual key material. + */ +@RunWith(AndroidJUnit4::class) +class AndroidKeystoreAesCipherTest { + + private val random = SecureRandom() + + @Test + fun encryptDecryptRoundTrip_variousSizes() { + val cipher = AndroidKeystoreAesCipher() + + repeat(20) { i -> + val plaintext = ByteArray(1 + i * 7).also { random.nextBytes(it) } + val encrypted = cipher.encrypt(plaintext) + val decrypted = cipher.decrypt(encrypted) + assertThat(decrypted).isEqualTo(plaintext) + } + } + + @Test + fun emptyPlaintext_roundTrips() { + val cipher = AndroidKeystoreAesCipher() + val encrypted = cipher.encrypt(ByteArray(0)) + val decrypted = cipher.decrypt(encrypted) + assertThat(decrypted).isEqualTo(ByteArray(0)) + } + + @Test + fun sameEncryptedValue_decryptsDifferentlyEachTime_dueToRandomIv() { + val cipher = AndroidKeystoreAesCipher() + val plaintext = "same plaintext both times".toByteArray() + + val encrypted1 = cipher.encrypt(plaintext) + val encrypted2 = cipher.encrypt(plaintext) + + assertThat(encrypted1).isNotEqualTo(encrypted2) + assertThat(cipher.decrypt(encrypted1)).isEqualTo(plaintext) + assertThat(cipher.decrypt(encrypted2)).isEqualTo(plaintext) + } + + @Test + fun keyPersistsAcrossSeparateCipherInstances() { + val cipherBeforeRestart = AndroidKeystoreAesCipher() + val plaintext = "must survive a simulated restart".toByteArray() + val encrypted = cipherBeforeRestart.encrypt(plaintext) + + val cipherAfterRestart = AndroidKeystoreAesCipher() + val decrypted = cipherAfterRestart.decrypt(encrypted) + + assertThat(decrypted).isEqualTo(plaintext) + } + + @Test(expected = Exception::class) + fun tamperedCiphertext_failsToDecrypt() { + val cipher = AndroidKeystoreAesCipher() + val plaintext = "sensitive credential material".toByteArray() + val encrypted = cipher.encrypt(plaintext) + + val raw = java.util.Base64.getDecoder().decode(encrypted) + raw[raw.size - 1] = (raw[raw.size - 1] + 1).toByte() + val tampered = java.util.Base64.getEncoder().encodeToString(raw) + + cipher.decrypt(tampered) + } + + @Test(expected = Exception::class) + fun malformedBase64_failsToDecryptRatherThanCrashingUnpredictably() { + val cipher = AndroidKeystoreAesCipher() + cipher.decrypt("not valid base64 at all !!!") + } +} diff --git a/pump/omnipod/omnipod5/src/main/AndroidManifest.xml b/pump/omnipod/omnipod5/src/main/AndroidManifest.xml new file mode 100644 index 000000000000..fd3e29e82367 --- /dev/null +++ b/pump/omnipod/omnipod5/src/main/AndroidManifest.xml @@ -0,0 +1,11 @@ + + + + + + + + + diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/O5PumpPlugin.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/O5PumpPlugin.kt new file mode 100644 index 000000000000..e56a40c8b931 --- /dev/null +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/O5PumpPlugin.kt @@ -0,0 +1,1270 @@ +package app.aaps.pump.omnipod.omnipod5 +import app.aaps.pump.omnipod.common.R + +import app.aaps.core.data.model.BS +import app.aaps.core.data.plugin.PluginType +import app.aaps.core.data.pump.defs.ManufacturerType +import app.aaps.core.data.pump.defs.PumpDescription +import app.aaps.core.data.pump.defs.PumpType +import app.aaps.core.data.time.T +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.configuration.ExternalOptions +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.notifications.NotificationId +import app.aaps.core.interfaces.notifications.NotificationManager +import app.aaps.core.interfaces.plugin.PluginDescription +import app.aaps.core.interfaces.pump.BlePreCheck +import app.aaps.core.interfaces.pump.BolusProgressData +import app.aaps.core.interfaces.pump.DetailedBolusInfo +import app.aaps.core.interfaces.pump.Pump +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.pump.PumpInsulin +import app.aaps.core.interfaces.pump.PumpPluginBase +import app.aaps.core.interfaces.pump.PumpProfile +import app.aaps.core.interfaces.pump.PumpRate +import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.pump.defs.fillFor +import app.aaps.core.interfaces.protection.ProtectionCheck +import app.aaps.core.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.queue.CustomCommand +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.collectResilient +import app.aaps.core.keys.interfaces.Preferences +import app.aaps.core.keys.interfaces.withCompose +import app.aaps.core.ui.compose.ComposeScreenContent +import app.aaps.core.ui.compose.icons.IcPluginOmnipod +import app.aaps.core.ui.compose.preference.PreferenceSubScreenDef +import app.aaps.pump.omnipod.omnipod5.bledriver.comm.O5BleManager +import app.aaps.pump.omnipod.common.bledriver.pod.command.DeactivateCommand +import app.aaps.pump.omnipod.common.bledriver.pod.command.GetStatusCommand +import app.aaps.pump.omnipod.common.bledriver.pod.command.ProgramAlertsCommand +import app.aaps.pump.omnipod.common.bledriver.pod.command.ProgramBasalCommand +import app.aaps.pump.omnipod.common.bledriver.pod.command.ProgramBeepsCommand +import app.aaps.pump.omnipod.common.bledriver.pod.command.ProgramBolusCommand +import app.aaps.pump.omnipod.common.bledriver.pod.command.ProgramTempBasalCommand +import app.aaps.pump.omnipod.common.bledriver.pod.command.SilenceAlertsCommand +import app.aaps.pump.omnipod.common.bledriver.pod.command.StopDeliveryCommand +import app.aaps.pump.omnipod.common.bledriver.pod.command.SuspendDeliveryCommand +import app.aaps.pump.omnipod.common.bledriver.pod.definition.ActivationProgress +import app.aaps.pump.omnipod.common.bledriver.pod.definition.AlertConfiguration +import app.aaps.pump.omnipod.common.bledriver.pod.definition.AlertTrigger +import app.aaps.pump.omnipod.common.bledriver.pod.definition.AlertType +import app.aaps.pump.omnipod.common.bledriver.pod.definition.BeepRepetitionType +import app.aaps.pump.omnipod.common.bledriver.pod.definition.BeepType +import app.aaps.pump.omnipod.omnipod5.bledriver.pod.definition.O5_FIXED_NONCE +import app.aaps.pump.omnipod.common.bledriver.pod.definition.PodConstants +import app.aaps.pump.omnipod.common.bledriver.pod.definition.ProgramReminder +import app.aaps.pump.omnipod.common.bledriver.pod.response.AlarmStatusResponse +import app.aaps.pump.omnipod.common.bledriver.pod.response.DefaultStatusResponse +import app.aaps.pump.omnipod.common.bledriver.pod.response.PodInfoActivationTimeResponse +import app.aaps.pump.omnipod.common.bledriver.pod.response.PodInfoTriggeredAlertsResponse +import app.aaps.pump.omnipod.common.bledriver.pod.response.ResponseType +import app.aaps.pump.omnipod.omnipod5.bledriver.pod.state.O5PodStateManager +import app.aaps.pump.omnipod.omnipod5.bledriver.pod.state.basalDrift +import app.aaps.pump.omnipod.omnipod5.bledriver.pod.state.basalDelivered +import app.aaps.pump.omnipod.omnipod5.bledriver.pod.util.buildO5ExpirationAlerts +import app.aaps.pump.omnipod.common.keys.DashBooleanPreferenceKey +import app.aaps.pump.omnipod.common.keys.OmnipodBooleanPreferenceKey +import app.aaps.pump.omnipod.common.keys.OmnipodIntPreferenceKey +import app.aaps.pump.omnipod.common.queue.command.CommandDeactivatePod +import app.aaps.pump.omnipod.common.queue.command.CommandDeliverBasalCorrection +import app.aaps.pump.omnipod.common.queue.command.CommandDisableSuspendAlerts +import app.aaps.pump.omnipod.common.queue.command.CommandHandleTimeChange +import app.aaps.pump.omnipod.omnipod5.queue.command.CommandPairNewPod +import app.aaps.pump.omnipod.common.queue.command.CommandPlayTestBeep +import app.aaps.pump.omnipod.common.queue.command.CommandResumeDelivery +import app.aaps.pump.omnipod.common.queue.command.CommandSilenceAlerts +import app.aaps.pump.omnipod.common.queue.command.CommandSuspendDelivery +import app.aaps.pump.omnipod.common.queue.command.CommandUpdateAlertConfiguration +import app.aaps.pump.omnipod.omnipod5.keys.O5IntentKey +import app.aaps.pump.omnipod.omnipod5.ui.O5CertificateStoreScreen +import app.aaps.pump.omnipod.omnipod5.ui.compose.OmnipodO5ComposeContent +import app.aaps.pump.omnipod.omnipod5.util.mapProfileToBasalProgram +import io.reactivex.rxjava3.core.Completable +import io.reactivex.rxjava3.core.Single +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.SupervisorJob +import kotlinx.coroutines.cancel +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.drop +import kotlinx.coroutines.flow.map +import kotlinx.coroutines.flow.merge +import kotlinx.coroutines.launch +import kotlinx.coroutines.runBlocking +import kotlinx.coroutines.rx3.rxCompletable +import org.json.JSONObject +import java.util.Date +import java.util.concurrent.CountDownLatch +import javax.inject.Inject +import javax.inject.Provider +import javax.inject.Singleton +import kotlin.concurrent.thread +import kotlin.math.ceil + +/** + * `Pump`-interface implementation for Omnipod 5 - the missing piece [O5Module]'s doc + * comment describes. Connects the already-built pairing/BLE/command/persistence layers + * (see [O5BleManager], [O5PodStateManager]) to AAPS's dosing/control surface. + * + * Runs O5 as a manual pod under AAPS's control, identical capabilities to Omnipod Dash - + * the pod's own onboard automated-delivery mode is never engaged (mirrors + * [PumpType.OMNIPOD_DASH]'s capability fields). + * + * Every dose-affecting command (bolus, temp basal, basal program) records a + * [O5PodStateManager.pendingDoseCommand] marker *before* sending, and clears it only once + * the outcome is confirmed. If the BLE response never arrives, the marker survives (it's + * part of the persisted pod state) and [reconcilePendingDose] - run at the end of every + * [getPumpStatus] call - resolves it on the next successful status read. Regular status + * reads are driven by the loop cycle and `KeepAliveWorker` (like Dash), so the pod stays + * disconnected between cycles; the periodic [statusChecker] only queues an extra read when + * a [O5PodStateManager.pendingDoseCommand] is still outstanding (see + * [refreshStatusOnUnacknowledgedCommands]). This is what makes an uncertain delivery outcome + * recoverable instead of silently lost; see [O5PodStateManager]'s class doc for why this + * doesn't need a Dash-style persisted command ledger to do so. + */ +@Singleton +class O5PumpPlugin @Inject constructor( + aapsLogger: AAPSLogger, + rh: ResourceHelper, + preferences: Preferences, + commandQueue: CommandQueue, + private val bleManager: O5BleManager, + private val podStateManager: O5PodStateManager, + private val pumpSync: PumpSync, + private val notificationManager: NotificationManager, + private val pumpEnactResultProvider: Provider, + private val bolusProgressData: BolusProgressData, + private val protectionCheck: ProtectionCheck, + private val blePreCheck: BlePreCheck, + private val config: Config +) : PumpPluginBase( + pluginDescription = PluginDescription() + .mainType(PluginType.PUMP) + .composeContent { _ -> + OmnipodO5ComposeContent( + pluginName = rh.gs(R.string.omnipod_5_name), + protectionCheck = protectionCheck, + blePreCheck = blePreCheck, + rh = rh + ) + } + .icon(IcPluginOmnipod) + .pluginName(R.string.omnipod_5_name) + .shortName(R.string.omnipod_5_name_short) + .description(R.string.omnipod_5_pump_description), + ownPreferences = listOf( + OmnipodBooleanPreferenceKey::class.java, OmnipodIntPreferenceKey::class.java, + DashBooleanPreferenceKey::class.java, O5IntentKey::class.java + ), + aapsLogger, rh, preferences, commandQueue +), Pump { + + @Volatile private var bolusCanceled = false + @Volatile private var bolusDeliveryInProgress = false + @Volatile private var stopConnecting: CountDownLatch? = null + + private var statusChecker: Runnable + + private var scope: CoroutineScope? = null + + companion object { + + private const val BOLUS_RETRY_INTERVAL_MS = 2000L + private const val BOLUS_RETRIES = 5 + private const val STATUS_CHECK_INTERVAL_MS = 60L * 1000 + private const val RESERVOIR_OVER_50_UNITS_DEFAULT = 75.0 + + private const val FIXED_NONCE = O5_FIXED_NONCE + + /** Matches Dash's fixed pulse-delay constant for bolus delivery pacing - a + * pod-firmware-level property of the shared command layer. */ + private const val BOLUS_DELAY_BETWEEN_PULSES_EIGHTH_SECONDS: Byte = 16 + + private val pumpDescription = PumpDescription().fillFor(PumpType.OMNIPOD_5) + } + + init { + statusChecker = Runnable { + refreshStatusOnUnacknowledgedCommands() + if (podStateManager.pendingDoseCommand != null) { + handler?.postDelayed(statusChecker, STATUS_CHECK_INTERVAL_MS) + } + } + } + + /** + * (Re)start the 60s [statusChecker] tick. Called whenever a dose-affecting command records a + * [O5PodStateManager.pendingDoseCommand], so an unconfirmed dose is reconciled promptly. The + * tick self-stops once the pending marker is cleared, so it does not run while the pod is idle. + */ + private fun armStatusChecker() { + handler?.removeCallbacks(statusChecker) + handler?.postDelayed(statusChecker, STATUS_CHECK_INTERVAL_MS) + } + + /** + * Mirrors `OmnipodDashPumpPlugin.refreshStatusOnUnacknowledgedCommands`. The periodic tick no + * longer forces a BLE connect on its own - regular status polling is driven by the loop cycle + * and `KeepAliveWorker` (same as Dash), which keeps the pod disconnected between cycles instead + * of reconnecting every tick. We only reach out here when a dose-affecting command was left + * unconfirmed ([O5PodStateManager.pendingDoseCommand] survives), so a single status read is + * queued to reconcile it promptly rather than waiting for the next loop-driven read. The queue + * routes that read through [getPumpStatus], which runs [reconcilePendingDose] at the end. + */ + private fun refreshStatusOnUnacknowledgedCommands() { + if (podStateManager.activationProgress == ActivationProgress.COMPLETED && + podStateManager.pendingDoseCommand != null && + commandQueue.size() == 0 && + commandQueue.performing() == null + ) { + scope?.launch { commandQueue.readStatus(rh.gs(R.string.omnipod_5_unconfirmed_command)) } + } + } + + override suspend fun onStart() { + super.onStart() + if (podStateManager.pendingDoseCommand != null) { + handler?.postDelayed(statusChecker, STATUS_CHECK_INTERVAL_MS) + } + val newScope = CoroutineScope(Dispatchers.IO + SupervisorJob()) + scope = newScope + merge( + preferences.observe(OmnipodBooleanPreferenceKey.ExpirationReminder).drop(1).map {}, + preferences.observe(OmnipodIntPreferenceKey.ExpirationReminderHours).drop(1).map {}, + preferences.observe(OmnipodBooleanPreferenceKey.ExpirationAlarm).drop(1).map {}, + preferences.observe(OmnipodIntPreferenceKey.ExpirationAlarmHours).drop(1).map {}, + preferences.observe(OmnipodBooleanPreferenceKey.LowReservoirAlert).drop(1).map {}, + preferences.observe(OmnipodIntPreferenceKey.LowReservoirAlertUnits).drop(1).map {}, + ).collectResilient(newScope, aapsLogger, LTag.PUMP) { commandQueue.customCommand(CommandUpdateAlertConfiguration()) } + } + + override suspend fun onStop() { + super.onStop() + handler?.removeCallbacks(statusChecker) + scope?.cancel() + scope = null + } + + + override fun isInitialized(): Boolean = podStateManager.activationProgress == ActivationProgress.COMPLETED + override fun isSuspended(): Boolean = podStateManager.deliverySuspended + + override fun isBusy(): Boolean = + podStateManager.activationProgress != ActivationProgress.NOT_STARTED && + podStateManager.activationProgress.isBefore(ActivationProgress.COMPLETED) + + override fun isConnected(): Boolean = + podStateManager.ltk == null || + podStateManager.bluetoothConnectionState == O5PodStateManager.BluetoothConnectionState.CONNECTED + + override fun isConnecting(): Boolean = stopConnecting != null + + override fun isHandshakeInProgress(): Boolean = + stopConnecting != null && + podStateManager.bluetoothConnectionState == O5PodStateManager.BluetoothConnectionState.CONNECTED + + override fun finishHandshaking() {} + + override fun connect(reason: String) { + aapsLogger.info(LTag.PUMP, "O5 connect reason=$reason") + podStateManager.bluetoothConnectionState = O5PodStateManager.BluetoothConnectionState.CONNECTING + synchronized(this) { + stopConnecting?.let { + aapsLogger.warn(LTag.PUMP, "O5 already connecting: $it") + return + } + stopConnecting = CountDownLatch(1) + } + thread(start = true, name = "O5ConnectionThread") { + try { + stopConnecting?.let { latch -> + bleManager.connect(latch).ignoreElements().blockingAwait() + } + } catch (e: Exception) { + aapsLogger.info(LTag.PUMPCOMM, "O5 connect error=$e") + } finally { + synchronized(this) { stopConnecting = null } + } + } + } + + override fun disconnect(reason: String) { + aapsLogger.info(LTag.PUMP, "O5 disconnect reason=$reason") + stopConnecting?.countDown() + bleManager.disconnect(false) + } + + override fun stopConnecting() { + aapsLogger.info(LTag.PUMP, "O5 stopConnecting") + stopConnecting?.countDown() + bleManager.disconnect(true) + } + + + override suspend fun getPumpStatus(reason: String) { + aapsLogger.debug(LTag.PUMP, "O5 getPumpStatus reason=$reason") + if (podStateManager.ltk == null) { + return + } + try { + fetchStatus().blockingAwait() + reconcilePendingDose() + checkPodFault() + updateAlertConfiguration() + } catch (e: Exception) { + aapsLogger.error(LTag.PUMP, "Error in O5 getPumpStatus", e) + } + syncPumpFlows() + } + + /** + * Posts a user-facing [NotificationId.OMNIPOD_POD_FAULT] alert (with sound) plus a + * [PumpSync.insertAnnouncement] entry the first time [O5PodStateManager.alarmType] + * is seen non-null, mirroring Dash's `OmnipodDashPumpPlugin.checkPodKaput()` handling - + * without this, a faulted O5 pod only shows CRITICAL status on + * the Omnipod overview screen with no system notification/sound, so a fault could go + * unnoticed if the user isn't actively looking at that screen. [O5PodStateManager + * .alarmSynced] makes this idempotent across repeated status polls of the same fault; + * the notification is skipped (but the announcement/sync flag are not) if a pod + * deactivation is already queued, since the user is already acting on the fault. + * + * Internal (rather than private) to allow unit testing within this module, without + * needing to drive [getPumpStatus]'s full status-poll chain. + */ + internal suspend fun checkPodFault() { + if (podStateManager.alarmSynced) return + if (!podStateManager.isPodKaput && podStateManager.alarmType == null) return + + if (podStateManager.alarmType == null) { + try { + fetchAlarmStatus().blockingAwait() + } catch (e: Exception) { + aapsLogger.debug(LTag.PUMP, "O5 could not read the alarm status page: ${e.message}") + } + } + + val description = podStateManager.alarmType?.toString() + ?: podStateManager.podStatus?.toString() + ?: return + + if (!commandQueue.isCustomCommandInQueue(CommandDeactivatePod::class.java)) { + notificationManager.post( + NotificationId.OMNIPOD_POD_FAULT, + description, + soundRes = app.aaps.core.ui.R.raw.boluserror + ) + } + pumpSync.insertAnnouncement( + error = description, + pumpId = System.currentTimeMillis(), + pumpType = PumpType.OMNIPOD_5, + pumpSerial = serialNumber() + ) + podStateManager.alarmSynced = true + } + + /** + * Reads status page 2, the pod's fault detail, to learn *why* it faulted. Mirrors the Dash + * driver, which requests this page explicitly - the pod never volunteers it. + */ + private fun fetchAlarmStatus(): Completable = Completable.defer { + val cmd = GetStatusCommand.Builder() + .setUniqueId(requirePodId()) + .setSequenceNumber(podStateManager.msgSequenceNumber.toShort()) + .setStatusResponseType(ResponseType.StatusResponseType.ALARM_STATUS) + .build() + bleManager.sendCommand(cmd, AlarmStatusResponse::class).ignoreElements() + } + + private fun ensureConnected(): Completable = Completable.defer { + bleManager.connect().ignoreElements() + } + + private fun fetchStatus(): Completable = ensureConnected().andThen(Completable.defer { + val cmd = GetStatusCommand.Builder() + .setUniqueId(requirePodId()) + .setSequenceNumber(podStateManager.msgSequenceNumber.toShort()) + .setStatusResponseType(ResponseType.StatusResponseType.DEFAULT_STATUS_RESPONSE) + .build() + bleManager.sendCommand(cmd, DefaultStatusResponse::class).ignoreElements() + }) + .andThen(Completable.defer { fetchActivationTimeIfNeeded() }) + .andThen(Completable.defer { fetchTriggeredAlertsIfNeeded() }) + + /** + * Status pages 5/1 carry diagnostic data only relevant once something's actually + * wrong or alerting - fetched conditionally, on top of the default status poll + * above, rather than on every 15s poll. State is populated as a side effect of + * [O5BleManager.sendCommand] via [O5BleManagerImpl]'s `recordStatusIfPresent`, + * same as every other response type, so nothing further is done with the result + * here - see [O5PodStateManager.podActivatedAt]/[O5PodStateManager.triggeredAlertTimes]. + */ + private fun fetchActivationTimeIfNeeded(): Completable { + if (podStateManager.alarmType == null || podStateManager.podActivatedAt != null) return Completable.complete() + val cmd = GetStatusCommand.Builder() + .setUniqueId(requirePodId()) + .setSequenceNumber(podStateManager.msgSequenceNumber.toShort()) + .setStatusResponseType(ResponseType.StatusResponseType.STATUS_RESPONSE_PAGE_5) + .build() + return bleManager.sendCommand(cmd, PodInfoActivationTimeResponse::class).ignoreElements() + } + + private fun fetchTriggeredAlertsIfNeeded(): Completable { + if (podStateManager.activeAlerts?.isNotEmpty() != true) return Completable.complete() + val cmd = GetStatusCommand.Builder() + .setUniqueId(requirePodId()) + .setSequenceNumber(podStateManager.msgSequenceNumber.toShort()) + .setStatusResponseType(ResponseType.StatusResponseType.STATUS_RESPONSE_PAGE_1) + .build() + return bleManager.sendCommand(cmd, PodInfoTriggeredAlertsResponse::class).ignoreElements() + } + + /** + * Resolves a [O5PodStateManager.pendingDoseCommand] left over from a dose-affecting + * call whose BLE response never arrived - see this class's doc comment. Called after + * every successful status read, so an uncertain outcome is recovered automatically + * rather than only on the next user-triggered action. + * + * Decides in the same order OmnipodKit's `PodCommsSession.recoverUnacknowledgedCommand` + * does: + * 1. **Authoritative** - the pod reports the sequence number of the last programming + * command it accepted ([O5PodStateManager.sequenceNumberOfLastProgrammingCommand]). + * If it equals the number this dose was sent with, the pod definitely got it. + * 2. **Heuristic fallback** - otherwise, a *positive* sign of the delivery actually + * running counts as confirmation ([confirmedByDeliveryStatus]). + * 3. **Otherwise the pod never got the command**, so the marker is dropped without + * recording any insulin. + * + * Step 3 is why the sequence number matters. With only the delivery-status heuristic, an + * uncertain bolus that the pod never received looks identical to one that completed - both + * report "not currently bolusing" - and the old code resolved that ambiguity by assuming + * delivery, crediting `requestedUnits - bolusPulsesRemaining` as insulin that was never + * given. That inflates IOB and suppresses later dosing. + */ + internal suspend fun reconcilePendingDose() { + val pending = podStateManager.pendingDoseCommand ?: return + + val podSequence = podStateManager.sequenceNumberOfLastProgrammingCommand + val sentSequence = pending.sequenceNumber + val acceptedByPod = podSequence != null && sentSequence != null && + (podSequence.toInt() and 0x0f) == (sentSequence.toInt() and 0x0f) + + if (!acceptedByPod && !confirmedByDeliveryStatus(pending)) { + if (sentSequence != null && podSequence != null) { + aapsLogger.info( + LTag.PUMP, + "O5 pending ${pending.type} was not received by the pod " + + "(sent sequence $sentSequence, pod's last programming sequence $podSequence) - recording no delivery" + ) + podStateManager.pendingDoseCommand = null + return + } + } + + when (pending.type) { + O5PodStateManager.PendingDoseType.BOLUS -> + if (podStateManager.deliveryStatus?.bolusDeliveringActive() != true) { + val deliveredUnits = (pending.requestedUnits ?: 0.0) - + (podStateManager.bolusPulsesRemaining?.toInt() ?: 0) * PodConstants.POD_PULSE_BOLUS_UNITS + if (podStateManager.lastBolusDeliveredUnits == null) { + pumpSync.syncBolusWithPumpId( + timestamp = pending.startedAt, + amount = PumpInsulin(deliveredUnits), + type = pending.bolusType ?: BS.Type.NORMAL, + pumpId = pending.startedAt, + pumpType = PumpType.OMNIPOD_5, + pumpSerial = serialNumber() + ) + if (!pending.isBasalCorrection) { + val deliveredPulses = Math.round(deliveredUnits / PodConstants.POD_PULSE_BOLUS_UNITS).toShort() + podStateManager.cumulativeBolusPulsesDelivered = + ((podStateManager.cumulativeBolusPulsesDelivered ?: 0) + deliveredPulses).toShort() + } + } + podStateManager.lastBolusDeliveredUnits = deliveredUnits + podStateManager.pendingDoseCommand = null + } + + O5PodStateManager.PendingDoseType.TEMP_BASAL_START -> + if (podStateManager.deliveryStatus?.tempBasalActive() == true) { + podStateManager.pendingDoseCommand = null + } + + O5PodStateManager.PendingDoseType.TEMP_BASAL_CANCEL -> + if (podStateManager.deliveryStatus?.tempBasalActive() != true) { + podStateManager.activeTempBasalStartTime = null + podStateManager.activeTempBasalRate = null + podStateManager.activeTempBasalDurationMinutes = null + podStateManager.pendingDoseCommand = null + } + + O5PodStateManager.PendingDoseType.BASAL_PROGRAM -> + if (podStateManager.deliveryStatus?.basalActive() == true) { + podStateManager.pendingDoseCommand = null + } + } + } + + /** + * Clears the way for a new dose-affecting command, returning false if it must not be sent. + * + * A [O5PodStateManager.pendingDoseCommand] means an earlier dose may or may not have + * reached the pod. Issuing another one on top of that risks stacking a second dose onto a + * first that did land, so this first tries to settle the question the same way OmnipodKit's + * `PodCommsSession.tryToResolvePendingCommand` does - read status, reconcile, and proceed + * only if the pending marker actually cleared. + * + * Note this resolves rather than merely refuses: in the ordinary case where the pod is + * reachable again, the status read settles the outcome and the new command goes ahead + * normally. Refusal is reserved for a pod that still cannot be reached or whose status + * leaves the earlier dose undecided. + * + * Deliberately *not* applied to pod deactivation. Blocking a user from taking a pod off + * because the driver is unsure about a temp basal is the wrong trade, and deactivation + * never sets a pending marker of its own. + */ + private suspend fun pendingDoseResolved(): Boolean { + if (podStateManager.pendingDoseCommand == null) return true + return try { + fetchStatus().blockingAwait() + reconcilePendingDose() + val resolved = podStateManager.pendingDoseCommand == null + if (!resolved) { + aapsLogger.warn(LTag.PUMP, "O5 refusing new dose command: an earlier dose is still unresolved after a status read") + } + resolved + } catch (e: Exception) { + aapsLogger.warn(LTag.PUMP, "O5 refusing new dose command: could not read status to resolve the pending dose: ${e.message}") + false + } + } + + private fun unresolvedDoseResult(): PumpEnactResult = + pumpEnactResultProvider.get().success(false).enacted(false) + .comment(rh.gs(R.string.omnipod_5_error_unresolved_dose_pending)) + + /** + * Whether the pod's delivery status positively shows [pending] took effect - the fallback + * for when the sequence number cannot decide it (mirrors OmnipodKit's + * `checkCommandAgainstStatus`). + * + * Deliberately only ever answers true on a *positive* observation. "Not currently + * bolusing" is not evidence a bolus happened, so [O5PodStateManager.PendingDoseType.BOLUS] + * has no fallback at all: a bolus whose sequence number did not match is treated as never + * received. The cancel cases are the mirror image - delivery having stopped is the + * positive observation there. + */ + private fun confirmedByDeliveryStatus(pending: O5PodStateManager.PendingDoseCommand): Boolean { + val status = podStateManager.deliveryStatus ?: return false + return when (pending.type) { + O5PodStateManager.PendingDoseType.BOLUS -> status.bolusDeliveringActive() + O5PodStateManager.PendingDoseType.TEMP_BASAL_START -> status.tempBasalActive() + O5PodStateManager.PendingDoseType.TEMP_BASAL_CANCEL -> !status.tempBasalActive() + O5PodStateManager.PendingDoseType.BASAL_PROGRAM -> status.basalActive() + } + } + + private fun requirePodId(): Int = + podStateManager.podId?.toInt() ?: throw IllegalStateException("O5 pod not paired") + + + override suspend fun setNewBasalProfile(profile: PumpProfile): PumpEnactResult { + if (podStateManager.ltk == null) { + return pumpEnactResultProvider.get().success(true).enacted(true) + } + if (!pendingDoseResolved()) return unresolvedDoseResult() + val basalProgram = mapProfileToBasalProgram(profile, PumpType.OMNIPOD_5) + return try { + if (podStateManager.deliveryStatus?.suspended() != true) { + val basalBeeps = preferences.get(OmnipodBooleanPreferenceKey.BasalBeepsEnabled) + val cmd = SuspendDeliveryCommand.Builder() + .setUniqueId(requirePodId()) + .setSequenceNumber(podStateManager.msgSequenceNumber.toShort()) + .setNonce(FIXED_NONCE) + .setBeepType(if (basalBeeps) BeepType.LONG_SINGLE_BEEP else BeepType.SILENT) + .build() + bleManager.sendCommand(cmd, DefaultStatusResponse::class).ignoreElements().blockingAwait() + podStateManager.deliverySuspended = true + } + + podStateManager.pendingDoseCommand = O5PodStateManager.PendingDoseCommand( + type = O5PodStateManager.PendingDoseType.BASAL_PROGRAM, + startedAt = System.currentTimeMillis(), + sequenceNumber = podStateManager.msgSequenceNumber.toShort() + ) + armStatusChecker() + val basalBeeps = preferences.get(OmnipodBooleanPreferenceKey.BasalBeepsEnabled) + val cmd = ProgramBasalCommand.Builder() + .setUniqueId(requirePodId()) + .setSequenceNumber(podStateManager.msgSequenceNumber.toShort()) + .setNonce(FIXED_NONCE) + .setBasalProgram(basalProgram) + .setProgramReminder(ProgramReminder(atStart = basalBeeps, atEnd = false, atInterval = 0)) + .setCurrentTime(Date()) + .build() + bleManager.sendCommand(cmd, DefaultStatusResponse::class).ignoreElements().blockingAwait() + podStateManager.basalProgram = basalProgram + podStateManager.deliverySuspended = false + podStateManager.pendingDoseCommand = null + notificationManager.post(NotificationId.PROFILE_SET_OK, app.aaps.core.ui.R.string.profile_set_ok) + disableSuspendAlerts() + pumpEnactResultProvider.get().success(true).enacted(true) + } catch (e: Exception) { + aapsLogger.error(LTag.PUMP, "Error in O5 setNewBasalProfile", e) + notifyUncertain(NotificationId.FAILED_UPDATE_PROFILE, rh.gs(R.string.omnipod_5_error_setting_basal_profile_might_have_failed)) + pumpEnactResultProvider.get().success(false).enacted(false) + } + } + + override fun isThisProfileSet(profile: PumpProfile): Boolean { + if (podStateManager.ltk == null) return true + if (podStateManager.deliverySuspended) return false + return mapProfileToBasalProgram(profile, PumpType.OMNIPOD_5) == podStateManager.basalProgram + } + + + private val _lastDataTime = MutableStateFlow(0L) + override val lastDataTime: StateFlow = _lastDataTime + + private val _lastBolusTime = MutableStateFlow(null) + override val lastBolusTime: StateFlow = _lastBolusTime + + private val _lastBolusAmount = MutableStateFlow(null) + override val lastBolusAmount: StateFlow = _lastBolusAmount + + override val baseBasalRate: PumpRate + get() { + val rate = if (podStateManager.alarmType != null) 0.0 + else podStateManager.basalProgram?.rateAt(System.currentTimeMillis()) ?: 0.0 + return PumpRate(rate) + } + + private val _reservoirLevel = MutableStateFlow(PumpInsulin(0.0)) + override val reservoirLevel: StateFlow = _reservoirLevel + + override val batteryLevel: StateFlow = MutableStateFlow(null) + + private fun syncPumpFlows() { + _lastDataTime.value = podStateManager.lastStatusResponseReceived ?: 0L + _lastBolusTime.value = podStateManager.lastBolusStartTime + _lastBolusAmount.value = podStateManager.lastBolusRequestedUnits?.let { PumpInsulin(it) } + _reservoirLevel.value = PumpInsulin( + podStateManager.reservoirPulsesRemaining?.let { it * PodConstants.POD_PULSE_BOLUS_UNITS } + ?: RESERVOIR_OVER_50_UNITS_DEFAULT + ) + } + + + override suspend fun deliverTreatment(detailedBolusInfo: DetailedBolusInfo): PumpEnactResult { + require(detailedBolusInfo.carbs == 0.0) { detailedBolusInfo.toString() } + require(detailedBolusInfo.insulin > 0) { detailedBolusInfo.toString() } + + if (!pendingDoseResolved()) { + return pumpEnactResultProvider.get().success(false).enacted(false).bolusDelivered(0.0) + .comment(rh.gs(R.string.omnipod_5_error_unresolved_dose_pending)) + } + try { + bolusDeliveryInProgress = true + syncPumpFlows() + val requestedUnits = detailedBolusInfo.insulin + if (requestedUnits > reservoirLevel.value.cU) { + return pumpEnactResultProvider.get().success(false).enacted(false).bolusDelivered(0.0) + .comment(rh.gs(R.string.omnipod_5_error_not_enough_insulin)) + } + if (podStateManager.deliveryStatus?.bolusDeliveringActive() == true) { + return pumpEnactResultProvider.get().success(false).enacted(false).bolusDelivered(0.0) + .comment(rh.gs(R.string.omnipod_5_error_bolus_already_in_progress)) + } + + val bolusBeepsKey = if (detailedBolusInfo.bolusType == BS.Type.SMB) OmnipodBooleanPreferenceKey.SmbBeepsEnabled + else OmnipodBooleanPreferenceKey.BolusBeepsEnabled + val bolusBeeps = preferences.get(bolusBeepsKey) + val startedAt = System.currentTimeMillis() + + podStateManager.pendingDoseCommand = O5PodStateManager.PendingDoseCommand( + type = O5PodStateManager.PendingDoseType.BOLUS, + requestedUnits = requestedUnits, + bolusType = detailedBolusInfo.bolusType, + startedAt = startedAt, + sequenceNumber = podStateManager.msgSequenceNumber.toShort() + ) + armStatusChecker() + podStateManager.lastBolusStartTime = startedAt + podStateManager.lastBolusRequestedUnits = requestedUnits + podStateManager.lastBolusDeliveredUnits = null + + val cmd = ProgramBolusCommand.Builder() + .setUniqueId(requirePodId()) + .setSequenceNumber(podStateManager.msgSequenceNumber.toShort()) + .setNonce(FIXED_NONCE) + .setNumberOfUnits(requestedUnits) + .setDelayBetweenPulsesInEighthSeconds(BOLUS_DELAY_BETWEEN_PULSES_EIGHTH_SECONDS) + .setProgramReminder(ProgramReminder(atStart = bolusBeeps, atEnd = bolusBeeps, atInterval = 0)) + .setO5BolusInfo(mealUnits = 0.0, correctionUnits = requestedUnits) + .build() + + var deliveredUnits = 0.0 + val ret = try { + bleManager.sendCommand(cmd, DefaultStatusResponse::class) + .filter { it.isCommandSent() } + .concatMapCompletable { + rxCompletable(Dispatchers.IO) { + pumpSync.syncBolusWithPumpId( + timestamp = startedAt, + amount = PumpInsulin(requestedUnits), + type = detailedBolusInfo.bolusType, + pumpId = startedAt, + pumpType = PumpType.OMNIPOD_5, + pumpSerial = serialNumber() + ) + } + } + .blockingAwait() + deliveredUnits = waitForBolusDeliveryToComplete(requestedUnits).blockingGet() + pumpEnactResultProvider.get().success(true).enacted(true).bolusDelivered(deliveredUnits) + } catch (throwable: Throwable) { + aapsLogger.error(LTag.PUMP, "O5 deliverTreatment error: $throwable") + pumpEnactResultProvider.get().success(bolusCanceled).enacted(false) + } + + if (detailedBolusInfo.bolusType == BS.Type.SMB) { + notifyUncertain(NotificationId.OMNIPOD_UNCERTAIN_SMB, rh.gs(R.string.omnipod_5_error_uncertain_smb, requestedUnits)) + } else if (podStateManager.pendingDoseCommand != null) { + notifyUncertain(NotificationId.OMNIPOD_POD_FAULT, rh.gs(R.string.omnipod_5_error_bolus_delivery_status_uncertain)) + } + return ret + } finally { + bolusCanceled = false + bolusDeliveryInProgress = false + } + } + + private fun waitForBolusDeliveryToComplete(requestedUnits: Double): Single = Single.defer { + val estimatedSeconds = ceil(requestedUnits / PodConstants.POD_PULSE_BOLUS_UNITS).toLong() * 2 + 3 + var waited = 0L + while (waited < estimatedSeconds && !bolusCanceled) { + waited += 1 + Thread.sleep(1000) + val percent = (waited.toFloat() / estimatedSeconds) * 100 + bolusProgressData.updateProgress(percent.toInt()) + } + + repeat(BOLUS_RETRIES) { + val cmd = if (bolusCanceled) cancelBolus() else fetchStatus() + try { + cmd.blockingAwait() + } catch (e: Exception) { + aapsLogger.debug(LTag.PUMP, "waitForBolusDeliveryToComplete errorGettingStatus=$e") + Thread.sleep(BOLUS_RETRY_INTERVAL_MS) + return@repeat + } + val bolusActive = podStateManager.deliveryStatus?.bolusDeliveringActive() == true + if (bolusActive) { + val remainingUnits = (podStateManager.bolusPulsesRemaining?.toInt() ?: 0) * PodConstants.POD_PULSE_BOLUS_UNITS + val delivered = requestedUnits - remainingUnits + val percent = (delivered / requestedUnits) * 100 + bolusProgressData.updateProgress(percent.toInt()) + val sleepSeconds = if (bolusCanceled) BOLUS_RETRY_INTERVAL_MS / 1000 + else ceil(remainingUnits / PodConstants.POD_PULSE_BOLUS_UNITS).toLong() * 2 + 3 + Thread.sleep(sleepSeconds * 1000) + } else { + val deliveredUnits = requestedUnits - (podStateManager.bolusPulsesRemaining?.toInt() ?: 0) * PodConstants.POD_PULSE_BOLUS_UNITS + podStateManager.lastBolusDeliveredUnits = deliveredUnits + podStateManager.pendingDoseCommand = null + return@defer Single.just(deliveredUnits) + } + } + Single.just(requestedUnits) + } + + private fun cancelBolus(): Completable = ensureConnected().andThen(Completable.defer { + val bolusBeeps = preferences.get(OmnipodBooleanPreferenceKey.BolusBeepsEnabled) + val cmd = StopDeliveryCommand.Builder() + .setUniqueId(requirePodId()) + .setSequenceNumber(podStateManager.msgSequenceNumber.toShort()) + .setNonce(FIXED_NONCE) + .setDeliveryType(StopDeliveryCommand.DeliveryType.BOLUS) + .setBeepType(if (bolusBeeps) BeepType.LONG_SINGLE_BEEP else BeepType.SILENT) + .build() + bleManager.sendCommand(cmd, DefaultStatusResponse::class).ignoreElements() + }) + + override fun stopBolusDelivering() { + aapsLogger.info(LTag.PUMP, "O5 stopBolusDelivering called") + if (bolusDeliveryInProgress) { + bolusCanceled = true + } + } + + + override suspend fun setTempBasalAbsolute( + absoluteRate: Double, + durationInMinutes: Int, + enforceNew: Boolean, + tbrType: PumpSync.TemporaryBasalType + ): PumpEnactResult { + aapsLogger.info(LTag.PUMP, "O5 setTempBasalAbsolute: rate=$absoluteRate U/h duration=$durationInMinutes min enforce=$enforceNew type=$tbrType") + if (!pendingDoseResolved()) return unresolvedDoseResult() + return try { + if (podStateManager.deliveryStatus?.tempBasalActive() == true) { + cancelActiveTempBasal() + } + val tempBasalBeeps = preferences.get(OmnipodBooleanPreferenceKey.TbrBeepsEnabled) + val startedAt = System.currentTimeMillis() + podStateManager.pendingDoseCommand = O5PodStateManager.PendingDoseCommand( + type = O5PodStateManager.PendingDoseType.TEMP_BASAL_START, + requestedRate = absoluteRate, + requestedDurationMinutes = durationInMinutes.toShort(), + startedAt = startedAt, + sequenceNumber = podStateManager.msgSequenceNumber.toShort() + ) + armStatusChecker() + val cmd = ProgramTempBasalCommand.Builder() + .setUniqueId(requirePodId()) + .setSequenceNumber(podStateManager.msgSequenceNumber.toShort()) + .setNonce(FIXED_NONCE) + .setProgramReminder(ProgramReminder(atStart = tempBasalBeeps, atEnd = tempBasalBeeps, atInterval = 0)) + .setRateInUnitsPerHour(absoluteRate) + .setDurationInMinutes(durationInMinutes.toShort()) + .build() + bleManager.sendCommand(cmd, DefaultStatusResponse::class).ignoreElements().blockingAwait() + + pumpSync.syncTemporaryBasalWithPumpId( + timestamp = startedAt, + rate = PumpRate(absoluteRate), + duration = T.mins(durationInMinutes.toLong()).msecs(), + isAbsolute = true, + type = tbrType, + pumpId = startedAt, + pumpType = PumpType.OMNIPOD_5, + pumpSerial = serialNumber() + ) + podStateManager.activeTempBasalStartTime = startedAt + podStateManager.activeTempBasalRate = absoluteRate + podStateManager.activeTempBasalDurationMinutes = durationInMinutes.toShort() + podStateManager.pendingDoseCommand = null + if (needsBasalCorrection()) deliverBasalCorrection() + pumpEnactResultProvider.get().success(true).enacted(true).isPercent(false).absolute(absoluteRate).duration(durationInMinutes) + } catch (e: Exception) { + aapsLogger.error(LTag.PUMP, "Error in O5 setTempBasalAbsolute", e) + notifyUncertain(NotificationId.OMNIPOD_TBR_ALERTS, rh.gs(R.string.omnipod_5_error_setting_temp_basal_might_have_failed)) + pumpEnactResultProvider.get().success(false).enacted(false) + } + } + + override suspend fun setTempBasalPercent(percent: Int, durationInMinutes: Int, enforceNew: Boolean, tbrType: PumpSync.TemporaryBasalType): PumpEnactResult = + error("Pump doesn't support percent basal rate") + + override suspend fun cancelTempBasal(enforceNew: Boolean): PumpEnactResult { + if (podStateManager.deliveryStatus?.tempBasalActive() != true && pumpSync.expectedPumpState().temporaryBasal == null) { + return pumpEnactResultProvider.get().success(true).enacted(false) + } + if (!pendingDoseResolved()) return unresolvedDoseResult() + return try { + cancelActiveTempBasal() + pumpEnactResultProvider.get().success(true).enacted(true) + } catch (e: Exception) { + aapsLogger.error(LTag.PUMP, "Error in O5 cancelTempBasal", e) + notifyUncertain(NotificationId.OMNIPOD_TBR_ALERTS, rh.gs(R.string.omnipod_5_error_cancel_temp_basal_result_is_uncertain)) + pumpEnactResultProvider.get().success(false).enacted(false) + } + } + + private fun cancelActiveTempBasal() { + podStateManager.pendingDoseCommand = O5PodStateManager.PendingDoseCommand( + type = O5PodStateManager.PendingDoseType.TEMP_BASAL_CANCEL, + startedAt = System.currentTimeMillis(), + sequenceNumber = podStateManager.msgSequenceNumber.toShort() + ) + armStatusChecker() + val tempBasalBeeps = preferences.get(OmnipodBooleanPreferenceKey.TbrBeepsEnabled) + val cmd = StopDeliveryCommand.Builder() + .setUniqueId(requirePodId()) + .setSequenceNumber(podStateManager.msgSequenceNumber.toShort()) + .setNonce(FIXED_NONCE) + .setDeliveryType(StopDeliveryCommand.DeliveryType.TEMP_BASAL) + .setBeepType(if (tempBasalBeeps) BeepType.LONG_SINGLE_BEEP else BeepType.SILENT) + .build() + bleManager.sendCommand(cmd, DefaultStatusResponse::class).ignoreElements().blockingAwait() + podStateManager.activeTempBasalStartTime = null + podStateManager.activeTempBasalRate = null + podStateManager.activeTempBasalDurationMinutes = null + podStateManager.pendingDoseCommand = null + if (needsBasalCorrection()) deliverBasalCorrection() + } + + override suspend fun setExtendedBolus(insulin: Double, durationInMinutes: Int): PumpEnactResult = + pumpEnactResultProvider.get().success(false).enacted(false) + .comment(rh.gs(R.string.omnipod_5_error_extended_bolus_not_supported)) + + override suspend fun cancelExtendedBolus(): PumpEnactResult = + pumpEnactResultProvider.get().success(false).enacted(false) + .comment(rh.gs(R.string.omnipod_5_error_extended_bolus_not_supported)) + + + override fun updateExtendedJsonStatus(extendedStatus: JSONObject) {} + + override val pumpDescription: PumpDescription = Companion.pumpDescription + override fun manufacturer(): ManufacturerType = ManufacturerType.Insulet + override fun model(): PumpType = pumpDescription.pumpType + override fun serialNumber(): String = podStateManager.podId?.toString() ?: "O5-unpaired" + override val isFakingTempsByExtendedBoluses: Boolean = false + + override suspend fun loadTDDs(): PumpEnactResult = + pumpEnactResultProvider.get().success(false).enacted(false) + .comment(rh.gs(R.string.omnipod_5_error_tdd_not_supported)) + + override fun canHandleDST(): Boolean = false + + override fun executeCustomCommand(customCommand: CustomCommand): PumpEnactResult = + when (customCommand) { + is CommandPairNewPod -> pairNewPod() + is CommandDeactivatePod -> deactivatePod() + is CommandSilenceAlerts -> silenceAlerts() + is CommandResumeDelivery -> runBlocking { resumeOrHandleTimeChange() } + is CommandSuspendDelivery -> suspendDelivery() + is CommandPlayTestBeep -> playTestBeep() + is CommandHandleTimeChange -> runBlocking { resumeOrHandleTimeChange() } + is CommandUpdateAlertConfiguration -> updateAlertConfiguration() + is CommandDisableSuspendAlerts -> disableSuspendAlerts() + is CommandDeliverBasalCorrection -> deliverBasalCorrection() + else -> { + aapsLogger.warn(LTag.PUMP, "Unsupported custom command: " + customCommand.javaClass.name) + pumpEnactResultProvider.get().success(false).enacted(false).comment( + rh.gs(R.string.omnipod_common_error_unsupported_custom_command, customCommand.javaClass.name) + ) + } + } + + private fun pairNewPod(): PumpEnactResult = + try { + bleManager.pairNewPod().ignoreElements().blockingAwait() + pumpEnactResultProvider.get().success(true).enacted(true) + } catch (e: Exception) { + aapsLogger.error(LTag.PUMP, "Error pairing new O5 pod", e) + pumpEnactResultProvider.get().success(false).enacted(false) + } + + private fun deactivatePod(): PumpEnactResult = + try { + val cmd = DeactivateCommand.Builder() + .setUniqueId(requirePodId()) + .setSequenceNumber(podStateManager.msgSequenceNumber.toShort()) + .setNonce(FIXED_NONCE) + .build() + bleManager.sendCommand(cmd, DefaultStatusResponse::class).ignoreElements().blockingAwait() + bleManager.removeBond() + podStateManager.reset() + notificationManager.dismiss(NotificationId.OMNIPOD_POD_FAULT) + pumpEnactResultProvider.get().success(true).enacted(true) + } catch (e: Exception) { + aapsLogger.error(LTag.PUMP, "Error deactivating O5 pod", e) + pumpEnactResultProvider.get().success(false).enacted(false) + } + + private fun silenceAlerts(): PumpEnactResult = + podStateManager.activeAlerts?.let { alerts -> + try { + val cmd = SilenceAlertsCommand.Builder() + .setUniqueId(requirePodId()) + .setSequenceNumber(podStateManager.msgSequenceNumber.toShort()) + .setNonce(FIXED_NONCE) + .setAlertTypes(alerts) + .build() + bleManager.sendCommand(cmd, DefaultStatusResponse::class).ignoreElements().blockingAwait() + pumpEnactResultProvider.get().success(true).enacted(true) + } catch (e: Exception) { + aapsLogger.error(LTag.PUMP, "Error silencing O5 alerts", e) + pumpEnactResultProvider.get().success(false).enacted(false) + } + } ?: pumpEnactResultProvider.get().success(false).enacted(false).comment(rh.gs(R.string.omnipod_5_error_no_active_alerts)) + + private fun suspendDelivery(): PumpEnactResult = + try { + val basalBeeps = preferences.get(OmnipodBooleanPreferenceKey.BasalBeepsEnabled) + val cmd = SuspendDeliveryCommand.Builder() + .setUniqueId(requirePodId()) + .setSequenceNumber(podStateManager.msgSequenceNumber.toShort()) + .setNonce(FIXED_NONCE) + .setBeepType(if (basalBeeps) BeepType.LONG_SINGLE_BEEP else BeepType.SILENT) + .build() + bleManager.sendCommand(cmd, DefaultStatusResponse::class).ignoreElements().blockingAwait() + podStateManager.deliverySuspended = true + podStateManager.suspendAlertsEnabled = true + pumpEnactResultProvider.get().success(true).enacted(true) + } catch (e: Exception) { + aapsLogger.error(LTag.PUMP, "Error suspending O5 delivery", e) + pumpEnactResultProvider.get().success(false).enacted(false) + } + + private fun playTestBeep(): PumpEnactResult = + try { + val silentReminder = ProgramReminder(atStart = false, atEnd = false, atInterval = 0) + val cmd = ProgramBeepsCommand.Builder() + .setUniqueId(requirePodId()) + .setSequenceNumber(podStateManager.msgSequenceNumber.toShort()) + .setImmediateBeepType(BeepType.LONG_SINGLE_BEEP) + .setBasalReminder(silentReminder) + .setTempBasalReminder(silentReminder) + .setBolusReminder(silentReminder) + .build() + bleManager.sendCommand(cmd, DefaultStatusResponse::class).ignoreElements().blockingAwait() + pumpEnactResultProvider.get().success(true).enacted(true) + } catch (e: Exception) { + aapsLogger.error(LTag.PUMP, "Error playing O5 test beep", e) + pumpEnactResultProvider.get().success(false).enacted(false) + } + + /** Resume Delivery and Handle Time Change are both just "(re)program the current + * basal profile" - [ProgramBasalCommand] always sets the pod's current time and + * implicitly resumes delivery, same as Dash's identical handling of both. */ + private suspend fun resumeOrHandleTimeChange(): PumpEnactResult = + pumpSync.expectedPumpState().profile?.let { setNewBasalProfile(it) } + ?: pumpEnactResultProvider.get().success(false).enacted(false).comment(rh.gs(R.string.omnipod_5_error_no_active_profile)) + + private fun notifyUncertain(id: NotificationId, message: String) { + if (podStateManager.pendingDoseCommand != null) { + notificationManager.post(id, message, soundRes = app.aaps.core.ui.R.raw.boluserror) + } + } + + + /** Re-pushes expiration/low-reservoir alert config to the pod when preferences have + * changed since the last successful push - safe to call often (see [getPumpStatus]'s + * call site), since it's a no-op whenever nothing has changed. Mirrors Dash's + * updateAlertConfiguration(), minus its isPodRunning/expiry-negative guards (O5's + * activationProgress check below covers the same intent). */ + private fun updateAlertConfiguration(): PumpEnactResult { + val expirationReminderEnabled = preferences.get(OmnipodBooleanPreferenceKey.ExpirationReminder) + val expirationReminderHours = preferences.get(OmnipodIntPreferenceKey.ExpirationReminderHours) + val expirationAlarmEnabled = preferences.get(OmnipodBooleanPreferenceKey.ExpirationAlarm) + val expirationAlarmHours = preferences.get(OmnipodIntPreferenceKey.ExpirationAlarmHours) + val lowReservoirAlertEnabled = preferences.get(OmnipodBooleanPreferenceKey.LowReservoirAlert) + val lowReservoirAlertUnits = preferences.get(OmnipodIntPreferenceKey.LowReservoirAlertUnits) + val current = O5PodStateManager.SyncedAlertSettings( + expirationReminderEnabled, expirationReminderHours, + expirationAlarmEnabled, expirationAlarmHours, + lowReservoirAlertEnabled, lowReservoirAlertUnits + ) + + if (podStateManager.syncedAlertSettings == current) { + return pumpEnactResultProvider.get().success(true).enacted(false) + } + if (podStateManager.activationProgress != ActivationProgress.COMPLETED) { + return pumpEnactResultProvider.get().success(true).enacted(false) + } + + return try { + val alerts = buildO5ExpirationAlerts(podStateManager, preferences, aapsLogger) + AlertConfiguration( + AlertType.LOW_RESERVOIR, + enabled = lowReservoirAlertEnabled, + durationInMinutes = 0, + autoOff = false, + AlertTrigger.ReservoirVolumeTrigger((lowReservoirAlertUnits * 10).toShort()), + BeepType.FOUR_TIMES_BIP_BEEP, + BeepRepetitionType.XXX + ) + val cmd = ProgramAlertsCommand.Builder() + .setUniqueId(requirePodId()) + .setSequenceNumber(podStateManager.msgSequenceNumber.toShort()) + .setNonce(FIXED_NONCE) + .setAlertConfigurations(alerts) + .build() + bleManager.sendCommand(cmd, DefaultStatusResponse::class).ignoreElements().blockingAwait() + podStateManager.syncedAlertSettings = current + pumpEnactResultProvider.get().success(true).enacted(true) + } catch (e: Exception) { + aapsLogger.error(LTag.PUMP, "Error updating O5 alert configuration", e) + pumpEnactResultProvider.get().success(false).enacted(false) + } + } + + /** Silences the pod's SUSPEND_ENDED alert once delivery has resumed - see + * [podStateManager]'s suspendAlertsEnabled doc comment. */ + private fun disableSuspendAlerts(): PumpEnactResult { + if (!podStateManager.suspendAlertsEnabled) { + return pumpEnactResultProvider.get().success(true).enacted(false) + } + return try { + val cmd = ProgramAlertsCommand.Builder() + .setUniqueId(requirePodId()) + .setSequenceNumber(podStateManager.msgSequenceNumber.toShort()) + .setNonce(FIXED_NONCE) + .setAlertConfigurations( + listOf( + AlertConfiguration( + AlertType.SUSPEND_ENDED, enabled = false, durationInMinutes = 0, autoOff = false, + AlertTrigger.TimerTrigger(0), BeepType.FOUR_TIMES_BIP_BEEP, BeepRepetitionType.EVERY_MINUTE_AND_EVERY_15_MIN + ) + ) + ) + .build() + bleManager.sendCommand(cmd, DefaultStatusResponse::class).ignoreElements().blockingAwait() + podStateManager.suspendAlertsEnabled = false + pumpEnactResultProvider.get().success(true).enacted(true) + } catch (e: Exception) { + aapsLogger.error(LTag.PUMP, "Error disabling O5 suspend alerts", e) + pumpEnactResultProvider.get().success(false).enacted(false) + } + } + + + /** Mirrors OmnipodDashPodStateManagerImpl.needsBasalCorrection() exactly (thresholds, + * cooldown, drift-reset/zero-TBR safety checks), adapted to O5's flat temp-basal + * fields in place of Dash's TempBasal object. Opt-in via the same + * [ExternalOptions.ENABLE_OMNIPOD_DRIFT_COMPENSATION] semaphore file Dash uses. */ + private fun needsBasalCorrection(): Boolean { + if (!config.isEnabled(ExternalOptions.ENABLE_OMNIPOD_DRIFT_COMPENSATION)) return false + + val correctionThreshold = -PodConstants.POD_PULSE_BOLUS_UNITS / 2 + + if (podStateManager.activationProgress != ActivationProgress.COMPLETED) return false + if (podStateManager.deliverySuspended || podStateManager.alarmType != null) return false + + podStateManager.lastBasalCorrectionTime?.let { + if (System.currentTimeMillis() - it < 2 * 60 * 1000L) return false + } + + val drift = podStateManager.basalDrift + + if (drift >= PodConstants.POD_PULSE_BOLUS_UNITS * 2 || drift <= -PodConstants.POD_PULSE_BOLUS_UNITS * 2) { + aapsLogger.warn(LTag.PUMP, "Resetting O5 basal drift: drift=${"%.3f".format(drift)}U") + podStateManager.basalExpected = podStateManager.basalDelivered + return false + } + + if (drift > correctionThreshold) return false + + if (podStateManager.activeTempBasalRate == 0.0) { + val timeSinceLastBolus = podStateManager.lastBolusStartTime?.let { System.currentTimeMillis() - it } + if (timeSinceLastBolus == null || timeSinceLastBolus >= 5 * 60 * 1000L) return false + } + + return true + } + + /** Delivers a single POD_PULSE_BOLUS_UNITS (0.05U) correction bolus to true up basal + * drift - see [needsBasalCorrection]. Reuses [waitForBolusDeliveryToComplete] for the + * same progress-polling/confirmation logic a regular bolus uses. */ + private fun deliverBasalCorrection(): PumpEnactResult { + if (!needsBasalCorrection()) { + aapsLogger.info(LTag.PUMP, "O5 basal correction no longer appropriate") + return pumpEnactResultProvider.get().success(true).enacted(false) + } + if (podStateManager.pendingDoseCommand != null) { + aapsLogger.info(LTag.PUMP, "O5 basal correction skipped: an earlier dose is still unresolved") + return pumpEnactResultProvider.get().success(false).enacted(false) + } + podStateManager.lastBasalCorrectionTime = System.currentTimeMillis() + + val requestedInsulinAmount = PodConstants.POD_PULSE_BOLUS_UNITS + syncPumpFlows() + if (requestedInsulinAmount > reservoirLevel.value.cU) { + aapsLogger.info(LTag.PUMP, "O5 basal correction skipped: not enough insulin in reservoir") + return pumpEnactResultProvider.get().success(false).enacted(false) + } + if (podStateManager.deliveryStatus?.bolusDeliveringActive() == true) { + aapsLogger.info(LTag.PUMP, "O5 basal correction skipped: bolus already in progress") + return pumpEnactResultProvider.get().success(false).enacted(false) + } + + return try { + bolusDeliveryInProgress = true + podStateManager.basalCorrectionInProgress = true + aapsLogger.info(LTag.PUMP, "Delivering O5 basal correction") + + val startedAt = System.currentTimeMillis() + podStateManager.pendingDoseCommand = O5PodStateManager.PendingDoseCommand( + type = O5PodStateManager.PendingDoseType.BOLUS, + requestedUnits = requestedInsulinAmount, + bolusType = BS.Type.NORMAL, + startedAt = startedAt, + isBasalCorrection = true, + sequenceNumber = podStateManager.msgSequenceNumber.toShort() + ) + armStatusChecker() + podStateManager.lastBolusStartTime = startedAt + podStateManager.lastBolusRequestedUnits = requestedInsulinAmount + podStateManager.lastBolusDeliveredUnits = null + + val cmd = ProgramBolusCommand.Builder() + .setUniqueId(requirePodId()) + .setSequenceNumber(podStateManager.msgSequenceNumber.toShort()) + .setNonce(FIXED_NONCE) + .setNumberOfUnits(requestedInsulinAmount) + .setDelayBetweenPulsesInEighthSeconds(BOLUS_DELAY_BETWEEN_PULSES_EIGHTH_SECONDS) + .setProgramReminder(ProgramReminder(atStart = false, atEnd = false, atInterval = 0)) + .setO5BolusInfo(mealUnits = 0.0, correctionUnits = requestedInsulinAmount) + .build() + bleManager.sendCommand(cmd, DefaultStatusResponse::class).ignoreElements().blockingAwait() + runBlocking { + pumpSync.syncBolusWithPumpId( + timestamp = startedAt, + amount = PumpInsulin(requestedInsulinAmount), + type = BS.Type.NORMAL, + pumpId = startedAt, + pumpType = PumpType.OMNIPOD_5, + pumpSerial = serialNumber() + ) + } + val deliveredUnits = waitForBolusDeliveryToComplete(requestedInsulinAmount).blockingGet() + aapsLogger.info(LTag.PUMP, "O5 basal correction delivered: $deliveredUnits U") + pumpEnactResultProvider.get().success(true).enacted(true).bolusDelivered(deliveredUnits) + } catch (e: Exception) { + aapsLogger.error(LTag.PUMP, "O5 basal correction delivery failed", e) + pumpEnactResultProvider.get().success(false).enacted(false) + } finally { + bolusDeliveryInProgress = false + podStateManager.basalCorrectionInProgress = false + } + } + + override fun getPreferenceScreenContent() = PreferenceSubScreenDef( + key = "omnipod_5_settings", + titleResId = R.string.omnipod_5_name, + items = listOf( + PreferenceSubScreenDef( + key = "omnipod_5_beeps", + titleResId = app.aaps.pump.omnipod.common.R.string.omnipod_common_preferences_category_confirmation_beeps, + items = listOf( + OmnipodBooleanPreferenceKey.BolusBeepsEnabled, + OmnipodBooleanPreferenceKey.BasalBeepsEnabled, + OmnipodBooleanPreferenceKey.SmbBeepsEnabled, + OmnipodBooleanPreferenceKey.TbrBeepsEnabled + ) + ), + PreferenceSubScreenDef( + key = "omnipod_5_alerts", + titleResId = app.aaps.pump.omnipod.common.R.string.omnipod_common_preferences_category_alerts, + items = listOf( + OmnipodBooleanPreferenceKey.ExpirationReminder, + OmnipodIntPreferenceKey.ExpirationReminderHours, + OmnipodBooleanPreferenceKey.ExpirationAlarm, + OmnipodIntPreferenceKey.ExpirationAlarmHours, + OmnipodBooleanPreferenceKey.LowReservoirAlert, + OmnipodIntPreferenceKey.LowReservoirAlertUnits + ) + ), + PreferenceSubScreenDef( + key = "omnipod_5_notifications", + titleResId = app.aaps.pump.omnipod.common.R.string.omnipod_common_preferences_category_notifications, + items = listOf( + OmnipodBooleanPreferenceKey.SoundUncertainTbrNotification, + OmnipodBooleanPreferenceKey.SoundUncertainSmbNotification, + OmnipodBooleanPreferenceKey.SoundUncertainBolusNotification, + DashBooleanPreferenceKey.SoundDeliverySuspendedNotification + ) + ), + O5IntentKey.CertificateStore.withCompose( + ComposeScreenContent { onBack -> + O5CertificateStoreScreen(rh = rh, onBack = onBack) + } + ) + ), + icon = pluginDescription.icon + ) + +} diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/O5BleManager.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/O5BleManager.kt new file mode 100644 index 000000000000..c48ce87d20c0 --- /dev/null +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/O5BleManager.kt @@ -0,0 +1,39 @@ +package app.aaps.pump.omnipod.omnipod5.bledriver.comm + +import app.aaps.pump.omnipod.common.bledriver.comm.interfaces.session.BleConnection +import app.aaps.pump.omnipod.common.bledriver.comm.session.ConnectionState +import app.aaps.pump.omnipod.common.bledriver.event.PodEvent +import app.aaps.pump.omnipod.common.bledriver.pod.command.base.Command +import app.aaps.pump.omnipod.common.bledriver.pod.response.Response +import io.reactivex.rxjava3.core.Completable +import io.reactivex.rxjava3.core.Observable +import java.util.concurrent.CountDownLatch +import kotlin.reflect.KClass + +/** + * Omnipod 5 equivalent of [OmnipodDashBleManager]. Identical surface deliberately - the + * two pod types share the same [Command]/[Response]/[PodEvent] model (see + * [O5BleManagerImpl]'s class doc for why), so callers that already work against + * [OmnipodDashBleManager] can use this the same way. + */ +interface O5BleManager { + + fun sendCommand(cmd: Command, responseType: KClass): Observable + + fun getStatus(): ConnectionState + + fun connect(timeoutMs: Long = BleConnection.DEFAULT_CONNECT_TIMEOUT_MS): Observable + + fun connect(stopConnectionLatch: CountDownLatch): Observable + + fun pairNewPod(): Observable + + /** Sends the O5-only AID setup command batch (see [app.aaps.pump.omnipod.common + * .bledriver.pod.command.aid.O5AidSetupCommands]) over the already-established + * session. Must be called after [pairNewPod] completes and before any other + * activation command - see that object's class doc for why. */ + fun sendAidSetupCommands(): Completable + + fun disconnect(closeGatt: Boolean = false) + fun removeBond() +} diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/O5BleManagerImpl.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/O5BleManagerImpl.kt new file mode 100644 index 000000000000..a41634e46505 --- /dev/null +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/O5BleManagerImpl.kt @@ -0,0 +1,347 @@ +package app.aaps.pump.omnipod.omnipod5.bledriver.comm +import app.aaps.pump.omnipod.common.bledriver.comm.Id +import app.aaps.pump.omnipod.common.bledriver.comm.Ids + +import android.bluetooth.BluetoothAdapter +import android.bluetooth.BluetoothManager +import android.content.Context +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.utils.toHex +import app.aaps.pump.omnipod.common.bledriver.comm.exceptions.BusyException +import app.aaps.pump.omnipod.common.bledriver.comm.exceptions.ConnectException +import app.aaps.pump.omnipod.common.bledriver.comm.exceptions.CouldNotSendCommandException +import app.aaps.pump.omnipod.common.bledriver.comm.exceptions.FailedToConnectException +import app.aaps.pump.omnipod.common.bledriver.comm.exceptions.MessageIOException +import app.aaps.pump.omnipod.common.bledriver.comm.exceptions.NotConnectedException +import app.aaps.pump.omnipod.common.bledriver.comm.exceptions.PairingException +import app.aaps.pump.omnipod.common.bledriver.comm.exceptions.SessionEstablishmentException +import app.aaps.pump.omnipod.common.bledriver.comm.interfaces.device.BleDeviceManager +import app.aaps.pump.omnipod.common.bledriver.comm.interfaces.session.BleConnection +import app.aaps.pump.omnipod.omnipod5.bledriver.comm.legacy.O5BleConnectionFactory +import app.aaps.pump.omnipod.omnipod5.bledriver.comm.pair.O5CertificateStore +import app.aaps.pump.omnipod.omnipod5.bledriver.comm.pair.O5LTKExchanger +import app.aaps.pump.omnipod.omnipod5.bledriver.comm.pair.O5RegistrationData +import app.aaps.pump.omnipod.common.bledriver.comm.session.CommandAckError +import app.aaps.pump.omnipod.common.bledriver.comm.session.CommandReceiveError +import app.aaps.pump.omnipod.common.bledriver.comm.session.CommandReceiveSuccess +import app.aaps.pump.omnipod.common.bledriver.comm.session.CommandSendErrorConfirming +import app.aaps.pump.omnipod.common.bledriver.comm.session.CommandSendErrorSending +import app.aaps.pump.omnipod.common.bledriver.comm.session.CommandSendSuccess +import app.aaps.pump.omnipod.common.bledriver.comm.session.Connected +import app.aaps.pump.omnipod.common.bledriver.comm.session.ConnectionState +import app.aaps.pump.omnipod.common.bledriver.comm.session.ConnectionWaitCondition +import app.aaps.pump.omnipod.common.bledriver.comm.session.NotConnected +import app.aaps.pump.omnipod.common.bledriver.comm.session.Session +import app.aaps.pump.omnipod.common.bledriver.event.PodEvent +import app.aaps.pump.omnipod.omnipod5.bledriver.pod.command.aid.O5AidSetupCommands +import app.aaps.pump.omnipod.common.bledriver.pod.command.base.Command +import app.aaps.pump.omnipod.common.bledriver.pod.definition.PodType +import app.aaps.pump.omnipod.common.bledriver.pod.response.AlarmStatusResponse +import app.aaps.pump.omnipod.common.bledriver.pod.response.DefaultStatusResponse +import app.aaps.pump.omnipod.common.bledriver.pod.response.PodInfoActivationTimeResponse +import app.aaps.pump.omnipod.common.bledriver.pod.response.PodInfoTriggeredAlertsResponse +import app.aaps.pump.omnipod.common.bledriver.pod.response.Response +import app.aaps.pump.omnipod.common.bledriver.pod.response.SetUniqueIdResponse +import app.aaps.pump.omnipod.common.bledriver.pod.response.VersionResponse +import app.aaps.pump.omnipod.omnipod5.bledriver.pod.state.O5PodStateManager +import app.aaps.pump.omnipod.omnipod5.bledriver.pod.security.SecureO5RegistrationStorage +import app.aaps.pump.omnipod.omnipod5.bledriver.pod.util.P256KeyGenerator +import app.aaps.pump.omnipod.omnipod5.bledriver.pod.util.PodTypeAwarePodScanner +import io.reactivex.rxjava3.core.Completable +import io.reactivex.rxjava3.core.Observable +import java.util.concurrent.CountDownLatch +import java.util.concurrent.atomic.AtomicBoolean +import javax.inject.Inject +import javax.inject.Singleton +import kotlin.reflect.KClass + +/** + * Omnipod 5 equivalent of [OmnipodDashBleManagerImpl] - parallel to it rather than a + * modification, for the same reason [O5Connection] is parallel to [Connection]: that + * class is coupled throughout to [app.aaps.pump.omnipod.common.bledriver.pod.state + * .OmnipodDashPodStateManager]'s much larger state surface. + * + * The command/response layer itself ([Command], [Response], [PodEvent], [Session]) is + * reused completely unmodified - it turns out to have no Dash-specific assumptions baked + * in (see [app.aaps.pump.omnipod.common.bledriver.pod.command.base.HeaderEnabledCommand], + * which only needs a generic `uniqueId: Int` supplied externally). Only pairing and + * connection setup actually differ between the two pod types. + * + * Also restores previously-imported credentials (via [SecureO5RegistrationStorage]) into + * [O5RegistrationData]'s in-memory registry on construction - see the `init` block below. + */ +@Singleton +class O5BleManagerImpl @Inject constructor( + private val aapsLogger: AAPSLogger, + private val podState: O5PodStateManager, + private val config: Config, + private val context: Context, + private val bleConnectionFactory: O5BleConnectionFactory, + private val bleDeviceManager: BleDeviceManager, + private val secureO5RegistrationStorage: SecureO5RegistrationStorage, + private val p256KeyGenerator: P256KeyGenerator +) : O5BleManager { + + init { + secureO5RegistrationStorage.loadAndInstallAll() + } + + private val busy = AtomicBoolean(false) + private var connection: BleConnection? = null + + private val bluetoothAdapter: BluetoothAdapter? + get() = (context.getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager?)?.adapter + + override fun sendCommand(cmd: Command, responseType: KClass): Observable = + Observable.create { emitter -> + if (!busy.compareAndSet(false, true)) { + throw BusyException() + } + try { + val session = assertSessionEstablished() + + emitter.onNext(PodEvent.CommandSending(cmd)) + when (session.sendCommand(cmd)) { + is CommandSendErrorSending -> { + emitter.tryOnError(CouldNotSendCommandException()) + return@create + } + + is CommandSendSuccess -> { + emitter.onNext(PodEvent.CommandSent(cmd)) + podState.increaseMessageSequenceNumber() + } + + is CommandSendErrorConfirming -> { + emitter.onNext(PodEvent.CommandSendNotConfirmed(cmd)) + podState.increaseMessageSequenceNumber() + } + } + when (val readResult = session.readAndAckResponse()) { + is CommandReceiveSuccess -> { + recordStatusIfPresent(readResult.result) + emitter.onNext(PodEvent.ResponseReceived(cmd, readResult.result)) + podState.increaseMessageSequenceNumber() + } + + is CommandAckError -> { + recordStatusIfPresent(readResult.result) + emitter.onNext(PodEvent.ResponseReceived(cmd, readResult.result)) + podState.increaseMessageSequenceNumber() + } + + is CommandReceiveError -> { + readResult.result?.let { recordStatusIfPresent(it) } + emitter.tryOnError(MessageIOException("Could not read response: $readResult")) + return@create + } + } + busy.set(false) + emitter.onComplete() + } catch (ex: Exception) { + disconnect(false) + emitter.tryOnError(ex) + } finally { + busy.set(false) + } + } + + private fun recordStatusIfPresent(response: Response) { + when (response) { + is VersionResponse -> podState.updateFromVersionResponse(response) + is DefaultStatusResponse -> podState.updateFromDefaultStatusResponse(response) + is AlarmStatusResponse -> podState.updateFromAlarmStatusResponse(response) + is SetUniqueIdResponse -> podState.updateFromSetUniqueIdResponse(response) + is PodInfoActivationTimeResponse -> podState.updateFromActivationTimeResponse(response) + is PodInfoTriggeredAlertsResponse -> podState.updateFromTriggeredAlertsResponse(response) + else -> Unit + } + } + + private fun assertSessionEstablished(): Session { + val conn = assertConnected() + return conn.session + ?: throw NotConnectedException("Missing session") + } + + override fun getStatus(): ConnectionState = + connection?.connectionState() ?: NotConnected + + override fun connect(timeoutMs: Long): Observable = + connect(ConnectionWaitCondition(timeoutMs = timeoutMs)) + + override fun connect(stopConnectionLatch: CountDownLatch): Observable = + connect(ConnectionWaitCondition(stopConnection = stopConnectionLatch)) + + private fun connect(connectionWaitCond: ConnectionWaitCondition): Observable = Observable + .create { emitter -> + if (!busy.compareAndSet(false, true)) { + throw BusyException() + } + try { + emitter.onNext(PodEvent.BluetoothConnecting) + + val podAddress = podState.bluetoothAddress + ?: throw FailedToConnectException("Missing bluetoothAddress, activate the pod first") + + if (!bleDeviceManager.isBluetoothAvailable()) { + throw ConnectException("Bluetooth not available") + } + if (!bleDeviceManager.ensureBondedIfRequired(podAddress)) { + throw ConnectException("Bluetooth not available or bonding failed") + } + + val conn = connection ?: bleConnectionFactory.createConnection(podAddress) + connection = conn + if (conn.connectionState() is Connected && conn.session != null) { + emitter.onNext(PodEvent.AlreadyConnected(podAddress)) + busy.set(false) + emitter.onComplete() + return@create + } + + conn.connect(connectionWaitCond) + + emitter.onNext(PodEvent.BluetoothConnected(podAddress)) + emitter.onNext(PodEvent.EstablishingSession) + establishSession(1.toByte()) + emitter.onNext(PodEvent.Connected) + + busy.set(false) + emitter.onComplete() + } catch (ex: Exception) { + aapsLogger.error(LTag.PUMPBTCOMM, "O5 connection failed", ex) + disconnect(false) + emitter.tryOnError(ex) + } finally { + busy.set(false) + } + } + + private fun establishSession(msgSeq: Byte) { + val conn = assertConnected() + val ltk = assertPaired() + val ids = assertIdentity() + + val eapSqn = podState.increaseEapAkaSequenceNumber() + var newSqn = conn.establishSession(ltk, msgSeq, ids, eapSqn) + + if (newSqn != null) { + aapsLogger.info(LTag.PUMPBTCOMM, "Updating O5 EAP SQN to: $newSqn") + podState.eapAkaSequenceNumber = newSqn.toLong() + newSqn = conn.establishSession(ltk, msgSeq, ids, podState.increaseEapAkaSequenceNumber()) + if (newSqn != null) { + throw SessionEstablishmentException("Received resynchronization SQN for the second time (O5)") + } + } + podState.successfulConnections++ + podState.commitEapAkaSequenceNumber() + } + + private fun assertPaired(): ByteArray = + podState.ltk ?: throw FailedToConnectException("Missing LTK, activate the O5 pod first") + + private fun assertIdentity(): Ids { + val controllerId = podState.controllerId + ?: throw FailedToConnectException("Missing controllerId, activate the O5 pod first") + val podId = podState.podId + ?: throw FailedToConnectException("Missing podId, activate the O5 pod first") + return Ids.forController(Id.fromLong(controllerId), Id.fromLong(podId)) + } + + private fun assertConnected(): BleConnection = + connection ?: throw FailedToConnectException("connection lost (O5)") + + override fun pairNewPod(): Observable = Observable.create { emitter -> + if (!busy.compareAndSet(false, true)) { + throw BusyException() + } + try { + if (podState.ltk != null) { + emitter.onNext(PodEvent.AlreadyPaired) + emitter.onComplete() + return@create + } + aapsLogger.info(LTag.PUMPBTCOMM, "Starting new O5 pod activation") + + val controllerId = O5RegistrationData.pickControllerId + if (controllerId == 0L) { + throw PairingException( + "No O5 registration data available - cannot pair an Omnipod 5 pod without " + + "real Insulet-issued controller credentials (see O5RegistrationData)" + ) + } + val certStore = O5CertificateStore(aapsLogger, p256KeyGenerator, controllerId) + + val adapter = bluetoothAdapter ?: throw ConnectException("Bluetooth not available") + emitter.onNext(PodEvent.Scanning) + val scanner = PodTypeAwarePodScanner(aapsLogger, adapter) + val discovered = scanner.scanForPod(PodType.OMNIPOD_5) + podState.bluetoothAddress = discovered.address + + emitter.onNext(PodEvent.BluetoothConnecting) + val conn = bleConnectionFactory.createConnection(discovered.address, controllerId) + connection = conn + conn.connect(ConnectionWaitCondition(timeoutMs = BleConnection.DEFAULT_CONNECT_TIMEOUT_MS)) + emitter.onNext(PodEvent.BluetoothConnected(discovered.address)) + + emitter.onNext(PodEvent.Pairing) + val mIO = conn.msgIO ?: throw ConnectException("Connection lost") + + val myId = Id.fromLong(certStore.controllerId) + val podId = myId.increment() + + val ltkExchanger = O5LTKExchanger(aapsLogger, mIO, certStore, myId, podId) + val pairResult = ltkExchanger.o5NegotiateLTK() + emitter.onNext(PodEvent.Paired(podId)) + + podState.updateFromPairing(certStore.controllerId, podId.toLong(), pairResult) + if (config.DEBUG) { + aapsLogger.info(LTag.PUMPCOMM, "Got O5 LTK: ${pairResult.ltk.toHex()}") + } + + emitter.onNext(PodEvent.EstablishingSession) + establishSession(pairResult.msgSeq) + podState.successfulConnections++ + emitter.onNext(PodEvent.Connected) + emitter.onComplete() + } catch (ex: Exception) { + aapsLogger.error(LTag.PUMPBTCOMM, "O5 pod activation failed", ex) + disconnect(false) + emitter.tryOnError(ex) + } finally { + busy.set(false) + } + } + + override fun sendAidSetupCommands(): Completable = Completable.fromAction { + if (!busy.compareAndSet(false, true)) { + throw BusyException() + } + try { + val session = assertSessionEstablished() + O5AidSetupCommands.send(session) + } catch (ex: Exception) { + disconnect(false) + throw ex + } finally { + busy.set(false) + } + } + + override fun disconnect(closeGatt: Boolean) { + connection?.disconnect(closeGatt) + ?: aapsLogger.info(LTag.PUMPBTCOMM, "Trying to disconnect a null O5 connection") + } + + override fun removeBond() { + val address = podState.bluetoothAddress + if (address == null) { + aapsLogger.error(LTag.PUMPBTCOMM, "removeBond (O5): MAC address not found") + return + } + bleDeviceManager.removeBond(address) + } +} diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/O5IdRotation.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/O5IdRotation.kt new file mode 100644 index 000000000000..b1637ca32f38 --- /dev/null +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/O5IdRotation.kt @@ -0,0 +1,33 @@ +package app.aaps.pump.omnipod.omnipod5.bledriver.comm + +/** + * PodId rotation for Omnipod 5 pairing retries, ported from OmnipodKit's Id.swift + * (`nextPodId`/`controllerIdForPodId`). + * + * Unlike Dash (whose controllerId is randomly generated locally), O5's controllerId must + * match a value already present in the certificate store - so podIds cycle through 3 + * values (`controllerId+1`, `+2`, `+3`) built on top of a *fixed* controllerId, rather than + * generating a fresh controllerId per attempt the way Dash does. + */ +object O5IdRotation { + + private const val CONTROLLER_ID_BIT_MASK: Long = 0b11L + + /** Given a [podId], returns the controllerId it was derived from (clears the low 2 bits). */ + fun controllerIdForPodId(podId: Long): Long = + podId and (CONTROLLER_ID_BIT_MASK.inv()) + + /** + * Returns the next podId in the 3-way rotation after [lastPodId]: `+1, +2, +3`, then + * wraps back to `base+1` (matching OmnipodKit's exact wrap-around behavior, used when + * a pairing attempt with one podId fails and the next one in rotation should be tried). + */ + fun nextPodId(lastPodId: Long): Long { + val low2Bits = lastPodId and CONTROLLER_ID_BIT_MASK + return if (low2Bits == CONTROLLER_ID_BIT_MASK) { + controllerIdForPodId(lastPodId) + 1 + } else { + lastPodId + 1 + } + } +} diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/O5PairingCoordinator.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/O5PairingCoordinator.kt new file mode 100644 index 000000000000..0581e61fc210 --- /dev/null +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/O5PairingCoordinator.kt @@ -0,0 +1,110 @@ +package app.aaps.pump.omnipod.omnipod5.bledriver.comm +import app.aaps.pump.omnipod.common.bledriver.comm.Id +import app.aaps.pump.omnipod.common.bledriver.comm.Ids + +import android.bluetooth.BluetoothAdapter +import android.bluetooth.BluetoothManager +import android.content.Context +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.pump.omnipod.common.bledriver.comm.exceptions.ConnectException +import app.aaps.pump.omnipod.common.bledriver.comm.exceptions.PairingException +import app.aaps.pump.omnipod.common.bledriver.comm.interfaces.session.BleConnection +import app.aaps.pump.omnipod.omnipod5.bledriver.comm.legacy.O5BleConnectionFactory +import app.aaps.pump.omnipod.omnipod5.bledriver.comm.pair.O5CertificateStore +import app.aaps.pump.omnipod.omnipod5.bledriver.comm.pair.O5LTKExchanger +import app.aaps.pump.omnipod.omnipod5.bledriver.comm.pair.O5RegistrationData +import app.aaps.pump.omnipod.common.bledriver.comm.pair.PairResult +import app.aaps.pump.omnipod.common.bledriver.comm.session.ConnectionWaitCondition +import app.aaps.pump.omnipod.common.bledriver.pod.definition.PodType +import app.aaps.pump.omnipod.omnipod5.bledriver.pod.state.O5PodStateManager +import app.aaps.pump.omnipod.omnipod5.bledriver.pod.util.P256KeyGenerator +import app.aaps.pump.omnipod.omnipod5.bledriver.pod.util.PodTypeAwarePodScanner +import javax.inject.Inject +import javax.inject.Singleton + +/** + * The O5 pairing entry point: scans for a pairable Omnipod 5 pod, connects to it, runs + * [O5LTKExchanger]'s pairing message sequence, then establishes the post-pairing encrypted + * session - parallel to [OmnipodDashBleManagerImpl.pairNewPod] rather than a modification + * of it. + * + * Requires real registration data to already be installed in [O5RegistrationData] (see + * that class's doc comment) - without it, [pairNewPod] fails immediately with a + * [PairingException] rather than attempting a pairing that could never succeed. + */ +@Singleton +class O5PairingCoordinator @Inject constructor( + private val aapsLogger: AAPSLogger, + private val config: Config, + private val context: Context, + private val podState: O5PodStateManager, + private val bleConnectionFactory: O5BleConnectionFactory, + private val p256KeyGenerator: P256KeyGenerator +) { + + private val bluetoothAdapter: BluetoothAdapter? + get() = (context.getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager?)?.adapter + + /** + * Pairs a new Omnipod 5 pod and establishes the initial encrypted session with it. + * Returns the negotiated [PairResult] on success. + * + * @throws PairingException if no O5 registration data is available, or if pairing fails. + * @throws ConnectException if the BLE connection is lost partway through. + */ + fun pairNewPod(): PairResult { + aapsLogger.info(LTag.PUMPBTCOMM, "Starting new O5 pod activation") + + val adapter = bluetoothAdapter ?: throw ConnectException("Bluetooth not available") + + val controllerId = O5RegistrationData.pickControllerId + if (controllerId == 0L) { + throw PairingException( + "No O5 registration data available - cannot pair an Omnipod 5 pod without " + + "real Insulet-issued controller credentials (see O5RegistrationData)" + ) + } + val certStore = O5CertificateStore(aapsLogger, p256KeyGenerator, controllerId) + + val scanner = PodTypeAwarePodScanner(aapsLogger, adapter) + val discovered = scanner.scanForPod(PodType.OMNIPOD_5) + podState.bluetoothAddress = discovered.address + aapsLogger.info(LTag.PUMPBTCOMM, "Found O5 pod at ${discovered.address}, connecting") + + val conn = bleConnectionFactory.createConnection(discovered.address, controllerId) + conn.connect(ConnectionWaitCondition(timeoutMs = BleConnection.DEFAULT_CONNECT_TIMEOUT_MS)) + + val mIO = conn.msgIO ?: throw ConnectException("Connection lost before pairing could start") + + val myId = Id.fromLong(certStore.controllerId) + val podId = myId.increment() + + aapsLogger.info(LTag.PUMPBTCOMM, "Pairing with predicted podId=$podId, myId=$myId") + val ltkExchanger = O5LTKExchanger(aapsLogger, mIO, certStore, myId, podId) + val pairResult = ltkExchanger.o5NegotiateLTK() + + podState.updateFromPairing(certStore.controllerId, podId.toLong(), pairResult) + aapsLogger.info(LTag.PUMPBTCOMM, "O5 pairing succeeded, establishing session") + + val ids = Ids.forController(myId, podId) + val eapSqn = podState.increaseEapAkaSequenceNumber() + val resyncSqn = conn.establishSession(pairResult.ltk, pairResult.msgSeq, ids, eapSqn) + if (resyncSqn != null) { + aapsLogger.info(LTag.PUMPBTCOMM, "O5 EAP AKA resynchronization on first connect: $resyncSqn") + podState.eapAkaSequenceNumber = resyncSqn.toLong() + val secondAttemptSqn = conn.establishSession( + pairResult.ltk, pairResult.msgSeq, ids, podState.increaseEapAkaSequenceNumber() + ) + if (secondAttemptSqn != null) { + throw PairingException("Received EAP AKA resynchronization for the second time") + } + } + podState.commitEapAkaSequenceNumber() + podState.successfulConnections++ + + aapsLogger.info(LTag.PUMPBTCOMM, "O5 pod paired and session established") + return pairResult + } +} diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/legacy/O5BleConnectionFactory.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/legacy/O5BleConnectionFactory.kt new file mode 100644 index 000000000000..55598be18488 --- /dev/null +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/legacy/O5BleConnectionFactory.kt @@ -0,0 +1,49 @@ +package app.aaps.pump.omnipod.omnipod5.bledriver.comm.legacy + +import android.bluetooth.BluetoothAdapter +import android.bluetooth.BluetoothManager +import android.content.Context +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.pump.omnipod.common.bledriver.comm.exceptions.ConnectException +import app.aaps.pump.omnipod.common.bledriver.comm.interfaces.session.BleConnection +import app.aaps.pump.omnipod.common.bledriver.comm.interfaces.session.BleConnectionFactory +import app.aaps.pump.omnipod.omnipod5.bledriver.comm.legacy.session.O5Connection +import app.aaps.pump.omnipod.omnipod5.bledriver.pod.state.O5PodStateManager +import app.aaps.pump.omnipod.omnipod5.bledriver.pod.util.P256KeyGenerator +import javax.inject.Inject +import javax.inject.Singleton + +/** + * Creates [O5Connection] instances, parallel to Dash's [LegacyBleConnectionFactory] + * rather than a modification of it (that factory is hardwired to Dash's + * [app.aaps.pump.omnipod.common.bledriver.pod.state.OmnipodDashPodStateManager]). + */ +@Singleton +class O5BleConnectionFactory @Inject constructor( + private val context: Context, + private val aapsLogger: AAPSLogger, + private val config: Config, + private val podState: O5PodStateManager, + private val p256KeyGenerator: P256KeyGenerator +) : BleConnectionFactory { + + private val bluetoothAdapter: BluetoothAdapter? + get() = (context.getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager?)?.adapter + + override fun createConnection(podAddress: String): BleConnection = createConnection(podAddress, null) + + /** + * O5-specific overload used during new pod activation, where the controller id is known + * from the picked credentials but not yet stored in [O5PodStateManager] (that only + * happens after pairing succeeds). The id is passed straight into the 'hello' handshake + * so it matches the source id used in the pairing messages. For reconnects to an already + * paired pod, use [createConnection] with no controller id - [O5Connection] resolves it + * from [O5PodStateManager.controllerId]. + */ + fun createConnection(podAddress: String, controllerId: Long?): BleConnection { + val adapter = bluetoothAdapter ?: throw ConnectException("Bluetooth not available") + val podDevice = adapter.getRemoteDevice(podAddress) + return O5Connection(podDevice, aapsLogger, config, context, podState, p256KeyGenerator, controllerId) + } +} diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/legacy/session/O5Connection.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/legacy/session/O5Connection.kt new file mode 100644 index 000000000000..dd53781b6aa7 --- /dev/null +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/legacy/session/O5Connection.kt @@ -0,0 +1,305 @@ +package app.aaps.pump.omnipod.omnipod5.bledriver.comm.legacy.session +import app.aaps.pump.omnipod.common.bledriver.comm.legacy.session.Connection +import app.aaps.pump.omnipod.common.bledriver.comm.legacy.session.ServiceDiscoverer + +import android.bluetooth.BluetoothDevice +import android.bluetooth.BluetoothGatt +import android.bluetooth.BluetoothManager +import android.bluetooth.BluetoothProfile +import android.content.Context +import android.os.SystemClock +import app.aaps.core.data.configuration.Constants +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.utils.toHex +import app.aaps.pump.omnipod.common.bledriver.comm.Ids +import app.aaps.pump.omnipod.common.bledriver.comm.endecrypt.EnDecrypt +import app.aaps.pump.omnipod.common.bledriver.comm.exceptions.ConnectException +import app.aaps.pump.omnipod.common.bledriver.comm.exceptions.FailedToConnectException +import app.aaps.pump.omnipod.common.bledriver.comm.interfaces.io.CharacteristicType +import app.aaps.pump.omnipod.common.bledriver.comm.interfaces.session.BleConnection +import app.aaps.pump.omnipod.common.bledriver.comm.legacy.callbacks.BleCommCallbacks +import app.aaps.pump.omnipod.common.bledriver.comm.legacy.io.CmdBleIO +import app.aaps.pump.omnipod.common.bledriver.comm.legacy.io.DataBleIO +import app.aaps.pump.omnipod.common.bledriver.comm.legacy.io.IncomingPackets +import app.aaps.pump.omnipod.common.bledriver.comm.message.MessageIO +import app.aaps.pump.omnipod.omnipod5.bledriver.comm.pair.O5CertificateStore +import app.aaps.pump.omnipod.common.bledriver.comm.session.Connected +import app.aaps.pump.omnipod.common.bledriver.comm.session.ConnectionState +import app.aaps.pump.omnipod.common.bledriver.comm.session.ConnectionWaitCondition +import app.aaps.pump.omnipod.common.bledriver.comm.session.DisconnectHandler +import app.aaps.pump.omnipod.common.bledriver.comm.session.EapSqn +import app.aaps.pump.omnipod.common.bledriver.comm.session.NotConnected +import app.aaps.pump.omnipod.common.bledriver.comm.session.STOP_CONNECTING_CHECK_INTERVAL_MS +import app.aaps.pump.omnipod.common.bledriver.comm.session.Session +import app.aaps.pump.omnipod.common.bledriver.comm.session.SessionEstablisher +import app.aaps.pump.omnipod.common.bledriver.comm.session.SessionKeys +import app.aaps.pump.omnipod.common.bledriver.comm.session.SessionNegotiationResynchronization +import app.aaps.pump.omnipod.common.bledriver.pod.definition.PodType +import app.aaps.pump.omnipod.omnipod5.bledriver.pod.state.O5PodStateManager +import app.aaps.pump.omnipod.omnipod5.bledriver.pod.util.P256KeyGenerator + +/** + * BLE GATT connection lifecycle and session establishment for Omnipod 5, parallel to + * Dash's [Connection] rather than a modification of it - [Connection] is coupled + * throughout to the much larger [app.aaps.pump.omnipod.common.bledriver.pod.state + * .OmnipodDashPodStateManager] (full pod status surface: basal programs, alerts, + * delivery status, etc.), which doesn't fit O5's connection-only [O5PodStateManager]. + * + * Everything below the GATT-characteristic-selection level - [ServiceDiscoverer] (called + * here with [PodType.OMNIPOD_5]), [CmdBleIO], [DataBleIO], [MessageIO], + * [SessionEstablisher], [Session], [EnDecrypt] - is reused unmodified from the existing + * Dash connection path, since none of it is actually Dash-specific once given the right + * pod type and identity. + */ +class O5Connection( + private val podDevice: BluetoothDevice, + private val aapsLogger: AAPSLogger, + private val config: Config, + private val context: Context, + private val podState: O5PodStateManager, + private val p256KeyGenerator: P256KeyGenerator, + private val pairingControllerId: Long? = null +) : BleConnection, DisconnectHandler { + + private val incomingPackets = IncomingPackets() + private val bleCommCallbacks = BleCommCallbacks(aapsLogger, incomingPackets, this) + private var gattConnection: BluetoothGatt? = null + + private val bluetoothManager: BluetoothManager? = + context.getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager? + + private var _connectionWaitCond: ConnectionWaitCondition? = null + + @Volatile + override var session: Session? = null + + @Volatile + override var msgIO: MessageIO? = null + + @Synchronized + override fun connect(connectionWaitCond: ConnectionWaitCondition) { + aapsLogger.debug(LTag.PUMPBTCOMM, "Connecting (O5) connectionWaitCond=$connectionWaitCond") + _connectionWaitCond = connectionWaitCond + podState.connectionAttempts++ + podState.bluetoothConnectionState = O5PodStateManager.BluetoothConnectionState.CONNECTING + val autoConnect = false + var gatt = gattConnection + if (gatt == null) { + gatt = podDevice.connectGatt(context, autoConnect, bleCommCallbacks, BluetoothDevice.TRANSPORT_LE) + if (gatt == null) { + Thread.sleep(SLEEP_WHEN_FAILING_TO_CONNECT_GATT) + throw FailedToConnectException("connectGatt() returned null") + } + gattConnection = gatt + } else if (!gatt.connect()) { + throw FailedToConnectException("connect() returned false") + } + val before = SystemClock.elapsedRealtime() + if (waitForConnection(connectionWaitCond) !is Connected) { + podState.bluetoothConnectionState = O5PodStateManager.BluetoothConnectionState.DISCONNECTED + _connectionWaitCond = null + throw FailedToConnectException(podDevice.address) + } + val waitedMs = SystemClock.elapsedRealtime() - before + val timeoutMs = connectionWaitCond.timeoutMs + if (timeoutMs != null) { + var newTimeout = timeoutMs - waitedMs + if (newTimeout < MIN_DISCOVERY_TIMEOUT_MS) { + newTimeout = MIN_DISCOVERY_TIMEOUT_MS + } + connectionWaitCond.timeoutMs = newTimeout + } + podState.bluetoothConnectionState = O5PodStateManager.BluetoothConnectionState.CONNECTED + aapsLogger.debug(LTag.PUMPBTCOMM, "GATT connected (O5) to ${podDevice.address}, discovering services") + + val discoverer = ServiceDiscoverer(aapsLogger, gatt, bleCommCallbacks, this) + val discovered = discoverer.discoverServices(connectionWaitCond, PodType.OMNIPOD_5) + aapsLogger.debug(LTag.PUMPBTCOMM, "Service discovery complete (O5): characteristics=${discovered.keys}") + + requestLargeMtu(gatt) + + val cmdBleIO = CmdBleIO( + aapsLogger, + discovered.getValue(CharacteristicType.CMD), + incomingPackets.cmdQueue, + gatt, + bleCommCallbacks + ) + val dataBleIO = DataBleIO( + aapsLogger, + discovered.getValue(CharacteristicType.DATA), + incomingPackets.dataQueue, + gatt, + bleCommCallbacks, + CharacteristicType.DATA_O5 + ) + msgIO = MessageIO(aapsLogger, cmdBleIO, dataBleIO, PodType.OMNIPOD_5) + val helloControllerId = pairingControllerId ?: podState.controllerId + if (helloControllerId != null) { + aapsLogger.debug( + LTag.PUMPBTCOMM, + "Performing O5 CMD 'hello' handshake (controllerId=0x%08x) and enabling reads".format(helloControllerId) + ) + cmdBleIO.hello(helloControllerId.toInt()) + } else { + aapsLogger.warn( + LTag.PUMPBTCOMM, + "O5 'hello' handshake has no controllerId available - falling back to default, pairing will likely fail" + ) + cmdBleIO.hello() + } + cmdBleIO.readyToRead() + dataBleIO.readyToRead() + aapsLogger.debug(LTag.PUMPBTCOMM, "O5 BLE connection ready (message IO established) for ${podDevice.address}") + _connectionWaitCond = null + } + + @Synchronized + override fun disconnect(closeGatt: Boolean) { + aapsLogger.debug(LTag.PUMPBTCOMM, "Disconnecting (O5) closeGatt=$closeGatt") + if (!closeGatt && gattConnection != null) { + gattConnection?.disconnect() + podState.bluetoothConnectionState = O5PodStateManager.BluetoothConnectionState.DISCONNECTED + } else { + gattConnection?.close() + bleCommCallbacks.resetConnection() + gattConnection = null + session = null + msgIO = null + podState.bluetoothConnectionState = O5PodStateManager.BluetoothConnectionState.DISCONNECTED + } + } + + /** + * O5 messages are sent as single GATT writes up to [PodType.OMNIPOD_5]'s 244-byte + * packet payload (see BlePacketLayout.OMNIPOD_5), which needs an ATT MTU of at least + * [MIN_REQUIRED_MTU]. Android starts every connection at the 23-byte default and does + * NOT auto-negotiate a larger MTU (unlike iOS/CoreBluetooth, which is why OmnipodKit + * never has to ask). Without this, the first pairing message (SP1+SP2, ~51 bytes on + * the wire) is truncated to ~20 bytes and the pod replies ABORT. Dash is unaffected + * because its packets fit in the default MTU. + */ + private fun requestLargeMtu(gatt: BluetoothGatt) { + if (!gatt.requestMtu(REQUESTED_MTU)) { + aapsLogger.warn(LTag.PUMPBTCOMM, "O5 requestMtu($REQUESTED_MTU) call returned false - continuing with default MTU") + return + } + val completed = bleCommCallbacks.waitForMtuChange(MTU_NEGOTIATION_TIMEOUT_MS) + val mtu = bleCommCallbacks.negotiatedMtu + if (!completed) { + aapsLogger.warn(LTag.PUMPBTCOMM, "O5 MTU negotiation timed out - continuing with MTU=$mtu") + } else { + aapsLogger.debug(LTag.PUMPBTCOMM, "O5 MTU negotiated: $mtu") + } + if (mtu < MIN_REQUIRED_MTU) { + aapsLogger.warn( + LTag.PUMPBTCOMM, + "O5 negotiated MTU=$mtu is below the required $MIN_REQUIRED_MTU - large pairing messages may be truncated and rejected by the pod" + ) + } + } + + private fun waitForConnection(connectionWaitCond: ConnectionWaitCondition): ConnectionState { + aapsLogger.debug(LTag.PUMPBTCOMM, "waitForConnection (O5) connectionWaitCond=$connectionWaitCond") + try { + connectionWaitCond.timeoutMs?.let { + bleCommCallbacks.waitForConnection(it) + } + val startWaiting = System.currentTimeMillis() + connectionWaitCond.stopConnection?.let { + while (!bleCommCallbacks.waitForConnection(STOP_CONNECTING_CHECK_INTERVAL_MS)) { + if (it.count == 0L) { + throw ConnectException("stopConnecting called") + } + val secondsElapsed = (System.currentTimeMillis() - startWaiting) / 1000 + if (secondsElapsed > MAX_WAIT_FOR_CONNECTION_SECONDS) { + throw ConnectException("connection timeout") + } + } + } + } catch (e: InterruptedException) { + aapsLogger.info(LTag.PUMPBTCOMM, "Interrupted while waiting for connection (O5)") + } + return connectionState() + } + + override fun connectionState(): ConnectionState { + val connectionState = bluetoothManager?.getConnectionState(podDevice, BluetoothProfile.GATT) + aapsLogger.debug(LTag.PUMPBTCOMM, "GATT connection state (O5): $connectionState") + if (connectionState != BluetoothProfile.STATE_CONNECTED) { + return NotConnected + } + return Connected + } + + /** + * [ids] here must be built via [Ids.forController] using the pod's certificate-derived + * controller id and its own O5 pod id - O5 has no [Ids] constructor of its own since it + * has no Dash-style pod state manager to derive one from (see [Ids]'s class doc). + */ + override fun establishSession(ltk: ByteArray, msgSeq: Byte, ids: Ids, eapSqn: ByteArray): EapSqn? { + val mIO = msgIO ?: throw ConnectException("Connection lost") + aapsLogger.debug( + LTag.PUMPBTCOMM, + "Establishing O5 session (EAP-AKA): msgSeq=$msgSeq, ltk=${ltk.size} bytes, eapSqn=${eapSqn.toHex()}, ids=$ids" + ) + + val eapAkaExchanger = SessionEstablisher(aapsLogger, config, mIO, ltk, eapSqn, ids, msgSeq) + return when (val keys = eapAkaExchanger.negotiateSessionKeys()) { + is SessionNegotiationResynchronization -> { + aapsLogger.debug(LTag.PUMPBTCOMM, "O5 EAP-AKA requested SQN resynchronization: ${keys.synchronizedEapSqn}") + if (config.DEBUG) { + aapsLogger.info(LTag.PUMPCOMM, "EAP AKA resynchronization (O5): ${keys.synchronizedEapSqn}") + } + keys.synchronizedEapSqn + } + + is SessionKeys -> { + if (config.DEBUG) { + aapsLogger.info(LTag.PUMPCOMM, "CK (O5): ${keys.ck.toHex()}") + aapsLogger.info(LTag.PUMPCOMM, "msgSequenceNumber (O5): ${keys.msgSequenceNumber}") + aapsLogger.info(LTag.PUMPCOMM, "Nonce (O5): ${keys.nonce}") + } + val enDecrypt = EnDecrypt(aapsLogger, keys.nonce, keys.ck) + val controllerId = requireNotNull(podState.controllerId) { + "Missing controllerId, cannot establish a signed O5 session" + } + val certStore = O5CertificateStore(aapsLogger, p256KeyGenerator, controllerId) + session = Session(aapsLogger, mIO, ids, sessionKeys = keys, enDecrypt = enDecrypt, commandSigner = certStore) + aapsLogger.debug( + LTag.PUMPBTCOMM, + "O5 session established - encrypted channel ready (msgSeq=${keys.msgSequenceNumber})" + ) + null + } + } + } + + override fun onConnectionLost(status: Int) { + aapsLogger.info(LTag.PUMPBTCOMM, "Lost connection (O5) with status: $status") + _connectionWaitCond?.stopConnection?.let { + if (it.count > 0) { + it.countDown() + } + } + disconnect(true) + } + + companion object { + const val MIN_DISCOVERY_TIMEOUT_MS = 10000L + const val MAX_WAIT_FOR_CONNECTION_SECONDS = Constants.PUMP_MAX_CONNECTION_TIME_IN_SECONDS + 10 + const val SLEEP_WHEN_FAILING_TO_CONNECT_GATT = 10000L + + /** MTU we ask the phone to negotiate. 512 lets the stack settle on the highest the + * phone and pod both support; O5 only needs [MIN_REQUIRED_MTU]. */ + const val REQUESTED_MTU = 512 + + /** Minimum ATT MTU that fits a full 244-byte O5 packet payload (244 + 3-byte ATT + * header). Below this, large pairing writes get truncated and the pod aborts. */ + const val MIN_REQUIRED_MTU = 247 + + const val MTU_NEGOTIATION_TIMEOUT_MS = 5000L + } +} diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/pair/O5CertificateStore.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/pair/O5CertificateStore.kt new file mode 100644 index 000000000000..3d9fcf605987 --- /dev/null +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/pair/O5CertificateStore.kt @@ -0,0 +1,324 @@ +package app.aaps.pump.omnipod.omnipod5.bledriver.comm.pair + +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.utils.toHex +import app.aaps.pump.omnipod.common.bledriver.comm.exceptions.PairingException +import app.aaps.pump.omnipod.common.bledriver.comm.pair.CommandSigner +import app.aaps.pump.omnipod.omnipod5.bledriver.pod.util.P256Codec +import app.aaps.pump.omnipod.omnipod5.bledriver.pod.util.P256KeyGenerator +import java.math.BigInteger +import java.security.Signature +import java.security.interfaces.ECPublicKey +import java.util.Base64 + +/** + * Manages the PKI material needed for Omnipod 5 pairing and pod command authentication. + * Key/certificate data comes from [O5RegistrationData] - swap the underlying registration + * to use different registration data. + * + * Ported from OmnipodKit's O5CertificateStore.swift (loopandlearn/OmnipodKit). Two + * deliberate differences from the Swift original, both explained inline below: + * 1. Certificate field extraction (public key + serial number) is ported as a faithful, + * hand-rolled byte-level parser rather than switched to a full ASN.1 library, so every + * line here could be verified against real, JDK-generated X.509 certificates without + * depending on an external library this environment couldn't compile-check. + * 2. DER signature encoding/decoding is similarly hand-rolled rather than delegated to a + * library, for the same verifiability reason. + * + * @throws PairingException if no registration data is available for [controllerId], or if + * the registration's stored public key doesn't match the one derived from its private key + * (which would indicate corrupted or tampered registration data). + */ +class O5CertificateStore( + private val aapsLogger: AAPSLogger, + private val p256KeyGenerator: P256KeyGenerator, + controllerId: Long +) : CommandSigner { + + val registration: O5RegistrationData = + O5RegistrationData.get(controllerId) + ?: throw PairingException("No O5 registration data found for controller id 0x%08X".format(controllerId)) + + val controllerId: Long get() = registration.controllerId + val controllerIdData: ByteArray get() = registration.controllerIdData + + private val signingPrivateKeyRaw: ByteArray = registration.privateKey + + /** The secondary P-256 signing key's raw (65-byte, uncompressed) public key. */ + val signingPublicKeyRaw: ByteArray + + init { + require(signingPrivateKeyRaw.size == P256Codec.SCALAR_LENGTH_BYTES) { + "Secondary key scalar must be exactly ${P256Codec.SCALAR_LENGTH_BYTES} bytes" + } + + signingPublicKeyRaw = p256KeyGenerator.publicFromPrivate(signingPrivateKeyRaw) + + if (!signingPublicKeyRaw.contentEquals(registration.publicKey)) { + aapsLogger.error( + LTag.PUMPBTCOMM, + "O5 signing public key does NOT match expected secondary public key for controller 0x%08X" + .format(controllerId) + ) + throw PairingException( + "O5 signing public key mismatch for controller id 0x%08X".format(controllerId) + ) + } + + val tlsCert = registration.tlsCertificate + val intermediateCA = registration.intermediateCA + val tlsSerial = tlsCert?.let { extractSerialNumber(it) } + aapsLogger.debug( + LTag.PUMPBTCOMM, + "O5CertificateStore initialized for controller 0x%08X (source=%s): tlsCert=%s bytes, intermediateCA=%s bytes, tlsSerial=%s, signingPublicKey=%d bytes" + .format( + controllerId, + O5RegistrationData.source(controllerId), + tlsCert?.size?.toString() ?: "null", + intermediateCA?.size?.toString() ?: "null", + tlsSerial?.toHex() ?: "unavailable", + signingPublicKeyRaw.size + ) + ) + if (tlsCert != null && extractP256PublicKey(tlsCert) == null) { + aapsLogger.warn( + LTag.PUMPBTCOMM, + "O5CertificateStore: could not extract P-256 public key from TLS certificate for controller 0x%08X" + .format(controllerId) + ) + } + } + + /** Sign [data] with the secondary key; returns the raw signature (r || s, 64 bytes). */ + override fun signRaw(data: ByteArray): ByteArray { + val privateKey = P256Codec.decodePrivateKey(signingPrivateKeyRaw) + val signature = Signature.getInstance(SIGNATURE_ALGORITHM) + signature.initSign(privateKey) + signature.update(data) + val raw = derSignatureToRaw(signature.sign()) + aapsLogger.debug( + LTag.PUMPBTCOMM, + "O5 signRaw: signed ${data.size} bytes with secondary key -> ${raw.size}-byte raw signature" + ) + return raw + } + + companion object { + + private const val SIGNATURE_ALGORITHM = "SHA256withECDSA" + + + /** + * Verify an ECDSA signature against a raw (65-byte, uncompressed) public key. + * Accepts [signature] in either DER or raw (64-byte r || s) form, trying DER first, + * matching the Swift original's behavior. + */ + fun verifySignature(signature: ByteArray, data: ByteArray, publicKeyRaw: ByteArray): Boolean { + val publicKey = try { + P256Codec.decodePublicKey(publicKeyRaw) + } catch (e: Exception) { + return false + } + + verifyDer(signature, data, publicKey)?.let { return it } + + if (signature.size == 64) { + val der = try { + rawSignatureToDer(signature) + } catch (e: Exception) { + null + } + if (der != null) { + verifyDer(der, data, publicKey)?.let { return it } + } + } + + return false + } + + /** Returns null (rather than false) if [der] isn't validly-DER-encoded, so the + * caller knows to try the other signature format instead of treating it as a + * genuine verification failure. */ + private fun verifyDer(der: ByteArray, data: ByteArray, publicKey: ECPublicKey): Boolean? = + try { + val signature = Signature.getInstance(SIGNATURE_ALGORITHM) + signature.initVerify(publicKey) + signature.update(data) + signature.verify(der) + } catch (e: Exception) { + null + } + + + internal fun derSignatureToRaw(der: ByteArray): ByteArray { + require(der.isNotEmpty() && der[0] == 0x30.toByte()) { "Expected DER SEQUENCE tag" } + val (_, seqContentStart) = readDerLength(der, 1) + + val (r, afterR) = readDerInteger(der, seqContentStart) + val (s, _) = readDerInteger(der, afterR) + + return r.toFixedLengthBytes(32) + s.toFixedLengthBytes(32) + } + + internal fun rawSignatureToDer(raw: ByteArray): ByteArray { + require(raw.size == 64) { "Raw ECDSA signature must be 64 bytes (r || s), got ${raw.size}" } + val r = BigInteger(1, raw.copyOfRange(0, 32)) + val s = BigInteger(1, raw.copyOfRange(32, 64)) + val body = encodeDerInteger(r) + encodeDerInteger(s) + return byteArrayOf(0x30) + encodeDerLength(body.size) + body + } + + private fun encodeDerInteger(value: BigInteger): ByteArray { + val content = value.toByteArray() + return byteArrayOf(0x02) + encodeDerLength(content.size) + content + } + + + private val p256SpkiHeader = byteArrayOf( + 0x30, 0x59.toByte(), + 0x30, 0x13, + 0x06, 0x07, 0x2a, 0x86.toByte(), 0x48, 0xce.toByte(), 0x3d, 0x02, 0x01, + 0x06, 0x08, 0x2a, 0x86.toByte(), 0x48, 0xce.toByte(), 0x3d, 0x03, 0x01, 0x07, + 0x03, 0x42, + 0x00, + 0x04 + ) + + /** Extract the raw P-256 public key (64 bytes, x || y) from a base64-encoded DER cert. */ + fun extractP256PublicKey(certDERBase64: String): ByteArray? { + val certDER = try { + Base64.getDecoder().decode(certDERBase64) + } catch (e: IllegalArgumentException) { + return null + } + return extractP256PublicKey(certDER) + } + + /** + * Extract the raw P-256 public key (64 bytes, x || y) from DER certificate bytes. + * Searches for the known SubjectPublicKeyInfo DER header pattern for P-256 keys, + * then extracts the 64-byte raw EC point (without the leading 0x04 prefix). + */ + fun extractP256PublicKey(certDER: ByteArray): ByteArray? { + val header = p256SpkiHeader + val headerLen = header.size + val keyLen = 64 + + if (certDER.size < headerLen + keyLen) return null + + val lastPossibleStart = certDER.size - headerLen - keyLen + for (i in 0..lastPossibleStart) { + var matches = true + for (j in 0 until headerLen) { + if (certDER[i + j] != header[j]) { + matches = false + break + } + } + if (matches) { + val keyStart = i + headerLen + return certDER.copyOfRange(keyStart, keyStart + keyLen) + } + } + return null + } + + + /** + * Extract the serial number from a DER-encoded X.509 certificate. + * + * Handles both v3 certificates (with explicit version tag `a0 03 02 01 02`) + * and v1 certificates (no version tag - serial immediately after the + * TBSCertificate SEQUENCE). + */ + fun extractSerialNumber(certDER: ByteArray): ByteArray? { + val v3Pattern = byteArrayOf(0xa0.toByte(), 0x03, 0x02, 0x01, 0x02, 0x02) + val v3PatternIndex = indexOf(certDER, v3Pattern) + if (v3PatternIndex >= 0) { + val serialLenOffset = v3PatternIndex + v3Pattern.size + if (serialLenOffset >= certDER.size) return null + val serialLen = certDER[serialLenOffset].toInt() and 0xFF + val serialStart = serialLenOffset + 1 + if (serialLen <= 0 || serialStart + serialLen > certDER.size) return null + return certDER.copyOfRange(serialStart, serialStart + serialLen) + } + + if (certDER.size <= 4 || certDER[0] != 0x30.toByte()) return null + val (_, outerContentStart) = readDerLength(certDER, 1) + if (outerContentStart >= certDER.size || certDER[outerContentStart] != 0x30.toByte()) return null + val (_, tbsContentStart) = readDerLength(certDER, outerContentStart + 1) + if (tbsContentStart >= certDER.size) return null + + if (certDER[tbsContentStart] != 0x02.toByte()) return null + val lenOffset = tbsContentStart + 1 + if (lenOffset >= certDER.size) return null + val serialLen = certDER[lenOffset].toInt() and 0xFF + val serialStart = lenOffset + 1 + if (serialLen <= 0 || serialStart + serialLen > certDER.size) return null + return certDER.copyOfRange(serialStart, serialStart + serialLen) + } + + private fun indexOf(haystack: ByteArray, needle: ByteArray): Int { + if (needle.isEmpty() || haystack.size < needle.size) return -1 + outer@ for (i in 0..haystack.size - needle.size) { + for (j in needle.indices) { + if (haystack[i + j] != needle[j]) continue@outer + } + return i + } + return -1 + } + + + /** + * Parses a DER length field starting at [offset]. Returns (length, contentStartOffset). + * Handles both short-form (single byte) and long-form (0x8n + n bytes) lengths. + */ + private fun readDerLength(data: ByteArray, offset: Int): Pair { + val firstByte = data[offset].toInt() and 0xFF + return if (firstByte and 0x80 == 0) { + Pair(firstByte, offset + 1) + } else { + val numLenBytes = firstByte and 0x7f + require(numLenBytes > 0 && offset + 1 + numLenBytes <= data.size) { "Malformed DER length" } + var len = 0 + for (i in 0 until numLenBytes) { + len = (len shl 8) or (data[offset + 1 + i].toInt() and 0xFF) + } + Pair(len, offset + 1 + numLenBytes) + } + } + + private fun encodeDerLength(length: Int): ByteArray { + if (length < 0x80) return byteArrayOf(length.toByte()) + var remaining = length + val bytes = java.util.ArrayDeque() + while (remaining > 0) { + bytes.addFirst((remaining and 0xFF).toByte()) + remaining = remaining shr 8 + } + return byteArrayOf((0x80 or bytes.size).toByte()) + bytes.toByteArray() + } + + /** Reads a DER INTEGER (tag 0x02) at [offset]; returns (value, offset after integer). */ + private fun readDerInteger(data: ByteArray, offset: Int): Pair { + require(data[offset] == 0x02.toByte()) { "Expected DER INTEGER tag" } + val (len, contentStart) = readDerLength(data, offset + 1) + val bytes = data.copyOfRange(contentStart, contentStart + len) + return Pair(BigInteger(bytes), contentStart + len) + } + + private fun BigInteger.toFixedLengthBytes(length: Int): ByteArray { + val raw = this.toByteArray() + return when { + raw.size == length -> raw + raw.size == length + 1 && raw[0] == 0.toByte() -> raw.copyOfRange(1, raw.size) + raw.size < length -> ByteArray(length - raw.size) + raw + else -> throw IllegalStateException( + "Value does not fit in $length bytes (got ${raw.size})" + ) + } + } + } +} diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/pair/O5KeyExchange.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/pair/O5KeyExchange.kt new file mode 100644 index 000000000000..c9bc901f84ec --- /dev/null +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/pair/O5KeyExchange.kt @@ -0,0 +1,255 @@ +package app.aaps.pump.omnipod.omnipod5.bledriver.comm.pair + +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.utils.toHex +import app.aaps.pump.omnipod.common.bledriver.comm.exceptions.MessageIOException +import app.aaps.pump.omnipod.common.bledriver.comm.exceptions.PairingException +import app.aaps.pump.omnipod.omnipod5.bledriver.pod.util.P256KeyGenerator +import app.aaps.pump.omnipod.common.bledriver.pod.util.RandomByteGenerator +import java.nio.ByteBuffer +import java.nio.ByteOrder +import java.security.MessageDigest + +/** + * Runs the Omnipod 5 pairing key exchange (the "SPS1"/"SPS2" handshake): generates the + * controller's ephemeral P-256 keypair and nonce, combines them with the pod's ephemeral + * public key and nonce plus the ECDH shared secret into a SHA-256-derived confirmation + * value and long-term key (LTK), and provides the nonce/transcript machinery the rest of + * the O5 pairing flow needs to build and verify SPS2/SPS2.1 messages. + * + * Ported from OmnipodKit's O5KeyExchange.swift (loopandlearn/OmnipodKit). + */ +class O5KeyExchange( + private val aapsLogger: AAPSLogger, + private val p256KeyGenerator: P256KeyGenerator, + randomByteGenerator: RandomByteGenerator, + /** The certificate-derived controller ID (4 bytes, big-endian). */ + val controllerIdData: ByteArray +) { + + enum class Direction { WRITE, READ } + + var pdmNonce: ByteArray = randomByteGenerator.nextBytes(NONCE_SIZE) + private set + val pdmPrivate: ByteArray = p256KeyGenerator.generatePrivateKey() + val pdmPublic: ByteArray = p256KeyGenerator.publicFromPrivate(pdmPrivate) + + var podPublic: ByteArray = ByteArray(PUBLIC_KEY_SIZE) + private set + var podNonce: ByteArray = ByteArray(NONCE_SIZE) + private set + + var conf: ByteArray = ByteArray(CMAC_SIZE) + private set + var ltk: ByteArray = ByteArray(CMAC_SIZE) + private set + + init { + if (pdmNonce.size != NONCE_SIZE) { + throw PairingException("pdmNonce size ${pdmNonce.size} != expected $NONCE_SIZE") + } + if (pdmPublic.size != PUBLIC_KEY_SIZE) { + throw PairingException("pdmPublic size ${pdmPublic.size} != expected $PUBLIC_KEY_SIZE") + } + aapsLogger.debug( + LTag.PUMPBTCOMM, + "O5KeyExchange init: controllerId=${controllerIdData.joinToString("") { "%02x".format(it) }}" + ) + } + + /** + * Processes the pod's SPS1 response payload (its ephemeral public key + nonce), + * then derives [conf] and [ltk] from the ECDH shared secret. + * + * @throws MessageIOException if [payload] isn't exactly PUBLIC_KEY_SIZE + NONCE_SIZE bytes. + */ + fun o5UpdatePodPublicData(payload: ByteArray) { + if (payload.size != PUBLIC_KEY_SIZE + NONCE_SIZE) { + throw MessageIOException( + "Invalid SPS1 payload size: ${payload.size}, expected ${PUBLIC_KEY_SIZE + NONCE_SIZE}" + ) + } + podPublic = payload.copyOfRange(0, PUBLIC_KEY_SIZE) + podNonce = payload.copyOfRange(PUBLIC_KEY_SIZE, PUBLIC_KEY_SIZE + NONCE_SIZE) + aapsLogger.debug(LTag.PUMPBTCOMM, "pdmPublic (${pdmPublic.size}): ${pdmPublic.toHex()}") + aapsLogger.debug(LTag.PUMPBTCOMM, "podPublic (${podPublic.size}): ${podPublic.toHex()}") + aapsLogger.debug(LTag.PUMPBTCOMM, "pdmNonce (${pdmNonce.size}): ${pdmNonce.toHex()}") + aapsLogger.debug(LTag.PUMPBTCOMM, "podNonce (${podNonce.size}): ${podNonce.toHex()}") + o5GenerateKeys() + } + + private fun o5GenerateKeys() { + val sharedSecret = p256KeyGenerator.computeSharedSecret(pdmPrivate, podPublic) + + val data = ByteArrayBuilder() + .appendBigEndianU64Length(FIRMWARE_ID.size) + .append(FIRMWARE_ID) + .appendBigEndianU64Length(4) + .append(byteArrayOf(0x00, 0x00, 0x00, 0x00)) + .appendBigEndianU64Length(pdmPublic.size) + .append(pdmPublic) + .appendBigEndianU64Length(podPublic.size) + .append(podPublic) + .appendBigEndianU64Length(sharedSecret.size) + .append(sharedSecret) + .toByteArray() + + val derivedKey = MessageDigest.getInstance("SHA-256").digest(data) + if (derivedKey.size != 32) { + throw PairingException("SHA-256 output size ${derivedKey.size} != expected 32") + } + conf = derivedKey.copyOfRange(0, 16) + ltk = derivedKey.copyOfRange(16, 32) + aapsLogger.debug(LTag.PUMPBTCOMM, "Derived conf (${conf.size}): ${conf.toHex()}, ltk ${ltk.size} bytes") + } + + /** + * Builds the 13-byte AES-CCM nonce for an SPS2/SPS2.1 message in the given [direction]: + * `[directionByte] || first6(senderNonce) || first6(receiverNonce)`. + */ + fun getSPSNonce(direction: Direction): ByteArray { + if (pdmNonce.size < 6 || podNonce.size < 6) { + return ByteArray(0) + } + val pdmSlice = pdmNonce.copyOfRange(0, 6) + val podSlice = podNonce.copyOfRange(0, 6) + + val nonce = when (direction) { + Direction.WRITE -> byteArrayOf(0x01) + pdmSlice + podSlice + Direction.READ -> byteArrayOf(0x02) + podSlice + pdmSlice + } + return nonce + } + + /** Increments the controller's (write) or pod's (read) nonce by one, per [incrementNonceInPlace]. */ + fun incrementNonce(direction: Direction) { + when (direction) { + Direction.WRITE -> pdmNonce = incrementNonceInPlace(pdmNonce) + Direction.READ -> podNonce = incrementNonceInPlace(podNonce) + } + } + + /** + * Increments the first 8 bytes of [nonce], interpreted as a little-endian UInt64 + * counter (matching Swift's `withUnsafeBytes { $0.load(as: UInt64.self) }` on + * little-endian Apple hardware), wrapping on overflow. Bytes 8+ are preserved as-is. + */ + private fun incrementNonceInPlace(nonce: ByteArray): ByteArray { + val counter = ByteBuffer.wrap(nonce, 0, 8).order(ByteOrder.LITTLE_ENDIAN).long + val incremented = counter + 1 + val result = nonce.copyOf() + ByteBuffer.wrap(result, 0, 8).order(ByteOrder.LITTLE_ENDIAN).putLong(incremented) + return result + } + + /** + * Decrements the first 8 bytes of [nonce] (little-endian UInt64), wrapping on + * underflow, leaving the rest of the bytes untouched. Used only when building the + * pod's channel-binding transcript variant (see [buildPodChannelBindingTranscript]). + */ + private fun decrementNonceCopy(nonce: ByteArray): ByteArray { + val counter = ByteBuffer.wrap(nonce, 0, 8).order(ByteOrder.LITTLE_ENDIAN).long + val decremented = counter - 1 + val result = nonce.copyOf() + ByteBuffer.wrap(result, 0, 8).order(ByteOrder.LITTLE_ENDIAN).putLong(decremented) + return result + } + + /** + * Builds the 171-byte channel-binding transcript for SPS2.1 signing, from the + * controller's point of view: + * `[0x01] || FIRMWARE_ID(6) || zeros(4) || pdmPublic(64) || podPublic(64) || pdmNonce(16) || podNonce(16)` + */ + fun buildChannelBindingTranscript(): ByteArray { + val transcript = byteArrayOf(0x01) + + FIRMWARE_ID + + byteArrayOf(0x00, 0x00, 0x00, 0x00) + + pdmPublic + + podPublic + + pdmNonce + + podNonce + + check(transcript.size == TRANSCRIPT_SIZE) { + "Channel-binding transcript size mismatch: got ${transcript.size}, expected $TRANSCRIPT_SIZE" + } + return transcript + } + + /** + * Builds the pod's (peer) variant of the channel-binding transcript, for verifying the + * pod's own SPS2 signature. Must only be called AFTER: controller sent SPS2.1 (pdmNonce + * +1), received pod SPS2.1 (podNonce +1), sent SPS2 (pdmNonce +2 total), received pod + * SPS2 (podNonce +2 total) - i.e. from [O5LTKExchanger]'s `o5validatePodSps2()` step. + * + * At that point the pod's own nonce state when it built ITS transcript was one step + * behind the controller's current podNonce (the pod had only processed SPS2.1, not yet + * encrypted its SPS2 reply), so [podNonce] is decremented by one here to match. + * + * Layout: `[0x02] || zeros(4) || FIRMWARE_ID(6) || podPublic(64) || pdmPublic(64) || podNonceAdjusted(16) || pdmNonce(16)` + */ + fun buildPodChannelBindingTranscript(): ByteArray { + val podNonceAdjusted = decrementNonceCopy(podNonce) + + val transcript = byteArrayOf(0x02) + + byteArrayOf(0x00, 0x00, 0x00, 0x00) + + FIRMWARE_ID + + podPublic + + pdmPublic + + podNonceAdjusted + + pdmNonce + + check(transcript.size == TRANSCRIPT_SIZE) { + "Pod channel-binding transcript size mismatch: got ${transcript.size}, expected $TRANSCRIPT_SIZE" + } + return transcript + } + + /** A tiny append-only byte builder, just to keep [o5GenerateKeys] readable. */ + private class ByteArrayBuilder { + private val parts = mutableListOf() + + fun append(bytes: ByteArray): ByteArrayBuilder { + parts.add(bytes) + return this + } + + /** Appends [value] as an 8-byte big-endian length field (matches Swift's + * `UInt64(...).bigEndian` length-prefixing in the KDF input construction). */ + fun appendBigEndianU64Length(value: Int): ByteArrayBuilder { + val buffer = ByteBuffer.allocate(8).order(ByteOrder.BIG_ENDIAN) + buffer.putLong(value.toLong()) + parts.add(buffer.array()) + return this + } + + fun toByteArray(): ByteArray { + val total = parts.fold(0) { acc, part -> acc + part.size } + val result = ByteArray(total) + var offset = 0 + for (part in parts) { + part.copyInto(result, offset) + offset += part.size + } + return result + } + } + + companion object { + + const val CMAC_SIZE = 16 + const val PUBLIC_KEY_SIZE = 64 + const val NONCE_SIZE = 16 + private const val TRANSCRIPT_SIZE = 171 + + /** + * Fixed 6-byte value taken from the PDM firmware. Shared with [O5LTKExchanger] + * (not yet ported), which will reference this same constant rather than + * duplicating it. + */ + val FIRMWARE_ID: ByteArray = hexToBytes("9b0ab96a76f4") + + private fun hexToBytes(hex: String): ByteArray = + ByteArray(hex.length / 2) { i -> hex.substring(i * 2, i * 2 + 2).toInt(16).toByte() } + } +} diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/pair/O5LTKExchanger.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/pair/O5LTKExchanger.kt new file mode 100644 index 000000000000..e3eec274c373 --- /dev/null +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/pair/O5LTKExchanger.kt @@ -0,0 +1,441 @@ +package app.aaps.pump.omnipod.omnipod5.bledriver.comm.pair +import app.aaps.pump.omnipod.common.bledriver.comm.pair.PairMessage +import app.aaps.pump.omnipod.common.bledriver.comm.pair.PairResult + +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.utils.toHex +import app.aaps.pump.omnipod.common.bledriver.comm.Id +import app.aaps.pump.omnipod.common.bledriver.comm.exceptions.PairingException +import app.aaps.pump.omnipod.common.bledriver.comm.interfaces.scan.PodScanner +import app.aaps.pump.omnipod.common.bledriver.comm.message.MessageIO +import app.aaps.pump.omnipod.common.bledriver.comm.message.MessagePacket +import app.aaps.pump.omnipod.common.bledriver.comm.message.MessageSendSuccess +import app.aaps.pump.omnipod.common.bledriver.comm.message.StringLengthPrefixEncoding.Companion.parseKeys +import app.aaps.pump.omnipod.omnipod5.bledriver.pod.util.P256KeyGenerator +import app.aaps.pump.omnipod.common.bledriver.pod.util.RandomByteGenerator +import org.spongycastle.crypto.engines.AESEngine +import org.spongycastle.crypto.modes.CCMBlockCipher +import org.spongycastle.crypto.params.AEADParameters +import org.spongycastle.crypto.params.KeyParameter + +/** + * Drives the Omnipod 5 pairing message sequence over BLE: SP1+SP2, SPS0, SPS1, SPS2.1, + * SPS2, SP0GP0, P0 - using [O5KeyExchange] for the key agreement/nonces/transcripts and + * [O5CertificateStore] for certificate data and channel-binding signatures. + * + * Ported from OmnipodKit's O5LTKExchanger.swift (loopandlearn/OmnipodKit). + * + * Unlike the Swift original (which resolves `myId`/`podId` via a Dash-specific `Ids` + * helper tied to `OmnipodDashBleManagerImpl`/`OmnipodDashPodStateManager`), this takes + * [myId] and [podId] directly - O5 has its own certificate-derived controller identity + * (see [O5CertificateStore.controllerId]) rather than sharing Dash's `Ids` scheme, and + * wiring those together for a live pod is a separate integration step. + */ +class O5LTKExchanger( + private val aapsLogger: AAPSLogger, + private val msgIO: MessageIO, + private val certStore: O5CertificateStore, + private val myId: Id, + private val podId: Id +) { + + private val podAddress: Id = Id.fromLong(PodScanner.POD_ID_NOT_ACTIVATED) + private val keyExchange: O5KeyExchange = O5KeyExchange( + aapsLogger, + P256KeyGenerator(), + RandomByteGenerator(), + certStore.controllerIdData + ) + private var seq: Byte = 1 + + fun o5NegotiateLTK(): PairResult { + aapsLogger.debug(LTag.PUMPBTCOMM, "O5 pairing attempt using fixed confirmed parameters") + try { + val result = o5NegotiateLTKBody() + aapsLogger.debug(LTag.PUMPBTCOMM, "O5 pairing SUCCEEDED") + return result + } catch (e: Exception) { + aapsLogger.error(LTag.PUMPBTCOMM, "O5 pairing FAILED: $e") + throw e + } + } + + private fun o5NegotiateLTKBody(): PairResult { + val sp1sp2 = PairMessage( + sequenceNumber = seq, + source = myId, + destination = podAddress, + keys = arrayOf(SP1, SP2), + payloads = arrayOf(podId.address, o5Sp2(podId)) + ) + throwOnSendError(sp1sp2.messagePacket, SP1 + SP2) + + seq++ + val sps0 = PairMessage( + sequenceNumber = seq, + source = myId, + destination = podAddress, + keys = arrayOf(SPS0), + payloads = arrayOf(o5Sps0()) + ) + throwOnSendError(sps0.messagePacket, SPS0) + + val podSps0 = msgIO.receiveMessage() ?: throw PairingException("Could not read SPS0") + validatePodO5Sps0(podSps0) + + seq++ + val sps1 = PairMessage( + sequenceNumber = seq, + source = myId, + destination = podAddress, + keys = arrayOf(SPS1), + payloads = arrayOf(keyExchange.pdmPublic + keyExchange.pdmNonce) + ) + throwOnSendError(sps1.messagePacket, SPS1) + + val podSps1 = msgIO.receiveMessage() ?: throw PairingException("Could not read SPS1") + o5ValidatePodSps1(podSps1) + + seq++ + val sps2_1 = PairMessage( + sequenceNumber = seq, + source = myId, + destination = podAddress, + keys = arrayOf(SPS2_1), + payloads = arrayOf(o5Sps2_1()) + ) + throwOnSendError(sps2_1.messagePacket, SPS2_1) + + val podSps2_1 = msgIO.receiveMessage() ?: throw PairingException("Could not read SPS2.1") + o5ValidatePodSps2_1(podSps2_1) + + seq++ + val sps2 = PairMessage( + sequenceNumber = seq, + source = myId, + destination = podAddress, + keys = arrayOf(SPS2), + payloads = arrayOf(o5Sps2()) + ) + throwOnSendError(sps2.messagePacket, SPS2) + + val podSps2 = msgIO.receiveMessage() ?: throw PairingException("Could not read SPS2") + o5ValidatePodSps2(podSps2) + + seq++ + val sp0gp0 = PairMessage( + sequenceNumber = seq, + source = myId, + destination = podAddress, + keys = arrayOf(SP0GP0), + payloads = arrayOf(ByteArray(0)) + ) + val result = msgIO.sendMessage(sp0gp0.messagePacket) + if (result !is MessageSendSuccess) { + aapsLogger.warn(LTag.PUMPBTCOMM, "Error sending SP0GP0: $result") + } + + msgIO.receiveMessage() + ?.let { o5ValidateP0(it) } + ?: aapsLogger.warn(LTag.PUMPBTCOMM, "Could not read P0") + + check(keyExchange.ltk.size == 16) { "Invalid LTK size: ${keyExchange.ltk.size}" } + + aapsLogger.debug( + LTag.PUMPBTCOMM, + "=== O5 Pairing Complete === address: 0x%08x, seq: %d".format(podId.toLong(), seq) + ) + return PairResult(ltk = keyExchange.ltk, msgSeq = seq) + } + + private fun throwOnSendError(msg: MessagePacket, msgType: String) { + val result = msgIO.sendMessage(msg) + if (result !is MessageSendSuccess) { + throw PairingException("Could not send or confirm $msgType: $result") + } + } + + + private fun o5Sp2(podId: Id): ByteArray { + val body = byteArrayOf(0x0e, 0x01, 0x00) + val b9: Byte = 0x00 + val withoutCrc = podId.address + byteArrayOf(b9, body.size.toByte()) + body + val crc = classicCrc16(withoutCrc) + return withoutCrc + byteArrayOf((crc ushr 8).toByte(), (crc and 0xFF).toByte()) + } + + + /** + * Generates the 5-byte SPS0 payload with CRC-16/XMODEM. + * Structure: [constant_byte, direction_byte, algorithm_byte, crc16_high, crc16_low]. + * Direction: 0x01 for PDM->Pod. Algorithm byte 0x09 specifies the encryption algorithm. + */ + private fun o5Sps0(): ByteArray { + val header = byteArrayOf(0x00, 0x01, 0x09) + val crc = crc16XMODEM(header) + return header + byteArrayOf((crc ushr 8).toByte(), (crc and 0xFF).toByte()) + } + + /** Validates the pod's 5-byte SPS0 response (pod's direction byte is 0x00, vs PDM's 0x01). */ + private fun validatePodO5Sps0(msg: MessagePacket) { + val payload = parseKeys(arrayOf(SPS0), msg.payload)[0] + if (payload.size != 5) { + throw PairingException("Invalid SPS0 payload length: ${payload.size}") + } + if (payload[0] != 0x00.toByte() || payload[1] != 0x00.toByte() || payload[2] != 0x09.toByte()) { + throw PairingException("Unexpected SPS0 header bytes") + } + val header = payload.copyOfRange(0, 3) + val expectedCrc = crc16XMODEM(header) + val receivedCrc = ((payload[3].toInt() and 0xFF) shl 8) or (payload[4].toInt() and 0xFF) + if (expectedCrc != receivedCrc) { + throw PairingException( + "SPS0 CRC mismatch: expected %04x, received %04x".format(expectedCrc, receivedCrc) + ) + } + } + + + private fun o5ValidatePodSps1(msg: MessagePacket) { + val payload = parseKeys(arrayOf(SPS1), msg.payload)[0] + keyExchange.o5UpdatePodPublicData(payload) + } + + + /** + * Builds and encrypts the SPS2.1 payload: `AES_CCM_ENC(intermediateCA_DER) || tag(8)`. + * The ECDSA channel-binding signature goes in SPS2, not here. + */ + private fun o5Sps2_1(): ByteArray { + val certDER = certStore.registration.intermediateCA + ?: throw PairingException("SPS2.1: intermediate CA certificate DER is null") + + aapsLogger.debug(LTag.PUMPBTCOMM, "=== SPS2.1 PHASE START ===") + aapsLogger.debug(LTag.PUMPBTCOMM, "SPS2.1: using cert (${certDER.size} bytes, cert-only short path)") + + val nonce = keyExchange.getSPSNonce(O5KeyExchange.Direction.WRITE) + aapsLogger.debug( + LTag.PUMPBTCOMM, + "Encrypting SPS2.1: key=${keyExchange.conf.toHex()}, nonce=${nonce.toHex()}, plaintext=${certDER.size} bytes" + ) + val encrypted = aesCcmEncrypt(keyExchange.conf, nonce, certDER) + keyExchange.incrementNonce(O5KeyExchange.Direction.WRITE) + aapsLogger.debug(LTag.PUMPBTCOMM, "SPS2.1 encrypted: ${encrypted.size} bytes (target=${certDER.size + MAC_SIZE_BYTES})") + return encrypted + } + + /** Decrypts and validates the pod's SPS2.1 response (short path: cert only). */ + private fun o5ValidatePodSps2_1(msg: MessagePacket) { + val payload = parseKeys(arrayOf(SPS2_1), msg.payload)[0] + aapsLogger.debug(LTag.PUMPBTCOMM, "Received pod SPS2.1: ${payload.size} bytes") + + val nonce = keyExchange.getSPSNonce(O5KeyExchange.Direction.READ) + aapsLogger.debug( + LTag.PUMPBTCOMM, + "Decrypting pod SPS2.1: key=${keyExchange.conf.toHex()}, nonce=${nonce.toHex()}, ciphertext=${payload.size} bytes" + ) + val podCertDER = aesCcmDecrypt(keyExchange.conf, nonce, payload) + keyExchange.incrementNonce(O5KeyExchange.Direction.READ) + aapsLogger.debug(LTag.PUMPBTCOMM, "Pod SPS2.1 decrypted: ${podCertDER.size} bytes (pod cert DER, short path)") + + if (O5CertificateStore.extractP256PublicKey(podCertDER) == null) { + aapsLogger.error(LTag.PUMPBTCOMM, "Failed to extract P-256 public key from pod SPS2.1 certificate DER") + } + aapsLogger.debug(LTag.PUMPBTCOMM, "=== SPS2.1 PHASE COMPLETE ===") + } + + + /** + * Builds and encrypts the SPS2 payload: `AES_CCM_ENC(TLS_cert_DER || ECDSA_sig(64)) || tag(8)`. + * The 64-byte signature is over the 171-byte channel-binding transcript, signed with + * the secondary key. + */ + private fun o5Sps2(): ByteArray { + val certDER = certStore.registration.tlsCertificate + ?: throw PairingException("SPS2: TLS certificate DER is null") + + aapsLogger.debug(LTag.PUMPBTCOMM, "=== SPS2 PHASE START ===") + + val transcript = keyExchange.buildChannelBindingTranscript() + aapsLogger.debug(LTag.PUMPBTCOMM, "Channel-binding transcript (${transcript.size} bytes): ${transcript.toHex()}") + + val signatureRaw = certStore.signRaw(transcript) + aapsLogger.debug(LTag.PUMPBTCOMM, "ECDSA signature (${signatureRaw.size} bytes): ${signatureRaw.toHex()}") + + val plaintext = certDER + signatureRaw + aapsLogger.debug( + LTag.PUMPBTCOMM, + "SPS2: TLS cert (${certDER.size} bytes) + sig (${signatureRaw.size}) = ${plaintext.size} plaintext" + ) + + val nonce = keyExchange.getSPSNonce(O5KeyExchange.Direction.WRITE) + aapsLogger.debug( + LTag.PUMPBTCOMM, + "Encrypting SPS2: key=${keyExchange.conf.toHex()}, nonce=${nonce.toHex()}, plaintext=${plaintext.size} bytes" + ) + val encrypted = aesCcmEncrypt(keyExchange.conf, nonce, plaintext) + keyExchange.incrementNonce(O5KeyExchange.Direction.WRITE) + aapsLogger.debug( + LTag.PUMPBTCOMM, + "SPS2 encrypted: ${encrypted.size} bytes (target=${certDER.size + signatureRaw.size + MAC_SIZE_BYTES})" + ) + return encrypted + } + + /** + * Decrypts and validates the pod's SPS2 response (extended path: cert + signature), + * verifying the pod's ECDSA signature over its own channel-binding transcript variant. + * A signature mismatch is logged but does not abort pairing, matching the Swift + * original's "log and continue" behavior for this still-unverified O5 flow. + */ + private fun o5ValidatePodSps2(msg: MessagePacket) { + val payload = parseKeys(arrayOf(SPS2), msg.payload)[0] + aapsLogger.debug(LTag.PUMPBTCOMM, "Received pod SPS2: ${payload.size} bytes") + + val nonce = keyExchange.getSPSNonce(O5KeyExchange.Direction.READ) + aapsLogger.debug( + LTag.PUMPBTCOMM, + "Decrypting pod SPS2: key=${keyExchange.conf.toHex()}, nonce=${nonce.toHex()}, ciphertext=${payload.size} bytes" + ) + val decrypted = aesCcmDecrypt(keyExchange.conf, nonce, payload) + keyExchange.incrementNonce(O5KeyExchange.Direction.READ) + + if (decrypted.size <= 64) { + throw PairingException("Pod SPS2 payload too short: ${decrypted.size} bytes (need > 64)") + } + val certLen = decrypted.size - 64 + val podCertDER = decrypted.copyOfRange(0, certLen) + val podSignature = decrypted.copyOfRange(certLen, decrypted.size) + aapsLogger.debug( + LTag.PUMPBTCOMM, + "Pod SPS2 decrypted: ${decrypted.size} bytes (cert_DER=$certLen + sig=${podSignature.size})" + ) + aapsLogger.debug(LTag.PUMPBTCOMM, "Pod signature (${podSignature.size} bytes): ${podSignature.toHex()}") + + val podPubKeyRaw = O5CertificateStore.extractP256PublicKey(podCertDER) + if (podPubKeyRaw != null) { + val transcript = keyExchange.buildPodChannelBindingTranscript() + aapsLogger.debug(LTag.PUMPBTCOMM, "Pod channel-binding transcript (${transcript.size} bytes): ${transcript.toHex()}") + val valid = O5CertificateStore.verifySignature(podSignature, transcript, podPubKeyRaw) + if (valid) { + aapsLogger.debug(LTag.PUMPBTCOMM, "Pod SPS2 signature verification PASSED") + } else { + aapsLogger.error(LTag.PUMPBTCOMM, "Pod SPS2 signature verification FAILED - transcript format may differ") + } + } else { + aapsLogger.error(LTag.PUMPBTCOMM, "Failed to extract P-256 public key from pod SPS2 certificate DER") + } + aapsLogger.debug(LTag.PUMPBTCOMM, "=== SPS2 PHASE COMPLETE ===") + } + + + private fun o5ValidateP0(msg: MessagePacket) { + val payload = parseKeys(arrayOf(P0), msg.payload)[0] + if (!payload.contentEquals(EXPECTED_P0_PAYLOAD)) { + throw PairingException( + "Received unexpected P0 payload: ${payload.joinToString("") { "%02x".format(it) }}" + ) + } + } + + + private fun aesCcmEncrypt(key: ByteArray, nonce: ByteArray, plaintext: ByteArray): ByteArray { + val cipher = CCMBlockCipher(AESEngine()) + cipher.init(true, AEADParameters(KeyParameter(key), MAC_SIZE_BITS, nonce, ByteArray(0))) + val output = ByteArray(plaintext.size + MAC_SIZE_BYTES) + cipher.processPacket(plaintext, 0, plaintext.size, output, 0) + return output + } + + private fun aesCcmDecrypt(key: ByteArray, nonce: ByteArray, ciphertext: ByteArray): ByteArray { + val cipher = CCMBlockCipher(AESEngine()) + cipher.init(false, AEADParameters(KeyParameter(key), MAC_SIZE_BITS, nonce, ByteArray(0))) + val output = ByteArray(ciphertext.size - MAC_SIZE_BYTES) + cipher.processPacket(ciphertext, 0, ciphertext.size, output, 0) + return output + } + + companion object { + + private const val SP1 = "SP1=" + private const val SP2 = ",SP2=" + private const val SPS0 = "SPS0=" + private const val SPS1 = "SPS1=" + private const val SPS2_1 = "SPS2.1=" + private const val SPS2 = "SPS2=" + private const val SP0GP0 = "SP0,GP0" + private const val P0 = "P0=" + private val EXPECTED_P0_PAYLOAD = byteArrayOf(0xa5.toByte()) + + private const val MAC_SIZE_BYTES = 8 + private const val MAC_SIZE_BITS = MAC_SIZE_BYTES * 8 + + /** + * The CRC-16 variant (and 256-entry table) used by OmnipodKit's own Message.swift + * for the classic Omnipod message envelope in [o5Sp2]. Despite the table's + * resemblance to CRC-16/ARC's polynomial, it does NOT match CRC-16/ARC's published + * check value for "123456789" - this specific table+algorithm combination is + * whatever OmnipodKit itself uses, verified here only for faithful byte-for-byte + * reproduction of that source (see the class's test suite), not for matching any + * named textbook CRC-16 standard. This is a DIFFERENT variant from [crc16XMODEM] + * (used only for SPS0) - the two must not be confused. + */ + fun classicCrc16(data: ByteArray): Int { + var acc = 0 + for (byte in data) { + val idx = (acc xor (byte.toInt() and 0xFF)) and 0xFF + acc = (acc ushr 8) xor CLASSIC_CRC16_TABLE[idx] + } + return acc and 0xFFFF + } + + /** CRC-16/XMODEM (poly 0x1021, init 0x0000, no reflection), used only for SPS0. */ + fun crc16XMODEM(data: ByteArray): Int { + var crc = 0x0000 + for (byte in data) { + crc = crc xor ((byte.toInt() and 0xFF) shl 8) + repeat(8) { + crc = if (crc and 0x8000 != 0) (crc shl 1) xor 0x1021 else crc shl 1 + crc = crc and 0xFFFF + } + } + return crc and 0xFFFF + } + + private val CLASSIC_CRC16_TABLE: IntArray = intArrayOf( + 0x0000, 0x8005, 0x800f, 0x000a, 0x801b, 0x001e, 0x0014, 0x8011, + 0x8033, 0x0036, 0x003c, 0x8039, 0x0028, 0x802d, 0x8027, 0x0022, + 0x8063, 0x0066, 0x006c, 0x8069, 0x0078, 0x807d, 0x8077, 0x0072, + 0x0050, 0x8055, 0x805f, 0x005a, 0x804b, 0x004e, 0x0044, 0x8041, + 0x80c3, 0x00c6, 0x00cc, 0x80c9, 0x00d8, 0x80dd, 0x80d7, 0x00d2, + 0x00f0, 0x80f5, 0x80ff, 0x00fa, 0x80eb, 0x00ee, 0x00e4, 0x80e1, + 0x00a0, 0x80a5, 0x80af, 0x00aa, 0x80bb, 0x00be, 0x00b4, 0x80b1, + 0x8093, 0x0096, 0x009c, 0x8099, 0x0088, 0x808d, 0x8087, 0x0082, + 0x8183, 0x0186, 0x018c, 0x8189, 0x0198, 0x819d, 0x8197, 0x0192, + 0x01b0, 0x81b5, 0x81bf, 0x01ba, 0x81ab, 0x01ae, 0x01a4, 0x81a1, + 0x01e0, 0x81e5, 0x81ef, 0x01ea, 0x81fb, 0x01fe, 0x01f4, 0x81f1, + 0x81d3, 0x01d6, 0x01dc, 0x81d9, 0x01c8, 0x81cd, 0x81c7, 0x01c2, + 0x0140, 0x8145, 0x814f, 0x014a, 0x815b, 0x015e, 0x0154, 0x8151, + 0x8173, 0x0176, 0x017c, 0x8179, 0x0168, 0x816d, 0x8167, 0x0162, + 0x8123, 0x0126, 0x012c, 0x8129, 0x0138, 0x813d, 0x8137, 0x0132, + 0x0110, 0x8115, 0x811f, 0x011a, 0x810b, 0x010e, 0x0104, 0x8101, + 0x8303, 0x0306, 0x030c, 0x8309, 0x0318, 0x831d, 0x8317, 0x0312, + 0x0330, 0x8335, 0x833f, 0x033a, 0x832b, 0x032e, 0x0324, 0x8321, + 0x0360, 0x8365, 0x836f, 0x036a, 0x837b, 0x037e, 0x0374, 0x8371, + 0x8353, 0x0356, 0x035c, 0x8359, 0x0348, 0x834d, 0x8347, 0x0342, + 0x03c0, 0x83c5, 0x83cf, 0x03ca, 0x83db, 0x03de, 0x03d4, 0x83d1, + 0x83f3, 0x03f6, 0x03fc, 0x83f9, 0x03e8, 0x83ed, 0x83e7, 0x03e2, + 0x83a3, 0x03a6, 0x03ac, 0x83a9, 0x03b8, 0x83bd, 0x83b7, 0x03b2, + 0x0390, 0x8395, 0x839f, 0x039a, 0x838b, 0x038e, 0x0384, 0x8381, + 0x0280, 0x8285, 0x828f, 0x028a, 0x829b, 0x029e, 0x0294, 0x8291, + 0x82b3, 0x02b6, 0x02bc, 0x82b9, 0x02a8, 0x82ad, 0x82a7, 0x02a2, + 0x82e3, 0x02e6, 0x02ec, 0x82e9, 0x02f8, 0x82fd, 0x82f7, 0x02f2, + 0x02d0, 0x82d5, 0x82df, 0x02da, 0x82cb, 0x02ce, 0x02c4, 0x82c1, + 0x8243, 0x0246, 0x024c, 0x8249, 0x0258, 0x825d, 0x8257, 0x0252, + 0x0270, 0x8275, 0x827f, 0x027a, 0x826b, 0x026e, 0x0264, 0x8261, + 0x0220, 0x8225, 0x822f, 0x022a, 0x823b, 0x023e, 0x0234, 0x8231, + 0x8213, 0x0216, 0x021c, 0x8219, 0x0208, 0x820d, 0x8207, 0x0202 + ) + } +} diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/pair/O5RegistrationData.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/pair/O5RegistrationData.kt new file mode 100644 index 000000000000..111f7a8c2357 --- /dev/null +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/pair/O5RegistrationData.kt @@ -0,0 +1,245 @@ +package app.aaps.pump.omnipod.omnipod5.bledriver.comm.pair + +import java.util.Base64 +import java.util.Random +import java.util.ServiceLoader +import java.util.concurrent.ConcurrentHashMap + +/** + * PKI registration material for one Omnipod 5 controller identity: a secondary P-256 + * signing keypair plus the certificate chain issued for it, all keyed by controllerId. + * + * This is deliberately just a data holder + in-memory registry - this open-source project + * doesn't ship real Insulet-issued PKI material. Real registration data can be added at + * runtime three ways, mirroring OmnipodKit's own [O5RegistrationSource] distinction: + * - [Installer] discovered via [ServiceLoader] ([O5RegistrationSource.BUILT_IN]) + * - [installPacked] / [fromJson] ([O5RegistrationSource.IMPORTED]) - for a user pasting a + * credential string or importing a keypair file through some future settings UI + * - [install] called directly by other code, e.g. after a network fetch + * ([O5RegistrationSource.DOWNLOADED]) - note OmnipodKit's own automatic-download flow is + * built on Apple's DeviceCheck/App Attest, which has no Android equivalent; this source + * value exists for API parity, not because that specific flow is portable + * + * Ported from OmnipodKit's O5RegistrationData.swift (loopandlearn/OmnipodKit). The Swift + * original's built-in loading uses a `dlsym`-based dynamic symbol lookup, which has no + * portable JVM equivalent; [ServiceLoader] is the idiomatic JVM analogue. + */ +data class O5RegistrationData( + /** The 32-bit controller id this registration applies to (kept as Long to avoid + * unsigned-overflow pitfalls; valid values fit in the low 32 bits). */ + val controllerId: Long, + val privateKeyHex: String, + val publicKeyHex: String, + val intermediateCABase64: String, + val tlsCertificateBase64: String +) { + + val privateKey: ByteArray get() = hexToBytes(privateKeyHex) + val publicKey: ByteArray get() = hexToBytes(publicKeyHex) + + val intermediateCA: ByteArray? get() = decodeBase64OrNull(intermediateCABase64) + val tlsCertificate: ByteArray? get() = decodeBase64OrNull(tlsCertificateBase64) + + /** The controllerId as its 4-byte big-endian representation. */ + val controllerIdData: ByteArray + get() { + val id = controllerId and 0xFFFFFFFFL + return byteArrayOf( + ((id shr 24) and 0xFF).toByte(), + ((id shr 16) and 0xFF).toByte(), + ((id shr 8) and 0xFF).toByte(), + (id and 0xFF).toByte() + ) + } + + /** + * The shape matches OmnipodKit's "o5keypair" file format, so persisted entries and + * imported files/strings share one representation. + */ + fun toJsonMap(): Map = mapOf( + "controllerId" to controllerId.toString(), + "privateKey" to privateKeyHex, + "publicKey" to publicKeyHex, + "intermediateCA" to intermediateCABase64, + "tlsCertificate" to tlsCertificateBase64 + ) + + /** + * Implement and register via `META-INF/services` (or call [O5RegistrationData.install] + * directly at app startup) to supply real O5 PKI data from an optional module that + * isn't part of this open-source repository. + */ + interface Installer { + fun install() + } + + /** Where a given registration entry originally came from - for diagnostics/UI display. */ + enum class O5RegistrationSource { BUILT_IN, IMPORTED, DOWNLOADED } + + companion object { + + private val registry = ConcurrentHashMap() + private val sources = ConcurrentHashMap() + private val random = Random() + + @Volatile + private var optionalDataLoaded = false + + fun install(value: O5RegistrationData, source: O5RegistrationSource = O5RegistrationSource.DOWNLOADED) { + registry[value.controllerId] = value + sources[value.controllerId] = source + } + + fun markSource(controllerId: Long, source: O5RegistrationSource) { + sources[controllerId] = source + } + + fun source(forControllerId: Long): O5RegistrationSource? { + loadOptionalRegistrationDataOnce() + return sources[forControllerId] + } + + fun get(controllerId: Long): O5RegistrationData? { + loadOptionalRegistrationDataOnce() + return registry[controllerId] + } + + fun getRandom(): O5RegistrationData? { + loadOptionalRegistrationDataOnce() + val values = registry.values.toList() + return if (values.isEmpty()) null else values[random.nextInt(values.size)] + } + + val allValues: List + get() { + loadOptionalRegistrationDataOnce() + return registry.values.toList() + } + + val isEmpty: Boolean + get() { + loadOptionalRegistrationDataOnce() + return registry.isEmpty() + } + + fun contains(controllerId: Long): Boolean = get(controllerId) != null + + fun remove(controllerId: Long) { + registry.remove(controllerId) + sources.remove(controllerId) + } + + /** Randomly picks an available O5 controllerId, or 0 if none is available. */ + val pickControllerId: Long + get() = getRandom()?.controllerId ?: 0L + + /** + * Parses a compact delimited credential string: `"controllerId|privB64|pubB64|icaB64|tlsB64"` + * (matching OmnipodKit's own `install(packed:)` format, so a credential exported from + * one can be pasted directly into the other), converts the base64-encoded private/public + * keys to hex internally, and installs it with source [O5RegistrationSource.IMPORTED]. + * + * Returns true if the string parsed and installed successfully, false if it was + * malformed (wrong field count, unparseable controllerId) - this never throws, since + * it's meant to validate arbitrary user-pasted input. + */ + fun installPacked(packed: String): Boolean { + val parts = packed.trim().split("|") + if (parts.size != 5) return false + val controllerId = parts[0].toLongOrNull() ?: return false + + val privateKeyHex = base64ToHexOrNull(parts[1]) ?: return false + val publicKeyHex = base64ToHexOrNull(parts[2]) ?: return false + + install( + O5RegistrationData( + controllerId = controllerId, + privateKeyHex = privateKeyHex, + publicKeyHex = publicKeyHex, + intermediateCABase64 = parts[3], + tlsCertificateBase64 = parts[4] + ), + source = O5RegistrationSource.IMPORTED + ) + return true + } + + /** + * Builds the packed string form of [data], the inverse of [installPacked] - useful + * for exporting/backing up an installed credential. + */ + fun toPacked(data: O5RegistrationData): String { + val privB64 = Base64.getEncoder().encodeToString(data.privateKey) + val pubB64 = Base64.getEncoder().encodeToString(data.publicKey) + return "${data.controllerId}|$privB64|$pubB64|${data.intermediateCABase64}|${data.tlsCertificateBase64}" + } + + /** + * Parses an "o5keypair" JSON-shaped map (as produced by [O5RegistrationData.toJsonMap], + * or read from a JSON file/object elsewhere) into an [O5RegistrationData]. Returns null + * if any required field is missing or the controllerId isn't a valid number - this is + * a pure parse function; callers decide whether/how to [install] the result. + */ + fun fromJsonMap(json: Map): O5RegistrationData? { + val controllerId = json["controllerId"]?.toLongOrNull() ?: return null + val privateKeyHex = json["privateKey"] ?: return null + val publicKeyHex = json["publicKey"] ?: return null + val intermediateCABase64 = json["intermediateCA"] ?: return null + val tlsCertificateBase64 = json["tlsCertificate"] ?: return null + return O5RegistrationData( + controllerId = controllerId, + privateKeyHex = privateKeyHex, + publicKeyHex = publicKeyHex, + intermediateCABase64 = intermediateCABase64, + tlsCertificateBase64 = tlsCertificateBase64 + ) + } + + /** + * Visible for testing: forces the ServiceLoader-based optional-data lookup to run + * again on the next registry access, e.g. after registering a fake Installer. + */ + internal fun resetOptionalDataLoadedForTesting() { + optionalDataLoaded = false + } + + private fun loadOptionalRegistrationDataOnce() { + if (optionalDataLoaded) return + synchronized(this) { + if (optionalDataLoaded) return + try { + ServiceLoader.load(Installer::class.java).forEach { + it.install() + } + } catch (_: Throwable) { + } + optionalDataLoaded = true + } + } + + private fun hexToBytes(hex: String): ByteArray { + val clean = hex.trim() + require(clean.length % 2 == 0) { "Hex string must have an even length" } + return ByteArray(clean.length / 2) { i -> + clean.substring(i * 2, i * 2 + 2).toInt(16).toByte() + } + } + + private fun bytesToHex(bytes: ByteArray): String = + bytes.joinToString("") { "%02x".format(it) } + + private fun base64ToHexOrNull(base64: String): String? = + try { + bytesToHex(Base64.getDecoder().decode(base64)) + } catch (_: IllegalArgumentException) { + null + } + + private fun decodeBase64OrNull(value: String): ByteArray? = + try { + Base64.getDecoder().decode(value) + } catch (_: IllegalArgumentException) { + null + } + } +} diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/command/aid/O5AidSetupCommands.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/command/aid/O5AidSetupCommands.kt new file mode 100644 index 000000000000..cadc53897718 --- /dev/null +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/command/aid/O5AidSetupCommands.kt @@ -0,0 +1,95 @@ +package app.aaps.pump.omnipod.omnipod5.bledriver.pod.command.aid + +import app.aaps.pump.omnipod.common.bledriver.comm.session.Session +import java.nio.ByteBuffer +import java.nio.charset.StandardCharsets + +/** + * O5-only "AID setup" command batch - ported from OmnipodKit's O5AidCommands.swift / + * BlePodComms.o5SendAidSetupCommands() (loopandlearn/OmnipodKit). Required right after + * pairing/session establishment and before anything else in activation - the pod's + * onboard AID firmware expects this data even though AAPS runs O5 as a manual pod with + * that firmware's own automated-delivery mode never engaged (see + * [app.aaps.pump.omnipod.omnipod5.O5PumpPlugin]'s class doc). Skipping or getting any of + * these wrong blocks activation from completing: the reference throws immediately on any + * failure here and never proceeds to SetupPod/SetUniqueId, and [send] mirrors that by + * propagating [Session.sendAidSetupCommand]'s exceptions rather than swallowing them. + * + * Every value below except the UTC timestamp is a fixed placeholder the pod firmware + * never actually acts on for dosing (AAPS is the sole dosing decision-maker) - these + * exact fixed values, and every wire-format byte layout here, are cross-verified against + * a real captured O5 pairing's comm log (OmnipodKit's own OmniTests/O5/ + * O5CommLogFixtures.swift + O5AidCommandsTests.swift), not guessed from protocol + * documentation. + * + * The 9th AID command upstream (a pod-status query, feature `3.11`/`3.12`) is + * unconditionally skipped in OmnipodKit itself (`skipO5AID9 = true`, "isn't even + * needed") and isn't ported here for the same reason. + */ +object O5AidSetupCommands { + + fun send(session: Session) { + session.sendAidSetupCommand(utcCommand(), "ES255.2=") + session.sendAidSetupCommand(tdiCommand(), "3.2=") + session.sendAidSetupCommand(targetBgProfileCommand(), "3.1=") + session.sendAidSetupCommand(diaCommand(), "3.9=") + session.sendAidSetupCommand(egvCommand(), "3.7=") + repeat(INSULIN_HISTORY_BATCH_COUNT) { + session.sendAidSetupCommand(insulinHistoryCommand(), "ES2.1=") + } + } + + /** Feature 255.2, Extended SET - the only AID command carrying a real (non-fixed) + * value: the controller's current wall-clock time. */ + private fun utcCommand(): ByteArray { + val utcSeconds = System.currentTimeMillis() / 1000 + return "SE255.2=$utcSeconds".toByteArray(StandardCharsets.US_ASCII) + } + + /** Feature 3.2 (therapy delivery info / TDI), SET+GET - fixed 5-byte body: + * version(0x00), therapy-type(0x03), delivery-mode(0x00), bolus-speed(0x0E), + * reserved(0x00). Never varies with AAPS's actual profile. */ + private fun tdiCommand(): ByteArray { + val data = byteArrayOf(0x00, 0x03, 0x00, 0x0E, 0x00) + return "S3.2=".toByteArray(StandardCharsets.US_ASCII) + data + ",G3.2".toByteArray(StandardCharsets.US_ASCII) + } + + /** Feature 3.1 (target BG profile), SET+GET - 48 half-hour slots, each a 4-byte + * big-endian mg/dL value, all fixed at [DEFAULT_TARGET_MGDL] regardless of AAPS's + * real target profile (the pod firmware doesn't use this for dosing). */ + private fun targetBgProfileCommand(): ByteArray { + val body = ByteBuffer.allocate(2 + TARGET_SLOT_COUNT * 4) + body.putShort((TARGET_SLOT_COUNT * 4).toShort()) + repeat(TARGET_SLOT_COUNT) { body.putInt(DEFAULT_TARGET_MGDL) } + return "S3.1=".toByteArray(StandardCharsets.US_ASCII) + body.array() + ",G3.1".toByteArray(StandardCharsets.US_ASCII) + } + + /** Feature 3.9 (DIA), SET+GET - fixed ASCII value. OmnipodKit's own comment hedges on + * the exact unit semantics ("likely 8 half-hours = 4h DIA, but could be the raw + * value") - ported as the same fixed value regardless, since AAPS's own DIA setting + * is what actually governs dosing, not this pod-firmware field. */ + private fun diaCommand(): ByteArray = + "S3.9=$DEFAULT_DIA_VALUE,G3.9".toByteArray(StandardCharsets.US_ASCII) + + /** Feature 3.7 (EGV/CGM config), SET+GET - fixed ASCII composite/bitfield value; + * OmnipodKit doesn't decode its bit meaning either, it's just replicated verbatim. */ + private fun egvCommand(): ByteArray = + "S3.7=$DEFAULT_EGV_CONFIG,G3.7".toByteArray(StandardCharsets.US_ASCII) + + /** Feature 2.1 (algorithm insulin history), Extended SET - 24 all-zero 7-byte + * records (no real delivery history to report; AAPS is the dosing decision-maker, + * not the pod). */ + private fun insulinHistoryCommand(): ByteArray { + val body = ByteArray(INSULIN_HISTORY_RECORD_COUNT * INSULIN_HISTORY_RECORD_SIZE) + val header = ByteBuffer.allocate(2).putShort(body.size.toShort()).array() + return "SE2.1=".toByteArray(StandardCharsets.US_ASCII) + header + body + } + + private const val TARGET_SLOT_COUNT = 48 + private const val DEFAULT_TARGET_MGDL = 110 + private const val DEFAULT_DIA_VALUE = 8 + private const val DEFAULT_EGV_CONFIG = 3670015 + private const val INSULIN_HISTORY_RECORD_COUNT = 24 + private const val INSULIN_HISTORY_RECORD_SIZE = 7 + private const val INSULIN_HISTORY_BATCH_COUNT = 3 +} diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/definition/O5Protocol.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/definition/O5Protocol.kt new file mode 100644 index 000000000000..6585d2f7cba2 --- /dev/null +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/definition/O5Protocol.kt @@ -0,0 +1,12 @@ +package app.aaps.pump.omnipod.omnipod5.bledriver.pod.definition + +/** + * The Omnipod 5 pod protocol uses a fixed nonce for every `NonceEnabledCommand` - same + * finding as Dash's own fixed `NONCE` constant in + * [app.aaps.pump.omnipod.dash.driver.OmnipodDashManagerImpl], a pod-firmware-level + * property of the shared command/response layer, not specific to either pod type. + * Shared here so [app.aaps.pump.omnipod.omnipod5.O5PumpPlugin] and + * [app.aaps.pump.omnipod.omnipod5.ui.wizard.compose.O5OmnipodWizardViewModel] don't each + * define their own copy. + */ +const val O5_FIXED_NONCE = 1229869870 diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/security/AndroidKeystoreAesCipher.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/security/AndroidKeystoreAesCipher.kt new file mode 100644 index 000000000000..013ed089a883 --- /dev/null +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/security/AndroidKeystoreAesCipher.kt @@ -0,0 +1,104 @@ +package app.aaps.pump.omnipod.omnipod5.bledriver.pod.security + +import android.security.keystore.KeyGenParameterSpec +import android.security.keystore.KeyProperties +import java.security.KeyStore +import java.util.Base64 +import javax.crypto.Cipher +import javax.crypto.KeyGenerator +import javax.crypto.SecretKey +import javax.crypto.spec.GCMParameterSpec +import javax.inject.Inject + +/** + * Encrypts/decrypts small byte payloads (here, serialized O5 registration data) using an + * AES-256-GCM key that lives inside the Android Keystore - the key material itself never + * leaves secure hardware (or the OS's protected keystore on devices without a secure + * element) and is never present in plaintext in application memory or storage. + * + * This replaces storing private key material as plain Gson-serialized `SharedPreferences` + * text, which is not meaningfully protected against a rooted device or a backup-extraction + * attack - matching OmnipodKit's own choice to use the iOS Keychain (rather than + * `UserDefaults`) for exactly this data. `AndroidKeyStore` is Android's equivalent + * hardware/OS-backed protection. + * + * IMPORTANT CAVEAT: `AndroidKeyStore` is a real Android OS keystore provider that only + * exists on an actual Android device or emulator - it cannot be exercised in a plain JVM + * test. Every other piece of cryptography built this session was verified against a real + * running implementation; this class could not be, for that reason. The AES-GCM API usage + * here follows Android's own documented key-generation and cipher patterns exactly (same + * shape as Android's official EncryptedSharedPreferences implementation), but the standard + * caveat that applies to compiled-but-unexecuted code applies doubly here - please verify + * this actually round-trips correctly on a real device/emulator before relying on it. + */ +/** + * Narrow encrypt/decrypt contract, extracted purely so [SecureO5RegistrationStorage]'s + * surrounding logic (serialization, entry merging, install orchestration) can be tested + * against a fake implementation - [AndroidKeystoreAesCipher] itself can't be exercised + * outside a real Android device/emulator (see its own class doc). + */ +interface O5RegistrationCipher { + fun encrypt(plaintext: ByteArray): String + fun decrypt(encoded: String): ByteArray +} + +class AndroidKeystoreAesCipher @Inject constructor() : O5RegistrationCipher { + + private val keyAlias: String = DEFAULT_KEY_ALIAS + + private val keyStore: KeyStore = KeyStore.getInstance(ANDROID_KEY_STORE).apply { load(null) } + + private fun getOrCreateKey(): SecretKey { + (keyStore.getKey(keyAlias, null) as? SecretKey)?.let { return it } + + val keyGenerator = KeyGenerator.getInstance(KeyProperties.KEY_ALGORITHM_AES, ANDROID_KEY_STORE) + val spec = KeyGenParameterSpec.Builder( + keyAlias, + KeyProperties.PURPOSE_ENCRYPT or KeyProperties.PURPOSE_DECRYPT + ) + .setBlockModes(KeyProperties.BLOCK_MODE_GCM) + .setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_NONE) + .setKeySize(256) + .build() + keyGenerator.init(spec) + return keyGenerator.generateKey() + } + + /** + * Encrypts [plaintext] and returns a single base64 string encoding both the + * Keystore-generated IV and the ciphertext (`base64(ivLength(1 byte) || iv || ciphertext)`), + * so [decrypt] can recover the IV without needing it passed separately. + */ + override fun encrypt(plaintext: ByteArray): String { + val cipher = Cipher.getInstance(TRANSFORMATION) + cipher.init(Cipher.ENCRYPT_MODE, getOrCreateKey()) + val iv = cipher.iv + val ciphertext = cipher.doFinal(plaintext) + + require(iv.size <= 0xFF) { "Unexpectedly long IV: ${iv.size} bytes" } + val combined = byteArrayOf(iv.size.toByte()) + iv + ciphertext + return Base64.getEncoder().encodeToString(combined) + } + + /** Inverse of [encrypt]. Throws if [encoded] is malformed or decryption/auth fails. */ + override fun decrypt(encoded: String): ByteArray { + val combined = Base64.getDecoder().decode(encoded) + require(combined.isNotEmpty()) { "Encoded ciphertext is empty" } + + val ivLength = combined[0].toInt() and 0xFF + require(combined.size > 1 + ivLength) { "Encoded ciphertext is truncated" } + val iv = combined.copyOfRange(1, 1 + ivLength) + val ciphertext = combined.copyOfRange(1 + ivLength, combined.size) + + val cipher = Cipher.getInstance(TRANSFORMATION) + cipher.init(Cipher.DECRYPT_MODE, getOrCreateKey(), GCMParameterSpec(GCM_TAG_LENGTH_BITS, iv)) + return cipher.doFinal(ciphertext) + } + + companion object { + private const val ANDROID_KEY_STORE = "AndroidKeyStore" + private const val DEFAULT_KEY_ALIAS = "app.aaps.pump.omnipod.o5_registration_key" + private const val TRANSFORMATION = "AES/GCM/NoPadding" + private const val GCM_TAG_LENGTH_BITS = 128 + } +} diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/security/SecureO5RegistrationStorage.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/security/SecureO5RegistrationStorage.kt new file mode 100644 index 000000000000..f883bee011f2 --- /dev/null +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/security/SecureO5RegistrationStorage.kt @@ -0,0 +1,141 @@ +package app.aaps.pump.omnipod.omnipod5.bledriver.pod.security + +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.keys.interfaces.Preferences +import app.aaps.pump.omnipod.omnipod5.bledriver.comm.pair.O5RegistrationData +import app.aaps.pump.omnipod.omnipod5.keys.O5StringNonPreferenceKey +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import javax.inject.Inject +import javax.inject.Singleton + +/** + * Persists O5 registration (credential) data across app restarts, encrypted at rest via + * [AndroidKeystoreAesCipher] - the persistence-layer counterpart to + * [app.aaps.pump.omnipod.omnipod5.bledriver.comm.pair.O5RegistrationData]'s in-memory + * registry, mirroring OmnipodKit's O5CertificateKeychain.swift. + * + * Call [loadAndInstallAll] once at app startup (before any O5 pairing/connection code + * runs) to restore previously-imported credentials into the in-memory registry. Call + * [persistEntry] whenever a new credential is imported (e.g. via a future settings screen + * accepting a packed string or keypair file) so it survives the next cold start. + * + * Note on scope: only [O5RegistrationData.O5RegistrationSource.IMPORTED] entries are + * persisted here - BUILT_IN entries are, by definition, re-derived from the compiled + * ServiceLoader-discovered module on every app start, and DOWNLOADED entries aren't a + * pattern this codebase actually implements yet (see O5RegistrationData's class doc). + */ +@Singleton +class SecureO5RegistrationStorage @Inject constructor( + private val logger: AAPSLogger, + private val preferences: Preferences, + private val cipher: O5RegistrationCipher +) { + + private val gson = Gson() + + /** JSON-serializable shape for one persisted entry (Gson can't serialize the real + * [O5RegistrationData.O5RegistrationSource] enum's name reliably across app updates + * if it's ever reordered, so persist the name as a plain string defensively). */ + private data class PersistedEntry( + val controllerId: Long, + val privateKeyHex: String, + val publicKeyHex: String, + val intermediateCABase64: String, + val tlsCertificateBase64: String, + val sourceName: String + ) + + /** + * Loads any previously-persisted, imported registration entries and installs them into + * [O5RegistrationData]'s in-memory registry. Safe to call even if nothing has ever been + * persisted (no-ops). Logs and skips (rather than throwing) if decryption fails - e.g. + * after a device restore where the Keystore key itself didn't survive, which is + * expected Android Keystore behavior, not a bug. + */ + fun loadAndInstallAll() { + val encrypted = preferences.getIfExists(O5StringNonPreferenceKey.RegistrationData) + if (encrypted.isNullOrEmpty()) return + + try { + val json = String(cipher.decrypt(encrypted), Charsets.UTF_8) + val entries = parseEntries(json) + for (entry in entries) { + val data = O5RegistrationData( + controllerId = entry.controllerId, + privateKeyHex = entry.privateKeyHex, + publicKeyHex = entry.publicKeyHex, + intermediateCABase64 = entry.intermediateCABase64, + tlsCertificateBase64 = entry.tlsCertificateBase64 + ) + val source = try { + O5RegistrationData.O5RegistrationSource.valueOf(entry.sourceName) + } catch (_: IllegalArgumentException) { + O5RegistrationData.O5RegistrationSource.IMPORTED + } + O5RegistrationData.install(data, source) + } + logger.debug(LTag.PUMPCOMM, "Restored ${entries.size} persisted O5 registration entr${if (entries.size == 1) "y" else "ies"}") + } catch (ex: Exception) { + logger.error(LTag.PUMPCOMM, "Failed to load/decrypt persisted O5 registration data", ex) + } + } + + /** + * Persists [data] (with the given [source]) so it survives app restarts, alongside any + * other already-persisted entries. Re-encrypts and re-saves the entire entry set - simple + * and safe for the very small number of entries (realistically 1) this ever holds. + */ + fun persistEntry(data: O5RegistrationData, source: O5RegistrationData.O5RegistrationSource) { + try { + val current = loadPersistedEntriesOnly().filterNot { it.controllerId == data.controllerId } + val updated = current + PersistedEntry( + controllerId = data.controllerId, + privateKeyHex = data.privateKeyHex, + publicKeyHex = data.publicKeyHex, + intermediateCABase64 = data.intermediateCABase64, + tlsCertificateBase64 = data.tlsCertificateBase64, + sourceName = source.name + ) + saveEntries(updated) + logger.debug(LTag.PUMPCOMM, "Persisted O5 registration entry for controller 0x%08X".format(data.controllerId)) + } catch (ex: Exception) { + logger.error(LTag.PUMPCOMM, "Failed to encrypt/persist O5 registration data", ex) + } + } + + /** Removes a persisted entry (e.g. when the user deletes a saved credential). Does not + * affect the in-memory registry - call [O5RegistrationData.remove] separately if the + * entry should also stop being usable immediately, not just on next restart. */ + fun removeEntry(controllerId: Long) { + try { + val current = loadPersistedEntriesOnly().filterNot { it.controllerId == controllerId } + saveEntries(current) + } catch (ex: Exception) { + logger.error(LTag.PUMPCOMM, "Failed to remove persisted O5 registration entry", ex) + } + } + + private fun loadPersistedEntriesOnly(): List { + val encrypted = preferences.getIfExists(O5StringNonPreferenceKey.RegistrationData) + if (encrypted.isNullOrEmpty()) return emptyList() + return try { + parseEntries(String(cipher.decrypt(encrypted), Charsets.UTF_8)) + } catch (ex: Exception) { + logger.error(LTag.PUMPCOMM, "Failed to decrypt existing O5 registration data before update", ex) + emptyList() + } + } + + private fun saveEntries(entries: List) { + val json = gson.toJson(entries) + val encrypted = cipher.encrypt(json.toByteArray(Charsets.UTF_8)) + preferences.put(O5StringNonPreferenceKey.RegistrationData, encrypted) + } + + private fun parseEntries(json: String): List { + val type = object : TypeToken>() {}.type + return gson.fromJson(json, type) ?: emptyList() + } +} diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/state/O5PodStateManager.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/state/O5PodStateManager.kt new file mode 100644 index 000000000000..86e6413576cc --- /dev/null +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/state/O5PodStateManager.kt @@ -0,0 +1,520 @@ +package app.aaps.pump.omnipod.omnipod5.bledriver.pod.state + +import app.aaps.core.data.model.BS +import app.aaps.pump.omnipod.common.bledriver.comm.pair.PairResult +import app.aaps.pump.omnipod.common.bledriver.comm.session.EapSqn +import app.aaps.pump.omnipod.common.bledriver.pod.definition.ActivationProgress +import app.aaps.pump.omnipod.common.bledriver.pod.definition.AlarmType +import app.aaps.pump.omnipod.common.bledriver.pod.definition.AlertType +import app.aaps.pump.omnipod.common.bledriver.pod.definition.BasalProgram +import app.aaps.pump.omnipod.common.bledriver.pod.definition.DeliveryStatus +import app.aaps.pump.omnipod.common.bledriver.pod.definition.PodStatus +import app.aaps.pump.omnipod.common.bledriver.pod.definition.SoftwareVersion +import app.aaps.pump.omnipod.common.bledriver.pod.response.AlarmStatusResponse +import app.aaps.pump.omnipod.common.bledriver.pod.response.DefaultStatusResponse +import app.aaps.pump.omnipod.common.bledriver.pod.response.PodInfoActivationTimeResponse +import app.aaps.pump.omnipod.common.bledriver.pod.response.PodInfoTriggeredAlertsResponse +import app.aaps.pump.omnipod.common.bledriver.pod.response.SetUniqueIdResponse +import app.aaps.pump.omnipod.common.bledriver.pod.response.VersionResponse +import java.io.Serializable +import java.util.Calendar +import java.util.EnumSet +import java.util.concurrent.atomic.AtomicInteger + +/** + * Persisted/in-memory state needed to connect to, pair with, and read status from an + * Omnipod 5 pod, plus the dosing/control state ([O5PumpPlugin][app.aaps.pump.omnipod + * .common.O5PumpPlugin] needs to track basal program, last bolus, active temp basal, and + * an in-flight dose command whose outcome is still uncertain (BLE response never + * arrived) so it can be reconciled on the next status poll. Deliberately does NOT use a + * Dash-style historyId/persisted-ledger ([OmnipodDashPodStateManager.ActiveCommand]) + * to track in-flight commands - [app.aaps.pump.omnipod.common.bledriver.comm + * .O5BleManager.sendCommand] already gives 1:1 request/response correlation per call + * (unlike Dash's continuous connection-scoped event bus), so [pendingDoseCommand] only + * needs to be a single flat marker, not a ledger. + * + * [updateFromVersionResponse] and [updateFromDefaultStatusResponse] are read-only status + * updates - reused directly from [VersionResponse]/[DefaultStatusResponse], which turned + * out to have no Dash-specific assumptions baked in (pure byte-offset parsing), matching + * the same finding as [app.aaps.pump.omnipod.common.bledriver.pod.command.base + * .HeaderEnabledCommand]. + */ +interface O5PodStateManager { + + enum class BluetoothConnectionState { CONNECTING, CONNECTED, DISCONNECTED } + + var bluetoothConnectionState: BluetoothConnectionState + var connectionAttempts: Int + var successfulConnections: Int + + /** The Bluetooth MAC address of the paired pod, once known. */ + var bluetoothAddress: String? + + /** The certificate-derived controller id used for this pod's O5 identity (see + * [app.aaps.pump.omnipod.omnipod5.bledriver.comm.pair.O5CertificateStore.controllerId]). */ + var controllerId: Long? + + /** The pod's own id, once paired. */ + var podId: Long? + + /** The pod's long-term key, once paired. Null until [updateFromPairing] is called. */ + var ltk: ByteArray? + + /** Message sequence number to resume from after pairing/reconnection. */ + var msgSequenceNumber: Byte + + /** Advances [msgSequenceNumber] by one, wrapping at 4 bits (0x0-0xf) - the pod's + * command-header sequence number, distinct from the BLE-packet-level session + * sequence number the [app.aaps.pump.omnipod.common.bledriver.comm.session.Session] + * layer manages on its own. Must be called after every command round trip (sent, + * send-unconfirmed, or response received) or the pod will NAK every command after + * the first in a session - mirrors [OmnipodDashPodStateManager + * .increaseMessageSequenceNumber]. */ + fun increaseMessageSequenceNumber() + + var eapAkaSequenceNumber: Long + + /** How far through physical pod activation (pairing, prime, cannula insertion) the + * pod has progressed - default [ActivationProgress.NOT_STARTED]. Drives + * [app.aaps.pump.omnipod.omnipod5.O5PumpPlugin.isBusy] and lets + * [app.aaps.pump.omnipod.omnipod5.ui.wizard.compose.O5OmnipodWizardViewModel] resume + * a retried activation without resending already-completed steps. */ + var activationProgress: ActivationProgress + + + var primePulseRate: Short? + var firstPrimeBolusVolume: Short? + var secondPrimeBolusVolume: Short? + var podLifeInHours: Short? + + + /** The basal program currently believed to be running on the pod. */ + var basalProgram: BasalProgram? + + /** True while the pod's delivery is suspended (no basal/temp basal delivery). */ + var deliverySuspended: Boolean + + var lastBolusStartTime: Long? + var lastBolusRequestedUnits: Double? + + /** Null until the bolus is confirmed delivered (fully or partially - see + * [app.aaps.pump.omnipod.omnipod5.O5PumpPlugin]'s bolus-completion polling). */ + var lastBolusDeliveredUnits: Double? + + var activeTempBasalStartTime: Long? + var activeTempBasalRate: Double? + var activeTempBasalDurationMinutes: Short? + + /** + * A single dose-affecting command whose outcome is not yet confirmed - set + * optimistically right before the [app.aaps.pump.omnipod.common.bledriver.comm + * .O5BleManager.sendCommand] `Observable` for a bolus/temp-basal/basal-program + * command is subscribed, and cleared once the next status response confirms (or + * denies) it actually took effect. This is the field that makes uncertain BLE + * outcomes (dose sent but response never arrived) recoverable rather than silently + * lost - see [app.aaps.pump.omnipod.omnipod5.O5PumpPlugin]'s reconciliation logic. + */ + var pendingDoseCommand: PendingDoseCommand? + + enum class PendingDoseType { BOLUS, TEMP_BASAL_START, TEMP_BASAL_CANCEL, BASAL_PROGRAM } + + data class PendingDoseCommand( + val type: PendingDoseType, + val requestedUnits: Double? = null, + val requestedRate: Double? = null, + val requestedDurationMinutes: Short? = null, + /** Only set for [PendingDoseType.BOLUS] - needed to correctly finalize + * [app.aaps.core.interfaces.pump.PumpSync.syncBolusWithPumpId] if the original + * call never reached its own sync step. */ + val bolusType: BS.Type? = null, + val startedAt: Long, + /** + * The 4-bit command sequence number this dose was sent with, captured from + * [msgSequenceNumber] immediately before building the command. + * + * This is what makes an uncertain outcome *decidable* rather than guessable: the pod + * reports the sequence number of the last programming command it accepted (see + * [sequenceNumberOfLastProgrammingCommand]), so comparing the two answers "did the pod + * actually get this command" outright. Without it, reconciliation can only look at + * whether delivery is currently active, which cannot tell a bolus that finished from + * one that never started. + * + * Null only for a [PendingDoseCommand] restored from a state file written before this + * field existed; reconciliation falls back to the delivery-status heuristic then. + */ + val sequenceNumber: Short? = null, + /** True only for the micro-bolus [app.aaps.pump.omnipod.omnipod5.O5PumpPlugin + * .deliverBasalCorrection] issues - excluded from [cumulativeBolusPulsesDelivered] + * tracking so it counts toward delivered *basal* insulin, not bolus insulin + * (the whole point of the correction is to true up basal drift). */ + val isBasalCorrection: Boolean = false + ) : Serializable + + + val podStatus: PodStatus? + val deliveryStatus: DeliveryStatus? + + /** + * The pod has stopped delivering for good - it faulted or was deactivated. + * + * Derived from [podStatus], which every routine status poll refreshes, so this is the + * dependable fault signal. [alarmType] carries the *reason* but only arrives with an + * alarm-status response, which the pod sends solely in reply to an explicit request for + * that page - so a fault would otherwise go unnoticed until something asked. Mirrors the + * Dash driver's `isPodKaput`. + */ + val isPodKaput: Boolean + get() = podStatus in arrayOf(PodStatus.ALARM, PodStatus.DEACTIVATED) + val firmwareVersion: SoftwareVersion? + val bleVersion: SoftwareVersion? + val lotNumber: Long? + val podSequenceNumber: Long? + val totalPulsesDelivered: Short? + val bolusPulsesRemaining: Short? + val reservoirPulsesRemaining: Short? + val activeAlerts: EnumSet? + val minutesSinceActivation: Short? + val sequenceNumberOfLastProgrammingCommand: Short? + + /** System.currentTimeMillis() when the last status was received, or null if never. */ + val lastStatusResponseReceived: Long? + + + val alarmType: AlarmType? + /** Pod-clock minutes-since-activation timestamp of when the alarm occurred (not a + * wall-clock time - the pod has no wall clock of its own). */ + val alarmTime: Short? + val occlusionAlarm: Boolean? + val podStatusWhenAlarmOccurred: PodStatus? + val rssi: Short? + + /** True once the current [alarmType] has already produced a user-facing notification + * and a [app.aaps.core.interfaces.pump.PumpSync.insertAnnouncement] entry - set by + * [app.aaps.pump.omnipod.omnipod5.O5PumpPlugin]'s checkPodFault() so a still-faulted pod + * doesn't re-notify on every status poll. Mirrors [OmnipodDashPodStateManager + * .alarmSynced]; reset back to false only via [reset] (a new pod pairing). */ + var alarmSynced: Boolean + + + /** Wall-clock epoch millis the pod was activated, computed from status page 5's + * date fields - unlike [minutesSinceActivation], this survives across app + * restarts without drifting (it isn't a relative counter). Null until page 5 has + * been fetched at least once. */ + val podActivatedAt: Long? + + /** Pod-clock minutes-since-activation each [AlertType] slot last triggered, from + * status page 1. Only contains entries for slots that have actually triggered + * (value 0 = never triggered, per OmnipodKit's own convention, so those are + * filtered out here). Null until page 1 has been fetched at least once. */ + val triggeredAlertTimes: Map? + + + /** True while the pod's SUSPEND_ENDED alert is still armed from a prior suspend - + * set by [app.aaps.pump.omnipod.omnipod5.O5PumpPlugin]'s suspendDelivery(), cleared by + * its disableSuspendAlerts() once delivery resumes (silences the nuisance beep for a + * suspend/resume the user/algorithm caused intentionally). */ + var suspendAlertsEnabled: Boolean + + data class SyncedAlertSettings( + val expirationReminderEnabled: Boolean, + val expirationReminderHours: Int, + val expirationAlarmEnabled: Boolean, + val expirationAlarmHours: Int, + val lowReservoirAlertEnabled: Boolean, + val lowReservoirAlertUnits: Int + ) : Serializable + + /** The alert preference values last successfully pushed to the pod - null until + * [app.aaps.pump.omnipod.omnipod5.O5PumpPlugin]'s updateAlertConfiguration() first + * succeeds. Compared against current preferences to skip redundant re-syncs. */ + var syncedAlertSettings: SyncedAlertSettings? + + + /** Integrated expected basal delivery (units) since [O5PodStateManager] started + * tracking it (right after activation completes) - compared against actual delivered + * basal insulin ([app.aaps.pump.omnipod.omnipod5.bledriver.pod.state.basalDelivered]) + * to detect drift. Null until the first post-activation status poll. */ + var basalExpected: Double? + + /** Wall-clock time of the last basal-drift correction bolus - a cooldown to prevent + * rapid repeated corrections. Null if none has ever been delivered. */ + var lastBasalCorrectionTime: Long? + + /** True while a basal-drift correction bolus is in flight - prevents [deliverTreatment] + * concurrency guards from misreading it as a user-requested bolus. */ + var basalCorrectionInProgress: Boolean + + /** Cumulative pod pulses attributed to boluses (not basal) since activation completed - + * subtracted from [totalPulsesDelivered] to isolate delivered basal insulin. Excludes + * basal-correction boluses themselves (see [PendingDoseCommand.isBasalCorrection]). + * Initialized to [totalPulsesDelivered] at the moment activation completes (see + * [app.aaps.pump.omnipod.omnipod5.ui.wizard.compose.O5OmnipodWizardViewModel]), so + * priming/cannula-insertion pulses are excluded from the basal bucket too. */ + var cumulativeBolusPulsesDelivered: Short? + + fun updateFromVersionResponse(response: VersionResponse) + fun updateFromDefaultStatusResponse(response: DefaultStatusResponse) + fun updateFromAlarmStatusResponse(response: AlarmStatusResponse) + + /** Populates [podActivatedAt] plus [alarmType]/[alarmTime] (page 5 reports the same + * fault info [AlarmStatusResponse] does). */ + fun updateFromActivationTimeResponse(response: PodInfoActivationTimeResponse) + + /** Populates [triggeredAlertTimes] from page 1's 8 alert-slot values. */ + fun updateFromTriggeredAlertsResponse(response: PodInfoTriggeredAlertsResponse) + + /** Populates the prime-bolus parameters ([primePulseRate], [firstPrimeBolusVolume], + * [secondPrimeBolusVolume], [podLifeInHours]) plus version/status/lot/sequence + * fields - mirrors [OmnipodDashPodStateManager.updateFromSetUniqueIdResponse]. */ + fun updateFromSetUniqueIdResponse(response: SetUniqueIdResponse) + + /** + * Returns the next EAP-AKA sequence number (as its 6-byte on-wire [EapSqn] + * representation) without yet committing it - matching + * [OmnipodDashPodStateManager]'s increment-then-commit-on-success pattern, so a + * failed session establishment doesn't advance the persisted counter. + */ + fun increaseEapAkaSequenceNumber(): ByteArray + fun commitEapAkaSequenceNumber() + + fun updateFromPairing(controllerId: Long, podId: Long, pairResult: PairResult) + + fun reset() +} + +/** + * Simple in-memory [O5PodStateManager]. Not persisted across process restarts - use + * [PersistedO5PodStateManager] for that; this is mainly useful for tests. + */ +class InMemoryO5PodStateManager : O5PodStateManager { + + @Volatile override var bluetoothConnectionState: O5PodStateManager.BluetoothConnectionState = + O5PodStateManager.BluetoothConnectionState.DISCONNECTED + + private val connectionAttemptsCounter = AtomicInteger(0) + override var connectionAttempts: Int + get() = connectionAttemptsCounter.get() + set(value) { connectionAttemptsCounter.set(value) } + + private val successfulConnectionsCounter = AtomicInteger(0) + override var successfulConnections: Int + get() = successfulConnectionsCounter.get() + set(value) { successfulConnectionsCounter.set(value) } + + @Volatile override var bluetoothAddress: String? = null + @Volatile override var controllerId: Long? = null + @Volatile override var podId: Long? = null + @Volatile override var ltk: ByteArray? = null + @Volatile override var msgSequenceNumber: Byte = 1 + + @Volatile override var eapAkaSequenceNumber: Long = 0 + @Volatile private var pendingEapAkaSequenceNumber: Long = 0 + + @Volatile override var activationProgress: ActivationProgress = ActivationProgress.NOT_STARTED + @Volatile override var primePulseRate: Short? = null + @Volatile override var firstPrimeBolusVolume: Short? = null + @Volatile override var secondPrimeBolusVolume: Short? = null + @Volatile override var podLifeInHours: Short? = null + + @Volatile override var basalProgram: BasalProgram? = null + @Volatile override var deliverySuspended: Boolean = false + @Volatile override var lastBolusStartTime: Long? = null + @Volatile override var lastBolusRequestedUnits: Double? = null + @Volatile override var lastBolusDeliveredUnits: Double? = null + @Volatile override var activeTempBasalStartTime: Long? = null + @Volatile override var activeTempBasalRate: Double? = null + @Volatile override var activeTempBasalDurationMinutes: Short? = null + @Volatile override var pendingDoseCommand: O5PodStateManager.PendingDoseCommand? = null + + override fun increaseMessageSequenceNumber() { + msgSequenceNumber = ((msgSequenceNumber.toInt() + 1) and 0x0f).toByte() + } + + @Volatile override var podStatus: PodStatus? = null + private set + @Volatile override var deliveryStatus: DeliveryStatus? = null + private set + @Volatile override var firmwareVersion: SoftwareVersion? = null + private set + @Volatile override var bleVersion: SoftwareVersion? = null + private set + @Volatile override var lotNumber: Long? = null + private set + @Volatile override var podSequenceNumber: Long? = null + private set + @Volatile override var totalPulsesDelivered: Short? = null + private set + @Volatile override var bolusPulsesRemaining: Short? = null + private set + @Volatile override var reservoirPulsesRemaining: Short? = null + private set + @Volatile override var activeAlerts: EnumSet? = null + private set + @Volatile override var minutesSinceActivation: Short? = null + private set + @Volatile override var sequenceNumberOfLastProgrammingCommand: Short? = null + private set + @Volatile override var lastStatusResponseReceived: Long? = null + private set + + @Volatile override var alarmType: AlarmType? = null + private set + @Volatile override var alarmTime: Short? = null + private set + @Volatile override var occlusionAlarm: Boolean? = null + private set + @Volatile override var podStatusWhenAlarmOccurred: PodStatus? = null + private set + @Volatile override var rssi: Short? = null + private set + @Volatile override var alarmSynced: Boolean = false + + @Volatile override var podActivatedAt: Long? = null + private set + @Volatile override var triggeredAlertTimes: Map? = null + private set + + @Volatile override var suspendAlertsEnabled: Boolean = true + @Volatile override var syncedAlertSettings: O5PodStateManager.SyncedAlertSettings? = null + @Volatile override var basalExpected: Double? = null + @Volatile override var lastBasalCorrectionTime: Long? = null + @Volatile override var basalCorrectionInProgress: Boolean = false + @Volatile override var cumulativeBolusPulsesDelivered: Short? = null + + override fun increaseEapAkaSequenceNumber(): ByteArray { + pendingEapAkaSequenceNumber = eapAkaSequenceNumber + 1 + return EapSqn(pendingEapAkaSequenceNumber).value + } + + override fun commitEapAkaSequenceNumber() { + eapAkaSequenceNumber = pendingEapAkaSequenceNumber + } + + override fun updateFromPairing(controllerId: Long, podId: Long, pairResult: PairResult) { + this.controllerId = controllerId + this.podId = podId + ltk = pairResult.ltk + msgSequenceNumber = pairResult.msgSeq + } + + override fun updateFromVersionResponse(response: VersionResponse) { + podStatus = response.podStatus + firmwareVersion = SoftwareVersion(response.firmwareVersionMajor, response.firmwareVersionMinor, response.firmwareVersionInterim) + bleVersion = SoftwareVersion(response.bleVersionMajor, response.bleVersionMinor, response.bleVersionInterim) + lotNumber = response.lotNumber + podSequenceNumber = response.podSequenceNumber + lastStatusResponseReceived = System.currentTimeMillis() + } + + override fun updateFromDefaultStatusResponse(response: DefaultStatusResponse) { + val previousUpdate = lastStatusResponseReceived + val now = System.currentTimeMillis() + totalPulsesDelivered = response.totalPulsesDelivered + basalExpected = nextBasalExpected(previousUpdate, now) + podStatus = response.podStatus + deliveryStatus = response.deliveryStatus + bolusPulsesRemaining = response.bolusPulsesRemaining + reservoirPulsesRemaining = response.reservoirPulsesRemaining + activeAlerts = response.activeAlerts + minutesSinceActivation = response.minutesSinceActivation + sequenceNumberOfLastProgrammingCommand = response.sequenceNumberOfLastProgrammingCommand + lastStatusResponseReceived = now + } + + override fun updateFromAlarmStatusResponse(response: AlarmStatusResponse) { + podStatus = response.podStatus + deliveryStatus = response.deliveryStatus + totalPulsesDelivered = response.totalPulsesDelivered + bolusPulsesRemaining = response.bolusPulsesRemaining + reservoirPulsesRemaining = response.reservoirPulsesRemaining + activeAlerts = response.activeAlerts + minutesSinceActivation = response.minutesSinceActivation + sequenceNumberOfLastProgrammingCommand = response.sequenceNumberOfLastProgrammingCommand + alarmType = response.alarmType + alarmTime = response.alarmTime + occlusionAlarm = response.occlusionAlarm + podStatusWhenAlarmOccurred = response.podStatusWhenAlarmOccurred + rssi = response.rssi + lastStatusResponseReceived = System.currentTimeMillis() + } + + override fun updateFromActivationTimeResponse(response: PodInfoActivationTimeResponse) { + val calendar = Calendar.getInstance() + calendar.set(2000 + response.year, response.month - 1, response.day, response.hour, response.minute, 0) + calendar.set(Calendar.MILLISECOND, 0) + podActivatedAt = calendar.timeInMillis + alarmType = response.faultEventCode + alarmTime = response.faultTime + } + + override fun updateFromTriggeredAlertsResponse(response: PodInfoTriggeredAlertsResponse) { + triggeredAlertTimes = response.alertActivations.filterValues { it != 0.toShort() } + } + + override fun updateFromSetUniqueIdResponse(response: SetUniqueIdResponse) { + primePulseRate = response.primePumpRate + firstPrimeBolusVolume = response.numberOfEngagingClutchDrivePulses + secondPrimeBolusVolume = response.numberOfPrimePulses + podLifeInHours = response.podExpirationTimeInHours + firmwareVersion = SoftwareVersion(response.firmwareVersionMajor, response.firmwareVersionMinor, response.firmwareVersionInterim) + bleVersion = SoftwareVersion(response.bleVersionMajor, response.bleVersionMinor, response.bleVersionInterim) + podStatus = response.podStatus + lotNumber = response.lotNumber + podSequenceNumber = response.podSequenceNumber + lastStatusResponseReceived = System.currentTimeMillis() + } + + override fun reset() { + bluetoothConnectionState = O5PodStateManager.BluetoothConnectionState.DISCONNECTED + connectionAttemptsCounter.set(0) + successfulConnectionsCounter.set(0) + bluetoothAddress = null + controllerId = null + podId = null + ltk = null + msgSequenceNumber = 1 + eapAkaSequenceNumber = 0 + pendingEapAkaSequenceNumber = 0 + activationProgress = ActivationProgress.NOT_STARTED + primePulseRate = null + firstPrimeBolusVolume = null + secondPrimeBolusVolume = null + podLifeInHours = null + basalProgram = null + deliverySuspended = false + lastBolusStartTime = null + lastBolusRequestedUnits = null + lastBolusDeliveredUnits = null + activeTempBasalStartTime = null + activeTempBasalRate = null + activeTempBasalDurationMinutes = null + pendingDoseCommand = null + podStatus = null + deliveryStatus = null + firmwareVersion = null + bleVersion = null + lotNumber = null + podSequenceNumber = null + totalPulsesDelivered = null + bolusPulsesRemaining = null + reservoirPulsesRemaining = null + activeAlerts = null + minutesSinceActivation = null + sequenceNumberOfLastProgrammingCommand = null + lastStatusResponseReceived = null + alarmType = null + alarmTime = null + occlusionAlarm = null + podStatusWhenAlarmOccurred = null + rssi = null + alarmSynced = false + podActivatedAt = null + triggeredAlertTimes = null + suspendAlertsEnabled = true + syncedAlertSettings = null + basalExpected = null + lastBasalCorrectionTime = null + basalCorrectionInProgress = false + cumulativeBolusPulsesDelivered = null + } +} diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/state/O5PodStateManagerExtensions.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/state/O5PodStateManagerExtensions.kt new file mode 100644 index 000000000000..48c36ecb55fd --- /dev/null +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/state/O5PodStateManagerExtensions.kt @@ -0,0 +1,115 @@ +package app.aaps.pump.omnipod.omnipod5.bledriver.pod.state + +import app.aaps.pump.omnipod.common.bledriver.pod.definition.ActivationProgress +import app.aaps.pump.omnipod.common.bledriver.pod.definition.BasalProgram +import app.aaps.pump.omnipod.common.bledriver.pod.definition.PodConstants +import java.time.Duration +import java.time.ZonedDateTime +import java.util.TimeZone + +/** + * Estimated pod expiration time, mirroring + * [OmnipodDashPodStateManagerImpl.expiry]'s formula (including its unexplained + * `.minusHours(8)` grace-period adjustment, copied verbatim rather than guessed at) - + * null until [O5PodStateManager.podLifeInHours]/[O5PodStateManager.minutesSinceActivation] + * are known (i.e. before [app.aaps.pump.omnipod.common.bledriver.pod.response + * .SetUniqueIdResponse] has been received during activation). + */ +val O5PodStateManager.expiry: ZonedDateTime? + get() { + val hours = podLifeInHours ?: return null + val minutes = minutesSinceActivation ?: return null + val lastUpdated = lastStatusResponseReceived ?: return null + return ZonedDateTime.now() + .plusHours(hours.toLong()) + .minusMinutes(minutes.toLong()) + .minus(Duration.ofMillis(System.currentTimeMillis() - lastUpdated)) + .minusHours(8) + } + + +/** [O5PodStateManager.totalPulsesDelivered] minus pulses already attributed to boluses - + * null until both are known (i.e. before activation completes and + * [O5PodStateManager.cumulativeBolusPulsesDelivered] is initialized). */ +val O5PodStateManager.basalPulsesDelivered: Short? + get() { + val total = totalPulsesDelivered ?: return null + val bolus = cumulativeBolusPulsesDelivered ?: return null + return (total - bolus).toShort() + } + +val O5PodStateManager.basalDelivered: Double + get() = (basalPulsesDelivered ?: 0) * PodConstants.POD_PULSE_BOLUS_UNITS + +/** Positive = over-delivery, negative = under-delivery, relative to [O5PodStateManager + * .basalExpected]. */ +val O5PodStateManager.basalDrift: Double + get() = basalDelivered - (basalExpected ?: basalDelivered) + +/** + * Integrates expected basal delivery (units) over `[startTime, endTime]`, accounting for + * an active temp basal overriding the scheduled program during its window. Mirrors + * [OmnipodDashPodStateManagerImpl.integrateExpectedDelivery], simplified: O5 doesn't track + * a separate pod-timezone offset the way Dash does (every other O5 basal-rate lookup - + * see [app.aaps.pump.omnipod.omnipod5.O5PumpPlugin.baseBasalRate] - already calls + * [BasalProgram.rateAt] directly against device-local time, so this does the same rather + * than introducing a cross-conversion no other O5 code performs). + */ +fun integrateO5ExpectedDelivery( + startTime: Long, + endTime: Long, + activeTempBasalStartTime: Long?, + activeTempBasalRate: Double?, + activeTempBasalDurationMinutes: Short?, + basalProgram: BasalProgram? +): Double? { + if (startTime > endTime) return null + + val tempBasalEnd = if (activeTempBasalStartTime != null && activeTempBasalDurationMinutes != null) + activeTempBasalStartTime + activeTempBasalDurationMinutes * 60_000L + else null + + val boundaries = mutableSetOf(startTime, endTime) + if (activeTempBasalStartTime != null && tempBasalEnd != null) { + if (activeTempBasalStartTime in startTime until endTime) boundaries.add(activeTempBasalStartTime) + if (tempBasalEnd in startTime until endTime) boundaries.add(tempBasalEnd) + } + basalProgram?.segments?.forEach { segment -> + val deviceOffsetMs = TimeZone.getDefault().getOffset(startTime) + val dayStartLocal = ((startTime + deviceOffsetMs) / 86400_000L) * 86400_000L - deviceOffsetMs + var segmentStart = dayStartLocal + segment.startSlotIndex.toLong() * 30 * 60_000L + if (segmentStart <= startTime) segmentStart += 86400_000L + while (segmentStart < endTime) { + boundaries.add(segmentStart) + segmentStart += 86400_000L + } + } + + return boundaries.sorted().windowed(2).map { (boundaryStart, boundaryEnd) -> + val segmentHours = (boundaryEnd - boundaryStart) / 3600_000.0 + val segmentMid = (boundaryStart + boundaryEnd) / 2 + val rate = if (activeTempBasalStartTime != null && activeTempBasalRate != null && tempBasalEnd != null && + segmentMid in activeTempBasalStartTime until tempBasalEnd + ) { + activeTempBasalRate + } else { + basalProgram?.rateAt(segmentMid) ?: return null + } + rate * segmentHours + }.sum() +} + +/** Integrates [integrateO5ExpectedDelivery] into [O5PodStateManager.basalExpected] since + * its last update, or seeds it from [basalDelivered] the first time this is called after + * activation completes - call from every `updateFromDefaultStatusResponse`, matching + * [OmnipodDashPodStateManagerImpl.updatePodState]'s equivalent step. [previousUpdate] must + * be the OLD [O5PodStateManager.lastStatusResponseReceived], captured before it's + * overwritten with the new response's timestamp. */ +fun O5PodStateManager.nextBasalExpected(previousUpdate: Long?, now: Long): Double? = + basalExpected?.let { current -> + previousUpdate?.let { start -> + integrateO5ExpectedDelivery( + start, now, activeTempBasalStartTime, activeTempBasalRate, activeTempBasalDurationMinutes, basalProgram + )?.let { delta -> current + delta } + } ?: current + } ?: basalDelivered.takeIf { activationProgress == ActivationProgress.COMPLETED } diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/state/PersistedO5PodStateManager.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/state/PersistedO5PodStateManager.kt new file mode 100644 index 000000000000..570a95601e5a --- /dev/null +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/state/PersistedO5PodStateManager.kt @@ -0,0 +1,475 @@ +package app.aaps.pump.omnipod.omnipod5.bledriver.pod.state + +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.keys.interfaces.Preferences +import app.aaps.pump.omnipod.common.bledriver.comm.pair.PairResult +import app.aaps.pump.omnipod.common.bledriver.comm.session.EapSqn +import app.aaps.pump.omnipod.common.bledriver.pod.definition.ActivationProgress +import app.aaps.pump.omnipod.common.bledriver.pod.definition.AlarmType +import app.aaps.pump.omnipod.common.bledriver.pod.definition.AlertType +import app.aaps.pump.omnipod.common.bledriver.pod.definition.BasalProgram +import app.aaps.pump.omnipod.common.bledriver.pod.definition.DeliveryStatus +import app.aaps.pump.omnipod.common.bledriver.pod.definition.PodStatus +import app.aaps.pump.omnipod.common.bledriver.pod.definition.SoftwareVersion +import app.aaps.pump.omnipod.common.bledriver.pod.response.AlarmStatusResponse +import app.aaps.pump.omnipod.common.bledriver.pod.response.DefaultStatusResponse +import app.aaps.pump.omnipod.common.bledriver.pod.response.PodInfoActivationTimeResponse +import app.aaps.pump.omnipod.common.bledriver.pod.response.PodInfoTriggeredAlertsResponse +import app.aaps.pump.omnipod.common.bledriver.pod.response.SetUniqueIdResponse +import app.aaps.pump.omnipod.common.bledriver.pod.response.VersionResponse +import app.aaps.pump.omnipod.omnipod5.keys.O5StringNonPreferenceKey +import com.google.gson.Gson +import java.io.Serializable +import java.util.Calendar +import java.util.EnumSet +import javax.inject.Inject +import javax.inject.Singleton + +/** + * [O5PodStateManager] persisted across app restarts, mirroring + * [OmnipodDashPodStateManagerImpl]'s Gson + [Preferences] store/load pattern exactly - + * just for O5's smaller state surface (see [O5PodStateManager]'s class doc for why). + */ +@Singleton +class PersistedO5PodStateManager @Inject constructor( + private val logger: AAPSLogger, + private val preferences: Preferences +) : O5PodStateManager { + + private val gson = Gson() + + private var _podState: PodState? = null + + /** Internal (rather than private) to allow unit testing within this module. + * Lazily deserialized on first access, matching Dash's rationale: keep Gson + * reflection off the main thread during app startup (Dagger constructs this + * @Singleton eagerly). */ + internal var podState: PodState + get() = _podState ?: synchronized(this) { _podState ?: load().also { _podState = it } } + set(value) { + synchronized(this) { _podState = value } + } + + override var bluetoothConnectionState: O5PodStateManager.BluetoothConnectionState + get() = podState.bluetoothConnectionState + set(value) { + podState.bluetoothConnectionState = value + store() + } + + override var connectionAttempts: Int + get() = podState.connectionAttempts + set(value) { + podState.connectionAttempts = value + store() + } + + override var successfulConnections: Int + get() = podState.successfulConnections + set(value) { + podState.successfulConnections = value + store() + } + + override var bluetoothAddress: String? + get() = podState.bluetoothAddress + set(value) { + podState.bluetoothAddress = value + store() + } + + override var controllerId: Long? + get() = podState.controllerId + set(value) { + podState.controllerId = value + store() + } + + override var podId: Long? + get() = podState.podId + set(value) { + podState.podId = value + store() + } + + override var ltk: ByteArray? + get() = podState.ltk + set(value) { + podState.ltk = value + store() + } + + override var msgSequenceNumber: Byte + get() = podState.msgSequenceNumber + set(value) { + podState.msgSequenceNumber = value + store() + } + + override var eapAkaSequenceNumber: Long + get() = podState.eapAkaSequenceNumber + set(value) { + podState.eapAkaSequenceNumber = value + store() + } + + private var pendingEapAkaSequenceNumber: Long = 0 + + override fun increaseMessageSequenceNumber() { + podState.msgSequenceNumber = ((podState.msgSequenceNumber.toInt() + 1) and 0x0f).toByte() + store() + } + + override var activationProgress: ActivationProgress + get() = podState.activationProgress + set(value) { + podState.activationProgress = value + store() + } + + override var primePulseRate: Short? + get() = podState.primePulseRate + set(value) { + podState.primePulseRate = value + store() + } + + override var firstPrimeBolusVolume: Short? + get() = podState.firstPrimeBolusVolume + set(value) { + podState.firstPrimeBolusVolume = value + store() + } + + override var secondPrimeBolusVolume: Short? + get() = podState.secondPrimeBolusVolume + set(value) { + podState.secondPrimeBolusVolume = value + store() + } + + override var podLifeInHours: Short? + get() = podState.podLifeInHours + set(value) { + podState.podLifeInHours = value + store() + } + + override var basalProgram: BasalProgram? + get() = podState.basalProgram + set(value) { + podState.basalProgram = value + store() + } + + override var deliverySuspended: Boolean + get() = podState.deliverySuspended + set(value) { + podState.deliverySuspended = value + store() + } + + override var lastBolusStartTime: Long? + get() = podState.lastBolusStartTime + set(value) { + podState.lastBolusStartTime = value + store() + } + + override var lastBolusRequestedUnits: Double? + get() = podState.lastBolusRequestedUnits + set(value) { + podState.lastBolusRequestedUnits = value + store() + } + + override var lastBolusDeliveredUnits: Double? + get() = podState.lastBolusDeliveredUnits + set(value) { + podState.lastBolusDeliveredUnits = value + store() + } + + override var activeTempBasalStartTime: Long? + get() = podState.activeTempBasalStartTime + set(value) { + podState.activeTempBasalStartTime = value + store() + } + + override var activeTempBasalRate: Double? + get() = podState.activeTempBasalRate + set(value) { + podState.activeTempBasalRate = value + store() + } + + override var activeTempBasalDurationMinutes: Short? + get() = podState.activeTempBasalDurationMinutes + set(value) { + podState.activeTempBasalDurationMinutes = value + store() + } + + override var pendingDoseCommand: O5PodStateManager.PendingDoseCommand? + get() = podState.pendingDoseCommand + set(value) { + podState.pendingDoseCommand = value + store() + } + + override val podStatus: PodStatus? get() = podState.podStatus + override val deliveryStatus: DeliveryStatus? get() = podState.deliveryStatus + override val firmwareVersion: SoftwareVersion? get() = podState.firmwareVersion + override val bleVersion: SoftwareVersion? get() = podState.bleVersion + override val lotNumber: Long? get() = podState.lotNumber + override val podSequenceNumber: Long? get() = podState.podSequenceNumber + override val totalPulsesDelivered: Short? get() = podState.totalPulsesDelivered + override val bolusPulsesRemaining: Short? get() = podState.bolusPulsesRemaining + override val reservoirPulsesRemaining: Short? get() = podState.reservoirPulsesRemaining + override val activeAlerts: EnumSet? get() = podState.activeAlerts + override val minutesSinceActivation: Short? get() = podState.minutesSinceActivation + override val sequenceNumberOfLastProgrammingCommand: Short? get() = podState.sequenceNumberOfLastProgrammingCommand + override val lastStatusResponseReceived: Long? get() = podState.lastStatusResponseReceived + + override val alarmType: AlarmType? get() = podState.alarmType + override val alarmTime: Short? get() = podState.alarmTime + override val occlusionAlarm: Boolean? get() = podState.occlusionAlarm + override val podStatusWhenAlarmOccurred: PodStatus? get() = podState.podStatusWhenAlarmOccurred + override val rssi: Short? get() = podState.rssi + + override var alarmSynced: Boolean + get() = podState.alarmSynced + set(value) { + podState.alarmSynced = value + store() + } + + override val podActivatedAt: Long? get() = podState.podActivatedAt + override val triggeredAlertTimes: Map? get() = podState.triggeredAlertTimes + + override var suspendAlertsEnabled: Boolean + get() = podState.suspendAlertsEnabled + set(value) { + podState.suspendAlertsEnabled = value + store() + } + + override var syncedAlertSettings: O5PodStateManager.SyncedAlertSettings? + get() = podState.syncedAlertSettings + set(value) { + podState.syncedAlertSettings = value + store() + } + + override var basalExpected: Double? + get() = podState.basalExpected + set(value) { + podState.basalExpected = value + store() + } + + override var lastBasalCorrectionTime: Long? + get() = podState.lastBasalCorrectionTime + set(value) { + podState.lastBasalCorrectionTime = value + store() + } + + override var basalCorrectionInProgress: Boolean + get() = podState.basalCorrectionInProgress + set(value) { + podState.basalCorrectionInProgress = value + store() + } + + override var cumulativeBolusPulsesDelivered: Short? + get() = podState.cumulativeBolusPulsesDelivered + set(value) { + podState.cumulativeBolusPulsesDelivered = value + store() + } + + override fun increaseEapAkaSequenceNumber(): ByteArray { + pendingEapAkaSequenceNumber = eapAkaSequenceNumber + 1 + return EapSqn(pendingEapAkaSequenceNumber).value + } + + override fun commitEapAkaSequenceNumber() { + eapAkaSequenceNumber = pendingEapAkaSequenceNumber + store() + } + + override fun updateFromPairing(controllerId: Long, podId: Long, pairResult: PairResult) { + podState.controllerId = controllerId + podState.podId = podId + podState.ltk = pairResult.ltk + podState.msgSequenceNumber = pairResult.msgSeq + store() + } + + override fun updateFromVersionResponse(response: VersionResponse) { + podState.podStatus = response.podStatus + podState.firmwareVersion = SoftwareVersion( + response.firmwareVersionMajor, response.firmwareVersionMinor, response.firmwareVersionInterim + ) + podState.bleVersion = SoftwareVersion( + response.bleVersionMajor, response.bleVersionMinor, response.bleVersionInterim + ) + podState.lotNumber = response.lotNumber + podState.podSequenceNumber = response.podSequenceNumber + podState.lastStatusResponseReceived = System.currentTimeMillis() + store() + } + + override fun updateFromDefaultStatusResponse(response: DefaultStatusResponse) { + val previousUpdate = podState.lastStatusResponseReceived + val now = System.currentTimeMillis() + podState.totalPulsesDelivered = response.totalPulsesDelivered + podState.basalExpected = nextBasalExpected(previousUpdate, now) + podState.podStatus = response.podStatus + podState.deliveryStatus = response.deliveryStatus + podState.bolusPulsesRemaining = response.bolusPulsesRemaining + podState.reservoirPulsesRemaining = response.reservoirPulsesRemaining + podState.activeAlerts = response.activeAlerts + podState.minutesSinceActivation = response.minutesSinceActivation + podState.sequenceNumberOfLastProgrammingCommand = response.sequenceNumberOfLastProgrammingCommand + podState.lastStatusResponseReceived = now + store() + } + + override fun updateFromAlarmStatusResponse(response: AlarmStatusResponse) { + podState.podStatus = response.podStatus + podState.deliveryStatus = response.deliveryStatus + podState.totalPulsesDelivered = response.totalPulsesDelivered + podState.bolusPulsesRemaining = response.bolusPulsesRemaining + podState.reservoirPulsesRemaining = response.reservoirPulsesRemaining + podState.activeAlerts = response.activeAlerts + podState.minutesSinceActivation = response.minutesSinceActivation + podState.sequenceNumberOfLastProgrammingCommand = response.sequenceNumberOfLastProgrammingCommand + podState.alarmType = response.alarmType + podState.alarmTime = response.alarmTime + podState.occlusionAlarm = response.occlusionAlarm + podState.podStatusWhenAlarmOccurred = response.podStatusWhenAlarmOccurred + podState.rssi = response.rssi + podState.lastStatusResponseReceived = System.currentTimeMillis() + store() + } + + override fun updateFromActivationTimeResponse(response: PodInfoActivationTimeResponse) { + val calendar = Calendar.getInstance() + calendar.set(2000 + response.year, response.month - 1, response.day, response.hour, response.minute, 0) + calendar.set(Calendar.MILLISECOND, 0) + podState.podActivatedAt = calendar.timeInMillis + podState.alarmType = response.faultEventCode + podState.alarmTime = response.faultTime + store() + } + + override fun updateFromTriggeredAlertsResponse(response: PodInfoTriggeredAlertsResponse) { + podState.triggeredAlertTimes = response.alertActivations.filterValues { it != 0.toShort() } + store() + } + + override fun updateFromSetUniqueIdResponse(response: SetUniqueIdResponse) { + podState.primePulseRate = response.primePumpRate + podState.firstPrimeBolusVolume = response.numberOfEngagingClutchDrivePulses + podState.secondPrimeBolusVolume = response.numberOfPrimePulses + podState.podLifeInHours = response.podExpirationTimeInHours + podState.firmwareVersion = SoftwareVersion( + response.firmwareVersionMajor, response.firmwareVersionMinor, response.firmwareVersionInterim + ) + podState.bleVersion = SoftwareVersion( + response.bleVersionMajor, response.bleVersionMinor, response.bleVersionInterim + ) + podState.podStatus = response.podStatus + podState.lotNumber = response.lotNumber + podState.podSequenceNumber = response.podSequenceNumber + podState.lastStatusResponseReceived = System.currentTimeMillis() + store() + } + + override fun reset() { + podState = PodState() + store() + } + + private fun store() { + try { + val cleanPodState = podState.copy(ltk = null) + logger.debug(LTag.PUMPCOMM, "Storing O5 Pod state: ${gson.toJson(cleanPodState)}") + + val serialized = gson.toJson(podState) + preferences.put(O5StringNonPreferenceKey.PodState, serialized) + } catch (ex: Exception) { + logger.error(LTag.PUMPCOMM, "Failed to store O5 Pod state", ex) + } + } + + private fun load(): PodState { + if (preferences.getIfExists(O5StringNonPreferenceKey.PodState) != null) { + try { + return gson.fromJson(preferences.get(O5StringNonPreferenceKey.PodState), PodState::class.java) + } catch (ex: Exception) { + logger.error(LTag.PUMPCOMM, "Failed to deserialize O5 Pod state", ex) + } + } + return PodState() + } + + /** Internal (rather than private) to allow unit testing within this module. */ + internal data class PodState( + var bluetoothConnectionState: O5PodStateManager.BluetoothConnectionState = + O5PodStateManager.BluetoothConnectionState.DISCONNECTED, + var connectionAttempts: Int = 0, + var successfulConnections: Int = 0, + var bluetoothAddress: String? = null, + var controllerId: Long? = null, + var podId: Long? = null, + var ltk: ByteArray? = null, + var msgSequenceNumber: Byte = 1, + var eapAkaSequenceNumber: Long = 0, + var activationProgress: ActivationProgress = ActivationProgress.NOT_STARTED, + var primePulseRate: Short? = null, + var firstPrimeBolusVolume: Short? = null, + var secondPrimeBolusVolume: Short? = null, + var podLifeInHours: Short? = null, + var basalProgram: BasalProgram? = null, + var deliverySuspended: Boolean = false, + var lastBolusStartTime: Long? = null, + var lastBolusRequestedUnits: Double? = null, + var lastBolusDeliveredUnits: Double? = null, + var activeTempBasalStartTime: Long? = null, + var activeTempBasalRate: Double? = null, + var activeTempBasalDurationMinutes: Short? = null, + var pendingDoseCommand: O5PodStateManager.PendingDoseCommand? = null, + var podStatus: PodStatus? = null, + var deliveryStatus: DeliveryStatus? = null, + var firmwareVersion: SoftwareVersion? = null, + var bleVersion: SoftwareVersion? = null, + var lotNumber: Long? = null, + var podSequenceNumber: Long? = null, + var totalPulsesDelivered: Short? = null, + var bolusPulsesRemaining: Short? = null, + var reservoirPulsesRemaining: Short? = null, + var activeAlerts: EnumSet? = null, + var minutesSinceActivation: Short? = null, + var sequenceNumberOfLastProgrammingCommand: Short? = null, + var lastStatusResponseReceived: Long? = null, + var alarmType: AlarmType? = null, + var alarmTime: Short? = null, + var occlusionAlarm: Boolean? = null, + var podStatusWhenAlarmOccurred: PodStatus? = null, + var rssi: Short? = null, + var alarmSynced: Boolean = false, + var podActivatedAt: Long? = null, + var triggeredAlertTimes: Map? = null, + var suspendAlertsEnabled: Boolean = true, + var syncedAlertSettings: O5PodStateManager.SyncedAlertSettings? = null, + var basalExpected: Double? = null, + var lastBasalCorrectionTime: Long? = null, + var basalCorrectionInProgress: Boolean = false, + var cumulativeBolusPulsesDelivered: Short? = null + ) : Serializable +} diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/util/LotDecode.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/util/LotDecode.kt new file mode 100644 index 000000000000..74e9b3dbf95c --- /dev/null +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/util/LotDecode.kt @@ -0,0 +1,113 @@ +package app.aaps.pump.omnipod.omnipod5.bledriver.pod.util + +import java.util.Calendar +import java.util.Locale + +/** + * Decoded fields of a modern (Dash / Omnipod 5) 32-bit Insulet lot number. + * + * Ported from OmnipodKit's LotDecode.swift (loopandlearn/OmnipodKit). Does NOT work + * for older (Eros and earlier) lot numbers, which use a different, simpler encoding + * already handled elsewhere in the Eros driver. + */ +data class LotDecode( + val lot: Long, + val lotHex: String, + val prefix: String, + val productNum: Int, + val productCode: String, + val locationNum: Int, + val locationCode: String, + val dateMMDD: String, + val dateYY: Int, + val line: Int, + val batch: String, + val readableText: String +) { + + companion object { + + private val PRODUCT_CODE: Map = mapOf( + 0x04 to "D1", + 0x18 to "D2", + 0x36 to "D5", + + 0x07 to "H1", + 0x1B to "H2", + 0x39 to "H5", + + 0x02 to "E1", + 0x16 to "E2", + 0x34 to "E5", + + 0x05 to "P1", + 0x19 to "P2", + 0x37 to "P5", + + 0x03 to "A0", + 0x09 to "R1" + ) + + private val MFG_LOC: Map = mapOf( + 0 to "C", + 1 to "U", + 2 to "K", + 6 to "M" + ) + + private fun mask(bits: Int): Long = (1L shl bits) - 1L + + /** + * Returns the decoded lot information for a modern Insulet 32-bit lot #. + * This function does not work for older (Eros and before) lot #s. + * + * @param lot the 32-bit lot number, passed as a Long so the full unsigned + * range fits without overflow. + */ + fun decode(lot: Long): LotDecode { + val lot32 = lot and 0xFFFFFFFFL + + val prefix = if ((lot32 and 0x80000000L) == 0L) "P" else "E" + + val productNum = ((lot32 shr 25) and mask(6)).toInt() + val productCode = PRODUCT_CODE[productNum] ?: "XX" + + val locationNum = ((lot32 shr 22) and mask(3)).toInt() + val locationCode = MFG_LOC[locationNum] ?: "X" + + val dayNumber = ((lot32 shr 7) and mask(15)).toInt() + val dateYY = dayNumber shr 9 + val dayOfYear = dayNumber - (dateYY shl 9) + + val dateMMDD: String = if (dayOfYear > 0) { + val calendar = Calendar.getInstance() + calendar.clear() + calendar.set(dateYY + 2000, Calendar.JANUARY, 1) + calendar.add(Calendar.DAY_OF_YEAR, dayOfYear - 1) + String.format(Locale.US, "%02d%02d", calendar.get(Calendar.MONTH) + 1, calendar.get(Calendar.DAY_OF_MONTH)) + } else { + "0000" + } + + val line = ((lot32 shr 4) and mask(3)).toInt() + val batch = (lot32 and mask(4)).toString(16).uppercase(Locale.US) + + val readableText = "$prefix$productCode$locationCode$dateMMDD$dateYY$line$batch" + + return LotDecode( + lot = lot32, + lotHex = String.format(Locale.US, "0x%08X", lot32), + prefix = prefix, + productNum = productNum, + productCode = productCode, + locationNum = locationNum, + locationCode = locationCode, + dateMMDD = dateMMDD, + dateYY = dateYY, + line = line, + batch = batch, + readableText = readableText + ) + } + } +} diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/util/O5AlertConfigBuilder.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/util/O5AlertConfigBuilder.kt new file mode 100644 index 000000000000..5ef35642524a --- /dev/null +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/util/O5AlertConfigBuilder.kt @@ -0,0 +1,91 @@ +package app.aaps.pump.omnipod.omnipod5.bledriver.pod.util + +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.pump.omnipod.common.bledriver.pod.definition.AlertConfiguration +import app.aaps.pump.omnipod.common.bledriver.pod.definition.AlertTrigger +import app.aaps.pump.omnipod.common.bledriver.pod.definition.AlertType +import app.aaps.pump.omnipod.common.bledriver.pod.definition.BeepRepetitionType +import app.aaps.pump.omnipod.common.bledriver.pod.definition.BeepType +import app.aaps.pump.omnipod.common.bledriver.pod.definition.PodConstants +import app.aaps.pump.omnipod.omnipod5.bledriver.pod.state.O5PodStateManager +import app.aaps.pump.omnipod.omnipod5.bledriver.pod.state.expiry +import app.aaps.pump.omnipod.common.keys.OmnipodBooleanPreferenceKey +import app.aaps.pump.omnipod.common.keys.OmnipodIntPreferenceKey +import app.aaps.core.keys.interfaces.Preferences +import java.time.Duration +import java.time.ZonedDateTime +import java.util.concurrent.TimeUnit + +/** + * Builds the expiration/expiration-imminent/user-set-expiration [AlertConfiguration]s from + * current preferences - mirrors [app.aaps.pump.omnipod.dash.driver.OmnipodDashManagerImpl + * .createActivationPart2Observables]'s expiration-alert delay math exactly, using O5's own + * [expiry] extension in place of Dash's pod-state-manager property. Shared between + * [app.aaps.pump.omnipod.omnipod5.ui.wizard.compose.O5OmnipodWizardViewModel] (initial + * programming during activation) and [app.aaps.pump.omnipod.omnipod5.O5PumpPlugin] (re-sync + * when preferences change afterward) - hoisted here rather than duplicated. + */ +fun buildO5ExpirationAlerts(podStateManager: O5PodStateManager, preferences: Preferences, aapsLogger: AAPSLogger): List { + val userConfiguredExpirationReminderHours = + preferences.get(OmnipodBooleanPreferenceKey.ExpirationReminder).let { enabled -> + if (enabled) preferences.get(OmnipodIntPreferenceKey.ExpirationReminderHours).toLong() else null + } + val userConfiguredExpirationAlarmHours = + preferences.get(OmnipodBooleanPreferenceKey.ExpirationAlarm).let { enabled -> + if (enabled) preferences.get(OmnipodIntPreferenceKey.ExpirationAlarmHours).toLong() else null + } + + val podLifeLeft = Duration.between(ZonedDateTime.now(), requireNotNull(podStateManager.expiry) { "Missing pod expiry" }) + + val expirationAlarmEnabled = userConfiguredExpirationAlarmHours != null && userConfiguredExpirationAlarmHours > 0 + val expirationAlarmDelay = podLifeLeft.minus( + Duration.ofHours(userConfiguredExpirationAlarmHours ?: PodConstants.POD_EXPIRATION_ALERT_HOURS_REMAINING_DEFAULT) + ).plus(Duration.ofHours(8)) + + val expirationImminentDelay = podLifeLeft.minus( + Duration.ofHours(PodConstants.POD_EXPIRATION_IMMINENT_ALERT_HOURS_REMAINING) + ).plus(Duration.ofHours(8)) + + val alerts = mutableListOf( + AlertConfiguration( + AlertType.EXPIRATION, + enabled = expirationAlarmEnabled, + durationInMinutes = (TimeUnit.HOURS.toMinutes(userConfiguredExpirationAlarmHours ?: PodConstants.POD_EXPIRATION_ALERT_HOURS_REMAINING_DEFAULT) - 60).toShort(), + autoOff = false, + AlertTrigger.TimerTrigger(expirationAlarmDelay.toMinutes().toShort()), + BeepType.FOUR_TIMES_BIP_BEEP, + BeepRepetitionType.XXX3 + ), + AlertConfiguration( + AlertType.EXPIRATION_IMMINENT, + enabled = expirationAlarmEnabled, + durationInMinutes = 0, + autoOff = false, + AlertTrigger.TimerTrigger(expirationImminentDelay.toMinutes().toShort()), + BeepType.FOUR_TIMES_BIP_BEEP, + BeepRepetitionType.XXX4 + ) + ) + + val userExpiryReminderEnabled = userConfiguredExpirationReminderHours != null && userConfiguredExpirationReminderHours > 0 + val userExpiryReminderDelay = podLifeLeft.minus( + Duration.ofHours(userConfiguredExpirationReminderHours ?: (PodConstants.MAX_POD_LIFETIME.toHours() + 1)) + ) + if (!userExpiryReminderDelay.isNegative) { + alerts.add( + AlertConfiguration( + AlertType.USER_SET_EXPIRATION, + enabled = userExpiryReminderEnabled, + durationInMinutes = 0, + autoOff = false, + AlertTrigger.TimerTrigger(userExpiryReminderDelay.toMinutes().toShort()), + BeepType.FOUR_TIMES_BIP_BEEP, + BeepRepetitionType.EVERY_MINUTE_AND_EVERY_15_MIN + ) + ) + } else { + aapsLogger.warn(LTag.PUMPBTCOMM, "buildO5ExpirationAlerts negative expiryAlertDuration=$userExpiryReminderDelay") + } + return alerts +} diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/util/P256Codec.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/util/P256Codec.kt new file mode 100644 index 000000000000..656ef08e75e0 --- /dev/null +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/util/P256Codec.kt @@ -0,0 +1,93 @@ +package app.aaps.pump.omnipod.omnipod5.bledriver.pod.util + +import java.math.BigInteger +import java.security.AlgorithmParameters +import java.security.KeyFactory +import java.security.interfaces.ECPrivateKey +import java.security.interfaces.ECPublicKey +import java.security.spec.ECGenParameterSpec +import java.security.spec.ECParameterSpec +import java.security.spec.ECPoint +import java.security.spec.ECPrivateKeySpec +import java.security.spec.ECPublicKeySpec + +/** + * Shared encode/decode helpers between NIST P-256 raw key representations (as used by + * Apple's CryptoKit, and therefore by Insulet's Omnipod 5 protocol) and the JCE's + * ECPrivateKey/ECPublicKey types. + * + * Used by both [P256KeyGenerator] (ECDH key agreement, for pairing) and O5CertificateStore + * (ECDSA signing/verification, for pod command authentication) since both operate on raw + * keys over the same curve and need the same raw-bytes <-> JCE-key-object conversions. + * + * Raw encodings match CryptoKit's `rawRepresentation` for P-256 keys: + * - Private key: the 32-byte big-endian scalar. + * - Public key: the 64-byte plain X || Y coordinate concatenation, **without** the 0x04 + * uncompressed-point prefix byte. This is deliberately different from the 65-byte ANSI + * X9.63 format (CryptoKit's separate `x963Representation`) - confirmed against both + * Apple's swift-crypto source (rawRepresentation and x963Representation are distinct + * properties there) and OmnipodKit's own O5KeyExchange.swift, which hardcodes + * `PUBLIC_KEY_SIZE = 64` for exactly this value. + */ +object P256Codec { + + const val CURVE_NAME = "secp256r1" + const val SCALAR_LENGTH_BYTES = 32 + + /** Raw public key length: 64 bytes (X || Y), no 0x04 prefix. See class doc. */ + const val RAW_POINT_LENGTH_BYTES = 64 + + fun ecParameterSpec(): ECParameterSpec { + val algorithmParameters = AlgorithmParameters.getInstance("EC") + algorithmParameters.init(ECGenParameterSpec(CURVE_NAME)) + return algorithmParameters.getParameterSpec(ECParameterSpec::class.java) + } + + fun decodePrivateKey(rawScalar: ByteArray): ECPrivateKey { + require(rawScalar.size == SCALAR_LENGTH_BYTES) { + "P-256 private key scalar must be $SCALAR_LENGTH_BYTES bytes, got ${rawScalar.size}" + } + val params = ecParameterSpec() + val s = BigInteger(1, rawScalar) + val keyFactory = KeyFactory.getInstance("EC") + return keyFactory.generatePrivate(ECPrivateKeySpec(s, params)) as ECPrivateKey + } + + /** Decodes a raw 64-byte (X || Y, no prefix) public key. */ + fun decodePublicKey(rawPoint: ByteArray): ECPublicKey { + require(rawPoint.size == RAW_POINT_LENGTH_BYTES) { + "P-256 public key must be $RAW_POINT_LENGTH_BYTES raw bytes (X || Y, no prefix), got ${rawPoint.size}" + } + val x = BigInteger(1, rawPoint.copyOfRange(0, SCALAR_LENGTH_BYTES)) + val y = BigInteger(1, rawPoint.copyOfRange(SCALAR_LENGTH_BYTES, RAW_POINT_LENGTH_BYTES)) + val params = ecParameterSpec() + val keyFactory = KeyFactory.getInstance("EC") + return keyFactory.generatePublic(ECPublicKeySpec(ECPoint(x, y), params)) as ECPublicKey + } + + /** Encodes a point as raw 64 bytes (X || Y, no 0x04 prefix). */ + fun encodePoint(point: ECPoint): ByteArray { + val x = point.affineX.toFixedLengthBytes(SCALAR_LENGTH_BYTES) + val y = point.affineY.toFixedLengthBytes(SCALAR_LENGTH_BYTES) + return x + y + } + + fun encodePublicKey(publicKey: ECPublicKey): ByteArray = encodePoint(publicKey.w) + + /** + * Normalizes a BigInteger's magnitude to exactly [length] bytes, big-endian. + * [BigInteger.toByteArray] may prepend a 0x00 sign byte, or be shorter than + * expected for small values; this pads/strips as needed. + */ + fun BigInteger.toFixedLengthBytes(length: Int): ByteArray { + val raw = this.toByteArray() + return when { + raw.size == length -> raw + raw.size == length + 1 && raw[0] == 0.toByte() -> raw.copyOfRange(1, raw.size) + raw.size < length -> ByteArray(length - raw.size) + raw + else -> throw IllegalStateException( + "Value does not fit in $length bytes (got ${raw.size})" + ) + } + } +} diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/util/P256KeyGenerator.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/util/P256KeyGenerator.kt new file mode 100644 index 000000000000..6be28d36b583 --- /dev/null +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/util/P256KeyGenerator.kt @@ -0,0 +1,103 @@ +package app.aaps.pump.omnipod.omnipod5.bledriver.pod.util + +import java.math.BigInteger +import java.security.KeyPairGenerator +import java.security.interfaces.ECPrivateKey +import java.security.spec.ECFieldFp +import java.security.spec.ECGenParameterSpec +import java.security.spec.ECParameterSpec +import java.security.spec.ECPoint +import javax.crypto.KeyAgreement +import javax.inject.Inject + +/** + * NIST P-256 (secp256r1) key generation and ECDH key agreement for Omnipod 5 pairing. + * + * Ported from OmnipodKit's P256KeyGenerator.swift (loopandlearn/OmnipodKit), which wraps + * Apple's CryptoKit P256.KeyAgreement. There is no equivalent to CryptoKit available on + * Android, so this uses the standard java.security / javax.crypto EC APIs directly, via + * the shared raw-key encode/decode helpers in [P256Codec] (see that file's doc comment + * for why public keys here are 64 raw bytes, not 65). + * + * The shared secret returned by [computeSharedSecret] is the raw ECDH result (the X + * coordinate of the agreed point), matching CryptoKit's `sharedSecretFromKeyAgreement`, + * which also returns the raw (un-hashed) agreed secret. Any KDF/hashing on top of this + * shared secret is the caller's responsibility, same as with the Swift original. + */ +class P256KeyGenerator @Inject constructor() { + + fun generatePrivateKey(): ByteArray { + val keyPairGenerator = KeyPairGenerator.getInstance("EC") + keyPairGenerator.initialize(ECGenParameterSpec(P256Codec.CURVE_NAME)) + val keyPair = keyPairGenerator.generateKeyPair() + val privateKey = keyPair.private as ECPrivateKey + with(P256Codec) { return privateKey.s.toFixedLengthBytes(P256Codec.SCALAR_LENGTH_BYTES) } + } + + /** Returns the raw 64-byte (X || Y, no 0x04 prefix) public key. */ + fun publicFromPrivate(privateKey: ByteArray): ByteArray { + require(privateKey.size == P256Codec.SCALAR_LENGTH_BYTES) { + "P-256 private key scalar must be ${P256Codec.SCALAR_LENGTH_BYTES} bytes, got ${privateKey.size}" + } + val params = P256Codec.ecParameterSpec() + val s = BigInteger(1, privateKey) + val publicPoint = multiplyPoint(params.generator, s, params) + return P256Codec.encodePoint(publicPoint) + } + + fun computeSharedSecret(privateKey: ByteArray, publicKey: ByteArray): ByteArray { + val ecPrivateKey = P256Codec.decodePrivateKey(privateKey) + val ecPublicKey = P256Codec.decodePublicKey(publicKey) + + val keyAgreement = KeyAgreement.getInstance("ECDH") + keyAgreement.init(ecPrivateKey) + keyAgreement.doPhase(ecPublicKey, true) + return keyAgreement.generateSecret() + } + + + private val POINT_AT_INFINITY = ECPoint(BigInteger.valueOf(-1), BigInteger.valueOf(-1)) + + private fun isInfinity(point: ECPoint) = point == POINT_AT_INFINITY + + private fun multiplyPoint(point: ECPoint, scalar: BigInteger, params: ECParameterSpec): ECPoint { + val p = (params.curve.field as ECFieldFp).p + val a = params.curve.a + + var result = POINT_AT_INFINITY + var addend = point + var k = scalar + + while (k.signum() > 0) { + if (k.testBit(0)) { + result = addPoints(result, addend, p, a) + } + addend = addPoints(addend, addend, p, a) + k = k.shiftRight(1) + } + return result + } + + private fun addPoints(p1: ECPoint, p2: ECPoint, p: BigInteger, a: BigInteger): ECPoint { + if (isInfinity(p1)) return p2 + if (isInfinity(p2)) return p1 + + val lambda: BigInteger + if (p1.affineX == p2.affineX) { + if ((p1.affineY.add(p2.affineY)).mod(p) == BigInteger.ZERO) { + return POINT_AT_INFINITY + } + val numerator = p1.affineX.pow(2).multiply(BigInteger.valueOf(3)).add(a).mod(p) + val denominator = p1.affineY.multiply(BigInteger.TWO).mod(p) + lambda = numerator.multiply(denominator.modInverse(p)).mod(p) + } else { + val numerator = p2.affineY.subtract(p1.affineY).mod(p) + val denominator = p2.affineX.subtract(p1.affineX).mod(p) + lambda = numerator.multiply(denominator.modInverse(p)).mod(p) + } + + val x3 = lambda.pow(2).subtract(p1.affineX).subtract(p2.affineX).mod(p) + val y3 = lambda.multiply(p1.affineX.subtract(x3)).subtract(p1.affineY).mod(p) + return ECPoint(x3, y3) + } +} diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/util/PodAdvertisement.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/util/PodAdvertisement.kt new file mode 100644 index 000000000000..25e576ad6018 --- /dev/null +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/util/PodAdvertisement.kt @@ -0,0 +1,116 @@ +package app.aaps.pump.omnipod.omnipod5.bledriver.pod.util + +import android.os.ParcelUuid +import app.aaps.pump.omnipod.common.bledriver.pod.definition.PodType + +/** + * Parses a BLE advertisement's service UUID list into pod identity fields, branching on + * [PodType] since Dash and Omnipod 5 pods advertise completely different UUID layouts. + * + * Ported from OmnipodKit's PodAdvertisement.swift (loopandlearn/OmnipodKit). This is an + * additive, standalone parser - it does not replace the existing Dash-only parsing in + * [app.aaps.pump.omnipod.common.bledriver.comm.legacy.scan.BleDiscoveredDevice]. Wiring pod-type + * detection into the live scan path is a separate, follow-up change so existing Dash pairing + * is not put at risk by this addition. + * + * Unlike the Swift original (a failable initializer that throws/returns nil on malformed + * input), [parse] simply returns null for anything that doesn't match the expected shape + * for the given [PodType]. + */ +data class PodAdvertisement private constructor( + val podType: PodType, + /** Dash only: the pod's 32-bit id, decoded from service UUIDs 3 & 4. */ + val podId: Long?, + /** Dash only: the pod's lot number, decoded from service UUIDs 5-7. */ + val lotNo: Long?, + /** Dash only: the pod's sequence number, decoded from service UUIDs 7-8. */ + val sequenceNo: Int?, + /** Omnipod 5 only: the PDM id embedded in the single 128-bit service UUID. */ + val pdmId: Long?, + /** + * True if this advertisement represents a pod that has not yet been paired to any PDM + * (i.e. still showing its placeholder id), and is therefore eligible for pairing. + */ + val pairable: Boolean +) { + + companion object { + + private const val DASH_MAIN_SERVICE_UUID = "4024" + private const val DASH_UNKNOWN_THIRD_SERVICE_UUID = "000a" + private const val DASH_UNPAIRED_POD_ID_HIGH = "ffff" + private const val DASH_UNPAIRED_POD_ID_LOW = "fffe" + private const val O5_UNPAIRED_PDM_ID_HEX = "fffffffe" + + /** + * Attempts to parse [serviceUuids] as an advertisement from a pod of the given + * [podType]. Returns null if the advertisement doesn't match the shape expected + * for that pod type (wrong UUID count, wrong fixed UUIDs, unparseable ids, etc). + */ + fun parse(serviceUuids: List?, podType: PodType): PodAdvertisement? { + if (serviceUuids.isNullOrEmpty()) return null + return when (podType) { + PodType.DASH -> parseDash(serviceUuids) + PodType.OMNIPOD_5 -> parseO5(serviceUuids) + PodType.EROS, + PodType.UNKNOWN -> null + } + } + + /** Extracts the 16-bit UUID hex (4 chars) from a standard 36-char UUID string. */ + private fun extractUuid16(uuid: ParcelUuid): String = + uuid.toString().substring(4, 8) + + private fun parseDash(serviceUuids: List): PodAdvertisement? { + if (serviceUuids.size != 9) return null + if (extractUuid16(serviceUuids[0]) != DASH_MAIN_SERVICE_UUID) return null + if (extractUuid16(serviceUuids[2]) != DASH_UNKNOWN_THIRD_SERVICE_UUID) return null + + val podIdHigh = extractUuid16(serviceUuids[3]) + val podIdLow = extractUuid16(serviceUuids[4]) + val podId = (podIdHigh + podIdLow).toLongOrNull(16) ?: return null + + val lotSeqPrefix = extractUuid16(serviceUuids[5]) + + extractUuid16(serviceUuids[6]) + + extractUuid16(serviceUuids[7]) + if (lotSeqPrefix.length < 10) return null + val lotNo = lotSeqPrefix.substring(0, 10).toLongOrNull(16) ?: return null + + val seqHex = extractUuid16(serviceUuids[7]) + extractUuid16(serviceUuids[8]) + if (seqHex.length < 3) return null + val sequenceNo = seqHex.substring(2).toIntOrNull(16) ?: return null + + val pairable = podIdHigh.equals(DASH_UNPAIRED_POD_ID_HIGH, ignoreCase = true) && + podIdLow.equals(DASH_UNPAIRED_POD_ID_LOW, ignoreCase = true) + + return PodAdvertisement( + podType = PodType.DASH, + podId = podId, + lotNo = lotNo, + sequenceNo = sequenceNo, + pdmId = null, + pairable = pairable + ) + } + + private fun parseO5(serviceUuids: List): PodAdvertisement? { + if (serviceUuids.size != 1) return null + + val idString = serviceUuids[0].toString() + if (idString.length != 36) return null + + val pdmIdHex = idString.substring(26, 34) + val pdmId = pdmIdHex.toLongOrNull(16) ?: return null + val pairable = pdmIdHex.equals(O5_UNPAIRED_PDM_ID_HEX, ignoreCase = true) + + return PodAdvertisement( + podType = PodType.OMNIPOD_5, + podId = null, + lotNo = null, + sequenceNo = null, + pdmId = pdmId, + pairable = pairable + ) + } + } +} diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/util/PodTypeAwarePodScanner.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/util/PodTypeAwarePodScanner.kt new file mode 100644 index 000000000000..2271fb18873e --- /dev/null +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/util/PodTypeAwarePodScanner.kt @@ -0,0 +1,135 @@ +package app.aaps.pump.omnipod.omnipod5.bledriver.pod.util +import app.aaps.pump.omnipod.common.bledriver.pod.util.BluetoothServiceUuids + +import android.bluetooth.BluetoothAdapter +import android.bluetooth.le.ScanCallback +import android.bluetooth.le.ScanFilter +import android.bluetooth.le.ScanResult +import android.bluetooth.le.ScanSettings +import android.os.ParcelUuid +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.pump.omnipod.common.bledriver.comm.exceptions.ScanException +import app.aaps.pump.omnipod.common.bledriver.comm.exceptions.ScanFailFoundTooManyException +import app.aaps.pump.omnipod.common.bledriver.comm.interfaces.scan.BleDiscoveredDevice +import app.aaps.pump.omnipod.common.bledriver.pod.definition.PodType +import java.util.Collections +import java.util.concurrent.ConcurrentHashMap + +/** + * A pairable pod found during a [PodTypeAwarePodScanner] scan, holding both the raw + * Android scan result and the parsed [PodAdvertisement] for whichever pod type matched. + */ +class PodTypeAwareDiscoveredDevice( + val scanResult: ScanResult, + val advertisement: PodAdvertisement +) : BleDiscoveredDevice { + + override val address: String get() = scanResult.device.address + + override fun toString(): String = + "PodTypeAwareDiscoveredDevice{address=$address, podType=${advertisement.podType}, " + + "pairable=${advertisement.pairable}}" +} + +/** + * BLE scanner supporting pod discovery across pod types (currently Dash and Omnipod 5), + * additive alongside the existing Dash-only + * [app.aaps.pump.omnipod.common.bledriver.comm.legacy.scan.PodScanner] rather than + * replacing it - that class's existing single-pod-type contract and callers are + * untouched by this file. + * + * Scanning behavior intentionally differs by pod type, matching how each pod's + * advertisement actually works (see [PodAdvertisement]): + * - **Dash**: the target pod's id is already known (e.g. from a prior scan or user + * input), so [scanForPod] filters for a specific [expectedPodId]. + * - **Omnipod 5**: a fresh pod's real identity isn't known before pairing - its + * advertisement only indicates "not yet paired to anyone" - so [expectedPodId] is + * ignored for O5 and [scanForPod] simply returns the first pairable O5 advertisement + * found. + */ +class PodTypeAwarePodScanner( + private val aapsLogger: AAPSLogger, + private val bluetoothAdapter: BluetoothAdapter +) { + + @Throws(InterruptedException::class, ScanException::class) + fun scanForPod(podType: PodType, expectedPodId: Long? = null): PodTypeAwareDiscoveredDevice { + val scanner = bluetoothAdapter.bluetoothLeScanner + ?: throw ScanException("BluetoothLeScanner not available (Bluetooth may be off or unsupported)") + val filter = ScanFilter.Builder() + .setServiceUuid(ParcelUuid.fromString(BluetoothServiceUuids.unpairedAdvertisementUuid(podType))) + .build() + val scanSettings = ScanSettings.Builder() + .setLegacy(false) + .setCallbackType(ScanSettings.CALLBACK_TYPE_ALL_MATCHES) + .setScanMode(ScanSettings.SCAN_MODE_LOW_LATENCY) + .build() + + val collector = PodTypeAwareScanCollector(aapsLogger, podType, expectedPodId) + aapsLogger.debug(LTag.PUMPBTCOMM, "Scanning for $podType with filter: $filter settings: $scanSettings") + scanner.startScan(listOf(filter), scanSettings, collector) + Thread.sleep(SCAN_DURATION_MS) + scanner.flushPendingScanResults(collector) + scanner.stopScan(collector) + + val found = collector.collect() + aapsLogger.debug(LTag.PUMPBTCOMM, "Scan for $podType complete: ${found.size} pairable pod(s) found") + return when { + found.isEmpty() -> throw ScanException("No pairable $podType pod found") + found.size > 1 -> throw ScanFailFoundTooManyException(found) + else -> found[0] + } + } + + companion object { + + private const val SCAN_DURATION_MS = 5000L + } +} + +private class PodTypeAwareScanCollector( + private val aapsLogger: AAPSLogger, + private val podType: PodType, + private val expectedPodId: Long? +) : ScanCallback() { + + private val found: ConcurrentHashMap = ConcurrentHashMap() + private var scanFailed = 0 + + override fun onScanResult(callbackType: Int, result: ScanResult) { + aapsLogger.debug(LTag.PUMPBTCOMM, "Scan found: $result") + + val serviceUuids: List? = result.scanRecord?.serviceUuids + val advertisement = PodAdvertisement.parse(serviceUuids, podType) ?: return + + if (!advertisement.pairable) return + + if (podType == PodType.DASH && expectedPodId != null && advertisement.podId != expectedPodId) { + aapsLogger.debug( + LTag.PUMPBTCOMM, + "Ignoring pairable pod with non-matching podId: found=${advertisement.podId}, expected=$expectedPodId" + ) + return + } + + found[result.device.address] = PodTypeAwareDiscoveredDevice(result, advertisement) + aapsLogger.debug( + LTag.PUMPBTCOMM, + "Accepted pairable $podType pod: address=${result.device.address}, podId=${advertisement.podId}" + ) + } + + override fun onScanFailed(errorCode: Int) { + aapsLogger.warn(LTag.PUMPBTCOMM, "Scan failed with errorCode: $errorCode") + scanFailed = errorCode + } + + @Throws(ScanException::class) + fun collect(): List { + if (scanFailed != 0) { + throw ScanException(scanFailed) + } + return Collections.unmodifiableList(found.values.toList()) + } +} diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/di/O5Module.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/di/O5Module.kt new file mode 100644 index 000000000000..7b2e454a497b --- /dev/null +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/di/O5Module.kt @@ -0,0 +1,60 @@ +package app.aaps.pump.omnipod.omnipod5.di +import app.aaps.pump.omnipod.common.di.OmnipodCommonBleModule + +import app.aaps.core.interfaces.di.PumpDriver +import app.aaps.core.interfaces.plugin.PluginBase +import app.aaps.pump.omnipod.omnipod5.O5PumpPlugin +import app.aaps.pump.omnipod.omnipod5.bledriver.comm.O5BleManager +import app.aaps.pump.omnipod.omnipod5.bledriver.comm.O5BleManagerImpl +import app.aaps.pump.omnipod.omnipod5.bledriver.pod.security.AndroidKeystoreAesCipher +import app.aaps.pump.omnipod.omnipod5.bledriver.pod.security.O5RegistrationCipher +import app.aaps.pump.omnipod.omnipod5.bledriver.pod.state.O5PodStateManager +import app.aaps.pump.omnipod.omnipod5.bledriver.pod.state.PersistedO5PodStateManager +import dagger.Binds +import dagger.Module +import dagger.hilt.InstallIn +import dagger.hilt.components.SingletonComponent +import dagger.multibindings.IntKey +import dagger.multibindings.IntoMap + +/** + * Dagger wiring for Omnipod 5, mirroring + * [app.aaps.pump.omnipod.dash.di.OmnipodDashModule]'s manager/state bindings, now + * including the pump plugin registration itself (see [O5PumpPlugin] for the `Pump`- + * interface implementation this module previously lacked). + * + * [SecureO5RegistrationStorage][app.aaps.pump.omnipod.common.bledriver.pod.security + * .SecureO5RegistrationStorage]'s `loadAndInstallAll()` is called from + * [O5BleManagerImpl][app.aaps.pump.omnipod.omnipod5.bledriver.comm.O5BleManagerImpl]'s + * `init` block, since that class must be constructed before any pairing/connection code + * can run - this avoids needing a separate, broader app-startup hook. There's still no + * settings UI that could actually produce an imported credential for it to load, though. + * + * [O5BleConnectionFactory][app.aaps.pump.omnipod.common.bledriver.comm.legacy + * .O5BleConnectionFactory] and [P256KeyGenerator][app.aaps.pump.omnipod.common.bledriver + * .pod.util.P256KeyGenerator] need no `@Binds` here - both are injected by their concrete + * type (not behind an interface) throughout this codebase, so Dagger constructs them + * directly from their own `@Inject` constructors. [BleDeviceManager] is shared with Dash + * and already bound by [OmnipodCommonBleModule], included below for safety in case this + * module is ever installed without Dash's. + */ +@Module(includes = [OmnipodCommonBleModule::class]) +@InstallIn(SingletonComponent::class) +@Suppress("unused") +abstract class O5Module { + + @Binds + abstract fun bindsO5BleManagerImpl(bleManager: O5BleManagerImpl): O5BleManager + + @Binds + abstract fun bindsPersistedO5PodStateManager(podStateManager: PersistedO5PodStateManager): O5PodStateManager + + @Binds + abstract fun bindsAndroidKeystoreAesCipher(cipher: AndroidKeystoreAesCipher): O5RegistrationCipher + + @Binds + @PumpDriver + @IntoMap + @IntKey(1085) + abstract fun bindO5PumpPlugin(plugin: O5PumpPlugin): PluginBase +} diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/keys/O5IntentKey.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/keys/O5IntentKey.kt new file mode 100644 index 000000000000..0af9bcc709c4 --- /dev/null +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/keys/O5IntentKey.kt @@ -0,0 +1,28 @@ +package app.aaps.pump.omnipod.omnipod5.keys + +import app.aaps.core.keys.PreferenceType +import app.aaps.core.keys.interfaces.BooleanPreferenceKey +import app.aaps.core.keys.interfaces.IntentPreferenceKey +import app.aaps.pump.omnipod.common.R + +enum class O5IntentKey( + override val key: String, + override val titleResId: Int = 0, + override val summaryResId: Int? = null, + override val preferenceType: PreferenceType = PreferenceType.ACTIVITY, + override val defaultedBySM: Boolean = false, + override val showInApsMode: Boolean = true, + override val showInNsClientMode: Boolean = true, + override val showInPumpControlMode: Boolean = true, + override val dependency: BooleanPreferenceKey? = null, + override val negativeDependency: BooleanPreferenceKey? = null, + override val hideParentScreenIfHidden: Boolean = false, + override val exportable: Boolean = false +) : IntentPreferenceKey { + + CertificateStore( + key = "omnipod_5_certificate_store", + titleResId = R.string.omnipod_5_certificate_store, + summaryResId = R.string.omnipod_5_certificate_store_summary + ) +} diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/keys/O5StringNonPreferenceKey.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/keys/O5StringNonPreferenceKey.kt new file mode 100644 index 000000000000..b55073ffb6d5 --- /dev/null +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/keys/O5StringNonPreferenceKey.kt @@ -0,0 +1,19 @@ +package app.aaps.pump.omnipod.omnipod5.keys + +import app.aaps.core.keys.interfaces.StringNonPreferenceKey + +/** + * Preference key(s) for persisting Omnipod 5 pod state, mirroring [DashStringNonPreferenceKey]. + */ +enum class O5StringNonPreferenceKey( + override val key: String, + override val defaultValue: String, + override val exportable: Boolean = true +) : StringNonPreferenceKey { + + PodState("AAPS.Omnipod5.pod_state", ""), + + /** Holds Keystore-encrypted O5 registration (credential) data - never exported, since + * unlike pod connection state, this contains actual key material. */ + RegistrationData("AAPS.Omnipod5.registration_data_encrypted", "", exportable = false), +} diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/queue/command/CommandPairNewPod.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/queue/command/CommandPairNewPod.kt new file mode 100644 index 000000000000..089be8ef223c --- /dev/null +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/queue/command/CommandPairNewPod.kt @@ -0,0 +1,13 @@ +package app.aaps.pump.omnipod.omnipod5.queue.command + +import app.aaps.core.interfaces.queue.CustomCommand + +/** + * Triggers [app.aaps.pump.omnipod.omnipod5.bledriver.comm.O5BleManager.pairNewPod] via + * [app.aaps.pump.omnipod.omnipod5.O5PumpPlugin.executeCustomCommand] - the only pairing + * entry point for O5 right now, since no pairing/setup wizard UI exists yet. + */ +class CommandPairNewPod : CustomCommand { + + override val statusDescription = "PAIR NEW POD" +} diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/O5CertificateStoreScreen.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/O5CertificateStoreScreen.kt new file mode 100644 index 000000000000..0c66c28e43d7 --- /dev/null +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/O5CertificateStoreScreen.kt @@ -0,0 +1,49 @@ +package app.aaps.pump.omnipod.omnipod5.ui + +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.ArrowBack +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.res.stringResource +import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.ui.compose.AapsTopAppBar +import app.aaps.pump.omnipod.common.R + +@Composable +fun O5CertificateStoreScreen( + rh: ResourceHelper, + onBack: () -> Unit +) { + val viewModel: O5CredentialImportViewModel = hiltViewModel() + Scaffold( + topBar = { + AapsTopAppBar( + title = { Text(stringResource(R.string.omnipod_5_certificate_store)) }, + navigationIcon = { + IconButton(onClick = onBack) { + Icon( + imageVector = Icons.AutoMirrored.Filled.ArrowBack, + contentDescription = stringResource(app.aaps.core.ui.R.string.back) + ) + } + } + ) + } + ) { paddingValues -> + Box( + modifier = Modifier + .fillMaxSize() + .padding(paddingValues) + ) { + O5CredentialImportScreen(viewModel = viewModel, rh = rh) + } + } +} diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/O5CredentialImportScreen.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/O5CredentialImportScreen.kt new file mode 100644 index 000000000000..718be07be4e1 --- /dev/null +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/O5CredentialImportScreen.kt @@ -0,0 +1,130 @@ +package app.aaps.pump.omnipod.omnipod5.ui + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.heightIn +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.Button +import androidx.compose.material3.Card +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +import androidx.compose.runtime.Composable +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.pump.omnipod.omnipod5.bledriver.comm.pair.O5RegistrationData + +/** + * Settings screen for importing an Omnipod 5 credential and viewing/removing already-installed + * ones. No dosing/pairing/connection actions live here - purely credential management, feeding + * [O5RegistrationData] for whenever actual O5 pairing is attempted elsewhere. + * + * Wired in via [app.aaps.pump.omnipod.omnipod5.ui.compose.OmnipodO5ComposeContent] and + * [app.aaps.pump.omnipod.omnipod5.ui.O5CertificateStoreScreen] - reached from the certificate + * store subpage of the plugin settings, and auto-routed to from "Activate Pod" when no + * registration credentials are installed yet. + */ +@Composable +fun O5CredentialImportScreen( + viewModel: O5CredentialImportViewModel, + rh: ResourceHelper +) { + val inputText by viewModel.inputText.collectAsState() + val importResult by viewModel.importResult.collectAsState() + val installedCredentials by viewModel.installedCredentials.collectAsState() + + Column( + modifier = Modifier + .fillMaxWidth() + .verticalScroll(rememberScrollState()) + .padding(16.dp), + verticalArrangement = Arrangement.spacedBy(12.dp) + ) { + Text( + text = "Omnipod 5 Credential", + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.Bold + ) + Text( + text = "Paste a credential string obtained from a trusted source. This does not " + + "pair with a pod by itself - it only makes the credential available for pairing.", + style = MaterialTheme.typography.bodySmall + ) + + OutlinedTextField( + value = inputText, + onValueChange = viewModel::onInputChanged, + label = { Text("Credential string") }, + modifier = Modifier + .fillMaxWidth() + .heightIn(max = 180.dp), + singleLine = false + ) + + when (val result = importResult) { + is ImportResult.Success -> Text( + text = "Imported credential for controller 0x%08X".format(result.controllerId), + color = MaterialTheme.colorScheme.primary, + style = MaterialTheme.typography.bodySmall + ) + + is ImportResult.Failure -> Text( + text = result.reason, + color = MaterialTheme.colorScheme.error, + style = MaterialTheme.typography.bodySmall + ) + + ImportResult.None -> Unit + } + + Button( + onClick = viewModel::importCurrentInput, + modifier = Modifier.fillMaxWidth() + ) { + Text("Import") + } + + if (installedCredentials.isNotEmpty()) { + Text( + text = "Installed credentials", + style = MaterialTheme.typography.titleSmall, + fontWeight = FontWeight.Bold + ) + Column(verticalArrangement = Arrangement.spacedBy(8.dp)) { + installedCredentials.forEach { row -> + Card(modifier = Modifier.fillMaxWidth()) { + Row( + modifier = Modifier + .fillMaxWidth() + .padding(12.dp), + horizontalArrangement = Arrangement.SpaceBetween + ) { + Column { + Text( + text = "Controller 0x%08X".format(row.controllerId), + style = MaterialTheme.typography.bodyMedium + ) + Text( + text = row.source.name.lowercase().replaceFirstChar { it.uppercase() }, + style = MaterialTheme.typography.labelSmall + ) + } + TextButton(onClick = { viewModel.removeCredential(row.controllerId) }) { + Text("Remove") + } + } + } + } + } + } + } +} diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/O5CredentialImportViewModel.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/O5CredentialImportViewModel.kt new file mode 100644 index 000000000000..0accd1cd63e5 --- /dev/null +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/O5CredentialImportViewModel.kt @@ -0,0 +1,155 @@ +package app.aaps.pump.omnipod.omnipod5.ui + +import androidx.compose.runtime.Stable +import androidx.lifecycle.ViewModel +import app.aaps.pump.omnipod.omnipod5.bledriver.comm.pair.O5RegistrationData +import app.aaps.pump.omnipod.omnipod5.bledriver.pod.security.SecureO5RegistrationStorage +import dagger.hilt.android.lifecycle.HiltViewModel +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import org.json.JSONException +import org.json.JSONObject +import javax.inject.Inject + +/** One row of the "currently installed credentials" list shown in the import screen. */ +data class InstalledCredentialRow( + val controllerId: Long, + val source: O5RegistrationData.O5RegistrationSource +) + +/** Result of the last import attempt, so the screen can show a success/error message. */ +sealed class ImportResult { + object None : ImportResult() + data class Success(val controllerId: Long) : ImportResult() + data class Failure(val reason: String) : ImportResult() +} + +/** + * Drives a settings screen for importing an Omnipod 5 credential and viewing/removing + * already-installed credentials. Accepts either format, auto-detected from the pasted + * text: + * - a `.o5keypair`-shaped JSON object (as produced by OmnipodKit's own `toJSON()` on + * iOS - `controllerId`/`privateKey`/`publicKey`/`intermediateCA`/`tlsCertificate`, + * keys hex-encoded and certs base64-encoded) - see [O5RegistrationData.fromJsonMap] + * - the packed `"controllerId|priv|pub|ica|tls"` string format - see + * [O5RegistrationData.installPacked] + * + * Deliberately has no dosing-related functionality whatsoever - this only manages which + * credentials [O5RegistrationData] knows about, nothing about pairing, connection, or + * pod control. + */ +@HiltViewModel +class O5CredentialImportViewModel @Inject constructor( + private val secureO5RegistrationStorage: SecureO5RegistrationStorage +) : ViewModel() { + + private val _inputText = MutableStateFlow("") + val inputText: StateFlow = _inputText + + private val _importResult = MutableStateFlow(ImportResult.None) + val importResult: StateFlow = _importResult + + private val _installedCredentials = MutableStateFlow>(emptyList()) + val installedCredentials: StateFlow> = _installedCredentials + + init { + refreshInstalledCredentials() + } + + fun onInputChanged(text: String) { + _inputText.value = text + if (_importResult.value != ImportResult.None) { + _importResult.value = ImportResult.None + } + } + + /** + * Attempts to parse and install [inputText]'s current value, auto-detecting whether + * it's a `.o5keypair`-shaped JSON object or a packed credential string (see class doc). + * On success, also persists it (encrypted) so it survives app restarts, and clears the + * input field. On failure, leaves the input as-is so the user can correct it. + */ + fun importCurrentInput() { + val text = _inputText.value.trim() + if (text.isEmpty()) { + _importResult.value = ImportResult.Failure("Paste a credential string first") + return + } + + val controllerId = if (text.startsWith("{")) importJsonCredential(text) else importPackedCredential(text) + if (controllerId == null) { + _importResult.value = ImportResult.Failure( + "Could not parse that credential - check it was copied completely" + ) + return + } + + val installed = O5RegistrationData.get(controllerId) + if (installed == null) { + _importResult.value = ImportResult.Failure("Import failed unexpectedly") + return + } + + secureO5RegistrationStorage.persistEntry(installed, O5RegistrationData.O5RegistrationSource.IMPORTED) + _importResult.value = ImportResult.Success(controllerId) + _inputText.value = "" + refreshInstalledCredentials() + } + + /** + * Parses [text] as the `.o5keypair`-shaped JSON object OmnipodKit's own `toJSON()` + * produces on iOS and installs it if valid. Returns the resulting controllerId, or + * null if the text wasn't valid JSON or was missing a required field. + */ + private fun importJsonCredential(text: String): Long? { + val json = try { + JSONObject(text) + } catch (e: JSONException) { + return null + } + val map = REQUIRED_JSON_KEYS.associateWith { key -> json.optString(key, null) } + val data = O5RegistrationData.fromJsonMap(map) ?: return null + O5RegistrationData.install(data, O5RegistrationData.O5RegistrationSource.IMPORTED) + return data.controllerId + } + + /** + * Parses [text] as a packed `"controllerId|priv|pub|ica|tls"` string and installs it + * if valid (see [O5RegistrationData.installPacked]). Returns the resulting + * controllerId, or null if parsing/installation failed. + */ + private fun importPackedCredential(text: String): Long? { + val controllerId = parseControllerIdFromPacked(text) + val ok = O5RegistrationData.installPacked(text) + return controllerId.takeIf { ok } + } + + /** Removes a credential from both the in-memory registry and persisted storage. */ + fun removeCredential(controllerId: Long) { + O5RegistrationData.remove(controllerId) + secureO5RegistrationStorage.removeEntry(controllerId) + refreshInstalledCredentials() + } + + private fun refreshInstalledCredentials() { + _installedCredentials.value = O5RegistrationData.allValues.mapNotNull { data -> + O5RegistrationData.source(data.controllerId)?.let { source -> + InstalledCredentialRow(data.controllerId, source) + } + } + } + + /** + * Pulls just the controllerId out of a packed string, without fully parsing/validating + * it - used so a failed [O5RegistrationData.installPacked] call can still be attributed + * to a specific controllerId if the string was at least well-formed enough to read one. + * Returns null for anything that doesn't even have a parseable leading controllerId field. + */ + private fun parseControllerIdFromPacked(packed: String): Long? = + packed.substringBefore("|").toLongOrNull() + + private companion object { + /** Matches the keys OmnipodKit's `O5RegistrationData.toJSON()` produces on iOS. */ + val REQUIRED_JSON_KEYS = listOf("controllerId", "privateKey", "publicKey", "intermediateCA", "tlsCertificate") + } +} diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/O5OverviewViewModel.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/O5OverviewViewModel.kt new file mode 100644 index 000000000000..b130d166504b --- /dev/null +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/O5OverviewViewModel.kt @@ -0,0 +1,505 @@ +package app.aaps.pump.omnipod.omnipod5.ui.compose + +import android.content.Context +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.VolumeUp +import androidx.compose.material.icons.filled.Delete +import androidx.compose.material.icons.filled.NotificationsOff +import androidx.compose.material.icons.filled.Pause +import androidx.compose.material.icons.filled.PlayArrow +import androidx.compose.material.icons.filled.Refresh +import androidx.compose.material.icons.filled.Schedule +import androidx.compose.runtime.Stable +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import app.aaps.core.data.pump.defs.PumpType +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.insulin.ConcentrationHelper +import app.aaps.core.interfaces.pump.PumpInsulin +import app.aaps.core.interfaces.pump.PumpRate +import app.aaps.core.interfaces.pump.defs.determineCorrectBasalSize +import app.aaps.core.interfaces.pump.defs.determineCorrectBolusSize +import app.aaps.core.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.queue.CustomCommand +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.ui.compose.StatusLevel +import app.aaps.core.ui.compose.pump.ActionCategory +import app.aaps.core.ui.compose.pump.PumpAction +import app.aaps.core.ui.compose.pump.PumpCommunicationStatus +import app.aaps.core.ui.compose.pump.PumpInfoRow +import app.aaps.core.ui.compose.pump.PumpOverviewUiState +import app.aaps.core.ui.compose.pump.tickerFlow +import app.aaps.pump.omnipod.common.bledriver.pod.definition.ActivationProgress +import app.aaps.pump.omnipod.common.bledriver.pod.definition.AlertType +import app.aaps.pump.omnipod.common.bledriver.pod.definition.PodConstants +import app.aaps.pump.omnipod.omnipod5.bledriver.pod.state.O5PodStateManager +import app.aaps.pump.omnipod.omnipod5.bledriver.pod.state.expiry +import app.aaps.pump.omnipod.common.queue.command.CommandDeactivatePod +import app.aaps.pump.omnipod.common.queue.command.CommandHandleTimeChange +import app.aaps.pump.omnipod.common.queue.command.CommandPlayTestBeep +import app.aaps.pump.omnipod.common.queue.command.CommandResumeDelivery +import app.aaps.pump.omnipod.common.queue.command.CommandSilenceAlerts +import app.aaps.pump.omnipod.common.queue.command.CommandSuspendDelivery +import app.aaps.pump.omnipod.common.ui.wizard.compose.ActivationType +import app.aaps.pump.omnipod.common.ui.wizard.compose.OmnipodOverviewEvent +import dagger.hilt.android.lifecycle.HiltViewModel +import dagger.hilt.android.qualifiers.ApplicationContext +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.SupervisorJob +import kotlinx.coroutines.cancel +import kotlinx.coroutines.flow.MutableSharedFlow +import kotlinx.coroutines.flow.SharedFlow +import kotlinx.coroutines.flow.SharingStarted +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.combine +import kotlinx.coroutines.flow.stateIn +import kotlinx.coroutines.launch +import java.time.Duration +import java.time.ZonedDateTime +import java.util.Locale +import javax.inject.Inject +import app.aaps.core.ui.R as CoreUiR +import app.aaps.pump.omnipod.common.R as CommonR + +/** + * O5's pod-status display screen, mirroring + * [app.aaps.pump.omnipod.dash.ui.compose.DashOverviewViewModel]'s structure. O5's + * [O5PodStateManager] is flatter than Dash's state manager (no computed derived + * properties, no `activeCommand`/`lastBolus`/`tempBasal` value objects, no per-retry + * connection-quality counters, no timezone-drift tracking) - those are approximated here + * from O5's own flat fields ([O5PodStateManager.pendingDoseCommand] in place of Dash's + * `activeCommand`, the [expiry] extension in place of Dash's `expiry` property, etc.) + * rather than adding matching complexity to the state manager. No pod-history feature + * exists for O5 (no `DashHistory` equivalent), so there is no History action/screen here. + */ +@Stable +@HiltViewModel +class O5OverviewViewModel @Inject constructor( + private val rh: ResourceHelper, + private val podStateManager: O5PodStateManager, + private val commandQueue: CommandQueue, + private val rxBus: RxBus, + private val dateUtil: DateUtil, + private val config: Config, + private val ch: ConcentrationHelper, + @ApplicationContext private val context: Context +) : ViewModel() { + + companion object { + + private const val PLACEHOLDER = "-" + + /** + * Last pod status check. + */ + private const val STATUS_REFRESH_ON_OPEN_THROTTLE_MS = 60_000L + } + + private val scope = CoroutineScope(SupervisorJob() + Dispatchers.Default) + private val communicationStatus = PumpCommunicationStatus(rxBus, commandQueue, context, scope) + + private val _events = MutableSharedFlow(extraBufferCapacity = 5) + val events: SharedFlow = _events + + val uiState: StateFlow = combine( + communicationStatus.refreshTrigger, + tickerFlow(15_000L) + ) { _, _ -> buildUiState() }.stateIn( + scope = viewModelScope, + started = SharingStarted.WhileSubscribed(5000), + initialValue = buildUiState() + ) + + private fun buildUiState(): PumpOverviewUiState = + PumpOverviewUiState( + statusBanner = communicationStatus.statusBanner(), + infoRows = buildInfoRows(), + primaryActions = buildPrimaryActions(), + managementActions = buildManagementActions(), + queueStatus = communicationStatus.queueStatus() + ) + + init { + refreshStatusOnOpen() + } + + /** + * Read the pod status when the overview screen is opened + */ + private fun refreshStatusOnOpen() { + if (podStateManager.activationProgress != ActivationProgress.COMPLETED) return + if (!isQueueEmpty()) return + val lastStatus = podStateManager.lastStatusResponseReceived + if (lastStatus != null && System.currentTimeMillis() - lastStatus < STATUS_REFRESH_ON_OPEN_THROTTLE_MS) return + viewModelScope.launch { commandQueue.readStatus(rh.gs(CoreUiR.string.refresh)) } + } + + + private fun buildInfoRows(): List = buildList { + val activated = podStateManager.activationProgress.isAtLeast(ActivationProgress.SET_UNIQUE_ID) + + add( + PumpInfoRow( + label = rh.gs(CommonR.string.omnipod_common_overview_bluetooth_address), + value = podStateManager.bluetoothAddress ?: PLACEHOLDER + ) + ) + val attempts = podStateManager.connectionAttempts + val connQuality = if (attempts > 0) { + val pct = podStateManager.successfulConnections.toDouble() / attempts * 100 + "${podStateManager.successfulConnections}/$attempts :: ${String.format(Locale.getDefault(), "%.2f %%", pct)}" + } else PLACEHOLDER + add(PumpInfoRow(label = rh.gs(CommonR.string.omnipod_common_overview_bluetooth_connection_quality), value = connQuality)) + + if (config.isEngineeringMode()) { + add(PumpInfoRow(label = rh.gs(CommonR.string.omnipod_common_overview_delivery_status), value = podStateManager.deliveryStatus?.toString() ?: PLACEHOLDER)) + } + + if (!activated) { + add(PumpInfoRow(label = rh.gs(CommonR.string.omnipod_common_overview_pod_unique_id), value = PLACEHOLDER)) + add(PumpInfoRow(label = rh.gs(CommonR.string.omnipod_common_overview_lot_number), value = PLACEHOLDER)) + add(PumpInfoRow(label = rh.gs(CommonR.string.omnipod_common_overview_pod_sequence_number), value = PLACEHOLDER)) + add(PumpInfoRow(label = rh.gs(CommonR.string.omnipod_common_overview_firmware_version), value = PLACEHOLDER)) + add(PumpInfoRow(label = rh.gs(CommonR.string.omnipod_common_overview_time_on_pod), value = PLACEHOLDER)) + add(PumpInfoRow(label = rh.gs(CommonR.string.omnipod_common_overview_pod_expiry_date), value = PLACEHOLDER)) + add(PumpInfoRow(label = rh.gs(CommonR.string.omnipod_common_overview_pod_status), value = buildPodStatusText(), level = buildPodStatusLevel())) + add(PumpInfoRow(label = rh.gs(CommonR.string.omnipod_common_overview_last_connection), value = PLACEHOLDER)) + add(PumpInfoRow(label = rh.gs(CommonR.string.omnipod_common_overview_last_bolus), value = PLACEHOLDER)) + add(PumpInfoRow(label = rh.gs(CommonR.string.omnipod_common_overview_base_basal_rate), value = PLACEHOLDER)) + add(PumpInfoRow(label = rh.gs(CommonR.string.omnipod_common_overview_temp_basal_rate), value = PLACEHOLDER, visible = false)) + add(PumpInfoRow(label = rh.gs(CoreUiR.string.reservoir_label), value = PLACEHOLDER)) + add(PumpInfoRow(label = rh.gs(CommonR.string.omnipod_common_overview_total_delivered), value = PLACEHOLDER)) + add(PumpInfoRow(label = rh.gs(CommonR.string.omnipod_common_overview_pod_active_alerts), value = PLACEHOLDER)) + add(PumpInfoRow(label = rh.gs(CoreUiR.string.errors), value = PLACEHOLDER)) + } else { + add(PumpInfoRow(label = rh.gs(CommonR.string.omnipod_common_overview_pod_unique_id), value = podStateManager.podId.toString())) + add(PumpInfoRow(label = rh.gs(CommonR.string.omnipod_common_overview_lot_number), value = podStateManager.lotNumber.toString())) + add(PumpInfoRow(label = rh.gs(CommonR.string.omnipod_common_overview_pod_sequence_number), value = podStateManager.podSequenceNumber.toString())) + add( + PumpInfoRow( + label = rh.gs(CommonR.string.omnipod_common_overview_firmware_version), + value = rh.gs(CommonR.string.omnipod_common_overview_firmware_version_value, podStateManager.firmwareVersion.toString(), podStateManager.bleVersion.toString()) + ) + ) + + val timeOnPodValue = podStateManager.minutesSinceActivation?.let { minutes -> + dateUtil.dateAndTimeString(System.currentTimeMillis() - minutes * 60_000L) + } ?: PLACEHOLDER + add(PumpInfoRow(label = rh.gs(CommonR.string.omnipod_common_overview_time_on_pod), value = timeOnPodValue)) + + podStateManager.podActivatedAt?.let { + add(PumpInfoRow(label = rh.gs(CommonR.string.omnipod_common_overview_pod_activated_at), value = dateUtil.dateAndTimeString(it))) + } + + val expiresAt = podStateManager.expiry + val expiryValue = expiresAt?.let { dateUtil.dateAndTimeString(it.toEpochSecond() * 1000) } ?: PLACEHOLDER + val expiryLevel = when { + expiresAt != null && ZonedDateTime.now().isAfter(expiresAt) -> StatusLevel.CRITICAL + expiresAt != null && ZonedDateTime.now().isAfter(expiresAt.minusHours(4)) -> StatusLevel.WARNING + else -> StatusLevel.NORMAL + } + add(PumpInfoRow(label = rh.gs(CommonR.string.omnipod_common_overview_pod_expiry_date), value = expiryValue, level = expiryLevel)) + + add(PumpInfoRow(label = rh.gs(CommonR.string.omnipod_common_overview_pod_status), value = buildPodStatusText(), level = buildPodStatusLevel())) + + val lastConnValue = podStateManager.lastStatusResponseReceived?.let { + readableDuration(Duration.ofMillis(System.currentTimeMillis() - it)) + } ?: PLACEHOLDER + add(PumpInfoRow(label = rh.gs(CommonR.string.omnipod_common_overview_last_connection), value = lastConnValue)) + + val (lastBolusText, lastBolusLevel) = buildLastBolus() + lastBolusText?.let { add(PumpInfoRow(label = rh.gs(CoreUiR.string.last_bolus_label), value = it, level = lastBolusLevel)) } + + val basalText = if (podStateManager.basalProgram != null && !podStateManager.deliverySuspended) { + ch.basalRateString( + rate = PumpRate(PumpType.OMNIPOD_5.determineCorrectBasalSize(podStateManager.basalProgram!!.rateAt(System.currentTimeMillis()))), + isAbsolute = true + ) + } else PLACEHOLDER + add(PumpInfoRow(label = rh.gs(CommonR.string.omnipod_common_overview_base_basal_rate), value = basalText)) + + val tempBasalText = buildTempBasalText() + add(PumpInfoRow(label = rh.gs(CommonR.string.omnipod_common_overview_temp_basal_rate), value = tempBasalText, visible = tempBasalText != PLACEHOLDER)) + + val (reservoirText, reservoirLevel) = buildReservoir() + add(PumpInfoRow(label = rh.gs(CoreUiR.string.reservoir_label), value = reservoirText, level = reservoirLevel)) + + val totalDelivered = podStateManager.totalPulsesDelivered?.let { + ch.insulinAmountString(PumpInsulin(it * PodConstants.POD_PULSE_BOLUS_UNITS)) + } ?: PLACEHOLDER + add(PumpInfoRow(label = rh.gs(CommonR.string.omnipod_common_overview_total_delivered), value = totalDelivered)) + + val alertsText = podStateManager.activeAlerts?.let { alerts -> + alerts.joinToString("\n") { t -> translatedActiveAlert(t) + (triggeredAlertTimeSuffix(t) ?: "") } + } ?: PLACEHOLDER + add(PumpInfoRow(label = rh.gs(CommonR.string.omnipod_common_overview_pod_active_alerts), value = alertsText)) + + val errors = buildList { + podStateManager.alarmType?.let { alarm -> + add(rh.gs(CommonR.string.omnipod_common_pod_status_pod_fault_description, alarm.value, alarm.toString())) + faultTimeText()?.let { add(rh.gs(CommonR.string.omnipod_common_two_strings_concatenated_by_colon, rh.gs(CommonR.string.omnipod_common_pod_fault_time_label), it)) } + } + } + val errorsText = if (errors.isEmpty()) PLACEHOLDER else errors.joinToString("\n") + add(PumpInfoRow(label = rh.gs(CoreUiR.string.errors), value = errorsText, level = if (errors.isEmpty()) StatusLevel.NORMAL else StatusLevel.CRITICAL)) + } + } + + + + private fun buildPrimaryActions(): List { + val queueEmpty = isQueueEmpty() + val activated = podStateManager.activationProgress == ActivationProgress.COMPLETED + val podRunning = activated && podStateManager.podStatus?.isRunning() == true + + return listOf( + PumpAction( + label = rh.gs(CoreUiR.string.refresh), + icon = Icons.Filled.Refresh, + enabled = podStateManager.activationProgress.isAtLeast(ActivationProgress.SET_UNIQUE_ID) && queueEmpty, + onClick = { viewModelScope.launch { commandQueue.readStatus(rh.gs(CoreUiR.string.refresh)) } } + ), + PumpAction( + label = rh.gs(CommonR.string.omnipod_common_overview_button_silence_alerts), + icon = Icons.Filled.NotificationsOff, + enabled = queueEmpty, + visible = podRunning && (podStateManager.activeAlerts?.isNotEmpty() == true || commandQueue.isCustomCommandInQueue(CommandSilenceAlerts::class.java)), + onClick = { runCustomCommandWithErrorDialog(CommandSilenceAlerts(), rh.gs(CommonR.string.omnipod_common_error_failed_to_silence_alerts)) } + ), + PumpAction( + label = rh.gs(CommonR.string.omnipod_common_overview_button_resume_delivery), + icon = Icons.Filled.PlayArrow, + enabled = queueEmpty, + visible = podRunning && (podStateManager.deliverySuspended || commandQueue.isCustomCommandInQueue(CommandResumeDelivery::class.java)), + onClick = { runCustomCommandWithErrorDialog(CommandResumeDelivery(), rh.gs(CommonR.string.omnipod_common_error_failed_to_resume_delivery)) } + ), + PumpAction( + label = rh.gs(CommonR.string.omnipod_common_overview_button_suspend_delivery), + icon = Icons.Filled.Pause, + enabled = queueEmpty, + visible = podRunning && !podStateManager.deliverySuspended, + onClick = { runCustomCommandWithErrorDialog(CommandSuspendDelivery(), rh.gs(CommonR.string.omnipod_common_error_failed_to_suspend_delivery)) } + ), + PumpAction( + label = rh.gs(CommonR.string.omnipod_common_overview_button_set_time), + icon = Icons.Filled.Schedule, + enabled = !podStateManager.deliverySuspended && queueEmpty, + visible = false, + onClick = { runCustomCommandWithErrorDialog(CommandHandleTimeChange(true), rh.gs(CommonR.string.omnipod_common_error_failed_to_set_time)) } + ) + ) + } + + private fun buildManagementActions(): List { + isQueueEmpty() + val activated = podStateManager.activationProgress == ActivationProgress.COMPLETED + + return listOf( + PumpAction( + label = rh.gs(CommonR.string.omnipod_common_pod_management_button_activate_pod), + icon = Icons.Filled.PlayArrow, + category = ActionCategory.MANAGEMENT, + visible = !activated, + onClick = { onActivatePodClicked() } + ), + PumpAction( + label = rh.gs(CommonR.string.omnipod_common_pod_management_button_deactivate_pod), + icon = Icons.Filled.Pause, + category = ActionCategory.MANAGEMENT, + visible = activated, + enabled = podStateManager.bluetoothAddress != null || podStateManager.ltk != null, + onClick = { _events.tryEmit(OmnipodOverviewEvent.StartDeactivation) } + ), + PumpAction( + label = rh.gs(CommonR.string.omnipod_common_pod_management_button_play_test_beep), + icon = Icons.AutoMirrored.Filled.VolumeUp, + category = ActionCategory.MANAGEMENT, + enabled = podStateManager.activationProgress.isAtLeast(ActivationProgress.PHASE_1_COMPLETED) && !commandQueue.isCustomCommandInQueue(CommandPlayTestBeep::class.java), + visible = podStateManager.activationProgress.isAtLeast(ActivationProgress.PHASE_1_COMPLETED), + onClick = { runCustomCommandWithErrorDialog(CommandPlayTestBeep(), rh.gs(CommonR.string.omnipod_common_error_failed_to_play_test_beep)) } + ), + PumpAction( + label = rh.gs(CommonR.string.omnipod_common_pod_management_button_discard_pod), + icon = Icons.Filled.Delete, + category = ActionCategory.MANAGEMENT, + visible = podStateManager.podId != null && podStateManager.activationProgress.isBefore(ActivationProgress.SET_UNIQUE_ID), + onClick = { onDiscardPodClicked() } + ) + ) + } + + + + private fun onActivatePodClicked() { + viewModelScope.launch { + val type = if (podStateManager.activationProgress.isAtLeast(ActivationProgress.PRIME_COMPLETED)) { + ActivationType.SHORT + } else { + ActivationType.LONG + } + _events.tryEmit(OmnipodOverviewEvent.StartActivation(type)) + } + } + + private fun onDiscardPodClicked() { + _events.tryEmit( + OmnipodOverviewEvent.ShowDialog( + rh.gs(CommonR.string.omnipod_common_pod_management_button_discard_pod), + rh.gs(CommonR.string.omnipod_common_pod_management_discard_pod_confirmation) + ) + ) + } + + fun confirmDiscardPod() { + podStateManager.reset() + } + + + + private fun buildPodStatusText(): String = + when { + podStateManager.activationProgress == ActivationProgress.NOT_STARTED -> rh.gs(CommonR.string.omnipod_common_pod_status_no_active_pod) + podStateManager.activationProgress != ActivationProgress.COMPLETED -> + if (podStateManager.activationProgress.isBefore(ActivationProgress.SET_UNIQUE_ID)) { + rh.gs(CommonR.string.omnipod_common_pod_status_waiting_for_activation) + } else if (podStateManager.activationProgress.isBefore(ActivationProgress.PRIME_COMPLETED)) { + rh.gs(CommonR.string.omnipod_common_pod_status_waiting_for_activation) + } else { + rh.gs(CommonR.string.omnipod_common_pod_status_waiting_for_cannula_insertion) + } + + podStateManager.podStatus?.isRunning() == true -> + if (podStateManager.deliverySuspended) rh.gs(CommonR.string.omnipod_common_pod_status_suspended) + else rh.gs(CommonR.string.omnipod_common_pod_status_running) + + else -> podStateManager.podStatus.toString() + } + + private fun buildPodStatusLevel(): StatusLevel = when { + podStateManager.activationProgress != ActivationProgress.COMPLETED || + podStateManager.alarmType != null || podStateManager.deliverySuspended -> StatusLevel.CRITICAL + podStateManager.pendingDoseCommand != null -> StatusLevel.WARNING + else -> StatusLevel.NORMAL + } + + private fun buildLastBolus(): Pair { + val pending = podStateManager.pendingDoseCommand + if (pending != null && pending.type == O5PodStateManager.PendingDoseType.BOLUS) { + val requested = pending.requestedUnits ?: return null to StatusLevel.NORMAL + var text = ch.insulinAmountAgoString(PumpInsulin(PumpType.OMNIPOD_5.determineCorrectBolusSize(requested)), pending.startedAt) + text += " (${rh.gs(CommonR.string.omnipod_common_uncertain)})" + return text to StatusLevel.CRITICAL + } + val startTime = podStateManager.lastBolusStartTime ?: return null to StatusLevel.NORMAL + val bolusSize = podStateManager.lastBolusDeliveredUnits ?: podStateManager.lastBolusRequestedUnits ?: return null to StatusLevel.NORMAL + val text = ch.insulinAmountAgoString(PumpInsulin(PumpType.OMNIPOD_5.determineCorrectBolusSize(bolusSize)), startTime) + val level = if (podStateManager.lastBolusDeliveredUnits == null) StatusLevel.WARNING else StatusLevel.NORMAL + return text to level + } + + private fun buildTempBasalText(): String { + val startTime = podStateManager.activeTempBasalStartTime + val rate = podStateManager.activeTempBasalRate + val duration = podStateManager.activeTempBasalDurationMinutes + if (podStateManager.deliveryStatus?.tempBasalActive() == true && startTime != null && rate != null && duration != null) { + return ch.basalTbrString(rate = PumpRate(rate), startTime = startTime, durationInMin = duration.toInt()) + } + return PLACEHOLDER + } + + private fun buildReservoir(): Pair { + val reservoirLevel = podStateManager.reservoirPulsesRemaining?.let { PumpInsulin(it * PodConstants.POD_PULSE_BOLUS_UNITS) } + return reservoirLevel?.let { + val lowThreshold = PodConstants.DEFAULT_MAX_RESERVOIR_ALERT_THRESHOLD.toDouble() + val text = ch.insulinAmountString(it) + val level = if (ch.fromPump(it) < lowThreshold) StatusLevel.CRITICAL else StatusLevel.NORMAL + text to level + } ?: (rh.gs(CoreUiR.string.overview_reservoir_concentration_value_over, ch.insulinAmountString(PumpInsulin(50.0))) to StatusLevel.NORMAL) + } + + private fun translatedActiveAlert(alert: AlertType): String { + val id = when (alert) { + AlertType.LOW_RESERVOIR -> CommonR.string.omnipod_common_alert_low_reservoir + AlertType.EXPIRATION -> CommonR.string.omnipod_common_alert_expiration_advisory + AlertType.EXPIRATION_IMMINENT -> CommonR.string.omnipod_common_alert_expiration + AlertType.USER_SET_EXPIRATION -> CommonR.string.omnipod_common_alert_expiration_advisory + AlertType.AUTO_OFF -> CommonR.string.omnipod_common_alert_shutdown_imminent + AlertType.SUSPEND_IN_PROGRESS -> CommonR.string.omnipod_common_alert_delivery_suspended + AlertType.SUSPEND_ENDED -> CommonR.string.omnipod_common_alert_delivery_suspended + else -> CommonR.string.omnipod_common_alert_unknown_alert + } + return rh.gs(id) + } + + /** " (triggered ago)"-style suffix for [alert], if page 1 has reported a + * trigger time for it - null otherwise (never triggered, or page 1 not fetched). */ + private fun triggeredAlertTimeSuffix(alert: AlertType): String? { + val triggered = podStateManager.triggeredAlertTimes?.get(alert) ?: return null + val minutesSince = podStateManager.minutesSinceActivation ?: return null + val elapsed = (minutesSince - triggered).coerceAtLeast(0) + return " (${readableDuration(Duration.ofMinutes(elapsed.toLong()))})" + } + + /** Elapsed-since-fault text derived from [O5PodStateManager.alarmTime] (a + * pod-clock-relative minutes value, same convention as [O5PodStateManager + * .minutesSinceActivation]) - null until a status read has populated both. */ + private fun faultTimeText(): String? { + val alarmTime = podStateManager.alarmTime ?: return null + val minutesSince = podStateManager.minutesSinceActivation ?: return null + val elapsed = (minutesSince - alarmTime).coerceAtLeast(0) + return readableDuration(Duration.ofMinutes(elapsed.toLong())) + } + + private fun readableDuration(duration: Duration): String { + val hours = duration.toHours().toInt() + val minutes = duration.toMinutes().toInt() + val seconds = duration.seconds + return when { + seconds < 10 -> rh.gs(CommonR.string.omnipod_common_moments_ago) + seconds < 60 -> rh.gs(CommonR.string.omnipod_common_less_than_a_minute_ago) + seconds < 60 * 60 -> rh.gs(CommonR.string.omnipod_common_time_ago, rh.gq(CommonR.plurals.omnipod_common_minutes, minutes, minutes)) + + seconds < 24 * 60 * 60 -> { + val minutesLeft = minutes % 60 + if (minutesLeft > 0) + rh.gs(CommonR.string.omnipod_common_time_ago, rh.gs(CommonR.string.omnipod_common_composite_time, rh.gq(CommonR.plurals.omnipod_common_hours, hours, hours), rh.gq(CommonR.plurals.omnipod_common_minutes, minutesLeft, minutesLeft))) + else + rh.gs(CommonR.string.omnipod_common_time_ago, rh.gq(CommonR.plurals.omnipod_common_hours, hours, hours)) + } + + else -> { + val days = hours / 24 + val hoursLeft = hours % 24 + if (hoursLeft > 0) + rh.gs(CommonR.string.omnipod_common_time_ago, rh.gs(CommonR.string.omnipod_common_composite_time, rh.gq(CommonR.plurals.omnipod_common_days, days, days), rh.gq(CommonR.plurals.omnipod_common_hours, hoursLeft, hoursLeft))) + else + rh.gs(CommonR.string.omnipod_common_time_ago, rh.gq(CommonR.plurals.omnipod_common_days, days, days)) + } + } + } + + private fun isQueueEmpty(): Boolean = commandQueue.size() == 0 && commandQueue.performing() == null + + + private fun runCustomCommandWithErrorDialog(customCommand: CustomCommand, errorMessagePrefix: String) { + viewModelScope.launch { + val result = commandQueue.customCommand(customCommand) + if (!result.success) { + _events.tryEmit( + OmnipodOverviewEvent.ShowErrorDialog( + rh.gs(CoreUiR.string.warning), + rh.gs(CommonR.string.omnipod_common_two_strings_concatenated_by_colon, errorMessagePrefix, result.comment) + ) + ) + } + } + } + + override fun onCleared() { + super.onCleared() + scope.cancel() + } +} diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/OmnipodO5ComposeContent.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/OmnipodO5ComposeContent.kt new file mode 100644 index 000000000000..c49cdd66994d --- /dev/null +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/OmnipodO5ComposeContent.kt @@ -0,0 +1,208 @@ +package app.aaps.pump.omnipod.omnipod5.ui.compose + +import androidx.compose.foundation.layout.RowScope +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.ArrowBack +import androidx.compose.material.icons.filled.Settings +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.stringResource +import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel +import androidx.lifecycle.compose.collectAsStateWithLifecycle +import app.aaps.core.interfaces.protection.ProtectionCheck +import app.aaps.core.interfaces.pump.BlePreCheck +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.ui.compose.ComposablePluginContent +import app.aaps.core.ui.compose.ToolbarConfig +import app.aaps.core.ui.compose.dialogs.OkCancelDialog +import app.aaps.core.ui.compose.dialogs.OkDialog +import app.aaps.core.ui.compose.pump.BlePreCheckHost +import app.aaps.core.ui.compose.pump.KeepScreenOnEffect +import app.aaps.core.ui.compose.pump.PumpOverviewScreen +import app.aaps.pump.omnipod.common.R +import app.aaps.pump.omnipod.omnipod5.bledriver.comm.pair.O5RegistrationData +import app.aaps.pump.omnipod.omnipod5.ui.O5CredentialImportScreen +import app.aaps.pump.omnipod.omnipod5.ui.O5CredentialImportViewModel +import app.aaps.pump.omnipod.common.ui.compose.PodImage +import app.aaps.pump.omnipod.common.ui.wizard.compose.ActivationType +import app.aaps.pump.omnipod.omnipod5.ui.wizard.compose.O5OmnipodWizardViewModel +import app.aaps.pump.omnipod.common.ui.wizard.compose.OmnipodOverviewEvent +import app.aaps.pump.omnipod.common.ui.wizard.compose.OmnipodWizardScreen + +/** + * O5's plugin-settings entry composable - the `.composeContent {}` render target for + * [app.aaps.pump.omnipod.omnipod5.O5PumpPlugin]. Mirrors + * [app.aaps.pump.omnipod.dash.ui.compose.OmnipodDashComposeContent]'s overview/wizard + * toggle, but with a credentials screen in place of Dash's pod-history screen (O5 has no + * history feature) - the overview is always shown first; the settings gear opens the plugin + * preferences screen (which hosts the certificate store as a subpage), and "Activate Pod" + * routes to [O5CredentialImportScreen] first only if no registration credentials are installed + * yet (matches the confirmed UX choice - no auto-gating the whole screen). + */ +class OmnipodO5ComposeContent( + private val pluginName: String, + private val protectionCheck: ProtectionCheck, + private val blePreCheck: BlePreCheck, + private val rh: ResourceHelper +) : ComposablePluginContent { + + @Composable + override fun Render( + setToolbarConfig: (ToolbarConfig) -> Unit, + onNavigateBack: () -> Unit, + onSettings: (() -> Unit)? + ) { + val overviewViewModel: O5OverviewViewModel = hiltViewModel() + val context = LocalContext.current + + var showWizard by remember { mutableStateOf(false) } + var showCredentials by remember { mutableStateOf(false) } + var wizardActivationType by remember { mutableStateOf(null) } + var isDeactivation by remember { mutableStateOf(false) } + + var showDialog by remember { mutableStateOf(false) } + var dialogTitle by remember { mutableStateOf("") } + var dialogMessage by remember { mutableStateOf("") } + var showDiscardConfirm by remember { mutableStateOf(false) } + var showErrorDialog by remember { mutableStateOf(false) } + var errorTitle by remember { mutableStateOf("") } + var errorMessage by remember { mutableStateOf("") } + + val overviewNavIcon: @Composable () -> Unit = { + IconButton(onClick = onNavigateBack) { + Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = stringResource(app.aaps.core.ui.R.string.back)) + } + } + val settingsAction: @Composable RowScope.() -> Unit = { + onSettings?.let { action -> + IconButton(onClick = action) { + Icon(Icons.Filled.Settings, contentDescription = stringResource(app.aaps.core.ui.R.string.settings)) + } + } + } + + LaunchedEffect(showWizard, showCredentials) { + if (!showWizard && !showCredentials) { + setToolbarConfig(ToolbarConfig(title = pluginName, navigationIcon = overviewNavIcon, actions = settingsAction)) + } + } + + LaunchedEffect(overviewViewModel) { + overviewViewModel.events.collect { event -> + when (event) { + is OmnipodOverviewEvent.StartActivation -> { + if (O5RegistrationData.pickControllerId == 0L) { + showCredentials = true + } else { + wizardActivationType = event.activationType + isDeactivation = false + showWizard = true + } + } + + is OmnipodOverviewEvent.StartDeactivation -> { + isDeactivation = true + showWizard = true + } + + is OmnipodOverviewEvent.ShowHistory -> Unit + + is OmnipodOverviewEvent.ShowDialog -> { + if (event.title == context.getString(R.string.omnipod_common_pod_management_button_discard_pod)) { + showDiscardConfirm = true + dialogTitle = event.title + dialogMessage = event.message + } else { + dialogTitle = event.title + dialogMessage = event.message + showDialog = true + } + } + + is OmnipodOverviewEvent.ShowErrorDialog -> { + errorTitle = event.title + errorMessage = event.message + showErrorDialog = true + } + + is OmnipodOverviewEvent.StartActivity -> context.startActivity(event.intent) + is OmnipodOverviewEvent.ShowRileyLinkPairWizard -> Unit + is OmnipodOverviewEvent.ShowRileyLinkStats -> Unit + is OmnipodOverviewEvent.ShowSnackbar -> Unit + } + } + } + + if (showDialog) { + OkDialog(title = dialogTitle, message = dialogMessage, onDismiss = { showDialog = false }) + } + if (showErrorDialog) { + OkDialog(title = errorTitle, message = errorMessage, onDismiss = { showErrorDialog = false }) + } + if (showDiscardConfirm) { + OkCancelDialog( + title = dialogTitle, + message = dialogMessage, + onConfirm = { + showDiscardConfirm = false + overviewViewModel.confirmDiscardPod() + }, + onDismiss = { showDiscardConfirm = false } + ) + } + + when { + showWizard -> { + KeepScreenOnEffect() + BlePreCheckHost(blePreCheck = blePreCheck, onFailed = { showWizard = false }) + + val wizardViewModel: O5OmnipodWizardViewModel = hiltViewModel() + val wizardReady by wizardViewModel.ready.collectAsStateWithLifecycle() + LaunchedEffect(wizardReady, isDeactivation, wizardActivationType) { + if (!wizardReady) return@LaunchedEffect + if (isDeactivation) { + wizardViewModel.initializeDeactivation() + } else { + wizardActivationType?.let { wizardViewModel.initializeActivation(it) } + } + } + + OmnipodWizardScreen( + viewModel = wizardViewModel, + onFinish = { showWizard = false }, + setToolbarConfig = setToolbarConfig + ) + } + + showCredentials -> { + LaunchedEffect(Unit) { + setToolbarConfig( + ToolbarConfig( + title = rh.gs(R.string.omnipod_5_name), + navigationIcon = { + IconButton(onClick = { showCredentials = false }) { + Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = stringResource(app.aaps.core.ui.R.string.back)) + } + }, + actions = {} + ) + ) + } + val credentialViewModel: O5CredentialImportViewModel = hiltViewModel() + O5CredentialImportScreen(viewModel = credentialViewModel, rh = rh) + } + + else -> { + val uiState by overviewViewModel.uiState.collectAsStateWithLifecycle() + PumpOverviewScreen(state = uiState, customContent = { PodImage() }) + } + } + } +} diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/wizard/compose/O5OmnipodWizardViewModel.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/wizard/compose/O5OmnipodWizardViewModel.kt new file mode 100644 index 000000000000..ccb54c3c2c06 --- /dev/null +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/wizard/compose/O5OmnipodWizardViewModel.kt @@ -0,0 +1,424 @@ +package app.aaps.pump.omnipod.omnipod5.ui.wizard.compose +import app.aaps.pump.omnipod.common.ui.wizard.compose.OmnipodWizardStep +import app.aaps.pump.omnipod.common.ui.wizard.compose.OmnipodWizardViewModel +import app.aaps.pump.omnipod.common.R + +import androidx.annotation.StringRes +import androidx.compose.runtime.Stable +import androidx.lifecycle.viewModelScope +import app.aaps.core.data.model.ICfg +import app.aaps.core.data.model.TE +import app.aaps.core.data.pump.defs.PumpType +import app.aaps.core.data.time.T +import app.aaps.core.data.ue.Sources +import app.aaps.core.interfaces.db.PersistenceLayer +import app.aaps.core.interfaces.insulin.InsulinManager +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.notifications.NotificationId +import app.aaps.core.interfaces.notifications.NotificationManager +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.profile.ProfileRepository +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.keys.BooleanKey +import app.aaps.core.keys.IntKey +import app.aaps.core.keys.interfaces.Preferences +import app.aaps.core.ui.compose.siteRotation.BodyType +import app.aaps.pump.omnipod.omnipod5.bledriver.comm.O5BleManager +import app.aaps.pump.omnipod.common.bledriver.pod.command.GetStatusCommand +import app.aaps.pump.omnipod.common.bledriver.pod.command.GetVersionCommand +import app.aaps.pump.omnipod.common.bledriver.pod.command.ProgramAlertsCommand +import app.aaps.pump.omnipod.common.bledriver.pod.command.ProgramBasalCommand +import app.aaps.pump.omnipod.common.bledriver.pod.command.ProgramBolusCommand +import app.aaps.pump.omnipod.common.bledriver.pod.command.SetUniqueIdCommand +import app.aaps.pump.omnipod.common.bledriver.pod.definition.ActivationProgress +import app.aaps.pump.omnipod.common.bledriver.pod.definition.AlertConfiguration +import app.aaps.pump.omnipod.common.bledriver.pod.definition.AlertTrigger +import app.aaps.pump.omnipod.common.bledriver.pod.definition.AlertType +import app.aaps.pump.omnipod.common.bledriver.pod.definition.BeepRepetitionType +import app.aaps.pump.omnipod.common.bledriver.pod.definition.BeepType +import app.aaps.pump.omnipod.omnipod5.bledriver.pod.definition.O5_FIXED_NONCE +import app.aaps.pump.omnipod.common.bledriver.pod.definition.PodConstants +import app.aaps.pump.omnipod.common.bledriver.pod.definition.PodStatus +import app.aaps.pump.omnipod.common.bledriver.pod.definition.ProgramReminder +import app.aaps.pump.omnipod.common.bledriver.pod.response.DefaultStatusResponse +import app.aaps.pump.omnipod.common.bledriver.pod.response.ResponseType +import app.aaps.pump.omnipod.common.bledriver.pod.response.SetUniqueIdResponse +import app.aaps.pump.omnipod.common.bledriver.pod.response.VersionResponse +import app.aaps.pump.omnipod.omnipod5.bledriver.pod.state.O5PodStateManager +import app.aaps.pump.omnipod.omnipod5.bledriver.pod.util.buildO5ExpirationAlerts +import app.aaps.pump.omnipod.common.keys.OmnipodBooleanPreferenceKey +import app.aaps.pump.omnipod.common.keys.OmnipodIntPreferenceKey +import app.aaps.pump.omnipod.common.queue.command.CommandDeactivatePod +import app.aaps.pump.omnipod.omnipod5.util.mapProfileToBasalProgram +import dagger.hilt.android.lifecycle.HiltViewModel +import io.reactivex.rxjava3.core.Single +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.launch +import kotlinx.coroutines.rx3.rxSingle +import java.util.Date +import javax.inject.Inject +import javax.inject.Provider +import app.aaps.pump.omnipod.common.R as CommonR + +/** + * O5's concrete [OmnipodWizardViewModel] - physical pod activation (pairing, prime, + * cannula insertion) and deactivation. Replicates + * [app.aaps.pump.omnipod.dash.driver.OmnipodDashManagerImpl]'s `activatePodPart1`/ + * `activatePodPart2` command sequence exactly (see that class for the reference this was + * built from), but calls [O5BleManager]/command classes directly rather than delegating + * to a Dash-style manager layer - O5 has no such layer, and its per-call + * `Observable` correlation (see [O5BleManager.sendCommand]) makes the + * sequential/blocking style used elsewhere in [app.aaps.pump.omnipod.omnipod5.O5PumpPlugin] + * simpler here too than replicating Dash's reversed-Observable-list construction. + * + * Every sub-step is guarded on [O5PodStateManager.activationProgress] so the wizard's + * built-in retry-on-failure button can be pressed repeatedly without resending + * already-completed commands (matches Dash's identical resumability property). + */ +@Stable +@HiltViewModel +class O5OmnipodWizardViewModel @Inject constructor( + private val bleManager: O5BleManager, + private val podStateManager: O5PodStateManager, + private val preferences: Preferences, + private val rh: ResourceHelper, + private val commandQueue: CommandQueue, + private val notificationManager: NotificationManager, + private val pumpSync: PumpSync, + private val insulinManager: InsulinManager, + private val persistenceLayer: PersistenceLayer, + profileFunction: ProfileFunction, + profileRepository: ProfileRepository, + pumpEnactResultProvider: Provider, + logger: AAPSLogger, + aapsSchedulers: AapsSchedulers +) : OmnipodWizardViewModel(logger, aapsSchedulers, pumpEnactResultProvider, profileFunction, profileRepository) { + + private val _siteRotationEntries = MutableStateFlow>(emptyList()) + + init { + viewModelScope.launch { + val insulins = insulinManager.insulins.map { it.deepClone() } + val activeLabel = profileFunction.getProfile()?.iCfg?.insulinLabel + loadInsulins(insulins, activeLabel) + loadSiteRotationEntriesInternal() + resolveProfileGate() + _ready.value = true + } + } + + public override val pumpSource: Sources = Sources.Omnipod5 + + override fun fallbackICfg(): ICfg? = insulinManager.insulins.firstOrNull() + + override val concentrationEnabled: Boolean + get() = preferences.get(BooleanKey.GeneralInsulinConcentration) + + override val showSiteLocationStep: Boolean + get() = preferences.get(BooleanKey.SiteRotationManagePump) + + override fun bodyType(): BodyType = + BodyType.fromPref(preferences.get(IntKey.SiteRotationUserProfile)) + + override fun siteRotationEntries(): List = _siteRotationEntries.value + + private suspend fun loadSiteRotationEntriesInternal() { + _siteRotationEntries.value = persistenceLayer.getTherapyEventDataFromTime( + System.currentTimeMillis() - T.days(45).msecs(), false + ).filter { it.type == TE.Type.CANNULA_CHANGE || it.type == TE.Type.SENSOR_CHANGE } + } + + override fun executeInsulinProfileSwitch() { + val selected = selectedInsulin.value ?: return + val activeLabel = activeInsulinLabel.value + if (selected.insulinLabel == activeLabel) return + viewModelScope.launch { + profileFunction.createProfileSwitchWithNewInsulin(selected, Sources.Omnipod5) + } + } + + override fun saveSiteLocation() { + val location = getSelectedSiteLocation().takeIf { it != TE.Location.NONE } ?: return + val arrow = getSelectedSiteArrow().takeIf { it != TE.Arrow.NONE } + viewModelScope.launch { + try { + val now = System.currentTimeMillis() + val entries = persistenceLayer.getTherapyEventDataFromToTime(now - 60_000, now) + .filter { it.type == TE.Type.CANNULA_CHANGE } + entries.firstOrNull()?.let { te -> + persistenceLayer.insertOrUpdateTherapyEvent(te.copy(location = location, arrow = arrow)) + } + } catch (_: Exception) { + } + } + } + + private fun requirePodId(): Int = + podStateManager.podId?.toInt() ?: throw IllegalStateException("O5 pod not paired") + + private fun nextSeq(): Short = podStateManager.msgSequenceNumber.toShort() + + + override fun doInitializePod(): Single = rxSingle(Dispatchers.IO) { + try { + if (podStateManager.ltk == null) { + bleManager.pairNewPod().ignoreElements().blockingAwait() + } + + if (podStateManager.activationProgress.isBefore(ActivationProgress.GOT_POD_VERSION)) { + val cmd = GetVersionCommand.Builder() + .setUniqueId(GetVersionCommand.DEFAULT_UNIQUE_ID) + .setSequenceNumber(nextSeq()) + .build() + bleManager.sendCommand(cmd, VersionResponse::class).ignoreElements().blockingAwait() + podStateManager.activationProgress = ActivationProgress.GOT_POD_VERSION + } + + if (podStateManager.activationProgress.isBefore(ActivationProgress.AID_SETUP)) { + bleManager.sendAidSetupCommands().blockingAwait() + podStateManager.activationProgress = ActivationProgress.AID_SETUP + } + + if (podStateManager.activationProgress.isBefore(ActivationProgress.SET_UNIQUE_ID)) { + val cmd = SetUniqueIdCommand.Builder() + .setUniqueId(requirePodId()) + .setSequenceNumber(nextSeq()) + .setLotNumber(requireNotNull(podStateManager.lotNumber) { "Missing lotNumber" }.toInt()) + .setPodSequenceNumber(requireNotNull(podStateManager.podSequenceNumber) { "Missing podSequenceNumber" }.toInt()) + .setInitializationTime(Date()) + .build() + bleManager.sendCommand(cmd, SetUniqueIdResponse::class).ignoreElements().blockingAwait() + podStateManager.activationProgress = ActivationProgress.SET_UNIQUE_ID + } + + if (podStateManager.activationProgress.isBefore(ActivationProgress.PROGRAMMED_LOW_RESERVOIR_ALERTS)) { + if (preferences.get(OmnipodBooleanPreferenceKey.LowReservoirAlert)) { + val lowReservoirAlertUnits = preferences.get(OmnipodIntPreferenceKey.LowReservoirAlertUnits) + val cmd = ProgramAlertsCommand.Builder() + .setUniqueId(requirePodId()) + .setSequenceNumber(nextSeq()) + .setNonce(O5_FIXED_NONCE) + .setAlertConfigurations( + listOf( + AlertConfiguration( + AlertType.LOW_RESERVOIR, enabled = true, durationInMinutes = 0, autoOff = false, + AlertTrigger.ReservoirVolumeTrigger((lowReservoirAlertUnits * 10).toShort()), + BeepType.FOUR_TIMES_BIP_BEEP, BeepRepetitionType.XXX + ) + ) + ) + .build() + bleManager.sendCommand(cmd, DefaultStatusResponse::class).ignoreElements().blockingAwait() + } + podStateManager.activationProgress = ActivationProgress.PROGRAMMED_LOW_RESERVOIR_ALERTS + } + + if (podStateManager.activationProgress.isBefore(ActivationProgress.REPROGRAMMED_LUMP_OF_COAL_ALERT)) { + val cmd = ProgramAlertsCommand.Builder() + .setUniqueId(requirePodId()) + .setSequenceNumber(nextSeq()) + .setNonce(O5_FIXED_NONCE) + .setAlertConfigurations( + listOf( + AlertConfiguration( + AlertType.EXPIRATION, enabled = true, durationInMinutes = 55, autoOff = false, + AlertTrigger.TimerTrigger(5), BeepType.FOUR_TIMES_BIP_BEEP, BeepRepetitionType.XXX5 + ) + ) + ) + .build() + bleManager.sendCommand(cmd, DefaultStatusResponse::class).ignoreElements().blockingAwait() + podStateManager.activationProgress = ActivationProgress.REPROGRAMMED_LUMP_OF_COAL_ALERT + } + + if (podStateManager.activationProgress.isBefore(ActivationProgress.PRIMING)) { + bleManager.connect().ignoreElements().blockingAwait() + val firstPrimeBolusVolume = requireNotNull(podStateManager.firstPrimeBolusVolume) { "Missing firstPrimeBolusVolume" } + val primePulseRate = requireNotNull(podStateManager.primePulseRate) { "Missing primePulseRate" } + val cmd = ProgramBolusCommand.Builder() + .setUniqueId(requirePodId()) + .setSequenceNumber(nextSeq()) + .setNonce(O5_FIXED_NONCE) + .setNumberOfUnits(firstPrimeBolusVolume * PodConstants.POD_PULSE_BOLUS_UNITS) + .setDelayBetweenPulsesInEighthSeconds(primePulseRate.toByte()) + .setProgramReminder(ProgramReminder(atStart = false, atEnd = false, atInterval = 0)) + .setO5BolusInfo(mealUnits = 0.0, correctionUnits = 0.0) + .build() + bleManager.sendCommand(cmd, DefaultStatusResponse::class).ignoreElements().blockingAwait() + podStateManager.activationProgress = ActivationProgress.PRIMING + } + + if (podStateManager.activationProgress == ActivationProgress.PRIMING) { + val pulses = podStateManager.firstPrimeBolusVolume ?: 0 + val pulseRateEighthSeconds = podStateManager.primePulseRate ?: 8 + Thread.sleep(pulses.toLong() * pulseRateEighthSeconds.toLong() * 1000 / 8) + } + + if (podStateManager.activationProgress.isBefore(ActivationProgress.PRIME_COMPLETED)) { + bleManager.connect().ignoreElements().blockingAwait() + val cmd = GetStatusCommand.Builder() + .setUniqueId(requirePodId()) + .setSequenceNumber(nextSeq()) + .setStatusResponseType(ResponseType.StatusResponseType.DEFAULT_STATUS_RESPONSE) + .build() + bleManager.sendCommand(cmd, DefaultStatusResponse::class).ignoreElements().blockingAwait() + check(podStateManager.podStatus == PodStatus.CLUTCH_DRIVE_ENGAGED) { + "Unexpected Pod status: got ${podStateManager.podStatus}, expected CLUTCH_DRIVE_ENGAGED" + } + podStateManager.activationProgress = ActivationProgress.PRIME_COMPLETED + } + + podStateManager.activationProgress = ActivationProgress.PHASE_1_COMPLETED + pumpEnactResultProvider.get().success(true) + } catch (throwable: Throwable) { + logger.error(LTag.PUMP, "Error in O5 Pod activation part 1", throwable) + pumpEnactResultProvider.get().success(false).comment(throwable.message ?: throwable.javaClass.simpleName) + } + } + + override fun doInsertCannula(): Single = rxSingle(Dispatchers.IO) { + try { + val profile = pumpSync.expectedPumpState().profile ?: throw IllegalStateException("No profile set") + val basalProgram = mapProfileToBasalProgram(profile, PumpType.OMNIPOD_5) + + if (podStateManager.activationProgress.isBefore(ActivationProgress.PROGRAMMED_BASAL)) { + val basalBeeps = preferences.get(OmnipodBooleanPreferenceKey.BasalBeepsEnabled) + val cmd = ProgramBasalCommand.Builder() + .setUniqueId(requirePodId()) + .setSequenceNumber(nextSeq()) + .setNonce(O5_FIXED_NONCE) + .setBasalProgram(basalProgram) + .setProgramReminder(ProgramReminder(atStart = basalBeeps, atEnd = false, atInterval = 0)) + .setCurrentTime(Date()) + .build() + bleManager.sendCommand(cmd, DefaultStatusResponse::class).ignoreElements().blockingAwait() + podStateManager.activationProgress = ActivationProgress.PROGRAMMED_BASAL + } + + if (podStateManager.activationProgress.isBefore(ActivationProgress.UPDATED_EXPIRATION_ALERTS)) { + val cmd = ProgramAlertsCommand.Builder() + .setUniqueId(requirePodId()) + .setSequenceNumber(nextSeq()) + .setNonce(O5_FIXED_NONCE) + .setMultiCommandFlag(true) + .setAlertConfigurations(buildO5ExpirationAlerts(podStateManager, preferences, logger)) + .build() + bleManager.sendCommand(cmd, DefaultStatusResponse::class).ignoreElements().blockingAwait() + podStateManager.activationProgress = ActivationProgress.UPDATED_EXPIRATION_ALERTS + } + + if (podStateManager.activationProgress.isBefore(ActivationProgress.INSERTING_CANNULA)) { + bleManager.connect().ignoreElements().blockingAwait() + val secondPrimeBolusVolume = requireNotNull(podStateManager.secondPrimeBolusVolume) { "Missing secondPrimeBolusVolume" } + val primePulseRate = requireNotNull(podStateManager.primePulseRate) { "Missing primePulseRate" } + val cmd = ProgramBolusCommand.Builder() + .setUniqueId(requirePodId()) + .setSequenceNumber(nextSeq()) + .setNonce(O5_FIXED_NONCE) + .setNumberOfUnits(secondPrimeBolusVolume * PodConstants.POD_PULSE_BOLUS_UNITS) + .setDelayBetweenPulsesInEighthSeconds(primePulseRate.toByte()) + .setProgramReminder(ProgramReminder(atStart = false, atEnd = false, atInterval = 0)) + .setO5BolusInfo(mealUnits = 0.0, correctionUnits = 0.0) + .build() + bleManager.sendCommand(cmd, DefaultStatusResponse::class).ignoreElements().blockingAwait() + podStateManager.activationProgress = ActivationProgress.INSERTING_CANNULA + } + + if (podStateManager.activationProgress == ActivationProgress.INSERTING_CANNULA) { + val pulses = podStateManager.secondPrimeBolusVolume ?: 0 + val pulseRateEighthSeconds = podStateManager.primePulseRate ?: 8 + Thread.sleep(pulses.toLong() * pulseRateEighthSeconds.toLong() * 1000 / 8) + } + + if (podStateManager.activationProgress.isBefore(ActivationProgress.CANNULA_INSERTED)) { + bleManager.connect().ignoreElements().blockingAwait() + val cmd = GetStatusCommand.Builder() + .setUniqueId(requirePodId()) + .setSequenceNumber(nextSeq()) + .setStatusResponseType(ResponseType.StatusResponseType.DEFAULT_STATUS_RESPONSE) + .build() + bleManager.sendCommand(cmd, DefaultStatusResponse::class).ignoreElements().blockingAwait() + check(podStateManager.podStatus == PodStatus.RUNNING_ABOVE_MIN_VOLUME) { + "Unexpected Pod status: got ${podStateManager.podStatus}, expected RUNNING_ABOVE_MIN_VOLUME" + } + podStateManager.activationProgress = ActivationProgress.CANNULA_INSERTED + } + + podStateManager.basalProgram = basalProgram + pumpSync.connectNewPump() + val serial = podStateManager.podId?.toString() ?: "n/a" + pumpSync.insertTherapyEventIfNewWithTimestamp( + timestamp = System.currentTimeMillis(), type = TE.Type.CANNULA_CHANGE, pumpType = PumpType.OMNIPOD_5, pumpSerial = serial + ) + pumpSync.insertTherapyEventIfNewWithTimestamp( + timestamp = System.currentTimeMillis(), type = TE.Type.INSULIN_CHANGE, pumpType = PumpType.OMNIPOD_5, pumpSerial = serial + ) + notificationManager.dismiss(NotificationId.OMNIPOD_POD_NOT_ATTACHED) + podStateManager.activationProgress = ActivationProgress.COMPLETED + podStateManager.cumulativeBolusPulsesDelivered = podStateManager.totalPulsesDelivered ?: 0 + viewModelScope.launch { commandQueue.readStatus(rh.gs(CommonR.string.omnipod_common_pod_activation_wizard_pod_activated_title)) } + pumpEnactResultProvider.get().success(true) + } catch (throwable: Throwable) { + logger.error(LTag.PUMP, "Error in O5 Pod activation part 2", throwable) + pumpEnactResultProvider.get().success(false).comment(throwable.message ?: throwable.javaClass.simpleName) + } + } + + override fun doDeactivatePod(): Single = rxSingle { + commandQueue.customCommand(CommandDeactivatePod()) + } + + + + override fun discardPod() { + podStateManager.reset() + notificationManager.dismiss(NotificationId.OMNIPOD_POD_FAULT) + } + + override fun isPodInAlarm(): Boolean = podStateManager.alarmType != null + + override fun isPodActivationTimeExceeded(): Boolean = false + + override fun isPodDeactivatable(): Boolean = true + + + + @StringRes + override fun getTitleForStep(step: OmnipodWizardStep): Int = when (step) { + OmnipodWizardStep.PROFILE_GATE -> app.aaps.core.ui.R.string.pump_wizard_profile_gate_title + OmnipodWizardStep.START_POD_ACTIVATION -> CommonR.string.omnipod_common_pod_activation_wizard_start_pod_activation_title + OmnipodWizardStep.SELECT_INSULIN -> app.aaps.core.ui.R.string.select_insulin + OmnipodWizardStep.INITIALIZE_POD -> CommonR.string.omnipod_common_pod_activation_wizard_initialize_pod_title + OmnipodWizardStep.SITE_LOCATION -> app.aaps.core.ui.R.string.site_location + OmnipodWizardStep.ATTACH_POD -> CommonR.string.omnipod_common_pod_activation_wizard_attach_pod_title + OmnipodWizardStep.INSERT_CANNULA -> CommonR.string.omnipod_common_pod_activation_wizard_insert_cannula_title + OmnipodWizardStep.POD_ACTIVATED -> CommonR.string.omnipod_common_pod_activation_wizard_pod_activated_title + OmnipodWizardStep.START_POD_DEACTIVATION -> CommonR.string.omnipod_common_pod_deactivation_wizard_start_pod_deactivation_title + OmnipodWizardStep.DEACTIVATE_POD -> CommonR.string.omnipod_common_pod_deactivation_wizard_deactivating_pod_title + OmnipodWizardStep.POD_DEACTIVATED -> CommonR.string.omnipod_common_pod_deactivation_wizard_pod_deactivated_title + OmnipodWizardStep.POD_DISCARDED -> CommonR.string.omnipod_common_pod_deactivation_wizard_pod_discarded_title + } + + @StringRes + override fun getTextForStep(step: OmnipodWizardStep): Int = when (step) { + OmnipodWizardStep.PROFILE_GATE -> 0 + OmnipodWizardStep.START_POD_ACTIVATION -> CommonR.string.omnipod_5_pod_activation_wizard_start_pod_activation_text + OmnipodWizardStep.SELECT_INSULIN -> app.aaps.core.ui.R.string.select_insulin_description + OmnipodWizardStep.INITIALIZE_POD -> CommonR.string.omnipod_5_pod_activation_wizard_initialize_pod_text + OmnipodWizardStep.SITE_LOCATION -> app.aaps.core.ui.R.string.select_site_location + OmnipodWizardStep.ATTACH_POD -> CommonR.string.omnipod_common_pod_activation_wizard_attach_pod_text + OmnipodWizardStep.INSERT_CANNULA -> CommonR.string.omnipod_common_pod_activation_wizard_insert_cannula_text + OmnipodWizardStep.POD_ACTIVATED -> CommonR.string.omnipod_common_pod_activation_wizard_pod_activated_text + OmnipodWizardStep.START_POD_DEACTIVATION -> CommonR.string.omnipod_common_pod_deactivation_wizard_start_pod_deactivation_text + OmnipodWizardStep.DEACTIVATE_POD -> CommonR.string.omnipod_common_pod_deactivation_wizard_deactivating_pod_text + OmnipodWizardStep.POD_DEACTIVATED -> CommonR.string.omnipod_common_pod_deactivation_wizard_pod_deactivated_text + OmnipodWizardStep.POD_DISCARDED -> CommonR.string.omnipod_common_pod_deactivation_wizard_pod_discarded_text + } + +} diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/util/ProfileToBasalProgram.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/util/ProfileToBasalProgram.kt new file mode 100644 index 000000000000..5352c351754b --- /dev/null +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/util/ProfileToBasalProgram.kt @@ -0,0 +1,69 @@ +package app.aaps.pump.omnipod.omnipod5.util + +import app.aaps.core.data.pump.defs.PumpType +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.pump.defs.determineCorrectBasalSize +import app.aaps.pump.omnipod.common.bledriver.pod.definition.BasalProgram +import kotlin.math.roundToInt + +/** + * Converts an AAPS basal schedule/profile into the pod's 30-minute-slot [BasalProgram] + * wire format. Duplicated from [app.aaps.pump.omnipod.dash.util.mapProfileToBasalProgram] + * (parametrized on [PumpType] instead of hardcoding [PumpType.OMNIPOD_DASH]) rather than + * shared, because `dash` depends on `common`, not the reverse - this module can't import + * from `dash`. + */ +fun mapProfileToBasalProgram(profile: Profile, pumpType: PumpType): BasalProgram { + val basalValues = profile.getBasalValues() + if (basalValues.isEmpty()) { + throw IllegalArgumentException("Basal values should contain values") + } + + val entries: MutableList = ArrayList() + + var previousBasalValue: Profile.ProfileValue? = null + + for (basalValue in basalValues) { + if (basalValue.timeAsSeconds >= 86_400) { + throw IllegalArgumentException("Basal segment start time can not be greater than 86400") + } + if (basalValue.timeAsSeconds < 0) { + throw IllegalArgumentException("Basal segment start time can not be less than 0") + } + if (basalValue.timeAsSeconds % 1_800 != 0) { + throw IllegalArgumentException("Basal segment time should be dividable by 30 minutes") + } + + val startSlotIndex = (basalValue.timeAsSeconds / 1800).toShort() + + if (previousBasalValue != null) { + entries.add( + BasalProgram.Segment( + (previousBasalValue.timeAsSeconds / 1800).toShort(), + startSlotIndex, + (pumpType.determineCorrectBasalSize(previousBasalValue.value) * 100).roundToInt() + ) + ) + } + + if (entries.isEmpty() && basalValue.timeAsSeconds != 0) { + throw IllegalArgumentException("First basal segment start time should be 0") + } + + if (entries.isNotEmpty() && entries[entries.size - 1].endSlotIndex != startSlotIndex) { + throw IllegalArgumentException("Illegal start time for basal segment: does not match previous previous segment's end time") + } + + previousBasalValue = basalValue + } + + entries.add( + BasalProgram.Segment( + (previousBasalValue!!.timeAsSeconds / 1800).toShort(), + 48, + (pumpType.determineCorrectBasalSize(previousBasalValue.value) * 100).roundToInt() + ) + ) + + return BasalProgram(entries) +} diff --git a/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/O5PumpPluginTest.kt b/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/O5PumpPluginTest.kt new file mode 100644 index 000000000000..4b204854e3fd --- /dev/null +++ b/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/O5PumpPluginTest.kt @@ -0,0 +1,771 @@ +package app.aaps.pump.omnipod.omnipod5 +import app.aaps.pump.omnipod.common.R + +import app.aaps.core.data.pump.defs.ManufacturerType +import app.aaps.core.data.model.BS +import app.aaps.core.data.pump.defs.PumpType +import app.aaps.core.interfaces.protection.ProtectionCheck +import app.aaps.core.interfaces.pump.BlePreCheck +import app.aaps.core.interfaces.pump.BolusProgressData +import app.aaps.core.interfaces.pump.DetailedBolusInfo +import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.notifications.NotificationId +import app.aaps.core.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.queue.CustomCommand +import app.aaps.pump.omnipod.omnipod5.bledriver.comm.O5BleManager +import app.aaps.pump.omnipod.common.bledriver.event.PodEvent +import app.aaps.pump.omnipod.common.bledriver.pod.definition.ActivationProgress +import app.aaps.pump.omnipod.common.bledriver.pod.definition.AlarmType +import app.aaps.pump.omnipod.common.bledriver.pod.definition.AlertType +import app.aaps.pump.omnipod.common.bledriver.pod.definition.DeliveryStatus +import app.aaps.pump.omnipod.common.bledriver.pod.definition.PodStatus +import app.aaps.pump.omnipod.omnipod5.bledriver.pod.state.O5PodStateManager +import app.aaps.pump.omnipod.common.bledriver.pod.command.StopDeliveryCommand +import app.aaps.pump.omnipod.common.queue.command.CommandDeactivatePod +import app.aaps.pump.omnipod.common.queue.command.CommandDeliverBasalCorrection +import app.aaps.pump.omnipod.common.queue.command.CommandDisableSuspendAlerts +import app.aaps.pump.omnipod.common.queue.command.CommandHandleTimeChange +import app.aaps.pump.omnipod.omnipod5.queue.command.CommandPairNewPod +import app.aaps.pump.omnipod.common.queue.command.CommandPlayTestBeep +import app.aaps.pump.omnipod.common.queue.command.CommandResumeDelivery +import app.aaps.pump.omnipod.common.queue.command.CommandSilenceAlerts +import app.aaps.pump.omnipod.common.queue.command.CommandSuspendDelivery +import app.aaps.pump.omnipod.common.queue.command.CommandUpdateAlertConfiguration +import app.aaps.shared.tests.TestBaseWithProfile +import com.google.common.truth.Truth.assertThat +import io.reactivex.rxjava3.core.Observable +import kotlinx.coroutines.runBlocking +import org.junit.jupiter.api.Assertions.assertThrows +import org.junit.jupiter.api.BeforeEach +import org.junit.jupiter.api.Test +import org.mockito.Mock +import org.mockito.kotlin.any +import org.mockito.kotlin.anyOrNull +import org.mockito.kotlin.atLeast +import org.mockito.kotlin.eq +import org.mockito.kotlin.argThat +import org.mockito.kotlin.mock +import org.mockito.kotlin.never +import org.mockito.kotlin.times +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever + +/** + * Covers the safety-relevant gating logic and simple property surface of [O5PumpPlugin] - + * not exhaustive RxJava-flow coverage (no other pump plugin in this codebase unit-tests its + * full blocking-RxJava dosing flow either, see [app.aaps.pump.omnipod.eros + * .OmnipodErosPumpPluginTest] for the closest precedent). Focus: the gates that must reject + * *before* any BLE command is sent (reservoir check, bolus-already-in-progress check, + * no-op temp-basal-cancel), the `isBusy()`/`isConnected()`/`isInitialized()` state + * transitions (the exact thing that caused the queue-deadlock bug during development), and + * `executeCustomCommand` routing. + */ +class O5PumpPluginTest : TestBaseWithProfile() { + + @Mock lateinit var bleManager: O5BleManager + @Mock lateinit var podStateManager: O5PodStateManager + @Mock lateinit var pumpSync: PumpSync + @Mock lateinit var commandQueue: CommandQueue + @Mock lateinit var bolusProgressData: BolusProgressData + @Mock lateinit var protectionCheck: ProtectionCheck + @Mock lateinit var blePreCheck: BlePreCheck + + private lateinit var plugin: O5PumpPlugin + + @BeforeEach + fun setup() { + plugin = O5PumpPlugin( + aapsLogger, rh, preferences, commandQueue, bleManager, podStateManager, pumpSync, + notificationManager, pumpEnactResultProvider, bolusProgressData, protectionCheck, blePreCheck, config + ) + whenever(rh.gs(R.string.omnipod_5_error_not_enough_insulin)).thenReturn("Not enough insulin") + whenever(rh.gs(R.string.omnipod_5_error_bolus_already_in_progress)).thenReturn("Bolus already in progress") + whenever(rh.gs(R.string.omnipod_5_error_extended_bolus_not_supported)).thenReturn("Extended bolus not supported") + whenever(rh.gs(R.string.omnipod_common_error_unsupported_custom_command)).thenReturn("Unsupported custom command: %1\$s") + whenever(rh.gs(R.string.omnipod_5_error_no_active_profile)).thenReturn("No active profile") + whenever(rh.gs(R.string.omnipod_5_error_no_active_alerts)).thenReturn("No active alerts") + whenever(rh.gs(R.string.omnipod_5_error_unresolved_dose_pending)).thenReturn("Earlier dose unconfirmed") + } + + + @Test + fun `isBusy is false when activation has not started - pairing must never be blocked`() { + whenever(podStateManager.activationProgress).thenReturn(ActivationProgress.NOT_STARTED) + + assertThat(plugin.isBusy()).isFalse() + } + + @Test + fun `isBusy is true while activation is in progress`() { + whenever(podStateManager.activationProgress).thenReturn(ActivationProgress.GOT_POD_VERSION) + + assertThat(plugin.isBusy()).isTrue() + } + + @Test + fun `isBusy is false once activation is completed`() { + whenever(podStateManager.activationProgress).thenReturn(ActivationProgress.COMPLETED) + + assertThat(plugin.isBusy()).isFalse() + } + + @Test + fun `isInitialized is true only when activation is fully completed`() { + whenever(podStateManager.activationProgress).thenReturn(ActivationProgress.COMPLETED) + assertThat(plugin.isInitialized()).isTrue() + + whenever(podStateManager.activationProgress).thenReturn(ActivationProgress.PRIME_COMPLETED) + assertThat(plugin.isInitialized()).isFalse() + } + + @Test + fun `isConnected is true when unpaired - nothing to connect to yet`() { + whenever(podStateManager.ltk).thenReturn(null) + + assertThat(plugin.isConnected()).isTrue() + } + + @Test + fun `isConnected reflects bluetoothConnectionState once paired`() { + whenever(podStateManager.ltk).thenReturn(byteArrayOf(1)) + whenever(podStateManager.bluetoothConnectionState).thenReturn(O5PodStateManager.BluetoothConnectionState.CONNECTED) + assertThat(plugin.isConnected()).isTrue() + + whenever(podStateManager.bluetoothConnectionState).thenReturn(O5PodStateManager.BluetoothConnectionState.DISCONNECTED) + assertThat(plugin.isConnected()).isFalse() + } + + + @Test + fun `deliverTreatment rejects carbs`() { + assertThrows(IllegalArgumentException::class.java) { + runBlocking { plugin.deliverTreatment(DetailedBolusInfo().also { it.carbs = 5.0; it.insulin = 1.0 }) } + } + } + + @Test + fun `deliverTreatment rejects non-positive insulin`() { + assertThrows(IllegalArgumentException::class.java) { + runBlocking { plugin.deliverTreatment(DetailedBolusInfo().also { it.carbs = 0.0; it.insulin = 0.0 }) } + } + } + + @Test + fun `deliverTreatment rejects a bolus larger than the reservoir without sending any command`() { + whenever(podStateManager.reservoirPulsesRemaining).thenReturn(20) + whenever(podStateManager.lastStatusResponseReceived).thenReturn(System.currentTimeMillis()) + whenever(podStateManager.lastBolusStartTime).thenReturn(null) + whenever(podStateManager.lastBolusRequestedUnits).thenReturn(null) + whenever(podStateManager.deliveryStatus).thenReturn(DeliveryStatus.BASAL_ACTIVE) + + val result = runBlocking { + plugin.deliverTreatment(DetailedBolusInfo().also { it.carbs = 0.0; it.insulin = 5.0 }) + } + + assertThat(result.success).isFalse() + assertThat(result.enacted).isFalse() + assertThat(result.bolusDelivered).isEqualTo(0.0) + verify(bleManager, never()).sendCommand(any(), any()) + } + + @Test + fun `deliverTreatment rejects when a bolus is already delivering without sending any command`() { + whenever(podStateManager.reservoirPulsesRemaining).thenReturn(2000) + whenever(podStateManager.lastStatusResponseReceived).thenReturn(System.currentTimeMillis()) + whenever(podStateManager.lastBolusStartTime).thenReturn(null) + whenever(podStateManager.lastBolusRequestedUnits).thenReturn(null) + whenever(podStateManager.deliveryStatus).thenReturn(DeliveryStatus.BOLUS_AND_BASAL_ACTIVE) + + val result = runBlocking { + plugin.deliverTreatment(DetailedBolusInfo().also { it.carbs = 0.0; it.insulin = 1.0 }) + } + + assertThat(result.success).isFalse() + assertThat(result.enacted).isFalse() + verify(bleManager, never()).sendCommand(any(), any()) + } + + + @Test + fun `setTempBasalPercent is unsupported`() { + assertThrows(IllegalStateException::class.java) { + runBlocking { plugin.setTempBasalPercent(80, 30, false, PumpSync.TemporaryBasalType.NORMAL) } + } + } + + @Test + fun `cancelTempBasal is a no-op when nothing is running - never touches the pod`() { + whenever(podStateManager.deliveryStatus).thenReturn(DeliveryStatus.BASAL_ACTIVE) + + val result = runBlocking { + whenever(pumpSync.expectedPumpState()).thenReturn( + PumpSync.PumpState(temporaryBasal = null, extendedBolus = null, bolus = null, profile = null, serialNumber = "") + ) + plugin.cancelTempBasal(false) + } + + assertThat(result.success).isTrue() + assertThat(result.enacted).isFalse() + verify(bleManager, never()).sendCommand(any(), any()) + } + + + @Test + fun `executeCustomCommand pairs a new pod for CommandPairNewPod`() { + whenever(bleManager.pairNewPod()).thenReturn(Observable.empty()) + + val result = plugin.executeCustomCommand(CommandPairNewPod()) + + assertThat(result).isNotNull() + assertThat(result!!.success).isTrue() + assertThat(result.enacted).isTrue() + verify(bleManager).pairNewPod() + } + + @Test + fun `executeCustomCommand rejects an unrecognized custom command`() { + val unknown = object : CustomCommand { + override val statusDescription = "UNKNOWN" + } + + val result = plugin.executeCustomCommand(unknown) + + assertThat(result).isNotNull() + assertThat(result!!.success).isFalse() + assertThat(result.enacted).isFalse() + } + + @Test + fun `executeCustomCommand deactivates the pod for CommandDeactivatePod`() { + whenever(podStateManager.podId).thenReturn(12345L) + whenever(bleManager.sendCommand(any(), any())).thenReturn(Observable.empty()) + + val result = plugin.executeCustomCommand(CommandDeactivatePod()) + + assertThat(result!!.success).isTrue() + assertThat(result.enacted).isTrue() + verify(bleManager).sendCommand(any(), any()) + verify(bleManager).removeBond() + verify(podStateManager).reset() + } + + @Test + fun `executeCustomCommand silences alerts for CommandSilenceAlerts when there are active alerts`() { + whenever(podStateManager.podId).thenReturn(12345L) + whenever(podStateManager.activeAlerts).thenReturn(java.util.EnumSet.of(AlertType.LOW_RESERVOIR)) + whenever(bleManager.sendCommand(any(), any())).thenReturn(Observable.empty()) + + val result = plugin.executeCustomCommand(CommandSilenceAlerts()) + + assertThat(result!!.success).isTrue() + assertThat(result.enacted).isTrue() + verify(bleManager).sendCommand(any(), any()) + } + + @Test + fun `executeCustomCommand rejects CommandSilenceAlerts when there are no active alerts`() { + whenever(podStateManager.activeAlerts).thenReturn(null) + + val result = plugin.executeCustomCommand(CommandSilenceAlerts()) + + assertThat(result!!.success).isFalse() + assertThat(result.enacted).isFalse() + verify(bleManager, never()).sendCommand(any(), any()) + } + + @Test + fun `executeCustomCommand suspends delivery for CommandSuspendDelivery`() { + whenever(podStateManager.podId).thenReturn(12345L) + whenever(bleManager.sendCommand(any(), any())).thenReturn(Observable.empty()) + + val result = plugin.executeCustomCommand(CommandSuspendDelivery()) + + assertThat(result!!.success).isTrue() + assertThat(result.enacted).isTrue() + verify(bleManager).sendCommand(any(), any()) + verify(podStateManager).deliverySuspended = true + } + + @Test + fun `executeCustomCommand plays a test beep for CommandPlayTestBeep`() { + whenever(podStateManager.podId).thenReturn(12345L) + whenever(bleManager.sendCommand(any(), any())).thenReturn(Observable.empty()) + + val result = plugin.executeCustomCommand(CommandPlayTestBeep()) + + assertThat(result!!.success).isTrue() + assertThat(result.enacted).isTrue() + verify(bleManager).sendCommand(any(), any()) + } + + @Test + fun `executeCustomCommand for CommandResumeDelivery fails cleanly when there is no active profile`() { + runBlocking { + whenever(pumpSync.expectedPumpState()).thenReturn( + PumpSync.PumpState(temporaryBasal = null, extendedBolus = null, bolus = null, profile = null, serialNumber = "") + ) + + val result = plugin.executeCustomCommand(CommandResumeDelivery()) + + assertThat(result!!.success).isFalse() + assertThat(result.enacted).isFalse() + verify(bleManager, never()).sendCommand(any(), any()) + } + } + + @Test + fun `executeCustomCommand for CommandHandleTimeChange fails cleanly when there is no active profile`() { + runBlocking { + whenever(pumpSync.expectedPumpState()).thenReturn( + PumpSync.PumpState(temporaryBasal = null, extendedBolus = null, bolus = null, profile = null, serialNumber = "") + ) + + val result = plugin.executeCustomCommand(CommandHandleTimeChange(true)) + + assertThat(result!!.success).isFalse() + assertThat(result.enacted).isFalse() + verify(bleManager, never()).sendCommand(any(), any()) + } + } + + + @Test + fun `manufacturer, model, and DST support are fixed`() { + assertThat(plugin.manufacturer()).isEqualTo(ManufacturerType.Insulet) + assertThat(plugin.model()).isEqualTo(PumpType.OMNIPOD_5) + assertThat(plugin.canHandleDST()).isFalse() + assertThat(plugin.isFakingTempsByExtendedBoluses).isFalse() + } + + @Test + fun `serialNumber falls back to a placeholder before pairing`() { + whenever(podStateManager.podId).thenReturn(null) + assertThat(plugin.serialNumber()).isEqualTo("O5-unpaired") + + whenever(podStateManager.podId).thenReturn(4242L) + assertThat(plugin.serialNumber()).isEqualTo("4242") + } + + @Test + fun `extended bolus is unsupported`() { + val deliver = runBlocking { plugin.setExtendedBolus(1.0, 60) } + assertThat(deliver.success).isFalse() + + val cancel = runBlocking { plugin.cancelExtendedBolus() } + assertThat(cancel.success).isFalse() + } + + + @Test + fun `isThisProfileSet is true before pairing - prevents premature basal-set attempts`() { + whenever(podStateManager.ltk).thenReturn(null) + + assertThat(plugin.isThisProfileSet(mock())).isTrue() + } + + @Test + fun `isThisProfileSet is false while delivery is suspended - a set is genuinely needed`() { + whenever(podStateManager.ltk).thenReturn(byteArrayOf(1)) + whenever(podStateManager.deliverySuspended).thenReturn(true) + + assertThat(plugin.isThisProfileSet(mock())).isFalse() + } + + + @Test + fun `executeCustomCommand rejects CommandUpdateAlertConfiguration when settings already match`() { + whenever(podStateManager.activationProgress).thenReturn(ActivationProgress.COMPLETED) + whenever(podStateManager.syncedAlertSettings).thenReturn( + O5PodStateManager.SyncedAlertSettings( + expirationReminderEnabled = false, expirationReminderHours = 0, + expirationAlarmEnabled = false, expirationAlarmHours = 0, + lowReservoirAlertEnabled = false, lowReservoirAlertUnits = 0 + ) + ) + + val result = plugin.executeCustomCommand(CommandUpdateAlertConfiguration()) + + assertThat(result!!.success).isTrue() + assertThat(result.enacted).isFalse() + verify(bleManager, never()).sendCommand(any(), any()) + } + + @Test + fun `executeCustomCommand rejects CommandUpdateAlertConfiguration before activation completes`() { + whenever(podStateManager.activationProgress).thenReturn(ActivationProgress.PRIME_COMPLETED) + + val result = plugin.executeCustomCommand(CommandUpdateAlertConfiguration()) + + assertThat(result!!.success).isTrue() + assertThat(result.enacted).isFalse() + verify(bleManager, never()).sendCommand(any(), any()) + } + + @Test + fun `executeCustomCommand pushes CommandUpdateAlertConfiguration when settings changed and records the sync`() { + whenever(podStateManager.activationProgress).thenReturn(ActivationProgress.COMPLETED) + whenever(podStateManager.syncedAlertSettings).thenReturn(null) + whenever(podStateManager.podId).thenReturn(12345L) + whenever(podStateManager.podLifeInHours).thenReturn(80.toShort()) + whenever(podStateManager.minutesSinceActivation).thenReturn(60.toShort()) + whenever(podStateManager.lastStatusResponseReceived).thenReturn(System.currentTimeMillis()) + whenever(bleManager.sendCommand(any(), any())).thenReturn(Observable.empty()) + + val result = plugin.executeCustomCommand(CommandUpdateAlertConfiguration()) + + assertThat(result!!.success).isTrue() + assertThat(result.enacted).isTrue() + verify(bleManager).sendCommand(any(), any()) + verify(podStateManager).syncedAlertSettings = any() + } + + @Test + fun `executeCustomCommand rejects CommandDisableSuspendAlerts when nothing is armed`() { + whenever(podStateManager.suspendAlertsEnabled).thenReturn(false) + + val result = plugin.executeCustomCommand(CommandDisableSuspendAlerts(rh)) + + assertThat(result!!.success).isTrue() + assertThat(result.enacted).isFalse() + verify(bleManager, never()).sendCommand(any(), any()) + } + + @Test + fun `executeCustomCommand silences the pod for CommandDisableSuspendAlerts when armed`() { + whenever(podStateManager.suspendAlertsEnabled).thenReturn(true) + whenever(podStateManager.podId).thenReturn(12345L) + whenever(bleManager.sendCommand(any(), any())).thenReturn(Observable.empty()) + + val result = plugin.executeCustomCommand(CommandDisableSuspendAlerts(rh)) + + assertThat(result!!.success).isTrue() + assertThat(result.enacted).isTrue() + verify(bleManager).sendCommand(any(), any()) + verify(podStateManager).suspendAlertsEnabled = false + } + + @Test + fun `executeCustomCommand rejects CommandDeliverBasalCorrection when drift compensation is disabled - the default`() { + val result = plugin.executeCustomCommand(CommandDeliverBasalCorrection()) + + assertThat(result!!.success).isTrue() + assertThat(result.enacted).isFalse() + verify(bleManager, never()).sendCommand(any(), any()) + } + + + + @Test + fun `a faulted pod is reported even when the fault code was never read`() { + whenever(podStateManager.alarmSynced).thenReturn(false) + whenever(podStateManager.isPodKaput).thenReturn(true) + whenever(podStateManager.alarmType).thenReturn(null) + whenever(podStateManager.podStatus).thenReturn(PodStatus.ALARM) + whenever(podStateManager.podId).thenReturn(9999L) + whenever(commandQueue.isCustomCommandInQueue(CommandDeactivatePod::class.java)).thenReturn(false) + whenever(bleManager.sendCommand(any(), any())).thenReturn(Observable.error(RuntimeException("pod unreachable"))) + + runBlocking { + plugin.checkPodFault() + + verify(notificationManager).post( + eq(NotificationId.OMNIPOD_POD_FAULT), any(), level = any(), validMinutes = any(), + soundRes = anyOrNull(), actions = any(), validityCheck = anyOrNull() + ) + verify(pumpSync).insertAnnouncement(any(), any(), eq(PumpType.OMNIPOD_5), eq("9999")) + } + verify(podStateManager).alarmSynced = true + } + + @Test + fun `a healthy pod is not reported`() { + whenever(podStateManager.alarmSynced).thenReturn(false) + whenever(podStateManager.isPodKaput).thenReturn(false) + whenever(podStateManager.alarmType).thenReturn(null) + + runBlocking { plugin.checkPodFault() } + + verify(notificationManager, never()).post( + any(), any(), level = any(), validMinutes = any(), + soundRes = anyOrNull(), actions = any(), validityCheck = anyOrNull() + ) + verify(podStateManager, never()).alarmSynced = true + } + + @Test + fun `checkPodFault posts a notification and records an announcement on a new alarm`() { + whenever(podStateManager.alarmSynced).thenReturn(false) + whenever(podStateManager.alarmType).thenReturn(AlarmType.ALARM_OCCLUDED) + whenever(commandQueue.isCustomCommandInQueue(CommandDeactivatePod::class.java)).thenReturn(false) + whenever(podStateManager.podId).thenReturn(9999L) + + runBlocking { + plugin.checkPodFault() + + verify(notificationManager).post( + eq(NotificationId.OMNIPOD_POD_FAULT), any(), level = any(), validMinutes = any(), + soundRes = anyOrNull(), actions = any(), validityCheck = anyOrNull() + ) + verify(pumpSync).insertAnnouncement(any(), any(), eq(PumpType.OMNIPOD_5), eq("9999")) + } + verify(podStateManager).alarmSynced = true + } + + @Test + fun `checkPodFault is a no-op once the current alarm is already synced - not re-posted on every poll`() { + whenever(podStateManager.alarmSynced).thenReturn(true) + + runBlocking { plugin.checkPodFault() } + + verify(notificationManager, never()).post( + any(), any(), level = any(), validMinutes = any(), + soundRes = anyOrNull(), actions = any(), validityCheck = anyOrNull() + ) + } + + @Test + fun `checkPodFault is a no-op when there is no alarm`() { + whenever(podStateManager.alarmSynced).thenReturn(false) + whenever(podStateManager.alarmType).thenReturn(null) + + runBlocking { plugin.checkPodFault() } + + verify(notificationManager, never()).post( + any(), any(), level = any(), validMinutes = any(), + soundRes = anyOrNull(), actions = any(), validityCheck = anyOrNull() + ) + verify(podStateManager, never()).alarmSynced = any() + } + + @Test + fun `checkPodFault skips the notification but still records the announcement when deactivation is already queued`() { + whenever(podStateManager.alarmSynced).thenReturn(false) + whenever(podStateManager.alarmType).thenReturn(AlarmType.ALARM_OCCLUDED) + whenever(commandQueue.isCustomCommandInQueue(CommandDeactivatePod::class.java)).thenReturn(true) + whenever(podStateManager.podId).thenReturn(9999L) + + runBlocking { + plugin.checkPodFault() + + verify(notificationManager, never()).post( + any(), any(), level = any(), validMinutes = any(), + soundRes = anyOrNull(), actions = any(), validityCheck = anyOrNull() + ) + verify(pumpSync).insertAnnouncement(any(), any(), eq(PumpType.OMNIPOD_5), eq("9999")) + } + verify(podStateManager).alarmSynced = true + } + + + private fun pendingBolus(sequenceNumber: Short?) = O5PodStateManager.PendingDoseCommand( + type = O5PodStateManager.PendingDoseType.BOLUS, + requestedUnits = 3.0, + bolusType = BS.Type.NORMAL, + startedAt = 1_000L, + sequenceNumber = sequenceNumber + ) + + @Test + fun `an uncertain bolus the pod never received records no insulin`() { + whenever(podStateManager.pendingDoseCommand).thenReturn(pendingBolus(sequenceNumber = 4)) + whenever(podStateManager.sequenceNumberOfLastProgrammingCommand).thenReturn(9) + whenever(podStateManager.deliveryStatus).thenReturn(DeliveryStatus.BASAL_ACTIVE) + + runBlocking { + plugin.reconcilePendingDose() + + verify(pumpSync, never()).syncBolusWithPumpId( + any(), any(), any(), any(), any(), any() + ) + } + verify(podStateManager).pendingDoseCommand = null + } + + @Test + fun `an uncertain bolus the pod did receive is finalized`() { + whenever(podStateManager.pendingDoseCommand).thenReturn(pendingBolus(sequenceNumber = 9)) + whenever(podStateManager.sequenceNumberOfLastProgrammingCommand).thenReturn(9) + whenever(podStateManager.deliveryStatus).thenReturn(DeliveryStatus.BASAL_ACTIVE) + whenever(podStateManager.bolusPulsesRemaining).thenReturn(0) + whenever(podStateManager.lastBolusDeliveredUnits).thenReturn(null) + whenever(podStateManager.podId).thenReturn(9999L) + + runBlocking { + plugin.reconcilePendingDose() + + verify(pumpSync).syncBolusWithPumpId( + any(), any(), any(), any(), eq(PumpType.OMNIPOD_5), eq("9999") + ) + } + verify(podStateManager).pendingDoseCommand = null + } + + @Test + fun `a still-running bolus is confirmed by delivery status even when the sequence disagrees`() { + whenever(podStateManager.pendingDoseCommand).thenReturn(pendingBolus(sequenceNumber = 4)) + whenever(podStateManager.sequenceNumberOfLastProgrammingCommand).thenReturn(9) + whenever(podStateManager.deliveryStatus).thenReturn(DeliveryStatus.BOLUS_AND_BASAL_ACTIVE) + + runBlocking { plugin.reconcilePendingDose() } + + verify(podStateManager, never()).pendingDoseCommand = null + } + + @Test + fun `sequence numbers are compared as 4 bits so a wrapped counter still matches`() { + whenever(podStateManager.pendingDoseCommand).thenReturn(pendingBolus(sequenceNumber = 0x1F)) + whenever(podStateManager.sequenceNumberOfLastProgrammingCommand).thenReturn(0x0F) + whenever(podStateManager.deliveryStatus).thenReturn(DeliveryStatus.BASAL_ACTIVE) + whenever(podStateManager.bolusPulsesRemaining).thenReturn(0) + whenever(podStateManager.lastBolusDeliveredUnits).thenReturn(null) + whenever(podStateManager.podId).thenReturn(9999L) + + runBlocking { + plugin.reconcilePendingDose() + + verify(pumpSync).syncBolusWithPumpId( + any(), any(), any(), any(), eq(PumpType.OMNIPOD_5), eq("9999") + ) + } + } + + @Test + fun `a pending dose restored without a sequence number falls back to the old resolution`() { + whenever(podStateManager.pendingDoseCommand).thenReturn(pendingBolus(sequenceNumber = null)) + whenever(podStateManager.sequenceNumberOfLastProgrammingCommand).thenReturn(9) + whenever(podStateManager.deliveryStatus).thenReturn(DeliveryStatus.BASAL_ACTIVE) + whenever(podStateManager.bolusPulsesRemaining).thenReturn(0) + whenever(podStateManager.lastBolusDeliveredUnits).thenReturn(null) + whenever(podStateManager.podId).thenReturn(9999L) + + runBlocking { + plugin.reconcilePendingDose() + + verify(pumpSync).syncBolusWithPumpId( + any(), any(), any(), any(), eq(PumpType.OMNIPOD_5), eq("9999") + ) + } + } + + @Test + fun `an uncertain temp basal the pod never received is dropped without activating one`() { + whenever(podStateManager.pendingDoseCommand).thenReturn( + O5PodStateManager.PendingDoseCommand( + type = O5PodStateManager.PendingDoseType.TEMP_BASAL_START, + requestedRate = 0.5, + requestedDurationMinutes = 30, + startedAt = 1_000L, + sequenceNumber = 4 + ) + ) + whenever(podStateManager.sequenceNumberOfLastProgrammingCommand).thenReturn(9) + whenever(podStateManager.deliveryStatus).thenReturn(DeliveryStatus.BASAL_ACTIVE) + + runBlocking { plugin.reconcilePendingDose() } + + verify(podStateManager).pendingDoseCommand = null + } + + @Test + fun `reconcile is a no-op when nothing is pending`() { + whenever(podStateManager.pendingDoseCommand).thenReturn(null) + + runBlocking { plugin.reconcilePendingDose() } + + verify(podStateManager, never()).pendingDoseCommand = anyOrNull() + } + + + @Test + fun `a temp basal is refused while an earlier dose stays unresolved`() { + whenever(podStateManager.ltk).thenReturn(ByteArray(16)) + whenever(podStateManager.podId).thenReturn(12345L) + whenever(podStateManager.pendingDoseCommand).thenReturn(pendingBolus(sequenceNumber = 4)) + whenever(podStateManager.sequenceNumberOfLastProgrammingCommand).thenReturn(9) + whenever(podStateManager.deliveryStatus).thenReturn(DeliveryStatus.BOLUS_AND_BASAL_ACTIVE) + whenever(bleManager.sendCommand(any(), any())).thenReturn(Observable.empty()) + + val result = runBlocking { + plugin.setTempBasalAbsolute(1.0, 30, false, PumpSync.TemporaryBasalType.NORMAL) + } + + assertThat(result.success).isFalse() + assertThat(result.enacted).isFalse() + } + + @Test + fun `a bolus is refused while an earlier dose stays unresolved and no insulin is reported`() { + whenever(podStateManager.ltk).thenReturn(ByteArray(16)) + whenever(podStateManager.podId).thenReturn(12345L) + whenever(podStateManager.pendingDoseCommand).thenReturn(pendingBolus(sequenceNumber = 4)) + whenever(podStateManager.sequenceNumberOfLastProgrammingCommand).thenReturn(9) + whenever(podStateManager.deliveryStatus).thenReturn(DeliveryStatus.BOLUS_AND_BASAL_ACTIVE) + whenever(bleManager.sendCommand(any(), any())).thenReturn(Observable.empty()) + + val result = runBlocking { + plugin.deliverTreatment(DetailedBolusInfo().also { it.insulin = 2.0; it.carbs = 0.0 }) + } + + assertThat(result.success).isFalse() + assertThat(result.enacted).isFalse() + assertThat(result.bolusDelivered).isEqualTo(0.0) + } + + @Test + fun `the guard lets a command through once the status read settles the earlier dose`() { + whenever(podStateManager.ltk).thenReturn(ByteArray(16)) + whenever(podStateManager.podId).thenReturn(12345L) + whenever(podStateManager.pendingDoseCommand) + .thenReturn(pendingBolus(sequenceNumber = 9)) + .thenReturn(null) + whenever(podStateManager.sequenceNumberOfLastProgrammingCommand).thenReturn(9) + whenever(podStateManager.deliveryStatus).thenReturn(DeliveryStatus.BOLUS_AND_BASAL_ACTIVE) + whenever(bleManager.connect()).thenReturn(Observable.empty()) + whenever(bleManager.sendCommand(any(), any())).thenReturn(Observable.empty()) + + runBlocking { plugin.setTempBasalAbsolute(1.0, 30, false, PumpSync.TemporaryBasalType.NORMAL) } + + verify(bleManager, atLeast(2)).sendCommand(any(), any()) + } + + @Test + fun `nothing pending means no extra status read before a dose`() { + whenever(podStateManager.ltk).thenReturn(ByteArray(16)) + whenever(podStateManager.podId).thenReturn(12345L) + whenever(podStateManager.pendingDoseCommand).thenReturn(null) + whenever(podStateManager.deliveryStatus).thenReturn(DeliveryStatus.BASAL_ACTIVE) + whenever(bleManager.sendCommand(any(), any())).thenReturn(Observable.empty()) + + runBlocking { plugin.setTempBasalAbsolute(1.0, 30, false, PumpSync.TemporaryBasalType.NORMAL) } + + verify(bleManager, times(1)).sendCommand(any(), any()) + } + + @Test + fun `a canceled bolus reconnects and re-sends the stop command when the link dropped mid-delivery`() { + whenever(podStateManager.pendingDoseCommand).thenReturn(null) + whenever(podStateManager.reservoirPulsesRemaining).thenReturn(2000) + whenever(podStateManager.lastStatusResponseReceived).thenReturn(System.currentTimeMillis()) + whenever(podStateManager.lastBolusStartTime).thenReturn(null) + whenever(podStateManager.lastBolusRequestedUnits).thenReturn(null) + whenever(podStateManager.podId).thenReturn(12345L) + // Not bolus-active: lets the initial gate pass and the retry loop settle after one cancel. + whenever(podStateManager.deliveryStatus).thenReturn(DeliveryStatus.BASAL_ACTIVE) + // Reconnect is a no-op success - simulates the link being brought back up before the stop. + whenever(bleManager.connect()).thenReturn(Observable.empty()) + // The user presses cancel while the bolus program command is in flight. + whenever(bleManager.sendCommand(any(), any())).thenAnswer { + plugin.stopBolusDelivering() + Observable.empty() + } + + val result = runBlocking { + plugin.deliverTreatment(DetailedBolusInfo().also { it.carbs = 0.0; it.insulin = 0.5 }) + } + + assertThat(result.success).isTrue() + // The stop must reach the pod, and only after a (re)connect. + verify(bleManager).connect() + verify(bleManager).sendCommand(argThat { this is StopDeliveryCommand }, any()) + } +} diff --git a/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/O5BleManagerImplTest.kt b/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/O5BleManagerImplTest.kt new file mode 100644 index 000000000000..0885b7c33b96 --- /dev/null +++ b/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/O5BleManagerImplTest.kt @@ -0,0 +1,141 @@ +package app.aaps.pump.omnipod.omnipod5.bledriver.comm + +import android.content.Context +import app.aaps.core.interfaces.configuration.Config +import app.aaps.pump.omnipod.common.bledriver.comm.exceptions.FailedToConnectException +import app.aaps.pump.omnipod.common.bledriver.comm.exceptions.PairingException +import app.aaps.pump.omnipod.common.bledriver.comm.interfaces.device.BleDeviceManager +import app.aaps.pump.omnipod.omnipod5.bledriver.comm.legacy.O5BleConnectionFactory +import app.aaps.pump.omnipod.omnipod5.bledriver.comm.pair.O5RegistrationData +import app.aaps.pump.omnipod.common.bledriver.comm.session.NotConnected +import app.aaps.pump.omnipod.common.bledriver.event.PodEvent +import app.aaps.pump.omnipod.common.bledriver.pod.command.base.Command +import app.aaps.pump.omnipod.common.bledriver.pod.response.DefaultStatusResponse +import app.aaps.pump.omnipod.omnipod5.bledriver.pod.security.SecureO5RegistrationStorage +import app.aaps.pump.omnipod.omnipod5.bledriver.pod.state.O5PodStateManager +import app.aaps.pump.omnipod.omnipod5.bledriver.pod.util.P256KeyGenerator +import app.aaps.shared.tests.AAPSLoggerTest +import com.google.common.truth.Truth.assertThat +import org.junit.jupiter.api.AfterEach +import org.junit.jupiter.api.BeforeEach +import org.junit.jupiter.api.Test +import org.mockito.kotlin.mock +import org.mockito.kotlin.never +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever + +/** + * [O5BleManagerImpl] - covers the guard/validation paths reachable without a live BLE + * connection (missing pairing state, no connection established yet, the "already paired" + * short-circuit). Deep BLE session establishment ([O5BleManagerImpl.establishSession] and + * everything downstream of a real [app.aaps.pump.omnipod.common.bledriver.comm.interfaces + * .session.BleConnection]) is out of scope for this pass - it would need mocking the whole + * connection/session stack, not just this class's direct dependencies. + */ +class O5BleManagerImplTest { + + private val aapsLogger = AAPSLoggerTest() + private val podState = mock() + private val config = mock() + private val context = mock() + private val bleConnectionFactory = mock() + private val bleDeviceManager = mock() + private val secureO5RegistrationStorage = mock() + private val p256KeyGenerator = P256KeyGenerator() + + private fun newManager() = O5BleManagerImpl( + aapsLogger, podState, config, context, bleConnectionFactory, + bleDeviceManager, secureO5RegistrationStorage, p256KeyGenerator + ) + + @BeforeEach + fun clearRegistrationData() { + O5RegistrationData.allValues.forEach { O5RegistrationData.remove(it.controllerId) } + } + + @AfterEach + fun tearDown() { + O5RegistrationData.allValues.forEach { O5RegistrationData.remove(it.controllerId) } + } + + @Test + fun `getStatus returns NotConnected before any connection has been established`() { + val manager = newManager() + + assertThat(manager.getStatus()).isEqualTo(NotConnected) + } + + @Test + fun `constructor loads previously-imported credentials via SecureO5RegistrationStorage`() { + newManager() + + verify(secureO5RegistrationStorage).loadAndInstallAll() + } + + @Test + fun `sendCommand fails with FailedToConnectException when there is no established connection`() { + val manager = newManager() + + val observer = manager.sendCommand(mock(), DefaultStatusResponse::class).test() + + observer.assertError(FailedToConnectException::class.java) + } + + @Test + fun `connect fails with FailedToConnectException when the pod has no known bluetoothAddress`() { + whenever(podState.bluetoothAddress).thenReturn(null) + val manager = newManager() + + val observer = manager.connect(timeoutMs = 1000).test() + + observer.assertError(FailedToConnectException::class.java) + } + + @Test + fun `pairNewPod short-circuits with AlreadyPaired when an LTK is already present`() { + whenever(podState.ltk).thenReturn(byteArrayOf(1, 2, 3)) + val manager = newManager() + + val observer = manager.pairNewPod().test() + + observer.assertComplete() + observer.assertValue(PodEvent.AlreadyPaired) + } + + @Test + fun `pairNewPod fails with PairingException when no O5 registration data is installed`() { + whenever(podState.ltk).thenReturn(null) + val manager = newManager() + + val observer = manager.pairNewPod().test() + + observer.assertError(PairingException::class.java) + } + + @Test + fun `removeBond does nothing and does not call the device manager when bluetoothAddress is unknown`() { + whenever(podState.bluetoothAddress).thenReturn(null) + val manager = newManager() + + manager.removeBond() + + verify(bleDeviceManager, never()).removeBond(org.mockito.kotlin.any()) + } + + @Test + fun `removeBond delegates to the device manager with the pod's bluetoothAddress`() { + whenever(podState.bluetoothAddress).thenReturn("AA:BB:CC:DD:EE:FF") + val manager = newManager() + + manager.removeBond() + + verify(bleDeviceManager).removeBond("AA:BB:CC:DD:EE:FF") + } + + @Test + fun `disconnect does not throw when there is no active connection`() { + val manager = newManager() + + manager.disconnect(closeGatt = false) + } +} diff --git a/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/O5IdRotationTest.kt b/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/O5IdRotationTest.kt new file mode 100644 index 000000000000..12673d197728 --- /dev/null +++ b/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/O5IdRotationTest.kt @@ -0,0 +1,57 @@ +package app.aaps.pump.omnipod.omnipod5.bledriver.comm + +import com.google.common.truth.Truth.assertThat +import org.junit.jupiter.api.Test + +/** + * [O5IdRotation] - pure podId rotation logic used to retry O5 pairing with the next of 3 + * predicted podIds after a failed attempt. + */ +class O5IdRotationTest { + + @Test + fun `controllerIdForPodId clears the low 2 bits`() { + assertThat(O5IdRotation.controllerIdForPodId(0b1100L)).isEqualTo(0b1100L) + assertThat(O5IdRotation.controllerIdForPodId(0b1101L)).isEqualTo(0b1100L) + assertThat(O5IdRotation.controllerIdForPodId(0b1110L)).isEqualTo(0b1100L) + assertThat(O5IdRotation.controllerIdForPodId(0b1111L)).isEqualTo(0b1100L) + } + + @Test + fun `nextPodId advances through the 3-way rotation`() { + val base = 0b1000L + + assertThat(O5IdRotation.nextPodId(base + 1)).isEqualTo(base + 2) + assertThat(O5IdRotation.nextPodId(base + 2)).isEqualTo(base + 3) + } + + @Test + fun `nextPodId wraps back to base plus 1 after the third attempt`() { + val base = 0b10000L + + assertThat(O5IdRotation.nextPodId(base + 3)).isEqualTo(base + 1) + } + + @Test + fun `nextPodId preserves the controllerId bits across a wrap`() { + val base = 0xAABBCC00L + + val wrapped = O5IdRotation.nextPodId(base + 3) + + assertThat(O5IdRotation.controllerIdForPodId(wrapped)).isEqualTo(base) + } + + @Test + fun `full rotation cycle visits exactly base+1, base+2, base+3, then repeats`() { + val base = 0b100L + var podId = base + 1 + + val visited = mutableListOf(podId) + repeat(3) { + podId = O5IdRotation.nextPodId(podId) + visited.add(podId) + } + + assertThat(visited).containsExactly(base + 1, base + 2, base + 3, base + 1).inOrder() + } +} diff --git a/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/O5PairingCoordinatorTest.kt b/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/O5PairingCoordinatorTest.kt new file mode 100644 index 000000000000..7ddab4a9fea9 --- /dev/null +++ b/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/O5PairingCoordinatorTest.kt @@ -0,0 +1,70 @@ +package app.aaps.pump.omnipod.omnipod5.bledriver.comm + +import android.bluetooth.BluetoothAdapter +import android.bluetooth.BluetoothManager +import android.content.Context +import app.aaps.core.interfaces.configuration.Config +import app.aaps.pump.omnipod.common.bledriver.comm.exceptions.ConnectException +import app.aaps.pump.omnipod.common.bledriver.comm.exceptions.PairingException +import app.aaps.pump.omnipod.omnipod5.bledriver.comm.legacy.O5BleConnectionFactory +import app.aaps.pump.omnipod.omnipod5.bledriver.comm.pair.O5RegistrationData +import app.aaps.pump.omnipod.omnipod5.bledriver.pod.state.O5PodStateManager +import app.aaps.pump.omnipod.omnipod5.bledriver.pod.util.P256KeyGenerator +import app.aaps.shared.tests.AAPSLoggerTest +import org.junit.jupiter.api.AfterEach +import org.junit.jupiter.api.Assertions.assertThrows +import org.junit.jupiter.api.BeforeEach +import org.junit.jupiter.api.Test +import org.mockito.kotlin.mock +import org.mockito.kotlin.whenever + +/** + * [O5PairingCoordinator] - covers the two guard checks that run before any real BLE + * scanning/connection attempt. The rest of [O5PairingCoordinator.pairNewPod] (scan, connect, + * negotiate LTK, establish session) needs a live or deeply-mocked BLE stack and is out of + * scope for this pass - same boundary as [O5BleManagerImplTest]. + */ +class O5PairingCoordinatorTest { + + private val aapsLogger = AAPSLoggerTest() + private val config = mock() + private val context = mock() + private val podState = mock() + private val bleConnectionFactory = mock() + private val p256KeyGenerator = P256KeyGenerator() + + private fun newCoordinator() = O5PairingCoordinator( + aapsLogger, config, context, podState, bleConnectionFactory, p256KeyGenerator + ) + + @BeforeEach + fun clearRegistrationData() { + O5RegistrationData.allValues.forEach { O5RegistrationData.remove(it.controllerId) } + } + + @AfterEach + fun tearDown() { + O5RegistrationData.allValues.forEach { O5RegistrationData.remove(it.controllerId) } + } + + @Test + fun `pairNewPod throws ConnectException when Bluetooth is unavailable`() { + whenever(context.getSystemService(Context.BLUETOOTH_SERVICE)).thenReturn(null) + + assertThrows(ConnectException::class.java) { + newCoordinator().pairNewPod() + } + } + + @Test + fun `pairNewPod throws PairingException when no O5 registration data is installed`() { + val bluetoothManager = mock() + val bluetoothAdapter = mock() + whenever(context.getSystemService(Context.BLUETOOTH_SERVICE)).thenReturn(bluetoothManager) + whenever(bluetoothManager.adapter).thenReturn(bluetoothAdapter) + + assertThrows(PairingException::class.java) { + newCoordinator().pairNewPod() + } + } +} diff --git a/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/legacy/session/O5ConnectionTest.kt b/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/legacy/session/O5ConnectionTest.kt new file mode 100644 index 000000000000..7e64c69de25d --- /dev/null +++ b/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/legacy/session/O5ConnectionTest.kt @@ -0,0 +1,219 @@ +package app.aaps.pump.omnipod.omnipod5.bledriver.comm.legacy.session + +import android.bluetooth.BluetoothDevice +import android.bluetooth.BluetoothGatt +import android.bluetooth.BluetoothGattCharacteristic +import android.bluetooth.BluetoothGattDescriptor +import android.bluetooth.BluetoothGattService +import android.bluetooth.BluetoothManager +import android.bluetooth.BluetoothProfile +import android.content.Context +import app.aaps.core.interfaces.configuration.Config +import app.aaps.pump.omnipod.common.bledriver.comm.Id +import app.aaps.pump.omnipod.common.bledriver.comm.Ids +import app.aaps.pump.omnipod.common.bledriver.comm.exceptions.ConnectException +import app.aaps.pump.omnipod.common.bledriver.comm.exceptions.FailedToConnectException +import app.aaps.pump.omnipod.common.bledriver.comm.interfaces.io.CharacteristicType +import app.aaps.pump.omnipod.common.bledriver.comm.legacy.callbacks.BleCommCallbacks +import app.aaps.pump.omnipod.common.bledriver.comm.session.Connected +import app.aaps.pump.omnipod.common.bledriver.comm.session.ConnectionWaitCondition +import app.aaps.pump.omnipod.common.bledriver.comm.session.NotConnected +import app.aaps.pump.omnipod.omnipod5.bledriver.pod.state.O5PodStateManager +import app.aaps.pump.omnipod.omnipod5.bledriver.pod.util.P256KeyGenerator +import app.aaps.shared.tests.AAPSLoggerTest +import com.google.common.truth.Truth.assertThat +import org.junit.jupiter.api.Assertions.assertThrows +import org.junit.jupiter.api.Test +import org.mockito.kotlin.any +import org.mockito.kotlin.eq +import org.mockito.kotlin.mock +import org.mockito.kotlin.never +import org.mockito.kotlin.times +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever + +/** + * [O5Connection]'s GATT lifecycle. Unlike [app.aaps.pump.omnipod.common.bledriver.comm + * .O5PairingCoordinatorTest], which stopped at the two guard checks before any BLE work, + * this suite drives the real [connect] path through GATT connect, service discovery and + * the hello() handshake by mocking the Android BLE framework classes directly + * (already-proven-safe technique this session: Mockito's inline mock maker mocks these + * final/framework classes fine). It stops short of `readyToRead()` - see the comment above + * the happy-path test for why that step is a genuine environment boundary, not a gap in + * this suite's mocking. + * + * The key simplification: [BleCommCallbacks]'s blocking waits ([BleCommCallbacks + * .waitForConnection]/[waitForServiceDiscovery]/[confirmWrite]) are backed by a + * [java.util.concurrent.CountDownLatch]/[java.util.concurrent.BlockingQueue] that don't + * care *which thread* counts them down - so the real [BleCommCallbacks] instance + * [O5Connection] constructs internally (captured here via the [BluetoothDevice.connectGatt] + * argument) can have its callback methods invoked *synchronously inside* the `thenAnswer` + * for the GATT call that would normally trigger them (`connectGatt`, `discoverServices`, + * `writeCharacteristic`), so every blocking wait finds its latch/queue already satisfied + * and returns immediately - no real waiting, no background thread, no flaky timing. + */ +class O5ConnectionTest { + + private val aapsLogger = AAPSLoggerTest() + private val config = mock() + private val context = mock() + private val podState = mock() + private val podDevice = mock() + private val bluetoothManager = mock() + private val p256KeyGenerator = mock() + + private fun newConnection(bluetoothServiceAvailable: Boolean = true): O5Connection { + whenever(context.getSystemService(Context.BLUETOOTH_SERVICE)) + .thenReturn(if (bluetoothServiceAvailable) bluetoothManager else null) + return O5Connection(podDevice, aapsLogger, config, context, podState, p256KeyGenerator) + } + + + @Test fun `connectionState reports Connected when the GATT profile is connected`() { + whenever(bluetoothManager.getConnectionState(podDevice, BluetoothProfile.GATT)) + .thenReturn(BluetoothProfile.STATE_CONNECTED) + + assertThat(newConnection().connectionState()).isInstanceOf(Connected::class.java) + } + + @Test fun `connectionState reports NotConnected when the GATT profile is not connected`() { + whenever(bluetoothManager.getConnectionState(podDevice, BluetoothProfile.GATT)) + .thenReturn(BluetoothProfile.STATE_DISCONNECTED) + + assertThat(newConnection().connectionState()).isInstanceOf(NotConnected::class.java) + } + + @Test fun `connectionState reports NotConnected when the BluetoothManager system service is unavailable`() { + assertThat(newConnection(bluetoothServiceAvailable = false).connectionState()) + .isInstanceOf(NotConnected::class.java) + } + + + @Test fun `establishSession throws ConnectException when there is no active BLE connection`() { + val ids = Ids.forController(Id.fromInt(1), Id.fromInt(2)) + + assertThrows(ConnectException::class.java) { + newConnection().establishSession(ByteArray(16), 0, ids, ByteArray(6)) + } + } + + + @Test fun `disconnect is a no-op when there is no GATT connection yet`() { + newConnection().disconnect(closeGatt = true) + newConnection().disconnect(closeGatt = false) + } + + @Test fun `disconnect(closeGatt=false) disconnects the GATT object but keeps it for reuse`() { + val gatt = mock() + val connection = connectionWithGattConnectionEstablished(gatt) + + connection.disconnect(closeGatt = false) + + verify(gatt).disconnect() + verify(gatt, never()).close() + } + + @Test fun `disconnect(closeGatt=true) closes and clears the GATT object and resets the session`() { + val gatt = mock() + val connection = connectionWithGattConnectionEstablished(gatt) + + connection.disconnect(closeGatt = true) + + verify(gatt).close() + connection.disconnect(closeGatt = true) + verify(gatt, times(1)).close() + } + + /** Drives [O5Connection.connect] just far enough to populate its internal + * `gattConnection` (set immediately after a successful [BluetoothDevice.connectGatt]) + * then lets it fail at the connection-wait step, so [O5Connection.disconnect] has a + * real (mocked) GATT object to act on without needing the full handshake below. */ + private fun connectionWithGattConnectionEstablished(gatt: BluetoothGatt): O5Connection { + whenever( + podDevice.connectGatt(eq(context), eq(false), any(), eq(BluetoothDevice.TRANSPORT_LE)) + ).thenReturn(gatt) + whenever(bluetoothManager.getConnectionState(podDevice, BluetoothProfile.GATT)) + .thenReturn(BluetoothProfile.STATE_DISCONNECTED) + val connection = newConnection() + assertThrows(FailedToConnectException::class.java) { + connection.connect(ConnectionWaitCondition(timeoutMs = 10L)) + } + return connection + } + + + @Test fun `connect throws FailedToConnectException when the connection wait times out`() { + val gatt = mock() + whenever( + podDevice.connectGatt(eq(context), eq(false), any(), eq(BluetoothDevice.TRANSPORT_LE)) + ).thenReturn(gatt) + whenever(bluetoothManager.getConnectionState(podDevice, BluetoothProfile.GATT)) + .thenReturn(BluetoothProfile.STATE_DISCONNECTED) + + assertThrows(FailedToConnectException::class.java) { + newConnection().connect(ConnectionWaitCondition(timeoutMs = 10L)) + } + } + + + @Test fun `connect completes GATT connection, service discovery and hello() before hitting the readyToRead() environment boundary`() { + val gatt = mock() + val service = mock() + val cmdChar = mock() + val dataChar = mock() + val cmdDescriptor = mock() + val dataDescriptor = mock() + var bleCommCallbacks: BleCommCallbacks? = null + + whenever(bluetoothManager.getConnectionState(podDevice, BluetoothProfile.GATT)) + .thenReturn(BluetoothProfile.STATE_CONNECTED) + + whenever( + podDevice.connectGatt(eq(context), eq(false), any(), eq(BluetoothDevice.TRANSPORT_LE)) + ).thenAnswer { invocation -> + val callbacks = invocation.getArgument(2) + bleCommCallbacks = callbacks + callbacks.onConnectionStateChange(gatt, BluetoothGatt.GATT_SUCCESS, BluetoothProfile.STATE_CONNECTED) + gatt + } + + + whenever(gatt.discoverServices()).thenAnswer { + bleCommCallbacks!!.onServicesDiscovered(gatt, BluetoothGatt.GATT_SUCCESS) + true + } + whenever(gatt.getService(any())).thenReturn(service) + whenever(service.getCharacteristic(CharacteristicType.CMD.uuid)).thenReturn(cmdChar) + whenever(service.getCharacteristic(CharacteristicType.DATA_O5.uuid)).thenReturn(dataChar) + + var cmdCharValue: ByteArray? = null + whenever(cmdChar.uuid).thenReturn(CharacteristicType.CMD.uuid) + whenever(cmdChar.setValue(any())).thenAnswer { invocation -> + cmdCharValue = invocation.getArgument(0) + true + } + whenever(cmdChar.value).thenAnswer { cmdCharValue } + whenever(cmdChar.descriptors).thenReturn(listOf(cmdDescriptor)) + whenever(gatt.writeCharacteristic(cmdChar)).thenAnswer { + bleCommCallbacks!!.onCharacteristicWrite(gatt, cmdChar, BluetoothGatt.GATT_SUCCESS) + true + } + + whenever(gatt.setCharacteristicNotification(any(), any())).thenReturn(true) + whenever(cmdChar.properties).thenReturn(BluetoothGattCharacteristic.PROPERTY_INDICATE) + whenever(dataChar.descriptors).thenReturn(listOf(dataDescriptor)) + whenever(dataChar.properties).thenReturn(BluetoothGattCharacteristic.PROPERTY_INDICATE) + whenever(gatt.writeDescriptor(any())).thenReturn(true) + + val connection = newConnection() + assertThrows(NullPointerException::class.java) { + connection.connect(ConnectionWaitCondition(timeoutMs = 50L)) + } + + verify(gatt).discoverServices() + verify(gatt).writeCharacteristic(cmdChar) + assertThat(cmdCharValue).isNotNull() + assertThat(cmdCharValue).isNotEmpty() + assertThat(connection.msgIO).isNotNull() + } +} diff --git a/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/pair/O5CertificateStoreTest.kt b/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/pair/O5CertificateStoreTest.kt new file mode 100644 index 000000000000..c29eea9bcdd4 --- /dev/null +++ b/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/pair/O5CertificateStoreTest.kt @@ -0,0 +1,250 @@ +package app.aaps.pump.omnipod.omnipod5.bledriver.comm.pair + +import app.aaps.pump.omnipod.common.bledriver.comm.exceptions.PairingException +import app.aaps.pump.omnipod.omnipod5.bledriver.pod.util.P256KeyGenerator +import app.aaps.shared.tests.AAPSLoggerTest +import com.google.common.truth.Truth.assertThat +import org.junit.jupiter.api.AfterEach +import org.junit.jupiter.api.Assertions.assertThrows +import org.junit.jupiter.api.Test +import java.math.BigInteger +import java.security.KeyPairGenerator +import java.security.Signature +import java.security.spec.ECGenParameterSpec +import java.util.Base64 + +/** + * [O5CertificateStore] - pure crypto/DER logic, no BLE involved, so tested directly against + * real P-256 key material rather than mocks. [O5RegistrationData] is a process-wide registry + * keyed by controllerId, so every test uses its own controllerId and cleans up afterward to + * avoid cross-test pollution. + */ +class O5CertificateStoreTest { + + private val aapsLogger = AAPSLoggerTest() + private val keyGenerator = P256KeyGenerator() + private val usedControllerIds = mutableListOf() + + @AfterEach + fun tearDown() { + usedControllerIds.forEach { O5RegistrationData.remove(it) } + usedControllerIds.clear() + } + + private fun installValidRegistration(controllerId: Long): O5RegistrationData { + usedControllerIds.add(controllerId) + val privateKey = keyGenerator.generatePrivateKey() + val publicKey = keyGenerator.publicFromPrivate(privateKey) + val data = O5RegistrationData( + controllerId = controllerId, + privateKeyHex = privateKey.toHex(), + publicKeyHex = publicKey.toHex(), + intermediateCABase64 = "", + tlsCertificateBase64 = "" + ) + O5RegistrationData.install(data) + return data + } + + private fun ByteArray.toHex(): String = joinToString("") { "%02x".format(it) } + + @Test + fun `constructor throws when no registration data is installed`() { + assertThrows(PairingException::class.java) { + O5CertificateStore(aapsLogger, keyGenerator, 0x11223344L) + } + } + + @Test + fun `constructor succeeds and exposes registration fields when a matching keypair is installed`() { + val controllerId = 0xAABBCCDDL + val data = installValidRegistration(controllerId) + + val store = O5CertificateStore(aapsLogger, keyGenerator, controllerId) + + assertThat(store.controllerId).isEqualTo(controllerId) + assertThat(store.signingPublicKeyRaw).isEqualTo(data.publicKey) + } + + @Test + fun `controllerIdData is the big-endian 4-byte representation`() { + val controllerId = 0x01020304L + installValidRegistration(controllerId) + + val store = O5CertificateStore(aapsLogger, keyGenerator, controllerId) + + assertThat(store.controllerIdData).isEqualTo(byteArrayOf(0x01, 0x02, 0x03, 0x04)) + } + + @Test + fun `constructor throws when the stored public key does not match the private key`() { + val controllerId = 0x99887766L + usedControllerIds.add(controllerId) + val privateKey = keyGenerator.generatePrivateKey() + val unrelatedPublicKey = keyGenerator.publicFromPrivate(keyGenerator.generatePrivateKey()) + O5RegistrationData.install( + O5RegistrationData( + controllerId = controllerId, + privateKeyHex = privateKey.toHex(), + publicKeyHex = unrelatedPublicKey.toHex(), + intermediateCABase64 = "", + tlsCertificateBase64 = "" + ) + ) + + assertThrows(PairingException::class.java) { + O5CertificateStore(aapsLogger, keyGenerator, controllerId) + } + } + + @Test + fun `signRaw produces a signature verifySignature accepts against the matching public key`() { + val controllerId = 0x12345678L + val data = installValidRegistration(controllerId) + val store = O5CertificateStore(aapsLogger, keyGenerator, controllerId) + val message = "the quick brown fox".toByteArray() + + val signature = store.signRaw(message) + + assertThat(signature).hasLength(64) + assertThat(O5CertificateStore.verifySignature(signature, message, data.publicKey)).isTrue() + } + + @Test + fun `verifySignature rejects a signature checked against the wrong public key`() { + val controllerId = 0x22334455L + installValidRegistration(controllerId) + val store = O5CertificateStore(aapsLogger, keyGenerator, controllerId) + val message = "the quick brown fox".toByteArray() + val signature = store.signRaw(message) + val wrongPublicKey = keyGenerator.publicFromPrivate(keyGenerator.generatePrivateKey()) + + assertThat(O5CertificateStore.verifySignature(signature, message, wrongPublicKey)).isFalse() + } + + @Test + fun `verifySignature rejects a signature over different data`() { + val controllerId = 0x33445566L + val data = installValidRegistration(controllerId) + val store = O5CertificateStore(aapsLogger, keyGenerator, controllerId) + val signature = store.signRaw("original message".toByteArray()) + + assertThat(O5CertificateStore.verifySignature(signature, "tampered message".toByteArray(), data.publicKey)).isFalse() + } + + @Test + fun `derSignatureToRaw and rawSignatureToDer round-trip a real ECDSA signature`() { + val keyPairGenerator = KeyPairGenerator.getInstance("EC") + keyPairGenerator.initialize(ECGenParameterSpec("secp256r1")) + val keyPair = keyPairGenerator.generateKeyPair() + val message = "round trip me".toByteArray() + + val signature = Signature.getInstance("SHA256withECDSA") + signature.initSign(keyPair.private) + signature.update(message) + val der = signature.sign() + + val raw = O5CertificateStore.derSignatureToRaw(der) + assertThat(raw).hasLength(64) + + val reDer = O5CertificateStore.rawSignatureToDer(raw) + + val verify = Signature.getInstance("SHA256withECDSA") + verify.initVerify(keyPair.public) + verify.update(message) + assertThat(verify.verify(reDer)).isTrue() + } + + @Test + fun `verifySignature accepts a raw 64-byte signature directly, not just DER`() { + val controllerId = 0x44556677L + val data = installValidRegistration(controllerId) + val store = O5CertificateStore(aapsLogger, keyGenerator, controllerId) + val message = "raw format check".toByteArray() + + val rawSignature = store.signRaw(message) + + assertThat(rawSignature).hasLength(64) + assertThat(O5CertificateStore.verifySignature(rawSignature, message, data.publicKey)).isTrue() + } + + @Test + fun `verifySignature returns false for a garbage public key rather than throwing`() { + val garbagePublicKey = ByteArray(64) { 0x42 } + val garbageSignature = ByteArray(64) { 0x01 } + + assertThat(O5CertificateStore.verifySignature(garbageSignature, "data".toByteArray(), garbagePublicKey)).isFalse() + } + + + private val p256SpkiHeader = byteArrayOf( + 0x30, 0x59.toByte(), + 0x30, 0x13, + 0x06, 0x07, 0x2a, 0x86.toByte(), 0x48, 0xce.toByte(), 0x3d, 0x02, 0x01, + 0x06, 0x08, 0x2a, 0x86.toByte(), 0x48, 0xce.toByte(), 0x3d, 0x03, 0x01, 0x07, + 0x03, 0x42, + 0x00, + 0x04 + ) + + @Test + fun `extractP256PublicKey finds the 64-byte key following the SPKI header`() { + val expectedKey = ByteArray(64) { (it + 1).toByte() } + val certDER = byteArrayOf(0x11, 0x22, 0x33) + p256SpkiHeader + expectedKey + byteArrayOf(0x44, 0x55) + + val extracted = O5CertificateStore.extractP256PublicKey(certDER) + + assertThat(extracted).isEqualTo(expectedKey) + } + + @Test + fun `extractP256PublicKey returns null when the SPKI header is absent`() { + val certDER = ByteArray(100) { it.toByte() } + + assertThat(O5CertificateStore.extractP256PublicKey(certDER)).isNull() + } + + @Test + fun `extractP256PublicKey returns null when there is not enough trailing data for a full key`() { + val certDER = p256SpkiHeader + ByteArray(10) + + assertThat(O5CertificateStore.extractP256PublicKey(certDER)).isNull() + } + + @Test + fun `extractP256PublicKey base64 overload decodes then extracts`() { + val expectedKey = ByteArray(64) { (it * 3).toByte() } + val certDER = p256SpkiHeader + expectedKey + val certDERBase64 = Base64.getEncoder().encodeToString(certDER) + + assertThat(O5CertificateStore.extractP256PublicKey(certDERBase64)).isEqualTo(expectedKey) + } + + @Test + fun `extractP256PublicKey base64 overload returns null for invalid base64`() { + assertThat(O5CertificateStore.extractP256PublicKey("not valid base64!!")).isNull() + } + + + @Test + fun `extractSerialNumber handles the v3 explicit-version-tag pattern`() { + val serial = byteArrayOf(0x01, 0x02, 0x03) + val v3Pattern = byteArrayOf(0xa0.toByte(), 0x03, 0x02, 0x01, 0x02, 0x02) + val certDER = byteArrayOf(0x30, 0x10) + v3Pattern + byteArrayOf(serial.size.toByte()) + serial + byteArrayOf(0x00, 0x00) + + assertThat(O5CertificateStore.extractSerialNumber(certDER)).isEqualTo(serial) + } + + @Test + fun `extractSerialNumber falls back to v1 parsing when there is no version tag`() { + val serial = byteArrayOf(0x0A, 0x0B) + val certDER = byteArrayOf(0x30, 0x06, 0x30, 0x04, 0x02, 0x02) + serial + + assertThat(O5CertificateStore.extractSerialNumber(certDER)).isEqualTo(serial) + } + + @Test + fun `extractSerialNumber returns null for malformed input`() { + assertThat(O5CertificateStore.extractSerialNumber(byteArrayOf(0x01, 0x02))).isNull() + } +} diff --git a/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/pair/O5KeyExchangeTest.kt b/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/pair/O5KeyExchangeTest.kt new file mode 100644 index 000000000000..99fc850378ae --- /dev/null +++ b/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/pair/O5KeyExchangeTest.kt @@ -0,0 +1,170 @@ +package app.aaps.pump.omnipod.omnipod5.bledriver.comm.pair + +import app.aaps.pump.omnipod.common.bledriver.comm.exceptions.MessageIOException +import app.aaps.pump.omnipod.common.bledriver.comm.exceptions.PairingException +import app.aaps.pump.omnipod.omnipod5.bledriver.pod.util.P256KeyGenerator +import app.aaps.pump.omnipod.common.bledriver.pod.util.RandomByteGenerator +import app.aaps.shared.tests.AAPSLoggerTest +import com.google.common.truth.Truth.assertThat +import org.junit.jupiter.api.Assertions.assertThrows +import org.junit.jupiter.api.Test +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.spy +import org.mockito.kotlin.whenever + +/** + * [O5KeyExchange] - real P-256/SHA-256 crypto is exercised via real generators (not hand- + * verified against an external test vector, unlike [O5CertificateStoreTest]'s DER round-trip + * or [PulseLogEntryTest]'s openomni golden value - no equivalent published vector was found + * for this KDF). Tests instead check structural properties: sizes, byte-layout composition, + * and round-trip behavior (e.g. increment-then-check-against-original), which don't depend on + * knowing the "correct" hash output in advance. + */ +class O5KeyExchangeTest { + + private val aapsLogger = AAPSLoggerTest() + private val controllerIdData = byteArrayOf(0x01, 0x02, 0x03, 0x04) + + private fun newExchange( + keyGenerator: P256KeyGenerator = P256KeyGenerator(), + randomByteGenerator: RandomByteGenerator = RandomByteGenerator() + ) = O5KeyExchange(aapsLogger, keyGenerator, randomByteGenerator, controllerIdData) + + /** ECDH requires a genuine point on the curve - a real generated public key, standing in + * for the pod's, unlike an arbitrary byte array which fails curve validation. */ + private fun realPublicKey(): ByteArray { + val kg = P256KeyGenerator() + return kg.publicFromPrivate(kg.generatePrivateKey()) + } + + @Test + fun `constructor generates a correctly-sized nonce and public key`() { + val ke = newExchange() + + assertThat(ke.pdmNonce).hasLength(O5KeyExchange.NONCE_SIZE) + assertThat(ke.pdmPublic).hasLength(O5KeyExchange.PUBLIC_KEY_SIZE) + } + + @Test + fun `constructor throws when the random nonce generator returns the wrong size`() { + val randomByteGenerator = spy(RandomByteGenerator()) + doReturn(ByteArray(4)).whenever(randomByteGenerator).nextBytes(org.mockito.kotlin.any()) + + assertThrows(PairingException::class.java) { + newExchange(randomByteGenerator = randomByteGenerator) + } + } + + @Test + fun `constructor throws when the key generator returns a wrong-size public key`() { + val keyGenerator = spy(P256KeyGenerator()) + doReturn(ByteArray(10)).whenever(keyGenerator).publicFromPrivate(org.mockito.kotlin.any()) + + assertThrows(PairingException::class.java) { + newExchange(keyGenerator = keyGenerator) + } + } + + @Test + fun `o5UpdatePodPublicData throws for a wrong-size payload`() { + val ke = newExchange() + + assertThrows(MessageIOException::class.java) { + ke.o5UpdatePodPublicData(ByteArray(10)) + } + } + + @Test + fun `o5UpdatePodPublicData splits the payload and derives 16-byte conf and ltk`() { + val ke = newExchange() + val podPublic = realPublicKey() + val podNonce = ByteArray(O5KeyExchange.NONCE_SIZE) { (it + 100).toByte() } + + ke.o5UpdatePodPublicData(podPublic + podNonce) + + assertThat(ke.podPublic).isEqualTo(podPublic) + assertThat(ke.podNonce).isEqualTo(podNonce) + assertThat(ke.conf).hasLength(O5KeyExchange.CMAC_SIZE) + assertThat(ke.ltk).hasLength(O5KeyExchange.CMAC_SIZE) + assertThat(ke.conf).isNotEqualTo(ke.ltk) + } + + @Test + fun `getSPSNonce builds the direction-prefixed 13-byte nonce from both parties' first 6 bytes`() { + val ke = newExchange() + ke.o5UpdatePodPublicData(realPublicKey() + ByteArray(O5KeyExchange.NONCE_SIZE) { (it + 1).toByte() }) + + val writeNonce = ke.getSPSNonce(O5KeyExchange.Direction.WRITE) + val readNonce = ke.getSPSNonce(O5KeyExchange.Direction.READ) + + assertThat(writeNonce).hasLength(13) + assertThat(writeNonce[0]).isEqualTo(0x01.toByte()) + assertThat(writeNonce.copyOfRange(1, 7)).isEqualTo(ke.pdmNonce.copyOfRange(0, 6)) + assertThat(writeNonce.copyOfRange(7, 13)).isEqualTo(ke.podNonce.copyOfRange(0, 6)) + + assertThat(readNonce).hasLength(13) + assertThat(readNonce[0]).isEqualTo(0x02.toByte()) + assertThat(readNonce.copyOfRange(1, 7)).isEqualTo(ke.podNonce.copyOfRange(0, 6)) + assertThat(readNonce.copyOfRange(7, 13)).isEqualTo(ke.pdmNonce.copyOfRange(0, 6)) + } + + @Test + fun `incrementNonce increments the first 8 bytes as a little-endian counter and leaves the rest untouched`() { + val ke = newExchange() + val originalPdmNonce = ke.pdmNonce.copyOf() + + ke.incrementNonce(O5KeyExchange.Direction.WRITE) + + assertThat(ke.pdmNonce.copyOfRange(8, 16)).isEqualTo(originalPdmNonce.copyOfRange(8, 16)) + assertThat(ke.pdmNonce).isNotEqualTo(originalPdmNonce) + + val afterFirstIncrement = ke.pdmNonce.copyOf() + ke.incrementNonce(O5KeyExchange.Direction.WRITE) + assertThat(ke.pdmNonce).isNotEqualTo(afterFirstIncrement) + } + + @Test + fun `incrementNonce wraps a little-endian counter of all-0xFF bytes to zero`() { + val randomByteGenerator = spy(RandomByteGenerator()) + val allFF = ByteArray(O5KeyExchange.NONCE_SIZE) { 0xFF.toByte() } + doReturn(allFF).whenever(randomByteGenerator).nextBytes(org.mockito.kotlin.any()) + val ke = newExchange(randomByteGenerator = randomByteGenerator) + + ke.incrementNonce(O5KeyExchange.Direction.WRITE) + + assertThat(ke.pdmNonce.copyOfRange(0, 8)).isEqualTo(ByteArray(8)) + assertThat(ke.pdmNonce.copyOfRange(8, 16)).isEqualTo(ByteArray(8) { 0xFF.toByte() }) + } + + @Test + fun `buildChannelBindingTranscript is 171 bytes composed of the documented fields in order`() { + val ke = newExchange() + ke.o5UpdatePodPublicData(realPublicKey() + ByteArray(O5KeyExchange.NONCE_SIZE) { (it + 1).toByte() }) + + val transcript = ke.buildChannelBindingTranscript() + + assertThat(transcript).hasLength(171) + assertThat(transcript[0]).isEqualTo(0x01.toByte()) + assertThat(transcript.copyOfRange(1, 7)).isEqualTo(O5KeyExchange.FIRMWARE_ID) + assertThat(transcript.copyOfRange(7, 11)).isEqualTo(ByteArray(4)) + assertThat(transcript.copyOfRange(11, 75)).isEqualTo(ke.pdmPublic) + assertThat(transcript.copyOfRange(75, 139)).isEqualTo(ke.podPublic) + assertThat(transcript.copyOfRange(139, 155)).isEqualTo(ke.pdmNonce) + assertThat(transcript.copyOfRange(155, 171)).isEqualTo(ke.podNonce) + } + + @Test + fun `buildPodChannelBindingTranscript uses a podNonce decremented by one relative to the current value`() { + val ke = newExchange() + ke.o5UpdatePodPublicData(realPublicKey() + ByteArray(O5KeyExchange.NONCE_SIZE) { (it + 1).toByte() }) + val originalPodNonce = ke.podNonce.copyOf() + + ke.incrementNonce(O5KeyExchange.Direction.READ) + val transcript = ke.buildPodChannelBindingTranscript() + + assertThat(transcript).hasLength(171) + assertThat(transcript[0]).isEqualTo(0x02.toByte()) + val podNonceAdjustedInTranscript = transcript.copyOfRange(139, 155) + assertThat(podNonceAdjustedInTranscript).isEqualTo(originalPodNonce) + } +} diff --git a/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/pair/O5LTKExchangerTest.kt b/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/pair/O5LTKExchangerTest.kt new file mode 100644 index 000000000000..b7dda2f7f82f --- /dev/null +++ b/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/pair/O5LTKExchangerTest.kt @@ -0,0 +1,297 @@ +package app.aaps.pump.omnipod.omnipod5.bledriver.comm.pair + +import app.aaps.pump.omnipod.common.bledriver.comm.Id +import app.aaps.pump.omnipod.common.bledriver.comm.exceptions.MessageIOException +import app.aaps.pump.omnipod.common.bledriver.comm.exceptions.PairingException +import app.aaps.pump.omnipod.common.bledriver.comm.message.MessageIO +import app.aaps.pump.omnipod.common.bledriver.comm.message.MessagePacket +import app.aaps.pump.omnipod.common.bledriver.comm.message.MessageSendErrorSending +import app.aaps.pump.omnipod.common.bledriver.comm.message.MessageSendSuccess +import app.aaps.pump.omnipod.common.bledriver.comm.message.MessageType +import app.aaps.pump.omnipod.common.bledriver.comm.message.StringLengthPrefixEncoding +import app.aaps.pump.omnipod.omnipod5.bledriver.pod.util.P256KeyGenerator +import app.aaps.shared.tests.AAPSLoggerTest +import com.google.common.truth.Truth.assertThat +import org.junit.jupiter.api.AfterEach +import org.junit.jupiter.api.Assertions.assertThrows +import org.junit.jupiter.api.Test +import org.mockito.kotlin.any +import org.mockito.kotlin.mock +import org.mockito.kotlin.whenever +import org.spongycastle.crypto.engines.AESEngine +import org.spongycastle.crypto.modes.CCMBlockCipher +import org.spongycastle.crypto.params.AEADParameters +import org.spongycastle.crypto.params.KeyParameter +import java.nio.ByteBuffer +import java.nio.ByteOrder +import java.security.MessageDigest +import java.util.Base64 + +/** + * [O5LTKExchanger] - the two CRC-16 companion functions (pure, no mocking needed), the + * `o5NegotiateLTK()` orchestration's failure paths (send/receive failures, malformed + * responses - reachable without simulating real crypto), and one full happy-path test that + * *does* simulate a well-behaved pod's crypto responses (real ECDH + the same SHA-256 KDF + * and AES-CCM the production code uses), to verify the handshake's sequencing/nonce + * bookkeeping produces a correct, matching LTK end to end at the software layer. + * + * This does NOT verify the wire-format assumptions themselves are correct against a real + * pod (nothing here can, without hardware) - see [O5CertificateStore]'s doc comment and + * this project's own notes on `o5ValidatePodSps2`'s "transcript format may differ" comment + * for that caveat. + */ +class O5LTKExchangerTest { + + @Test + fun `crc16XMODEM matches the standard CRC-16-XMODEM check value`() { + assertThat(O5LTKExchanger.crc16XMODEM("123456789".toByteArray())).isEqualTo(0x31C3) + } + + @Test + fun `crc16XMODEM of empty input is zero`() { + assertThat(O5LTKExchanger.crc16XMODEM(ByteArray(0))).isEqualTo(0) + } + + @Test + fun `classicCrc16 is deterministic and sensitive to every input byte`() { + val a = O5LTKExchanger.classicCrc16(byteArrayOf(0x01, 0x02, 0x03)) + val aAgain = O5LTKExchanger.classicCrc16(byteArrayOf(0x01, 0x02, 0x03)) + val b = O5LTKExchanger.classicCrc16(byteArrayOf(0x01, 0x02, 0x04)) + + assertThat(a).isEqualTo(aAgain) + assertThat(a).isNotEqualTo(b) + } + + @Test + fun `classicCrc16 and crc16XMODEM are different algorithms, not accidentally identical`() { + val data = "regression guard".toByteArray() + + assertThat(O5LTKExchanger.classicCrc16(data)).isNotEqualTo(O5LTKExchanger.crc16XMODEM(data)) + } + + @Test + fun `classicCrc16 of empty input is zero`() { + assertThat(O5LTKExchanger.classicCrc16(ByteArray(0))).isEqualTo(0) + } + + + private val aapsLogger = AAPSLoggerTest() + private val p256KeyGenerator = P256KeyGenerator() + private val usedControllerIds = mutableListOf() + private val dummyId = Id.fromLong(0xDEADBEEFL and 0xFFFFFFFFL) + + @AfterEach + fun tearDownRegistrations() { + usedControllerIds.forEach { O5RegistrationData.remove(it) } + usedControllerIds.clear() + } + + private fun newCertStore(controllerId: Long, withIntermediateCA: Boolean = true, withTlsCertificate: Boolean = true): O5CertificateStore { + usedControllerIds.add(controllerId) + val privateKey = p256KeyGenerator.generatePrivateKey() + val publicKey = p256KeyGenerator.publicFromPrivate(privateKey) + O5RegistrationData.install( + O5RegistrationData( + controllerId = controllerId, + privateKeyHex = privateKey.joinToString("") { "%02x".format(it) }, + publicKeyHex = publicKey.joinToString("") { "%02x".format(it) }, + intermediateCABase64 = if (withIntermediateCA) Base64.getEncoder().encodeToString(byteArrayOf(1, 2, 3, 4)) else "", + tlsCertificateBase64 = if (withTlsCertificate) Base64.getEncoder().encodeToString(byteArrayOf(5, 6, 7, 8)) else "" + ) + ) + return O5CertificateStore(aapsLogger, p256KeyGenerator, controllerId) + } + + private fun pairingPacket(key: String, payload: ByteArray, sequenceNumber: Byte): MessagePacket = + MessagePacket( + type = MessageType.PAIRING, + source = dummyId, + destination = dummyId, + payload = StringLengthPrefixEncoding.formatKeys(arrayOf(key), arrayOf(payload)), + sequenceNumber = sequenceNumber + ) + + private fun incrementNonce(nonce: ByteArray): ByteArray { + val counter = ByteBuffer.wrap(nonce, 0, 8).order(ByteOrder.LITTLE_ENDIAN).long + val result = nonce.copyOf() + ByteBuffer.wrap(result, 0, 8).order(ByteOrder.LITTLE_ENDIAN).putLong(counter + 1) + return result + } + + /** Replicates O5KeyExchange's private o5GenerateKeys() KDF exactly, so the test can + * independently derive what conf/ltk the code under test will arrive at. */ + private fun deriveConfAndLtk(pdmPublic: ByteArray, podPublic: ByteArray, sharedSecret: ByteArray): Pair { + fun lengthPrefixed(value: Int): ByteArray = ByteBuffer.allocate(8).order(ByteOrder.BIG_ENDIAN).putLong(value.toLong()).array() + val firmwareId = O5KeyExchange.FIRMWARE_ID + val data = lengthPrefixed(firmwareId.size) + firmwareId + + lengthPrefixed(4) + byteArrayOf(0, 0, 0, 0) + + lengthPrefixed(pdmPublic.size) + pdmPublic + + lengthPrefixed(podPublic.size) + podPublic + + lengthPrefixed(sharedSecret.size) + sharedSecret + val digest = MessageDigest.getInstance("SHA-256").digest(data) + return digest.copyOfRange(0, 16) to digest.copyOfRange(16, 32) + } + + private fun aesCcmEncrypt(key: ByteArray, nonce: ByteArray, plaintext: ByteArray): ByteArray { + val cipher = CCMBlockCipher(AESEngine()) + cipher.init(true, AEADParameters(KeyParameter(key), 64, nonce, ByteArray(0))) + val output = ByteArray(plaintext.size + 8) + cipher.processPacket(plaintext, 0, plaintext.size, output, 0) + return output + } + + @Test + fun `o5NegotiateLTK throws when the SP1+SP2 send fails`() { + val certStore = newCertStore(0x10000001L) + val msgIO = mock() + whenever(msgIO.sendMessage(any())).thenReturn(MessageSendErrorSending("boom")) + + assertThrows(PairingException::class.java) { + O5LTKExchanger(aapsLogger, msgIO, certStore, dummyId, dummyId.increment()).o5NegotiateLTK() + } + } + + @Test + fun `o5NegotiateLTK throws when SPS0 is never received`() { + val certStore = newCertStore(0x10000002L) + val msgIO = mock() + whenever(msgIO.sendMessage(any())).thenReturn(MessageSendSuccess) + whenever(msgIO.receiveMessage()).thenReturn(null) + + val exception = assertThrows(PairingException::class.java) { + O5LTKExchanger(aapsLogger, msgIO, certStore, dummyId, dummyId.increment()).o5NegotiateLTK() + } + assertThat(exception.message).contains("SPS0") + } + + @Test + fun `o5NegotiateLTK throws when the pod's SPS0 CRC does not match`() { + val certStore = newCertStore(0x10000003L) + val msgIO = mock() + whenever(msgIO.sendMessage(any())).thenReturn(MessageSendSuccess) + whenever(msgIO.receiveMessage()).thenReturn(pairingPacket("SPS0=", byteArrayOf(0x00, 0x00, 0x09, 0x00, 0x00), sequenceNumber = 2)) + + assertThrows(PairingException::class.java) { + O5LTKExchanger(aapsLogger, msgIO, certStore, dummyId, dummyId.increment()).o5NegotiateLTK() + } + } + + @Test + fun `o5NegotiateLTK throws when SPS1 is never received`() { + val certStore = newCertStore(0x10000004L) + val msgIO = mock() + whenever(msgIO.sendMessage(any())).thenReturn(MessageSendSuccess) + var callIndex = 0 + whenever(msgIO.receiveMessage()).thenAnswer { + callIndex++ + if (callIndex == 1) { + val header = byteArrayOf(0x00, 0x00, 0x09) + val crc = O5LTKExchanger.crc16XMODEM(header) + pairingPacket("SPS0=", header + byteArrayOf((crc ushr 8).toByte(), (crc and 0xFF).toByte()), sequenceNumber = 2) + } else { + null + } + } + + val exception = assertThrows(PairingException::class.java) { + O5LTKExchanger(aapsLogger, msgIO, certStore, dummyId, dummyId.increment()).o5NegotiateLTK() + } + assertThat(exception.message).contains("SPS1") + } + + @Test + fun `o5NegotiateLTK throws MessageIOException when the pod's SPS1 payload is the wrong size`() { + val certStore = newCertStore(0x10000005L) + val msgIO = mock() + whenever(msgIO.sendMessage(any())).thenReturn(MessageSendSuccess) + var callIndex = 0 + whenever(msgIO.receiveMessage()).thenAnswer { + callIndex++ + when (callIndex) { + 1 -> { + val header = byteArrayOf(0x00, 0x00, 0x09) + val crc = O5LTKExchanger.crc16XMODEM(header) + pairingPacket("SPS0=", header + byteArrayOf((crc ushr 8).toByte(), (crc and 0xFF).toByte()), sequenceNumber = 2) + } + + 2 -> pairingPacket("SPS1=", ByteArray(10), sequenceNumber = 3) + else -> null + } + } + + assertThrows(MessageIOException::class.java) { + O5LTKExchanger(aapsLogger, msgIO, certStore, dummyId, dummyId.increment()).o5NegotiateLTK() + } + } + + @Test + fun `o5NegotiateLTK completes the full handshake and derives a matching LTK`() { + val certStore = newCertStore(0x10000006L) + val myId = Id.fromLong(certStore.controllerId) + val podId = myId.increment() + + val podPrivate = p256KeyGenerator.generatePrivateKey() + val podPublic = p256KeyGenerator.publicFromPrivate(podPrivate) + val podNonceP0 = ByteArray(16) { (it + 1).toByte() } + + var capturedPdmPublic: ByteArray? = null + var capturedPdmNonceN0: ByteArray? = null + + val msgIO = mock() + whenever(msgIO.sendMessage(any())).thenAnswer { invocation -> + val msg = invocation.getArgument(0) + runCatching { StringLengthPrefixEncoding.parseKeys(arrayOf("SPS1="), msg.payload) } + .getOrNull() + ?.takeIf { it[0].size == 80 } + ?.let { parsed -> + capturedPdmPublic = parsed[0].copyOfRange(0, 64) + capturedPdmNonceN0 = parsed[0].copyOfRange(64, 80) + } + MessageSendSuccess + } + + var callIndex = 0 + whenever(msgIO.receiveMessage()).thenAnswer { + callIndex++ + when (callIndex) { + 1 -> { + val header = byteArrayOf(0x00, 0x00, 0x09) + val crc = O5LTKExchanger.crc16XMODEM(header) + pairingPacket("SPS0=", header + byteArrayOf((crc ushr 8).toByte(), (crc and 0xFF).toByte()), sequenceNumber = 2) + } + + 2 -> { + pairingPacket("SPS1=", podPublic + podNonceP0, sequenceNumber = 3) + } + + 3 -> { + val n1 = incrementNonce(requireNotNull(capturedPdmNonceN0)) + val nonce = byteArrayOf(0x02) + podNonceP0.copyOfRange(0, 6) + n1.copyOfRange(0, 6) + val sharedSecret = p256KeyGenerator.computeSharedSecret(podPrivate, requireNotNull(capturedPdmPublic)) + val (conf, _) = deriveConfAndLtk(requireNotNull(capturedPdmPublic), podPublic, sharedSecret) + pairingPacket("SPS2.1=", aesCcmEncrypt(conf, nonce, ByteArray(20)), sequenceNumber = 4) + } + + 4 -> { + val n1 = incrementNonce(requireNotNull(capturedPdmNonceN0)) + val n2 = incrementNonce(n1) + val p1 = incrementNonce(podNonceP0) + val nonce = byteArrayOf(0x02) + p1.copyOfRange(0, 6) + n2.copyOfRange(0, 6) + val sharedSecret = p256KeyGenerator.computeSharedSecret(podPrivate, requireNotNull(capturedPdmPublic)) + val (conf, _) = deriveConfAndLtk(requireNotNull(capturedPdmPublic), podPublic, sharedSecret) + pairingPacket("SPS2=", aesCcmEncrypt(conf, nonce, ByteArray(70)), sequenceNumber = 5) + } + + 5 -> pairingPacket("P0=", byteArrayOf(0xa5.toByte()), sequenceNumber = 6) + else -> null + } + } + + val result = O5LTKExchanger(aapsLogger, msgIO, certStore, myId, podId).o5NegotiateLTK() + + val sharedSecret = p256KeyGenerator.computeSharedSecret(podPrivate, requireNotNull(capturedPdmPublic)) + val (_, expectedLtk) = deriveConfAndLtk(requireNotNull(capturedPdmPublic), podPublic, sharedSecret) + assertThat(result.ltk).isEqualTo(expectedLtk) + assertThat(result.msgSeq).isEqualTo(6.toByte()) + } +} diff --git a/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/session/SessionSigningTest.kt b/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/session/SessionSigningTest.kt new file mode 100644 index 000000000000..69d46bd5f51a --- /dev/null +++ b/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/session/SessionSigningTest.kt @@ -0,0 +1,137 @@ +package app.aaps.pump.omnipod.omnipod5.bledriver.comm.session +import app.aaps.pump.omnipod.common.bledriver.comm.session.Session +import app.aaps.pump.omnipod.common.bledriver.comm.session.SessionKeys + +import app.aaps.pump.omnipod.common.bledriver.comm.Id +import app.aaps.pump.omnipod.common.bledriver.comm.Ids +import app.aaps.pump.omnipod.common.bledriver.comm.endecrypt.EnDecrypt +import app.aaps.pump.omnipod.common.bledriver.comm.endecrypt.Nonce +import app.aaps.pump.omnipod.common.bledriver.comm.message.MessageIO +import app.aaps.pump.omnipod.common.bledriver.comm.message.MessagePacket +import app.aaps.pump.omnipod.common.bledriver.comm.message.MessageSendSuccess +import app.aaps.pump.omnipod.common.bledriver.comm.message.MessageType +import app.aaps.pump.omnipod.omnipod5.bledriver.comm.pair.O5CertificateStore +import app.aaps.pump.omnipod.omnipod5.bledriver.comm.pair.O5RegistrationData +import app.aaps.pump.omnipod.common.bledriver.pod.command.DeactivateCommand +import app.aaps.pump.omnipod.common.bledriver.pod.command.GetStatusCommand +import app.aaps.pump.omnipod.common.bledriver.pod.response.ResponseType +import app.aaps.pump.omnipod.omnipod5.bledriver.pod.util.P256KeyGenerator +import app.aaps.shared.tests.AAPSLoggerTest +import com.google.common.truth.Truth.assertThat +import org.junit.jupiter.api.AfterEach +import org.junit.jupiter.api.Test +import org.mockito.kotlin.any +import org.mockito.kotlin.argumentCaptor +import org.mockito.kotlin.mock +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever + +/** + * Covers [Session]'s O5-only Type-4 (ENCRYPTED_SIGNED) command signing - the fix for real + * O5 pod firmware rejecting insulin-schedule/deactivate/cancel-delivery commands sent as + * plain ENCRYPTED (confirmed against OmnipodKit's BleMessageTransport.swift, see + * `Session.sign()`'s doc comment). Uses a mocked [MessageIO] (the actual BLE I/O boundary, + * same approach as [app.aaps.pump.omnipod.omnipod5.bledriver.comm.pair.O5LTKExchangerTest]) + * plus a real [O5CertificateStore] built from generated P-256 test key material, so the + * signature produced is independently re-verifiable rather than just "some bytes got + * appended". + */ +class SessionSigningTest { + + private val aapsLogger = AAPSLoggerTest() + private val keyGenerator = P256KeyGenerator() + private val usedControllerIds = mutableListOf() + + @AfterEach + fun tearDown() { + usedControllerIds.forEach { O5RegistrationData.remove(it) } + usedControllerIds.clear() + } + + private fun installValidRegistration(controllerId: Long) { + usedControllerIds.add(controllerId) + val privateKey = keyGenerator.generatePrivateKey() + val publicKey = keyGenerator.publicFromPrivate(privateKey) + O5RegistrationData.install( + O5RegistrationData( + controllerId = controllerId, + privateKeyHex = privateKey.toHex(), + publicKeyHex = publicKey.toHex(), + intermediateCABase64 = "", + tlsCertificateBase64 = "" + ) + ) + } + + private fun ByteArray.toHex(): String = joinToString("") { "%02x".format(it) } + + private fun buildSession(msgIO: MessageIO, commandSigner: O5CertificateStore?): Session { + val ids = Ids.forController(Id.fromInt(1), Id.fromInt(2)) + val nonce = Nonce(ByteArray(8), 0) + val sessionKeys = SessionKeys(ck = ByteArray(16), nonce = nonce, msgSequenceNumber = 1) + val enDecrypt = EnDecrypt(aapsLogger, nonce, sessionKeys.ck) + return Session(aapsLogger, msgIO, ids, sessionKeys, enDecrypt, commandSigner) + } + + private fun sentPacket(msgIO: MessageIO): MessagePacket { + val captor = argumentCaptor() + verify(msgIO).sendMessage(captor.capture()) + return captor.firstValue + } + + @Test + fun `deactivate command is sent Type-4 signed, with a signature that verifies, when a signer is present`() { + val controllerId = 0x11112222L + installValidRegistration(controllerId) + val store = O5CertificateStore(aapsLogger, keyGenerator, controllerId) + val msgIO = mock() + whenever(msgIO.sendMessage(any())).thenReturn(MessageSendSuccess) + val session = buildSession(msgIO, commandSigner = store) + val cmd = DeactivateCommand.Builder().setUniqueId(1).setSequenceNumber(1).setNonce(0).build() + + session.sendCommand(cmd) + + val sent = sentPacket(msgIO) + assertThat(sent.type).isEqualTo(MessageType.ENCRYPTED_SIGNED) + assertThat(sent.signatureData).isNotNull() + assertThat(sent.signatureData!!.size).isEqualTo(64) + val aad = sent.asByteArray(forEncryption = false).copyOfRange(0, 16) + assertThat( + O5CertificateStore.verifySignature(sent.signatureData!!, aad + sent.payload, store.signingPublicKeyRaw) + ).isTrue() + } + + @Test + fun `a command outside the signed set is sent plain ENCRYPTED even when a signer is present`() { + val controllerId = 0x33334444L + installValidRegistration(controllerId) + val store = O5CertificateStore(aapsLogger, keyGenerator, controllerId) + val msgIO = mock() + whenever(msgIO.sendMessage(any())).thenReturn(MessageSendSuccess) + val session = buildSession(msgIO, commandSigner = store) + val cmd = GetStatusCommand.Builder() + .setUniqueId(1).setSequenceNumber(1) + .setStatusResponseType(ResponseType.StatusResponseType.DEFAULT_STATUS_RESPONSE) + .build() + + session.sendCommand(cmd) + + val sent = sentPacket(msgIO) + assertThat(sent.type).isEqualTo(MessageType.ENCRYPTED) + assertThat(sent.signatureData).isNull() + } + + @Test + fun `a deactivate command is never signed without a commandSigner - matches Dash, which has none`() { + val msgIO = mock() + whenever(msgIO.sendMessage(any())).thenReturn(MessageSendSuccess) + val session = buildSession(msgIO, commandSigner = null) + val cmd = DeactivateCommand.Builder().setUniqueId(1).setSequenceNumber(1).setNonce(0).build() + + session.sendCommand(cmd) + + val sent = sentPacket(msgIO) + assertThat(sent.type).isEqualTo(MessageType.ENCRYPTED) + assertThat(sent.signatureData).isNull() + } +} diff --git a/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/command/aid/O5AidSetupCommandsTest.kt b/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/command/aid/O5AidSetupCommandsTest.kt new file mode 100644 index 000000000000..f97daf408557 --- /dev/null +++ b/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/command/aid/O5AidSetupCommandsTest.kt @@ -0,0 +1,82 @@ +package app.aaps.pump.omnipod.omnipod5.bledriver.pod.command.aid + +import app.aaps.pump.omnipod.common.bledriver.comm.session.Session +import com.google.common.truth.Truth.assertThat +import org.junit.jupiter.api.Test +import org.mockito.kotlin.any +import org.mockito.kotlin.argumentCaptor +import org.mockito.kotlin.mock +import org.mockito.kotlin.times +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever +import java.nio.charset.StandardCharsets + +/** + * Verifies the exact byte-for-byte wire format of the 8 O5 AID setup commands (see + * [O5AidSetupCommands]'s class doc) against the values OmnipodKit's own O5AidCommands.swift + * sends - cross-checked there against a real captured O5 pairing's comm log, not just + * protocol documentation. [Session] is mocked directly (a plain, non-open Kotlin class, + * mockable via this project's inline mock maker - same approach already used for + * [app.aaps.pump.omnipod.common.bledriver.comm.message.MessageIO] elsewhere) so this stays + * a pure wire-format test with no AES-CCM/nonce simulation involved. + */ +class O5AidSetupCommandsTest { + + @Test + fun `sends all 8 AID setup commands in order with the exact OmnipodKit wire format`() { + val session = mock() + whenever(session.sendAidSetupCommand(any(), any())).thenReturn(ByteArray(0)) + val before = System.currentTimeMillis() / 1000 + + O5AidSetupCommands.send(session) + + val payloads = argumentCaptor() + val prefixes = argumentCaptor() + verify(session, times(8)).sendAidSetupCommand(payloads.capture(), prefixes.capture()) + val after = System.currentTimeMillis() / 1000 + + val utc = payloads.allValues[0].toString(StandardCharsets.US_ASCII) + assertThat(utc).startsWith("SE255.2=") + val utcSeconds = utc.removePrefix("SE255.2=").toLong() + assertThat(utcSeconds).isAtLeast(before) + assertThat(utcSeconds).isAtMost(after) + assertThat(prefixes.allValues[0]).isEqualTo("ES255.2=") + + assertThat(payloads.allValues[1]).isEqualTo( + "S3.2=".toByteArray(StandardCharsets.US_ASCII) + + byteArrayOf(0x00, 0x03, 0x00, 0x0E, 0x00) + + ",G3.2".toByteArray(StandardCharsets.US_ASCII) + ) + assertThat(prefixes.allValues[1]).isEqualTo("3.2=") + + val expectedTargets = ByteArray(2 + 48 * 4) + expectedTargets[0] = 0x00 + expectedTargets[1] = 0xC0.toByte() + for (slot in 0 until 48) { + val offset = 2 + slot * 4 + expectedTargets[offset] = 0x00 + expectedTargets[offset + 1] = 0x00 + expectedTargets[offset + 2] = 0x00 + expectedTargets[offset + 3] = 0x6E + } + assertThat(payloads.allValues[2]).isEqualTo( + "S3.1=".toByteArray(StandardCharsets.US_ASCII) + expectedTargets + ",G3.1".toByteArray(StandardCharsets.US_ASCII) + ) + assertThat(payloads.allValues[2].size).isEqualTo(204) + assertThat(prefixes.allValues[2]).isEqualTo("3.1=") + + assertThat(payloads.allValues[3]).isEqualTo("S3.9=8,G3.9".toByteArray(StandardCharsets.US_ASCII)) + assertThat(prefixes.allValues[3]).isEqualTo("3.9=") + + assertThat(payloads.allValues[4]).isEqualTo("S3.7=3670015,G3.7".toByteArray(StandardCharsets.US_ASCII)) + assertThat(prefixes.allValues[4]).isEqualTo("3.7=") + + val expectedHistory = "SE2.1=".toByteArray(StandardCharsets.US_ASCII) + + byteArrayOf(0x00, 0xA8.toByte()) + ByteArray(24 * 7) + assertThat(expectedHistory.size).isEqualTo(176) + for (i in 5..7) { + assertThat(payloads.allValues[i]).isEqualTo(expectedHistory) + assertThat(prefixes.allValues[i]).isEqualTo("ES2.1=") + } + } +} diff --git a/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/state/InMemoryO5PodStateManagerTest.kt b/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/state/InMemoryO5PodStateManagerTest.kt new file mode 100644 index 000000000000..edf89ecb2181 --- /dev/null +++ b/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/state/InMemoryO5PodStateManagerTest.kt @@ -0,0 +1,73 @@ +package app.aaps.pump.omnipod.omnipod5.bledriver.pod.state + +import app.aaps.pump.omnipod.common.bledriver.pod.definition.AlarmType +import app.aaps.pump.omnipod.common.bledriver.pod.definition.AlertType +import app.aaps.pump.omnipod.common.bledriver.pod.response.PodInfoActivationTimeResponse +import app.aaps.pump.omnipod.common.bledriver.pod.response.PodInfoTriggeredAlertsResponse +import com.google.common.truth.Truth.assertThat +import org.junit.jupiter.api.Test +import java.util.Calendar + +/** + * [O5PodStateManager.updateFromActivationTimeResponse]/[O5PodStateManager + * .updateFromTriggeredAlertsResponse] - status pages 5/1's update methods, fetched + * on-demand by [app.aaps.pump.omnipod.omnipod5.O5PumpPlugin] (see its + * `fetchActivationTimeIfNeeded`/`fetchTriggeredAlertsIfNeeded`). + */ +class InMemoryO5PodStateManagerTest { + + @Test + fun `updateFromActivationTimeResponse sets podActivatedAt and reuses alarmType-alarmTime`() { + val bytes = byteArrayOf( + 0x02, 0x11, 0x05, + 0x14, + 0x00, 0x7D, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x07, + 0x0F, + 0x1A, + 0x09, + 0x1E + ) + val state = InMemoryO5PodStateManager() + + state.updateFromActivationTimeResponse(PodInfoActivationTimeResponse(bytes)) + + assertThat(state.alarmType).isEqualTo(AlarmType.ALARM_OCCLUDED) + assertThat(state.alarmTime).isEqualTo(125.toShort()) + val activatedAt = requireNotNull(state.podActivatedAt) + val calendar = Calendar.getInstance() + calendar.timeInMillis = activatedAt + assertThat(calendar[Calendar.YEAR]).isEqualTo(2026) + assertThat(calendar[Calendar.MONTH]).isEqualTo(Calendar.JULY) + assertThat(calendar[Calendar.DAY_OF_MONTH]).isEqualTo(15) + assertThat(calendar[Calendar.HOUR_OF_DAY]).isEqualTo(9) + assertThat(calendar[Calendar.MINUTE]).isEqualTo(30) + } + + @Test + fun `updateFromTriggeredAlertsResponse keeps only non-zero slots`() { + val bytes = byteArrayOf( + 0x02, 0x13, 0x01, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x0A, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x78, + 0x00, 0x00, + 0x00, 0x00, + 0x01, 0x2C + ) + val state = InMemoryO5PodStateManager() + + state.updateFromTriggeredAlertsResponse(PodInfoTriggeredAlertsResponse(bytes)) + + val triggered = requireNotNull(state.triggeredAlertTimes) + assertThat(triggered).containsExactly( + AlertType.MULTI_COMMAND, 10.toShort(), + AlertType.LOW_RESERVOIR, 120.toShort(), + AlertType.EXPIRATION, 300.toShort() + ) + } +} diff --git a/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/state/O5PodStateManagerExtensionsTest.kt b/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/state/O5PodStateManagerExtensionsTest.kt new file mode 100644 index 000000000000..efd6ec9c7557 --- /dev/null +++ b/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/state/O5PodStateManagerExtensionsTest.kt @@ -0,0 +1,243 @@ +package app.aaps.pump.omnipod.omnipod5.bledriver.pod.state + +import app.aaps.pump.omnipod.common.bledriver.pod.definition.ActivationProgress +import app.aaps.pump.omnipod.common.bledriver.pod.definition.BasalProgram +import app.aaps.shared.tests.TestBase +import com.google.common.truth.Truth.assertThat +import org.junit.jupiter.api.Test +import org.mockito.kotlin.mock +import org.mockito.kotlin.whenever +import java.time.Duration +import java.time.ZonedDateTime + +/** + * [expiry] reads wall-clock time directly ([ZonedDateTime.now]/[System.currentTimeMillis]) + * rather than an injectable clock, so these tests assert against a tolerance window instead + * of an exact instant - tight enough to catch a wrong formula (wrong sign, wrong field) but + * not flaky on slow CI. The `.minusHours(8)` term is copied verbatim from + * [app.aaps.pump.omnipod.common.bledriver.pod.state.OmnipodDashPodStateManagerImpl.expiry] + * with no explanation found anywhere in this codebase for why it's there - this test locks + * down the current (copied) behavior, it does not claim to justify the 8 hours. + */ +class O5PodStateManagerExtensionsTest : TestBase() { + + private fun mockState( + podLifeInHours: Short? = null, + minutesSinceActivation: Short? = null, + lastStatusResponseReceived: Long? = null + ): O5PodStateManager { + val state = mock() + whenever(state.podLifeInHours).thenReturn(podLifeInHours) + whenever(state.minutesSinceActivation).thenReturn(minutesSinceActivation) + whenever(state.lastStatusResponseReceived).thenReturn(lastStatusResponseReceived) + return state + } + + @Test + fun `expiry is null when podLifeInHours is unknown`() { + val state = mockState(minutesSinceActivation = 0, lastStatusResponseReceived = System.currentTimeMillis()) + + assertThat(state.expiry).isNull() + } + + @Test + fun `expiry is null when minutesSinceActivation is unknown`() { + val state = mockState(podLifeInHours = 72, lastStatusResponseReceived = System.currentTimeMillis()) + + assertThat(state.expiry).isNull() + } + + @Test + fun `expiry is null when no status response has ever been received`() { + val state = mockState(podLifeInHours = 72, minutesSinceActivation = 0) + + assertThat(state.expiry).isNull() + } + + @Test + fun `freshly activated pod expires close to podLifeInHours minus the 8h grace period from now`() { + val state = mockState(podLifeInHours = 72, minutesSinceActivation = 0, lastStatusResponseReceived = System.currentTimeMillis()) + + val expiresAt = requireNotNull(state.expiry) + + val expected = ZonedDateTime.now().plusHours(64) + val diffSeconds = Duration.between(expected, expiresAt).abs().seconds + assertThat(diffSeconds).isLessThan(10) + } + + @Test + fun `elapsed minutesSinceActivation shortens the remaining life`() { + val state = mockState(podLifeInHours = 72, minutesSinceActivation = 60, lastStatusResponseReceived = System.currentTimeMillis()) + + val expiresAt = requireNotNull(state.expiry) + + val expected = ZonedDateTime.now().plusHours(63) + val diffSeconds = Duration.between(expected, expiresAt).abs().seconds + assertThat(diffSeconds).isLessThan(10) + } + + @Test + fun `time elapsed since the last status response is also subtracted`() { + val state = mockState( + podLifeInHours = 72, + minutesSinceActivation = 0, + lastStatusResponseReceived = System.currentTimeMillis() - Duration.ofMinutes(30).toMillis() + ) + + val expiresAt = requireNotNull(state.expiry) + + val expected = ZonedDateTime.now().plusHours(63).plusMinutes(30) + val diffSeconds = Duration.between(expected, expiresAt).abs().seconds + assertThat(diffSeconds).isLessThan(10) + } + + + private fun mockDriftState( + totalPulsesDelivered: Short? = null, + cumulativeBolusPulsesDelivered: Short? = null, + basalExpected: Double? = null + ): O5PodStateManager { + val state = mock() + whenever(state.totalPulsesDelivered).thenReturn(totalPulsesDelivered) + whenever(state.cumulativeBolusPulsesDelivered).thenReturn(cumulativeBolusPulsesDelivered) + whenever(state.basalExpected).thenReturn(basalExpected) + return state + } + + @Test + fun `basalPulsesDelivered is null when either input is unknown`() { + assertThat(mockDriftState(totalPulsesDelivered = 100).basalPulsesDelivered).isNull() + assertThat(mockDriftState(cumulativeBolusPulsesDelivered = 20).basalPulsesDelivered).isNull() + } + + @Test + fun `basalPulsesDelivered and basalDelivered subtract bolus pulses from the pod total`() { + val state = mockDriftState(totalPulsesDelivered = 100, cumulativeBolusPulsesDelivered = 20) + + assertThat(state.basalPulsesDelivered).isEqualTo(80.toShort()) + assertThat(state.basalDelivered).isWithin(1e-9).of(4.0) + } + + @Test + fun `basalDrift is zero when nothing is expected yet - falls back to basalDelivered itself`() { + val state = mockDriftState(totalPulsesDelivered = 100, cumulativeBolusPulsesDelivered = 20, basalExpected = null) + + assertThat(state.basalDrift).isWithin(1e-9).of(0.0) + } + + @Test + fun `basalDrift is positive when more basal was delivered than expected`() { + val state = mockDriftState(totalPulsesDelivered = 100, cumulativeBolusPulsesDelivered = 20, basalExpected = 3.0) + + assertThat(state.basalDrift).isWithin(1e-9).of(1.0) + } + + @Test + fun `basalDrift is negative when less basal was delivered than expected`() { + val state = mockDriftState(totalPulsesDelivered = 100, cumulativeBolusPulsesDelivered = 20, basalExpected = 5.0) + + assertThat(state.basalDrift).isWithin(1e-9).of(-1.0) + } + + + /** Full-day flat-rate program - sidesteps day-boundary/timezone edge cases entirely + * since the rate is constant across every slot the day-loop could add. */ + private fun flatRateProgram(unitsPerHour: Double) = + BasalProgram(listOf(BasalProgram.Segment(0, 48, (unitsPerHour * 100).toInt()))) + + @Test + fun `integrateO5ExpectedDelivery returns null when startTime is after endTime`() { + val now = System.currentTimeMillis() + assertThat( + integrateO5ExpectedDelivery(now, now - 1000, null, null, null, flatRateProgram(1.0)) + ).isNull() + } + + @Test + fun `integrateO5ExpectedDelivery returns null when there is no basal program and no temp basal`() { + val now = System.currentTimeMillis() + assertThat( + integrateO5ExpectedDelivery(now, now + 3600_000L, null, null, null, null) + ).isNull() + } + + @Test + fun `integrateO5ExpectedDelivery integrates a flat basal program over one hour`() { + val now = System.currentTimeMillis() + val result = integrateO5ExpectedDelivery(now, now + 3600_000L, null, null, null, flatRateProgram(1.0)) + + assertThat(requireNotNull(result)).isWithin(1e-6).of(1.0) + } + + @Test + fun `integrateO5ExpectedDelivery uses the temp basal rate for the whole window when it fully covers it`() { + val now = System.currentTimeMillis() + val result = integrateO5ExpectedDelivery( + now, now + 3600_000L, + activeTempBasalStartTime = now, activeTempBasalRate = 2.0, activeTempBasalDurationMinutes = 120, + basalProgram = flatRateProgram(1.0) + ) + + assertThat(requireNotNull(result)).isWithin(1e-6).of(2.0) + } + + @Test + fun `integrateO5ExpectedDelivery blends temp basal and scheduled basal across a boundary`() { + val now = System.currentTimeMillis() + val result = integrateO5ExpectedDelivery( + now, now + 3600_000L, + activeTempBasalStartTime = now, activeTempBasalRate = 2.0, activeTempBasalDurationMinutes = 30, + basalProgram = flatRateProgram(1.0) + ) + + assertThat(requireNotNull(result)).isWithin(1e-6).of(1.5) + } + + + @Test + fun `nextBasalExpected stays null before activation completes`() { + val state = mock() + whenever(state.basalExpected).thenReturn(null) + whenever(state.activationProgress).thenReturn(ActivationProgress.PRIME_COMPLETED) + + assertThat(state.nextBasalExpected(previousUpdate = null, now = System.currentTimeMillis())).isNull() + } + + @Test + fun `nextBasalExpected seeds itself from basalDelivered the first time activation is complete`() { + val state = mock() + whenever(state.basalExpected).thenReturn(null) + whenever(state.activationProgress).thenReturn(ActivationProgress.COMPLETED) + whenever(state.totalPulsesDelivered).thenReturn(100) + whenever(state.cumulativeBolusPulsesDelivered).thenReturn(0) + + val result = state.nextBasalExpected(previousUpdate = null, now = System.currentTimeMillis()) + + assertThat(requireNotNull(result)).isWithin(1e-9).of(5.0) + } + + @Test + fun `nextBasalExpected leaves the value unchanged when there is no previous update to integrate from`() { + val state = mock() + whenever(state.basalExpected).thenReturn(2.0) + + val result = state.nextBasalExpected(previousUpdate = null, now = System.currentTimeMillis()) + + assertThat(requireNotNull(result)).isWithin(1e-9).of(2.0) + } + + @Test + fun `nextBasalExpected integrates the elapsed period onto the existing value`() { + val state = mock() + whenever(state.basalExpected).thenReturn(2.0) + whenever(state.activeTempBasalStartTime).thenReturn(null) + whenever(state.activeTempBasalRate).thenReturn(null) + whenever(state.activeTempBasalDurationMinutes).thenReturn(null) + whenever(state.basalProgram).thenReturn(flatRateProgram(1.0)) + val now = System.currentTimeMillis() + + val result = state.nextBasalExpected(previousUpdate = now - 3600_000L, now = now) + + assertThat(requireNotNull(result)).isWithin(1e-6).of(3.0) + } +} diff --git a/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/state/PersistedO5PodStateManagerTest.kt b/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/state/PersistedO5PodStateManagerTest.kt new file mode 100644 index 000000000000..9e1822b79857 --- /dev/null +++ b/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/state/PersistedO5PodStateManagerTest.kt @@ -0,0 +1,368 @@ +package app.aaps.pump.omnipod.omnipod5.bledriver.pod.state + +import app.aaps.core.data.model.BS +import app.aaps.core.keys.interfaces.Preferences +import app.aaps.pump.omnipod.common.bledriver.pod.definition.ActivationProgress +import app.aaps.pump.omnipod.common.bledriver.pod.definition.AlarmType +import app.aaps.pump.omnipod.common.bledriver.pod.definition.AlertType +import app.aaps.pump.omnipod.common.bledriver.pod.definition.PodStatus +import app.aaps.pump.omnipod.common.bledriver.pod.definition.BasalProgram +import app.aaps.pump.omnipod.common.bledriver.pod.response.AlarmStatusResponse +import app.aaps.pump.omnipod.common.bledriver.pod.response.DefaultStatusResponse +import app.aaps.pump.omnipod.common.bledriver.pod.response.PodInfoActivationTimeResponse +import app.aaps.pump.omnipod.common.bledriver.pod.response.PodInfoTriggeredAlertsResponse +import app.aaps.pump.omnipod.common.bledriver.pod.response.VersionResponse +import app.aaps.pump.omnipod.omnipod5.keys.O5StringNonPreferenceKey +import app.aaps.shared.tests.TestBase +import com.google.common.truth.Truth.assertThat +import org.junit.jupiter.api.BeforeEach +import org.junit.jupiter.api.Test +import org.mockito.Mock +import org.mockito.kotlin.any +import org.mockito.kotlin.eq +import org.mockito.kotlin.whenever + +/** + * Gson+[Preferences] persistence round-trip for [PersistedO5PodStateManager], with a + * particular focus on [BasalProgram] - it has a custom `segments` property getter + * (`Collections.unmodifiableList` wrapper), and no other class in this file's persisted + * state had needed to serialize something with a custom getter before, so this is the + * check that resolves that open question rather than assuming it round-trips correctly. + * + * [Preferences] is backed here by a single in-memory [String] var rather than individual + * stubbed return values, so `store()` followed by a fresh manager's `load()` exercises the + * real Gson serialize/deserialize round trip, not just mock plumbing. + */ +class PersistedO5PodStateManagerTest : TestBase() { + + @Mock lateinit var preferences: Preferences + + private var backingStore: String? = null + + @BeforeEach + fun setUp() { + backingStore = null + whenever(preferences.put(eq(O5StringNonPreferenceKey.PodState), any())).thenAnswer { + backingStore = it.getArgument(1) + Unit + } + whenever(preferences.getIfExists(O5StringNonPreferenceKey.PodState)).thenAnswer { backingStore } + whenever(preferences.get(O5StringNonPreferenceKey.PodState)).thenAnswer { backingStore ?: "" } + } + + private fun newManager() = PersistedO5PodStateManager(aapsLogger, preferences) + + private fun hexToBytes(hex: String): ByteArray = + ByteArray(hex.length / 2) { i -> hex.substring(i * 2, i * 2 + 2).toInt(16).toByte() } + + @Test + fun `fresh manager with no stored state returns defaults`() { + val manager = newManager() + + assertThat(manager.activationProgress).isEqualTo(ActivationProgress.NOT_STARTED) + assertThat(manager.ltk).isNull() + assertThat(manager.basalProgram).isNull() + assertThat(manager.msgSequenceNumber).isEqualTo(1.toByte()) + } + + @Test + fun `basalProgram round-trips through Gson via a fresh manager instance`() { + val program = BasalProgram( + listOf( + BasalProgram.Segment(0, 24, 100), + BasalProgram.Segment(24, 48, 150) + ) + ) + val writer = newManager() + writer.basalProgram = program + + val reader = newManager() + + assertThat(reader.basalProgram).isEqualTo(program) + assertThat(reader.basalProgram!!.segments).hasSize(2) + assertThat(reader.basalProgram!!.segments[0].basalRateInHundredthUnitsPerHour).isEqualTo(100) + assertThat(reader.basalProgram!!.segments[1].basalRateInHundredthUnitsPerHour).isEqualTo(150) + } + + @Test + fun `activationProgress and prime parameters round-trip`() { + val writer = newManager() + writer.activationProgress = ActivationProgress.PRIME_COMPLETED + writer.primePulseRate = 20 + writer.firstPrimeBolusVolume = 52 + writer.secondPrimeBolusVolume = 10 + writer.podLifeInHours = 72 + + val reader = newManager() + + assertThat(reader.activationProgress).isEqualTo(ActivationProgress.PRIME_COMPLETED) + assertThat(reader.primePulseRate).isEqualTo(20.toShort()) + assertThat(reader.firstPrimeBolusVolume).isEqualTo(52.toShort()) + assertThat(reader.secondPrimeBolusVolume).isEqualTo(10.toShort()) + assertThat(reader.podLifeInHours).isEqualTo(72.toShort()) + } + + @Test + fun `pendingDoseCommand round-trips including nested bolusType enum`() { + val pending = O5PodStateManager.PendingDoseCommand( + type = O5PodStateManager.PendingDoseType.BOLUS, + requestedUnits = 1.25, + bolusType = BS.Type.SMB, + startedAt = 123456789L + ) + val writer = newManager() + writer.pendingDoseCommand = pending + + val reader = newManager() + + assertThat(reader.pendingDoseCommand).isEqualTo(pending) + assertThat(reader.pendingDoseCommand!!.bolusType).isEqualTo(BS.Type.SMB) + } + + @Test + fun `dosing state fields round-trip`() { + val writer = newManager() + writer.deliverySuspended = true + writer.lastBolusStartTime = 1_000L + writer.lastBolusRequestedUnits = 2.5 + writer.lastBolusDeliveredUnits = 2.5 + writer.activeTempBasalStartTime = 2_000L + writer.activeTempBasalRate = 0.5 + writer.activeTempBasalDurationMinutes = 30 + + val reader = newManager() + + assertThat(reader.deliverySuspended).isTrue() + assertThat(reader.lastBolusStartTime).isEqualTo(1_000L) + assertThat(reader.lastBolusRequestedUnits).isEqualTo(2.5) + assertThat(reader.lastBolusDeliveredUnits).isEqualTo(2.5) + assertThat(reader.activeTempBasalStartTime).isEqualTo(2_000L) + assertThat(reader.activeTempBasalRate).isEqualTo(0.5) + assertThat(reader.activeTempBasalDurationMinutes).isEqualTo(30.toShort()) + } + + @Test + fun `store() persists ltk but the logged copy strips it`() { + val writer = newManager() + writer.ltk = byteArrayOf(1, 2, 3, 4) + + val reader = newManager() + assertThat(reader.ltk).isEqualTo(byteArrayOf(1, 2, 3, 4)) + } + + @Test + fun `increaseMessageSequenceNumber wraps at 4 bits`() { + val manager = newManager() + manager.msgSequenceNumber = 0x0e + + manager.increaseMessageSequenceNumber() + assertThat(manager.msgSequenceNumber).isEqualTo(0x0f.toByte()) + + manager.increaseMessageSequenceNumber() + assertThat(manager.msgSequenceNumber).isEqualTo(0x00.toByte()) + } + + @Test + fun `reset clears activation progress, prime parameters, and dosing state`() { + val manager = newManager() + manager.activationProgress = ActivationProgress.COMPLETED + manager.basalProgram = BasalProgram(listOf(BasalProgram.Segment(0, 48, 100))) + manager.primePulseRate = 20 + manager.pendingDoseCommand = O5PodStateManager.PendingDoseCommand( + type = O5PodStateManager.PendingDoseType.BASAL_PROGRAM, startedAt = 1L + ) + manager.ltk = byteArrayOf(9) + + manager.reset() + + assertThat(manager.activationProgress).isEqualTo(ActivationProgress.NOT_STARTED) + assertThat(manager.basalProgram).isNull() + assertThat(manager.primePulseRate).isNull() + assertThat(manager.pendingDoseCommand).isNull() + assertThat(manager.ltk).isNull() + } + + @Test + fun `connection identity and counters round-trip`() { + val writer = newManager() + writer.bluetoothAddress = "AA:BB:CC:DD:EE:FF" + writer.controllerId = 0x11223344L + writer.podId = 0x55667788L + writer.connectionAttempts = 3 + writer.successfulConnections = 2 + writer.eapAkaSequenceNumber = 42L + + val reader = newManager() + + assertThat(reader.bluetoothAddress).isEqualTo("AA:BB:CC:DD:EE:FF") + assertThat(reader.controllerId).isEqualTo(0x11223344L) + assertThat(reader.podId).isEqualTo(0x55667788L) + assertThat(reader.connectionAttempts).isEqualTo(3) + assertThat(reader.successfulConnections).isEqualTo(2) + assertThat(reader.eapAkaSequenceNumber).isEqualTo(42L) + } + + @Test + fun `updateFromPairing sets controllerId, podId, ltk, and msgSequenceNumber together and persists`() { + val writer = newManager() + + val ltk = ByteArray(16) { it.toByte() } + writer.updateFromPairing( + controllerId = 0xAABBCCDDL, + podId = 0x11223344L, + pairResult = app.aaps.pump.omnipod.common.bledriver.comm.pair.PairResult(ltk = ltk, msgSeq = 7) + ) + + val reader = newManager() + assertThat(reader.controllerId).isEqualTo(0xAABBCCDDL) + assertThat(reader.podId).isEqualTo(0x11223344L) + assertThat(reader.ltk).isEqualTo(ltk) + assertThat(reader.msgSequenceNumber).isEqualTo(7.toByte()) + } + + @Test + fun `updateFromVersionResponse persists the parsed status-version fields`() { + val response = VersionResponse(hexToBytes("0115040A00010300040208146CC1000954D400FFFFFFFF")) + val writer = newManager() + + writer.updateFromVersionResponse(response) + + val reader = newManager() + assertThat(reader.podStatus).isEqualTo(response.podStatus) + assertThat(reader.firmwareVersion).isNotNull() + assertThat(reader.bleVersion).isNotNull() + assertThat(reader.lotNumber).isEqualTo(response.lotNumber) + assertThat(reader.podSequenceNumber).isEqualTo(response.podSequenceNumber) + assertThat(reader.lastStatusResponseReceived).isNotNull() + } + + @Test + fun `updateFromDefaultStatusResponse persists the parsed status fields`() { + val response = DefaultStatusResponse(hexToBytes("1D1800A02800000463FF")) + val writer = newManager() + + writer.updateFromDefaultStatusResponse(response) + + val reader = newManager() + assertThat(reader.podStatus).isEqualTo(response.podStatus) + assertThat(reader.deliveryStatus).isEqualTo(response.deliveryStatus) + assertThat(reader.totalPulsesDelivered).isEqualTo(response.totalPulsesDelivered) + assertThat(reader.reservoirPulsesRemaining).isEqualTo(response.reservoirPulsesRemaining) + assertThat(reader.minutesSinceActivation).isEqualTo(response.minutesSinceActivation) + } + + + @Test + fun `isPodKaput is true once a status response reports ALARM`() { + val response = DefaultStatusResponse(hexToBytes("1D1D00A02800000463FF")) + val manager = newManager() + assertThat(manager.isPodKaput).isFalse() + + manager.updateFromDefaultStatusResponse(response) + + assertThat(manager.podStatus).isEqualTo(PodStatus.ALARM) + assertThat(manager.isPodKaput).isTrue() + } + + @Test + fun `isPodKaput is true once a status response reports DEACTIVATED`() { + val manager = newManager() + + manager.updateFromDefaultStatusResponse(DefaultStatusResponse(hexToBytes("1D1F00A02800000463FF"))) + + assertThat(manager.podStatus).isEqualTo(PodStatus.DEACTIVATED) + assertThat(manager.isPodKaput).isTrue() + } + + @Test + fun `isPodKaput stays false for a normally running pod`() { + val manager = newManager() + + manager.updateFromDefaultStatusResponse(DefaultStatusResponse(hexToBytes("1D1800A02800000463FF"))) + + assertThat(manager.podStatus).isEqualTo(PodStatus.RUNNING_ABOVE_MIN_VOLUME) + assertThat(manager.isPodKaput).isFalse() + } + + @Test + fun `updateFromAlarmStatusResponse persists the parsed alarm fields`() { + val response = AlarmStatusResponse(hexToBytes("021602080100000501BD00000003FF01950000000000670A")) + val writer = newManager() + + writer.updateFromAlarmStatusResponse(response) + + val reader = newManager() + assertThat(reader.alarmType).isEqualTo(response.alarmType) + assertThat(reader.alarmTime).isEqualTo(response.alarmTime) + assertThat(reader.occlusionAlarm).isEqualTo(response.occlusionAlarm) + assertThat(reader.podStatusWhenAlarmOccurred).isEqualTo(response.podStatusWhenAlarmOccurred) + assertThat(reader.rssi).isEqualTo(response.rssi) + } + + @Test + fun `updateFromActivationTimeResponse persists podActivatedAt as an epoch millis Long`() { + val bytes = byteArrayOf( + 0x02, 0x11, 0x05, + 0x14, + 0x00, 0x7D, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x07, + 0x0F, + 0x1A, + 0x09, + 0x1E + ) + val response = PodInfoActivationTimeResponse(bytes) + val writer = newManager() + + writer.updateFromActivationTimeResponse(response) + + val reader = newManager() + assertThat(reader.alarmType).isEqualTo(AlarmType.ALARM_OCCLUDED) + assertThat(reader.alarmTime).isEqualTo(125.toShort()) + val activatedAt = requireNotNull(reader.podActivatedAt) + val calendar = java.util.Calendar.getInstance() + calendar.timeInMillis = activatedAt + assertThat(calendar[java.util.Calendar.YEAR]).isEqualTo(2026) + assertThat(calendar[java.util.Calendar.MONTH]).isEqualTo(java.util.Calendar.JULY) + assertThat(calendar[java.util.Calendar.DAY_OF_MONTH]).isEqualTo(15) + } + + @Test + fun `updateFromTriggeredAlertsResponse persists the AlertType-to-Short map through Gson`() { + val bytes = byteArrayOf( + 0x02, 0x13, 0x01, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x0A, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x78, + 0x00, 0x00, + 0x00, 0x00, + 0x01, 0x2C + ) + val response = PodInfoTriggeredAlertsResponse(bytes) + val writer = newManager() + + writer.updateFromTriggeredAlertsResponse(response) + + val reader = newManager() + val triggered = requireNotNull(reader.triggeredAlertTimes) + assertThat(triggered).containsExactly( + AlertType.MULTI_COMMAND, 10.toShort(), + AlertType.LOW_RESERVOIR, 120.toShort(), + AlertType.EXPIRATION, 300.toShort() + ) + } + + @Test + fun `load() falls back to defaults when the stored JSON is corrupted`() { + backingStore = "{ not valid json" + + val manager = newManager() + + assertThat(manager.activationProgress).isEqualTo(ActivationProgress.NOT_STARTED) + assertThat(manager.ltk).isNull() + } +} diff --git a/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/ui/O5CredentialImportViewModelTest.kt b/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/ui/O5CredentialImportViewModelTest.kt new file mode 100644 index 000000000000..521899076913 --- /dev/null +++ b/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/ui/O5CredentialImportViewModelTest.kt @@ -0,0 +1,117 @@ +package app.aaps.pump.omnipod.omnipod5.ui + +import app.aaps.pump.omnipod.omnipod5.bledriver.comm.pair.O5RegistrationData +import app.aaps.pump.omnipod.omnipod5.bledriver.pod.security.SecureO5RegistrationStorage +import com.google.common.truth.Truth.assertThat +import org.junit.jupiter.api.AfterEach +import org.junit.jupiter.api.BeforeEach +import org.junit.jupiter.api.Test +import org.mockito.kotlin.mock +import org.mockito.kotlin.verify +import java.util.Base64 + +/** + * [O5CredentialImportViewModel] - manipulates the process-wide [O5RegistrationData] registry, + * so every test cleans it up in @BeforeEach/@AfterEach to avoid cross-test pollution (same + * discipline as [app.aaps.pump.omnipod.omnipod5.bledriver.comm.pair.O5CertificateStoreTest] etc). + */ +class O5CredentialImportViewModelTest { + + private val secureO5RegistrationStorage = mock() + + private fun newViewModel() = O5CredentialImportViewModel(secureO5RegistrationStorage) + + private fun packedCredential(controllerId: Long): String { + val privB64 = Base64.getEncoder().encodeToString(byteArrayOf(1, 2, 3, 4)) + val pubB64 = Base64.getEncoder().encodeToString(byteArrayOf(5, 6, 7, 8)) + return "$controllerId|$privB64|$pubB64||" + } + + @BeforeEach + fun clearRegistrationData() { + O5RegistrationData.allValues.forEach { O5RegistrationData.remove(it.controllerId) } + } + + @AfterEach + fun tearDown() { + O5RegistrationData.allValues.forEach { O5RegistrationData.remove(it.controllerId) } + } + + @Test + fun `importCurrentInput fails with a helpful message when the input is blank`() { + val vm = newViewModel() + vm.onInputChanged(" ") + + vm.importCurrentInput() + + assertThat(vm.importResult.value).isInstanceOf(ImportResult.Failure::class.java) + } + + @Test + fun `importCurrentInput fails when the credential string is malformed`() { + val vm = newViewModel() + vm.onInputChanged("not a valid credential string") + + vm.importCurrentInput() + + assertThat(vm.importResult.value).isInstanceOf(ImportResult.Failure::class.java) + } + + @Test + fun `importCurrentInput installs, persists, and reports success for a well-formed credential`() { + val vm = newViewModel() + val controllerId = 99887766L + vm.onInputChanged(packedCredential(controllerId)) + + vm.importCurrentInput() + + assertThat(vm.importResult.value).isEqualTo(ImportResult.Success(controllerId)) + assertThat(vm.inputText.value).isEmpty() + assertThat(O5RegistrationData.contains(controllerId)).isTrue() + verify(secureO5RegistrationStorage).persistEntry( + O5RegistrationData.get(controllerId)!!, + O5RegistrationData.O5RegistrationSource.IMPORTED + ) + } + + @Test + fun `importCurrentInput updates installedCredentials after a successful import`() { + val vm = newViewModel() + val controllerId = 55443322L + vm.onInputChanged(packedCredential(controllerId)) + + vm.importCurrentInput() + + assertThat(vm.installedCredentials.value).hasSize(1) + assertThat(vm.installedCredentials.value[0].controllerId).isEqualTo(controllerId) + assertThat(vm.installedCredentials.value[0].source).isEqualTo(O5RegistrationData.O5RegistrationSource.IMPORTED) + } + + @Test + fun `onInputChanged updates inputText and clears a stale import result`() { + val vm = newViewModel() + vm.onInputChanged("not valid") + vm.importCurrentInput() + assertThat(vm.importResult.value).isNotEqualTo(ImportResult.None) + + vm.onInputChanged("something new") + + assertThat(vm.inputText.value).isEqualTo("something new") + assertThat(vm.importResult.value).isEqualTo(ImportResult.None) + } + + @Test + fun `removeCredential removes from the registry and persisted storage, then refreshes the list`() { + val vm = newViewModel() + val controllerId = 11223344L + vm.onInputChanged(packedCredential(controllerId)) + vm.importCurrentInput() + assertThat(vm.installedCredentials.value).hasSize(1) + + vm.removeCredential(controllerId) + + assertThat(O5RegistrationData.contains(controllerId)).isFalse() + assertThat(vm.installedCredentials.value).isEmpty() + verify(secureO5RegistrationStorage).removeEntry(controllerId) + } +} diff --git a/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/O5OverviewViewModelTest.kt b/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/O5OverviewViewModelTest.kt new file mode 100644 index 000000000000..ebe696cce648 --- /dev/null +++ b/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/O5OverviewViewModelTest.kt @@ -0,0 +1,150 @@ +package app.aaps.pump.omnipod.omnipod5.ui.compose + +import android.content.Context +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.insulin.ConcentrationHelper +import app.aaps.core.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventPumpStatusChanged +import app.aaps.core.interfaces.rx.events.EventQueueChanged +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.ui.compose.StatusLevel +import app.aaps.core.ui.compose.pump.PumpInfoRow +import app.aaps.pump.omnipod.common.bledriver.pod.definition.ActivationProgress +import app.aaps.pump.omnipod.common.bledriver.pod.definition.PodStatus +import app.aaps.pump.omnipod.omnipod5.bledriver.pod.state.O5PodStateManager +import com.google.common.truth.Truth.assertThat +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.flow.emptyFlow +import kotlinx.coroutines.test.UnconfinedTestDispatcher +import kotlinx.coroutines.test.resetMain +import kotlinx.coroutines.test.setMain +import org.junit.jupiter.api.AfterEach +import org.junit.jupiter.api.BeforeEach +import org.junit.jupiter.api.Test +import org.mockito.Mock +import org.mockito.MockitoAnnotations +import org.mockito.kotlin.any +import org.mockito.kotlin.whenever +import app.aaps.core.ui.R as CoreUiR +import app.aaps.pump.omnipod.common.R as CommonR + +/** + * Mirrors [app.aaps.pump.omnipod.dash.ui.compose.DashOverviewViewModelTest]'s pattern for + * O5's [O5OverviewViewModel] - covers [app.aaps.core.ui.compose.pump.PumpOverviewUiState] + * assembly (the initial value produced by `buildUiState()`). Both tests keep the pod in the + * pre-activation ("not initialized", `activationProgress = NOT_STARTED`) state, the + * least stub-heavy branch of `buildInfoRows()`: it emits placeholder rows and never + * dereferences the pod's optional dosing fields. + */ +@OptIn(ExperimentalCoroutinesApi::class) +internal class O5OverviewViewModelTest { + + @Mock private lateinit var rh: ResourceHelper + @Mock private lateinit var podStateManager: O5PodStateManager + @Mock private lateinit var commandQueue: CommandQueue + @Mock private lateinit var rxBus: RxBus + @Mock private lateinit var dateUtil: DateUtil + @Mock private lateinit var config: Config + @Mock private lateinit var ch: ConcentrationHelper + @Mock private lateinit var context: Context + + @BeforeEach + fun setUp() { + MockitoAnnotations.openMocks(this) + Dispatchers.setMain(UnconfinedTestDispatcher()) + + whenever(rxBus.toFlow(EventPumpStatusChanged::class.java)).thenReturn(emptyFlow()) + whenever(rxBus.toFlow(EventQueueChanged::class.java)).thenReturn(emptyFlow()) + + whenever(podStateManager.activationProgress).thenReturn(ActivationProgress.NOT_STARTED) + + whenever(rh.gs(any())).thenReturn("label") + whenever(rh.gs(any(), any(), any())).thenReturn("label") + whenever(dateUtil.dateAndTimeString(any())).thenReturn("date") + whenever(ch.insulinAmountString(any())).thenReturn("0 U") + } + + @AfterEach + fun tearDown() { + Dispatchers.resetMain() + } + + private fun createViewModel() = O5OverviewViewModel(rh, podStateManager, commandQueue, rxBus, dateUtil, config, ch, context) + + @Test + fun preActivation_buildsPlaceholderRows_criticalPodStatus_andOffersActivate() { + whenever(rh.gs(CommonR.string.omnipod_common_overview_pod_status)).thenReturn("Pod status") + whenever(rh.gs(CommonR.string.omnipod_common_pod_management_button_activate_pod)).thenReturn("Activate pod") + whenever(rh.gs(CoreUiR.string.refresh)).thenReturn("Refresh") + + val state = createViewModel().uiState.value + + assertThat(state.infoRows).isNotEmpty() + assertThat(state.statusBanner).isNull() + assertThat(state.queueStatus).isNull() + + val podStatusRow = state.infoRows.filterIsInstance().first { it.label == "Pod status" } + assertThat(podStatusRow.level).isEqualTo(StatusLevel.CRITICAL) + + val refresh = state.primaryActions.first { it.label == "Refresh" } + assertThat(refresh.enabled).isFalse() + val activate = state.managementActions.first { it.label == "Activate pod" } + assertThat(activate.visible).isTrue() + } + + @Test + fun noConnectionAttemptsYet_showsPlaceholderBluetoothQuality() { + whenever(rh.gs(CommonR.string.omnipod_common_overview_bluetooth_connection_quality)).thenReturn("BT quality") + whenever(podStateManager.connectionAttempts).thenReturn(0) + + val state = createViewModel().uiState.value + + val btQualityRow = state.infoRows.filterIsInstance().first { it.label == "BT quality" } + assertThat(btQualityRow.value).isEqualTo("-") + } + + @Test + fun connectionQuality_reportsSuccessfulOverAttemptedRatio() { + whenever(rh.gs(CommonR.string.omnipod_common_overview_bluetooth_connection_quality)).thenReturn("BT quality") + whenever(podStateManager.connectionAttempts).thenReturn(10) + whenever(podStateManager.successfulConnections).thenReturn(8) + + val state = createViewModel().uiState.value + + val btQualityRow = state.infoRows.filterIsInstance().first { it.label == "BT quality" } + assertThat(btQualityRow.value).contains("8/10") + } + + @Test + fun activatedPod_offersDeactivateNotActivate() { + whenever(podStateManager.activationProgress).thenReturn(ActivationProgress.COMPLETED) + whenever(rh.gs(CommonR.string.omnipod_common_pod_management_button_activate_pod)).thenReturn("Activate pod") + whenever(rh.gs(CommonR.string.omnipod_common_pod_management_button_deactivate_pod)).thenReturn("Deactivate pod") + + val state = createViewModel().uiState.value + + val activate = state.managementActions.first { it.label == "Activate pod" } + assertThat(activate.visible).isFalse() + val deactivate = state.managementActions.first { it.label == "Deactivate pod" } + assertThat(deactivate.visible).isTrue() + } + + @Test + fun suspendedActivePod_offersResumeNotSuspend() { + whenever(podStateManager.activationProgress).thenReturn(ActivationProgress.COMPLETED) + whenever(podStateManager.podStatus).thenReturn(PodStatus.RUNNING_ABOVE_MIN_VOLUME) + whenever(podStateManager.deliverySuspended).thenReturn(true) + whenever(rh.gs(CommonR.string.omnipod_common_overview_button_resume_delivery)).thenReturn("Resume") + whenever(rh.gs(CommonR.string.omnipod_common_overview_button_suspend_delivery)).thenReturn("Suspend") + + val state = createViewModel().uiState.value + + val resume = state.primaryActions.first { it.label == "Resume" } + assertThat(resume.visible).isTrue() + val suspend = state.primaryActions.first { it.label == "Suspend" } + assertThat(suspend.visible).isFalse() + } +} diff --git a/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/ui/wizard/compose/O5OmnipodWizardViewModelTest.kt b/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/ui/wizard/compose/O5OmnipodWizardViewModelTest.kt new file mode 100644 index 000000000000..54ce0ffd4939 --- /dev/null +++ b/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/ui/wizard/compose/O5OmnipodWizardViewModelTest.kt @@ -0,0 +1,192 @@ +package app.aaps.pump.omnipod.omnipod5.ui.wizard.compose +import app.aaps.pump.omnipod.common.ui.wizard.compose.OmnipodWizardStep +import app.aaps.pump.omnipod.common.ui.wizard.compose.ActivationType +import app.aaps.pump.omnipod.common.ui.wizard.compose.ActionState + +import app.aaps.core.data.model.ICfg +import app.aaps.core.data.model.TE +import app.aaps.core.data.ue.Sources +import app.aaps.core.interfaces.db.PersistenceLayer +import app.aaps.core.interfaces.insulin.InsulinManager +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.notifications.NotificationManager +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.profile.ProfileRepository +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.keys.BooleanKey +import app.aaps.core.keys.interfaces.Preferences +import app.aaps.pump.omnipod.omnipod5.bledriver.comm.O5BleManager +import app.aaps.pump.omnipod.common.bledriver.pod.definition.AlarmType +import app.aaps.pump.omnipod.omnipod5.bledriver.pod.state.O5PodStateManager +import com.google.common.truth.Truth.assertThat +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.test.StandardTestDispatcher +import kotlinx.coroutines.test.resetMain +import kotlinx.coroutines.test.setMain +import org.junit.jupiter.api.AfterEach +import org.junit.jupiter.api.BeforeEach +import org.junit.jupiter.api.Test +import org.mockito.Mock +import org.mockito.MockitoAnnotations +import org.mockito.kotlin.mock +import org.mockito.kotlin.whenever +import javax.inject.Provider + +/** + * Mirrors [app.aaps.pump.omnipod.dash.ui.wizard.compose.DashOmnipodWizardViewModelTest]'s + * pattern for O5's concrete [O5OmnipodWizardViewModel] - covers the synchronous, + * pure wizard-navigation and selection logic inherited from + * [OmnipodWizardViewModel] plus the O5-specific overrides. `doInitializePod()`/ + * `doInsertCannula()`/`doDeactivatePod()` are RxJava-heavy BLE flows deliberately not + * exercised here, same scoping choice Dash's own test makes. + * + * The VM's `init{}` launches a coroutine via `viewModelScope`. A `StandardTestDispatcher` + * as Main defers that coroutine (no `advanceUntilIdle()` here), so construction stays + * clean and every assertion runs against the deterministic default state. + */ +@OptIn(ExperimentalCoroutinesApi::class) +internal class O5OmnipodWizardViewModelTest { + + @Mock private lateinit var bleManager: O5BleManager + @Mock private lateinit var podStateManager: O5PodStateManager + @Mock private lateinit var preferences: Preferences + @Mock private lateinit var rh: ResourceHelper + @Mock private lateinit var commandQueue: CommandQueue + @Mock private lateinit var notificationManager: NotificationManager + @Mock private lateinit var pumpSync: PumpSync + @Mock private lateinit var insulinManager: InsulinManager + @Mock private lateinit var profileFunction: ProfileFunction + @Mock private lateinit var profileRepository: ProfileRepository + @Mock private lateinit var persistenceLayer: PersistenceLayer + @Mock private lateinit var pumpEnactResultProvider: Provider + @Mock private lateinit var logger: AAPSLogger + @Mock private lateinit var aapsSchedulers: AapsSchedulers + + private lateinit var sut: O5OmnipodWizardViewModel + + @BeforeEach + fun setUp() { + MockitoAnnotations.openMocks(this) + Dispatchers.setMain(StandardTestDispatcher()) + sut = O5OmnipodWizardViewModel( + bleManager, podStateManager, preferences, rh, commandQueue, + notificationManager, pumpSync, insulinManager, persistenceLayer, + profileFunction, profileRepository, pumpEnactResultProvider, logger, aapsSchedulers + ) + } + + @AfterEach + fun tearDown() = Dispatchers.resetMain() + + @Test + fun defaultState_isIdleAndUninitialized() { + assertThat(sut.currentStep.value).isNull() + assertThat(sut.totalSteps.value).isEqualTo(0) + assertThat(sut.currentStepIndex.value).isEqualTo(0) + assertThat(sut.canGoBack.value).isFalse() + assertThat(sut.actionState.value).isEqualTo(ActionState.Idle) + assertThat(sut.ready.value).isFalse() + assertThat(sut.availableInsulins.value).isEmpty() + assertThat(sut.selectedInsulin.value).isNull() + assertThat(sut.showInsulinStep).isFalse() + assertThat(sut.siteLocation.value).isEqualTo(TE.Location.NONE) + assertThat(sut.siteArrow.value).isEqualTo(TE.Arrow.NONE) + } + + @Test + fun pumpSource_isOmnipod5() { + assertThat(sut.pumpSource).isEqualTo(Sources.Omnipod5) + } + + @Test + fun isPodInAlarm_reflectsAlarmType_unlikeDashsUnimplementedStub() { + whenever(podStateManager.alarmType).thenReturn(null) + assertThat(sut.isPodInAlarm()).isFalse() + + whenever(podStateManager.alarmType).thenReturn(AlarmType.ALARM_EMPTY_RESERVOIR) + assertThat(sut.isPodInAlarm()).isTrue() + } + + @Test + fun podStateQueries_matchDashsUnimplementedDefaults() { + assertThat(sut.isPodActivationTimeExceeded()).isFalse() + assertThat(sut.isPodDeactivatable()).isTrue() + } + + @Test + fun profileGateStep_hasNoBodyTextResource() { + assertThat(sut.getTextForStep(OmnipodWizardStep.PROFILE_GATE)).isEqualTo(0) + } + + @Test + fun everyWizardStep_hasATitleAndTextResourceMapping() { + for (step in OmnipodWizardStep.entries) { + sut.getTitleForStep(step) + sut.getTextForStep(step) + } + } + + @Test + fun initializeDeactivation_buildsThreeStepFlow() { + sut.initializeDeactivation() + + assertThat(sut.totalSteps.value).isEqualTo(3) + assertThat(sut.currentStepIndex.value).isEqualTo(0) + assertThat(sut.currentStep.value).isEqualTo(OmnipodWizardStep.START_POD_DEACTIVATION) + assertThat(sut.canGoBack.value).isFalse() + + sut.moveToNext() + assertThat(sut.currentStepIndex.value).isEqualTo(1) + assertThat(sut.currentStep.value).isEqualTo(OmnipodWizardStep.DEACTIVATE_POD) + + sut.moveToNext() + assertThat(sut.currentStepIndex.value).isEqualTo(2) + assertThat(sut.currentStep.value).isEqualTo(OmnipodWizardStep.POD_DEACTIVATED) + } + + @Test + fun initializeActivationLong_buildsFullFlow_withoutOptionalSteps() { + whenever(preferences.get(BooleanKey.SiteRotationManagePump)).thenReturn(false) + + sut.initializeActivation(ActivationType.LONG) + + assertThat(sut.totalSteps.value).isEqualTo(5) + assertThat(sut.currentStepIndex.value).isEqualTo(0) + assertThat(sut.currentStep.value).isEqualTo(OmnipodWizardStep.START_POD_ACTIVATION) + + sut.moveToNext() + assertThat(sut.currentStep.value).isEqualTo(OmnipodWizardStep.INITIALIZE_POD) + } + + @Test + fun selectInsulin_updatesSelectedInsulin() { + val insulin: ICfg = mock() + + sut.selectInsulin(insulin) + + assertThat(sut.selectedInsulin.value).isSameInstanceAs(insulin) + } + + @Test + fun selectProfile_updatesSelectedProfile() { + sut.selectProfile("Default") + + assertThat(sut.selectedProfile.value).isEqualTo("Default") + } + + @Test + fun updateSiteLocationAndArrow_areReflectedInSelectors() { + sut.updateSiteLocation(TE.Location.SIDE_RIGHT_UPPER_ARM) + sut.updateSiteArrow(TE.Arrow.UP) + + assertThat(sut.siteLocation.value).isEqualTo(TE.Location.SIDE_RIGHT_UPPER_ARM) + assertThat(sut.siteArrow.value).isEqualTo(TE.Arrow.UP) + assertThat(sut.getSelectedSiteLocation()).isEqualTo(TE.Location.SIDE_RIGHT_UPPER_ARM) + assertThat(sut.getSelectedSiteArrow()).isEqualTo(TE.Arrow.UP) + } +} diff --git a/settings.gradle b/settings.gradle index bbc57b910f2d..af6f11c6fc30 100644 --- a/settings.gradle +++ b/settings.gradle @@ -43,6 +43,7 @@ include ':pump:medtronic' include ':pump:omnipod:common' include ':pump:omnipod:eros' include ':pump:omnipod:dash' +include ':pump:omnipod:omnipod5' include ':pump:common' include ':pump:rileylink' include ':pump:virtual' From 9e0ac2bed0277207976fd1d4fad089d3111393c3 Mon Sep 17 00:00:00 2001 From: Prem Nirmal Date: Wed, 26 Aug 2026 12:04:28 +0100 Subject: [PATCH 02/85] Update alert reminder config for O5 --- .../pod/util/O5AlertConfigBuilder.kt | 36 +++++++++++-------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/util/O5AlertConfigBuilder.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/util/O5AlertConfigBuilder.kt index 5ef35642524a..1607dc011181 100644 --- a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/util/O5AlertConfigBuilder.kt +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/util/O5AlertConfigBuilder.kt @@ -19,12 +19,17 @@ import java.util.concurrent.TimeUnit /** * Builds the expiration/expiration-imminent/user-set-expiration [AlertConfiguration]s from - * current preferences - mirrors [app.aaps.pump.omnipod.dash.driver.OmnipodDashManagerImpl - * .createActivationPart2Observables]'s expiration-alert delay math exactly, using O5's own + * current preferences - based on [app.aaps.pump.omnipod.dash.driver.OmnipodDashManagerImpl + * .createActivationPart2Observables]'s expiration-alert delay math, using O5's own * [expiry] extension in place of Dash's pod-state-manager property. Shared between * [app.aaps.pump.omnipod.omnipod5.ui.wizard.compose.O5OmnipodWizardViewModel] (initial * programming during activation) and [app.aaps.pump.omnipod.omnipod5.O5PumpPlugin] (re-sync * when preferences change afterward) - hoisted here rather than duplicated. + * + * Note: unlike Dash, the USER_SET_EXPIRATION reminder is always added to the returned list + * (with enabled=false when the reminder is disabled) rather than being omitted. The pod's + * ProgramAlerts command only updates the slots it contains, so omitting it would leave a + * previously programmed reminder beeping on the pod even after the user disables it. */ fun buildO5ExpirationAlerts(podStateManager: O5PodStateManager, preferences: Preferences, aapsLogger: AAPSLogger): List { val userConfiguredExpirationReminderHours = @@ -72,20 +77,21 @@ fun buildO5ExpirationAlerts(podStateManager: O5PodStateManager, preferences: Pre val userExpiryReminderDelay = podLifeLeft.minus( Duration.ofHours(userConfiguredExpirationReminderHours ?: (PodConstants.MAX_POD_LIFETIME.toHours() + 1)) ) - if (!userExpiryReminderDelay.isNegative) { - alerts.add( - AlertConfiguration( - AlertType.USER_SET_EXPIRATION, - enabled = userExpiryReminderEnabled, - durationInMinutes = 0, - autoOff = false, - AlertTrigger.TimerTrigger(userExpiryReminderDelay.toMinutes().toShort()), - BeepType.FOUR_TIMES_BIP_BEEP, - BeepRepetitionType.EVERY_MINUTE_AND_EVERY_15_MIN - ) - ) - } else { + // Always include USER_SET_EXPIRATION in the list. + val reminderActive = userExpiryReminderEnabled && !userExpiryReminderDelay.isNegative + if (userExpiryReminderEnabled && userExpiryReminderDelay.isNegative) { aapsLogger.warn(LTag.PUMPBTCOMM, "buildO5ExpirationAlerts negative expiryAlertDuration=$userExpiryReminderDelay") } + alerts.add( + AlertConfiguration( + AlertType.USER_SET_EXPIRATION, + enabled = reminderActive, + durationInMinutes = 0, + autoOff = false, + AlertTrigger.TimerTrigger(if (reminderActive) userExpiryReminderDelay.toMinutes().toShort() else 0), + BeepType.FOUR_TIMES_BIP_BEEP, + BeepRepetitionType.EVERY_MINUTE_AND_EVERY_15_MIN + ) + ) return alerts } From 09f35efe6e6eaa19206230c06e6ce8aecfe48ec7 Mon Sep 17 00:00:00 2001 From: Prem Nirmal Date: Wed, 26 Aug 2026 12:08:40 +0100 Subject: [PATCH 03/85] do not proactively connect to pod on overview open, do it when refresh is clicked --- .../ui/compose/O5OverviewViewModel.kt | 21 ------------------- 1 file changed, 21 deletions(-) diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/O5OverviewViewModel.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/O5OverviewViewModel.kt index b130d166504b..a8a8a53ed1a6 100644 --- a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/O5OverviewViewModel.kt +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/O5OverviewViewModel.kt @@ -91,11 +91,6 @@ class O5OverviewViewModel @Inject constructor( companion object { private const val PLACEHOLDER = "-" - - /** - * Last pod status check. - */ - private const val STATUS_REFRESH_ON_OPEN_THROTTLE_MS = 60_000L } private val scope = CoroutineScope(SupervisorJob() + Dispatchers.Default) @@ -122,22 +117,6 @@ class O5OverviewViewModel @Inject constructor( queueStatus = communicationStatus.queueStatus() ) - init { - refreshStatusOnOpen() - } - - /** - * Read the pod status when the overview screen is opened - */ - private fun refreshStatusOnOpen() { - if (podStateManager.activationProgress != ActivationProgress.COMPLETED) return - if (!isQueueEmpty()) return - val lastStatus = podStateManager.lastStatusResponseReceived - if (lastStatus != null && System.currentTimeMillis() - lastStatus < STATUS_REFRESH_ON_OPEN_THROTTLE_MS) return - viewModelScope.launch { commandQueue.readStatus(rh.gs(CoreUiR.string.refresh)) } - } - - private fun buildInfoRows(): List = buildList { val activated = podStateManager.activationProgress.isAtLeast(ActivationProgress.SET_UNIQUE_ID) From 0a073312a11293de00ed78c5c691cc49102b0f5e Mon Sep 17 00:00:00 2001 From: Prem Nirmal Date: Fri, 4 Sep 2026 15:02:55 +0100 Subject: [PATCH 04/85] Bolus completion fix, pairing IDs and activation timeout --- .../bledriver/pod/definition/PodStatus.kt | 2 + .../pump/omnipod/omnipod5/O5PumpPlugin.kt | 165 +++++++++++++----- .../bledriver/comm/O5BleManagerImpl.kt | 135 +++++++++----- .../omnipod5/bledriver/comm/O5IdRotation.kt | 18 +- .../bledriver/pod/state/O5PodStateManager.kt | 33 +++- .../pod/state/PersistedO5PodStateManager.kt | 29 ++- .../compose/O5OmnipodWizardViewModel.kt | 21 ++- .../pump/omnipod/omnipod5/O5PumpPluginTest.kt | 74 +++++++- .../bledriver/comm/O5BleManagerImplTest.kt | 7 +- .../bledriver/comm/O5IdRotationTest.kt | 18 +- .../state/PersistedO5PodStateManagerTest.kt | 67 ++++++- .../compose/O5OmnipodWizardViewModelTest.kt | 20 ++- 12 files changed, 460 insertions(+), 129 deletions(-) diff --git a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/definition/PodStatus.kt b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/definition/PodStatus.kt index 6acb26892b0d..b221a2b3af97 100644 --- a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/definition/PodStatus.kt +++ b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/pod/definition/PodStatus.kt @@ -23,4 +23,6 @@ enum class PodStatus(override val value: Byte) : HasValue { UNKNOWN(0xff.toByte()); fun isRunning(): Boolean = this == RUNNING_ABOVE_MIN_VOLUME || this == RUNNING_BELOW_MIN_VOLUME + + fun isActivationTimeExceeded(): Boolean = this == LUMP_OF_COAL } diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/O5PumpPlugin.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/O5PumpPlugin.kt index e56a40c8b931..c8ecf7377064 100644 --- a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/O5PumpPlugin.kt +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/O5PumpPlugin.kt @@ -347,6 +347,11 @@ class O5PumpPlugin @Inject constructor( } val description = podStateManager.alarmType?.toString() + ?: if (podStateManager.isPodActivationTimeExceeded) { + rh.gs(R.string.omnipod_common_error_pod_fault_activation_time_exceeded) + } else { + null + } ?: podStateManager.podStatus?.toString() ?: return @@ -449,43 +454,43 @@ class O5PumpPlugin @Inject constructor( val podSequence = podStateManager.sequenceNumberOfLastProgrammingCommand val sentSequence = pending.sequenceNumber - val acceptedByPod = podSequence != null && sentSequence != null && + val acceptedByPod = pending.confirmedByStatus || podSequence != null && sentSequence != null && (podSequence.toInt() and 0x0f) == (sentSequence.toInt() and 0x0f) - if (!acceptedByPod && !confirmedByDeliveryStatus(pending)) { + val confirmedByStatus = confirmedByDeliveryStatus(pending) + if (!acceptedByPod && !confirmedByStatus) { if (sentSequence != null && podSequence != null) { aapsLogger.info( LTag.PUMP, "O5 pending ${pending.type} was not received by the pod " + "(sent sequence $sentSequence, pod's last programming sequence $podSequence) - recording no delivery" ) + if (pending.type == O5PodStateManager.PendingDoseType.BOLUS && pending.bolusRecordExpected) { + pumpSync.syncBolusWithPumpId( + timestamp = pending.startedAt, + amount = PumpInsulin(0.0), + type = pending.bolusType ?: BS.Type.NORMAL, + pumpId = pending.startedAt, + pumpType = PumpType.OMNIPOD_5, + pumpSerial = serialNumber() + ) + } podStateManager.pendingDoseCommand = null return } } + if (!acceptedByPod && confirmedByStatus && pending.type == O5PodStateManager.PendingDoseType.BOLUS) { + podStateManager.pendingDoseCommand = pending.copy(confirmedByStatus = true) + return + } when (pending.type) { O5PodStateManager.PendingDoseType.BOLUS -> if (podStateManager.deliveryStatus?.bolusDeliveringActive() != true) { + val remainingPulses = podStateManager.bolusPulsesRemaining ?: return val deliveredUnits = (pending.requestedUnits ?: 0.0) - - (podStateManager.bolusPulsesRemaining?.toInt() ?: 0) * PodConstants.POD_PULSE_BOLUS_UNITS - if (podStateManager.lastBolusDeliveredUnits == null) { - pumpSync.syncBolusWithPumpId( - timestamp = pending.startedAt, - amount = PumpInsulin(deliveredUnits), - type = pending.bolusType ?: BS.Type.NORMAL, - pumpId = pending.startedAt, - pumpType = PumpType.OMNIPOD_5, - pumpSerial = serialNumber() - ) - if (!pending.isBasalCorrection) { - val deliveredPulses = Math.round(deliveredUnits / PodConstants.POD_PULSE_BOLUS_UNITS).toShort() - podStateManager.cumulativeBolusPulsesDelivered = - ((podStateManager.cumulativeBolusPulsesDelivered ?: 0) + deliveredPulses).toShort() - } - } - podStateManager.lastBolusDeliveredUnits = deliveredUnits - podStateManager.pendingDoseCommand = null + remainingPulses.toInt() * PodConstants.POD_PULSE_BOLUS_UNITS + finalizeBolus(pending, deliveredUnits) } O5PodStateManager.PendingDoseType.TEMP_BASAL_START -> @@ -684,17 +689,14 @@ class O5PumpPlugin @Inject constructor( val bolusBeeps = preferences.get(bolusBeepsKey) val startedAt = System.currentTimeMillis() - podStateManager.pendingDoseCommand = O5PodStateManager.PendingDoseCommand( + val pendingDose = O5PodStateManager.PendingDoseCommand( type = O5PodStateManager.PendingDoseType.BOLUS, requestedUnits = requestedUnits, bolusType = detailedBolusInfo.bolusType, startedAt = startedAt, sequenceNumber = podStateManager.msgSequenceNumber.toShort() ) - armStatusChecker() - podStateManager.lastBolusStartTime = startedAt - podStateManager.lastBolusRequestedUnits = requestedUnits - podStateManager.lastBolusDeliveredUnits = null + podStateManager.pendingDoseCommand = pendingDose val cmd = ProgramBolusCommand.Builder() .setUniqueId(requirePodId()) @@ -706,10 +708,14 @@ class O5PumpPlugin @Inject constructor( .setO5BolusInfo(mealUnits = 0.0, correctionUnits = requestedUnits) .build() - var deliveredUnits = 0.0 + var commandMayHaveBeenSent = false val ret = try { bleManager.sendCommand(cmd, DefaultStatusResponse::class) .filter { it.isCommandSent() } + .doOnNext { + commandMayHaveBeenSent = true + markBolusRecordExpected(startedAt) + } .concatMapCompletable { rxCompletable(Dispatchers.IO) { pumpSync.syncBolusWithPumpId( @@ -723,14 +729,27 @@ class O5PumpPlugin @Inject constructor( } } .blockingAwait() - deliveredUnits = waitForBolusDeliveryToComplete(requestedUnits).blockingGet() - pumpEnactResultProvider.get().success(true).enacted(true).bolusDelivered(deliveredUnits) + armStatusChecker() + val completion = waitForBolusDeliveryToComplete(requestedUnits).blockingGet() + val deliveredUnits = completion.deliveredUnits + if (deliveredUnits != null) { + finalizeBolus(pendingDose, deliveredUnits) + pumpEnactResultProvider.get().success(true).enacted(true).bolusDelivered(deliveredUnits) + } else { + pumpEnactResultProvider.get().success(true).enacted(true).bolusDelivered(requestedUnits) + .comment(rh.gs(R.string.omnipod_5_error_bolus_delivery_status_uncertain)) + } } catch (throwable: Throwable) { aapsLogger.error(LTag.PUMP, "O5 deliverTreatment error: $throwable") + if (!commandMayHaveBeenSent) { + podStateManager.pendingDoseCommand = null + } else { + armStatusChecker() + } pumpEnactResultProvider.get().success(bolusCanceled).enacted(false) } - if (detailedBolusInfo.bolusType == BS.Type.SMB) { + if (detailedBolusInfo.bolusType == BS.Type.SMB && podStateManager.pendingDoseCommand != null) { notifyUncertain(NotificationId.OMNIPOD_UNCERTAIN_SMB, rh.gs(R.string.omnipod_5_error_uncertain_smb, requestedUnits)) } else if (podStateManager.pendingDoseCommand != null) { notifyUncertain(NotificationId.OMNIPOD_POD_FAULT, rh.gs(R.string.omnipod_5_error_bolus_delivery_status_uncertain)) @@ -742,7 +761,9 @@ class O5PumpPlugin @Inject constructor( } } - private fun waitForBolusDeliveryToComplete(requestedUnits: Double): Single = Single.defer { + private data class BolusCompletion(val deliveredUnits: Double?) + + private fun waitForBolusDeliveryToComplete(requestedUnits: Double): Single = Single.defer { val estimatedSeconds = ceil(requestedUnits / PodConstants.POD_PULSE_BOLUS_UNITS).toLong() * 2 + 3 var waited = 0L while (waited < estimatedSeconds && !bolusCanceled) { @@ -763,7 +784,12 @@ class O5PumpPlugin @Inject constructor( } val bolusActive = podStateManager.deliveryStatus?.bolusDeliveringActive() == true if (bolusActive) { - val remainingUnits = (podStateManager.bolusPulsesRemaining?.toInt() ?: 0) * PodConstants.POD_PULSE_BOLUS_UNITS + val remainingPulses = podStateManager.bolusPulsesRemaining + if (remainingPulses == null) { + Thread.sleep(BOLUS_RETRY_INTERVAL_MS) + return@repeat + } + val remainingUnits = remainingPulses.toInt() * PodConstants.POD_PULSE_BOLUS_UNITS val delivered = requestedUnits - remainingUnits val percent = (delivered / requestedUnits) * 100 bolusProgressData.updateProgress(percent.toInt()) @@ -771,13 +797,44 @@ class O5PumpPlugin @Inject constructor( else ceil(remainingUnits / PodConstants.POD_PULSE_BOLUS_UNITS).toLong() * 2 + 3 Thread.sleep(sleepSeconds * 1000) } else { - val deliveredUnits = requestedUnits - (podStateManager.bolusPulsesRemaining?.toInt() ?: 0) * PodConstants.POD_PULSE_BOLUS_UNITS - podStateManager.lastBolusDeliveredUnits = deliveredUnits - podStateManager.pendingDoseCommand = null - return@defer Single.just(deliveredUnits) + val remainingPulses = podStateManager.bolusPulsesRemaining + if (remainingPulses != null) { + val deliveredUnits = requestedUnits - remainingPulses.toInt() * PodConstants.POD_PULSE_BOLUS_UNITS + return@defer Single.just(BolusCompletion(deliveredUnits)) + } } } - Single.just(requestedUnits) + Single.just(BolusCompletion(null)) + } + + private fun markBolusRecordExpected(startedAt: Long) { + val pending = podStateManager.pendingDoseCommand ?: return + if (pending.type == O5PodStateManager.PendingDoseType.BOLUS && pending.startedAt == startedAt) { + podStateManager.pendingDoseCommand = pending.copy(bolusRecordExpected = true) + } + } + + private suspend fun finalizeBolus(pending: O5PodStateManager.PendingDoseCommand, deliveredUnits: Double) { + val finalUnits = deliveredUnits.coerceIn(0.0, pending.requestedUnits ?: deliveredUnits) + pumpSync.syncBolusWithPumpId( + timestamp = pending.startedAt, + amount = PumpInsulin(finalUnits), + type = pending.bolusType ?: BS.Type.NORMAL, + pumpId = pending.startedAt, + pumpType = PumpType.OMNIPOD_5, + pumpSerial = serialNumber() + ) + val deliveredPulses = if (pending.isBasalCorrection) { + null + } else { + Math.round(finalUnits / PodConstants.POD_PULSE_BOLUS_UNITS).toShort() + } + podStateManager.completeBolus( + startedAt = pending.startedAt, + requestedUnits = pending.requestedUnits ?: finalUnits, + deliveredUnits = finalUnits, + deliveredPulses = deliveredPulses + ) } private fun cancelBolus(): Completable = ensureConnected().andThen(Completable.defer { @@ -1171,13 +1228,14 @@ class O5PumpPlugin @Inject constructor( return pumpEnactResultProvider.get().success(false).enacted(false) } + var commandMayHaveBeenSent = false return try { bolusDeliveryInProgress = true podStateManager.basalCorrectionInProgress = true aapsLogger.info(LTag.PUMP, "Delivering O5 basal correction") val startedAt = System.currentTimeMillis() - podStateManager.pendingDoseCommand = O5PodStateManager.PendingDoseCommand( + val pendingDose = O5PodStateManager.PendingDoseCommand( type = O5PodStateManager.PendingDoseType.BOLUS, requestedUnits = requestedInsulinAmount, bolusType = BS.Type.NORMAL, @@ -1185,10 +1243,7 @@ class O5PumpPlugin @Inject constructor( isBasalCorrection = true, sequenceNumber = podStateManager.msgSequenceNumber.toShort() ) - armStatusChecker() - podStateManager.lastBolusStartTime = startedAt - podStateManager.lastBolusRequestedUnits = requestedInsulinAmount - podStateManager.lastBolusDeliveredUnits = null + podStateManager.pendingDoseCommand = pendingDose val cmd = ProgramBolusCommand.Builder() .setUniqueId(requirePodId()) @@ -1199,7 +1254,15 @@ class O5PumpPlugin @Inject constructor( .setProgramReminder(ProgramReminder(atStart = false, atEnd = false, atInterval = 0)) .setO5BolusInfo(mealUnits = 0.0, correctionUnits = requestedInsulinAmount) .build() - bleManager.sendCommand(cmd, DefaultStatusResponse::class).ignoreElements().blockingAwait() + bleManager.sendCommand(cmd, DefaultStatusResponse::class) + .filter { it.isCommandSent() } + .doOnNext { + commandMayHaveBeenSent = true + markBolusRecordExpected(startedAt) + } + .ignoreElements() + .blockingAwait() + armStatusChecker() runBlocking { pumpSync.syncBolusWithPumpId( timestamp = startedAt, @@ -1210,11 +1273,23 @@ class O5PumpPlugin @Inject constructor( pumpSerial = serialNumber() ) } - val deliveredUnits = waitForBolusDeliveryToComplete(requestedInsulinAmount).blockingGet() - aapsLogger.info(LTag.PUMP, "O5 basal correction delivered: $deliveredUnits U") - pumpEnactResultProvider.get().success(true).enacted(true).bolusDelivered(deliveredUnits) + val completion = waitForBolusDeliveryToComplete(requestedInsulinAmount).blockingGet() + val deliveredUnits = completion.deliveredUnits + if (deliveredUnits != null) { + runBlocking { finalizeBolus(pendingDose, deliveredUnits) } + aapsLogger.info(LTag.PUMP, "O5 basal correction delivered: $deliveredUnits U") + pumpEnactResultProvider.get().success(true).enacted(true).bolusDelivered(deliveredUnits) + } else { + pumpEnactResultProvider.get().success(true).enacted(true).bolusDelivered(requestedInsulinAmount) + .comment(rh.gs(R.string.omnipod_5_error_bolus_delivery_status_uncertain)) + } } catch (e: Exception) { aapsLogger.error(LTag.PUMP, "O5 basal correction delivery failed", e) + if (!commandMayHaveBeenSent) { + podStateManager.pendingDoseCommand = null + } else { + armStatusChecker() + } pumpEnactResultProvider.get().success(false).enacted(false) } finally { bolusDeliveryInProgress = false diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/O5BleManagerImpl.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/O5BleManagerImpl.kt index a41634e46505..d9bb30e15296 100644 --- a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/O5BleManagerImpl.kt +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/O5BleManagerImpl.kt @@ -51,6 +51,7 @@ import app.aaps.pump.omnipod.omnipod5.bledriver.pod.util.P256KeyGenerator import app.aaps.pump.omnipod.omnipod5.bledriver.pod.util.PodTypeAwarePodScanner import io.reactivex.rxjava3.core.Completable import io.reactivex.rxjava3.core.Observable +import io.reactivex.rxjava3.core.ObservableEmitter import java.util.concurrent.CountDownLatch import java.util.concurrent.atomic.AtomicBoolean import javax.inject.Inject @@ -259,61 +260,101 @@ class O5BleManagerImpl @Inject constructor( throw BusyException() } try { - if (podState.ltk != null) { - emitter.onNext(PodEvent.AlreadyPaired) - emitter.onComplete() - return@create - } - aapsLogger.info(LTag.PUMPBTCOMM, "Starting new O5 pod activation") - - val controllerId = O5RegistrationData.pickControllerId - if (controllerId == 0L) { - throw PairingException( - "No O5 registration data available - cannot pair an Omnipod 5 pod without " + - "real Insulet-issued controller credentials (see O5RegistrationData)" - ) + var lastError: Exception? = null + for (attempt in 0..1) { + try { + pairNewPodAttempt(emitter) + emitter.onComplete() + return@create + } catch (ex: Exception) { + lastError = ex + disconnect(true) + if (attempt == 0 && podState.podId != null && !podState.isPodKaput) { + Thread.sleep(3_000) + } else { + break + } + } } - val certStore = O5CertificateStore(aapsLogger, p256KeyGenerator, controllerId) - - val adapter = bluetoothAdapter ?: throw ConnectException("Bluetooth not available") - emitter.onNext(PodEvent.Scanning) - val scanner = PodTypeAwarePodScanner(aapsLogger, adapter) - val discovered = scanner.scanForPod(PodType.OMNIPOD_5) - podState.bluetoothAddress = discovered.address + throw requireNotNull(lastError) + } catch (ex: Exception) { + aapsLogger.error(LTag.PUMPBTCOMM, "O5 pod activation failed", ex) + disconnect(true) + emitter.tryOnError(ex) + } finally { + busy.set(false) + } + } + private fun pairNewPodAttempt(emitter: ObservableEmitter) { + if (podState.ltk != null) { + emitter.onNext(PodEvent.AlreadyPaired) + val podAddress = podState.bluetoothAddress + ?: throw FailedToConnectException("Missing bluetoothAddress, activate the pod first") emitter.onNext(PodEvent.BluetoothConnecting) - val conn = bleConnectionFactory.createConnection(discovered.address, controllerId) + val conn = bleConnectionFactory.createConnection(podAddress) connection = conn conn.connect(ConnectionWaitCondition(timeoutMs = BleConnection.DEFAULT_CONNECT_TIMEOUT_MS)) - emitter.onNext(PodEvent.BluetoothConnected(discovered.address)) - - emitter.onNext(PodEvent.Pairing) - val mIO = conn.msgIO ?: throw ConnectException("Connection lost") - - val myId = Id.fromLong(certStore.controllerId) - val podId = myId.increment() - - val ltkExchanger = O5LTKExchanger(aapsLogger, mIO, certStore, myId, podId) - val pairResult = ltkExchanger.o5NegotiateLTK() - emitter.onNext(PodEvent.Paired(podId)) - - podState.updateFromPairing(certStore.controllerId, podId.toLong(), pairResult) - if (config.DEBUG) { - aapsLogger.info(LTag.PUMPCOMM, "Got O5 LTK: ${pairResult.ltk.toHex()}") - } - + emitter.onNext(PodEvent.BluetoothConnected(podAddress)) emitter.onNext(PodEvent.EstablishingSession) - establishSession(pairResult.msgSeq) - podState.successfulConnections++ + establishSession(podState.msgSequenceNumber) emitter.onNext(PodEvent.Connected) - emitter.onComplete() - } catch (ex: Exception) { - aapsLogger.error(LTag.PUMPBTCOMM, "O5 pod activation failed", ex) - disconnect(false) - emitter.tryOnError(ex) - } finally { - busy.set(false) + return + } + aapsLogger.info(LTag.PUMPBTCOMM, "Starting new O5 pod activation") + + val controllerId = podState.controllerId + ?.takeIf(O5RegistrationData::contains) + ?: O5RegistrationData.pickControllerId + if (controllerId == 0L) { + throw PairingException( + "No O5 registration data available - cannot pair an Omnipod 5 pod without " + + "real Insulet-issued controller credentials (see O5RegistrationData)" + ) + } + val certStore = O5CertificateStore(aapsLogger, p256KeyGenerator, controllerId) + + val podAddress = podState.bluetoothAddress ?: run { + val adapter = bluetoothAdapter ?: throw ConnectException("Bluetooth not available") + emitter.onNext(PodEvent.Scanning) + val scanner = PodTypeAwarePodScanner(aapsLogger, adapter) + scanner.scanForPod(PodType.OMNIPOD_5).address.also { podState.bluetoothAddress = it } } + val podIdLong = podState.podId + ?.takeIf { podState.controllerId == controllerId } + ?: podState.nextPodId + ?.takeIf { + O5IdRotation.controllerIdForPodId(it) == O5IdRotation.controllerIdForPodId(controllerId) + } + ?: O5IdRotation.firstPodId(controllerId) + podState.controllerId = controllerId + podState.podId = podIdLong + podState.nextPodId = null + + emitter.onNext(PodEvent.BluetoothConnecting) + val conn = bleConnectionFactory.createConnection(podAddress, controllerId) + connection = conn + conn.connect(ConnectionWaitCondition(timeoutMs = BleConnection.DEFAULT_CONNECT_TIMEOUT_MS)) + emitter.onNext(PodEvent.BluetoothConnected(podAddress)) + + emitter.onNext(PodEvent.Pairing) + val mIO = conn.msgIO ?: throw ConnectException("Connection lost") + + val myId = Id.fromLong(certStore.controllerId) + val podId = Id.fromLong(podIdLong) + + val ltkExchanger = O5LTKExchanger(aapsLogger, mIO, certStore, myId, podId) + val pairResult = ltkExchanger.o5NegotiateLTK() + emitter.onNext(PodEvent.Paired(podId)) + + podState.updateFromPairing(certStore.controllerId, podId.toLong(), pairResult) + if (config.DEBUG) { + aapsLogger.info(LTag.PUMPCOMM, "Got O5 LTK: ${pairResult.ltk.toHex()}") + } + + emitter.onNext(PodEvent.EstablishingSession) + establishSession(pairResult.msgSeq) + emitter.onNext(PodEvent.Connected) } override fun sendAidSetupCommands(): Completable = Completable.fromAction { diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/O5IdRotation.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/O5IdRotation.kt index b1637ca32f38..0c46666eca30 100644 --- a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/O5IdRotation.kt +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/O5IdRotation.kt @@ -1,27 +1,15 @@ package app.aaps.pump.omnipod.omnipod5.bledriver.comm -/** - * PodId rotation for Omnipod 5 pairing retries, ported from OmnipodKit's Id.swift - * (`nextPodId`/`controllerIdForPodId`). - * - * Unlike Dash (whose controllerId is randomly generated locally), O5's controllerId must - * match a value already present in the certificate store - so podIds cycle through 3 - * values (`controllerId+1`, `+2`, `+3`) built on top of a *fixed* controllerId, rather than - * generating a fresh controllerId per attempt the way Dash does. - */ object O5IdRotation { private const val CONTROLLER_ID_BIT_MASK: Long = 0b11L - /** Given a [podId], returns the controllerId it was derived from (clears the low 2 bits). */ fun controllerIdForPodId(podId: Long): Long = podId and (CONTROLLER_ID_BIT_MASK.inv()) - /** - * Returns the next podId in the 3-way rotation after [lastPodId]: `+1, +2, +3`, then - * wraps back to `base+1` (matching OmnipodKit's exact wrap-around behavior, used when - * a pairing attempt with one podId fails and the next one in rotation should be tried). - */ + fun firstPodId(controllerId: Long): Long = + controllerIdForPodId(controllerId) + 1 + fun nextPodId(lastPodId: Long): Long { val low2Bits = lastPodId and CONTROLLER_ID_BIT_MASK return if (low2Bits == CONTROLLER_ID_BIT_MASK) { diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/state/O5PodStateManager.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/state/O5PodStateManager.kt index 86e6413576cc..2689bf365007 100644 --- a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/state/O5PodStateManager.kt +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/state/O5PodStateManager.kt @@ -16,6 +16,7 @@ import app.aaps.pump.omnipod.common.bledriver.pod.response.PodInfoActivationTime import app.aaps.pump.omnipod.common.bledriver.pod.response.PodInfoTriggeredAlertsResponse import app.aaps.pump.omnipod.common.bledriver.pod.response.SetUniqueIdResponse import app.aaps.pump.omnipod.common.bledriver.pod.response.VersionResponse +import app.aaps.pump.omnipod.omnipod5.bledriver.comm.O5IdRotation import java.io.Serializable import java.util.Calendar import java.util.EnumSet @@ -57,6 +58,8 @@ interface O5PodStateManager { /** The pod's own id, once paired. */ var podId: Long? + var nextPodId: Long? + /** The pod's long-term key, once paired. Null until [updateFromPairing] is called. */ var ltk: ByteArray? @@ -147,7 +150,9 @@ interface O5PodStateManager { * .deliverBasalCorrection] issues - excluded from [cumulativeBolusPulsesDelivered] * tracking so it counts toward delivered *basal* insulin, not bolus insulin * (the whole point of the correction is to true up basal drift). */ - val isBasalCorrection: Boolean = false + val isBasalCorrection: Boolean = false, + val bolusRecordExpected: Boolean = false, + val confirmedByStatus: Boolean = false ) : Serializable @@ -164,7 +169,9 @@ interface O5PodStateManager { * Dash driver's `isPodKaput`. */ val isPodKaput: Boolean - get() = podStatus in arrayOf(PodStatus.ALARM, PodStatus.DEACTIVATED) + get() = podStatus in arrayOf(PodStatus.ALARM, PodStatus.DEACTIVATED) || isPodActivationTimeExceeded + val isPodActivationTimeExceeded: Boolean + get() = podStatus?.isActivationTimeExceeded() == true val firmwareVersion: SoftwareVersion? val bleVersion: SoftwareVersion? val lotNumber: Long? @@ -279,6 +286,8 @@ interface O5PodStateManager { fun updateFromPairing(controllerId: Long, podId: Long, pairResult: PairResult) + fun completeBolus(startedAt: Long, requestedUnits: Double, deliveredUnits: Double, deliveredPulses: Short?) + fun reset() } @@ -304,6 +313,7 @@ class InMemoryO5PodStateManager : O5PodStateManager { @Volatile override var bluetoothAddress: String? = null @Volatile override var controllerId: Long? = null @Volatile override var podId: Long? = null + @Volatile override var nextPodId: Long? = null @Volatile override var ltk: ByteArray? = null @Volatile override var msgSequenceNumber: Byte = 1 @@ -464,13 +474,30 @@ class InMemoryO5PodStateManager : O5PodStateManager { lastStatusResponseReceived = System.currentTimeMillis() } + @Synchronized + override fun completeBolus(startedAt: Long, requestedUnits: Double, deliveredUnits: Double, deliveredPulses: Short?) { + val alreadyCompleted = lastBolusStartTime == startedAt && lastBolusDeliveredUnits != null + if (!alreadyCompleted && deliveredPulses != null) { + cumulativeBolusPulsesDelivered = ((cumulativeBolusPulsesDelivered ?: 0) + deliveredPulses).toShort() + } + lastBolusStartTime = startedAt + lastBolusRequestedUnits = requestedUnits + lastBolusDeliveredUnits = deliveredUnits + if (pendingDoseCommand?.startedAt == startedAt) { + pendingDoseCommand = null + } + } + override fun reset() { + val retainedControllerId = controllerId + val retainedNextPodId = podId?.let(O5IdRotation::nextPodId) ?: nextPodId bluetoothConnectionState = O5PodStateManager.BluetoothConnectionState.DISCONNECTED connectionAttemptsCounter.set(0) successfulConnectionsCounter.set(0) bluetoothAddress = null - controllerId = null + controllerId = retainedControllerId podId = null + nextPodId = retainedNextPodId ltk = null msgSequenceNumber = 1 eapAkaSequenceNumber = 0 diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/state/PersistedO5PodStateManager.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/state/PersistedO5PodStateManager.kt index 570a95601e5a..3084c4e1bb75 100644 --- a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/state/PersistedO5PodStateManager.kt +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/state/PersistedO5PodStateManager.kt @@ -18,6 +18,7 @@ import app.aaps.pump.omnipod.common.bledriver.pod.response.PodInfoActivationTime import app.aaps.pump.omnipod.common.bledriver.pod.response.PodInfoTriggeredAlertsResponse import app.aaps.pump.omnipod.common.bledriver.pod.response.SetUniqueIdResponse import app.aaps.pump.omnipod.common.bledriver.pod.response.VersionResponse +import app.aaps.pump.omnipod.omnipod5.bledriver.comm.O5IdRotation import app.aaps.pump.omnipod.omnipod5.keys.O5StringNonPreferenceKey import com.google.gson.Gson import java.io.Serializable @@ -93,6 +94,13 @@ class PersistedO5PodStateManager @Inject constructor( store() } + override var nextPodId: Long? + get() = podState.nextPodId + set(value) { + podState.nextPodId = value + store() + } + override var ltk: ByteArray? get() = podState.ltk set(value) { @@ -390,8 +398,26 @@ class PersistedO5PodStateManager @Inject constructor( store() } + @Synchronized + override fun completeBolus(startedAt: Long, requestedUnits: Double, deliveredUnits: Double, deliveredPulses: Short?) { + val alreadyCompleted = podState.lastBolusStartTime == startedAt && podState.lastBolusDeliveredUnits != null + if (!alreadyCompleted && deliveredPulses != null) { + podState.cumulativeBolusPulsesDelivered = + ((podState.cumulativeBolusPulsesDelivered ?: 0) + deliveredPulses).toShort() + } + podState.lastBolusStartTime = startedAt + podState.lastBolusRequestedUnits = requestedUnits + podState.lastBolusDeliveredUnits = deliveredUnits + if (podState.pendingDoseCommand?.startedAt == startedAt) { + podState.pendingDoseCommand = null + } + store() + } + override fun reset() { - podState = PodState() + val retainedControllerId = podState.controllerId + val retainedNextPodId = podState.podId?.let(O5IdRotation::nextPodId) ?: podState.nextPodId + podState = PodState(controllerId = retainedControllerId, nextPodId = retainedNextPodId) store() } @@ -427,6 +453,7 @@ class PersistedO5PodStateManager @Inject constructor( var bluetoothAddress: String? = null, var controllerId: Long? = null, var podId: Long? = null, + var nextPodId: Long? = null, var ltk: ByteArray? = null, var msgSequenceNumber: Byte = 1, var eapAkaSequenceNumber: Long = 0, diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/wizard/compose/O5OmnipodWizardViewModel.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/wizard/compose/O5OmnipodWizardViewModel.kt index ccb54c3c2c06..895b51ea61f4 100644 --- a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/wizard/compose/O5OmnipodWizardViewModel.kt +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/wizard/compose/O5OmnipodWizardViewModel.kt @@ -177,6 +177,7 @@ class O5OmnipodWizardViewModel @Inject constructor( .setSequenceNumber(nextSeq()) .build() bleManager.sendCommand(cmd, VersionResponse::class).ignoreElements().blockingAwait() + ensureActivationTimeNotExceeded() podStateManager.activationProgress = ActivationProgress.GOT_POD_VERSION } @@ -194,6 +195,7 @@ class O5OmnipodWizardViewModel @Inject constructor( .setInitializationTime(Date()) .build() bleManager.sendCommand(cmd, SetUniqueIdResponse::class).ignoreElements().blockingAwait() + ensureActivationTimeNotExceeded() podStateManager.activationProgress = ActivationProgress.SET_UNIQUE_ID } @@ -215,6 +217,7 @@ class O5OmnipodWizardViewModel @Inject constructor( ) .build() bleManager.sendCommand(cmd, DefaultStatusResponse::class).ignoreElements().blockingAwait() + ensureActivationTimeNotExceeded() } podStateManager.activationProgress = ActivationProgress.PROGRAMMED_LOW_RESERVOIR_ALERTS } @@ -234,6 +237,7 @@ class O5OmnipodWizardViewModel @Inject constructor( ) .build() bleManager.sendCommand(cmd, DefaultStatusResponse::class).ignoreElements().blockingAwait() + ensureActivationTimeNotExceeded() podStateManager.activationProgress = ActivationProgress.REPROGRAMMED_LUMP_OF_COAL_ALERT } @@ -251,6 +255,7 @@ class O5OmnipodWizardViewModel @Inject constructor( .setO5BolusInfo(mealUnits = 0.0, correctionUnits = 0.0) .build() bleManager.sendCommand(cmd, DefaultStatusResponse::class).ignoreElements().blockingAwait() + ensureActivationTimeNotExceeded() podStateManager.activationProgress = ActivationProgress.PRIMING } @@ -268,6 +273,7 @@ class O5OmnipodWizardViewModel @Inject constructor( .setStatusResponseType(ResponseType.StatusResponseType.DEFAULT_STATUS_RESPONSE) .build() bleManager.sendCommand(cmd, DefaultStatusResponse::class).ignoreElements().blockingAwait() + ensureActivationTimeNotExceeded() check(podStateManager.podStatus == PodStatus.CLUTCH_DRIVE_ENGAGED) { "Unexpected Pod status: got ${podStateManager.podStatus}, expected CLUTCH_DRIVE_ENGAGED" } @@ -298,6 +304,7 @@ class O5OmnipodWizardViewModel @Inject constructor( .setCurrentTime(Date()) .build() bleManager.sendCommand(cmd, DefaultStatusResponse::class).ignoreElements().blockingAwait() + ensureActivationTimeNotExceeded() podStateManager.activationProgress = ActivationProgress.PROGRAMMED_BASAL } @@ -310,6 +317,7 @@ class O5OmnipodWizardViewModel @Inject constructor( .setAlertConfigurations(buildO5ExpirationAlerts(podStateManager, preferences, logger)) .build() bleManager.sendCommand(cmd, DefaultStatusResponse::class).ignoreElements().blockingAwait() + ensureActivationTimeNotExceeded() podStateManager.activationProgress = ActivationProgress.UPDATED_EXPIRATION_ALERTS } @@ -327,6 +335,7 @@ class O5OmnipodWizardViewModel @Inject constructor( .setO5BolusInfo(mealUnits = 0.0, correctionUnits = 0.0) .build() bleManager.sendCommand(cmd, DefaultStatusResponse::class).ignoreElements().blockingAwait() + ensureActivationTimeNotExceeded() podStateManager.activationProgress = ActivationProgress.INSERTING_CANNULA } @@ -344,6 +353,7 @@ class O5OmnipodWizardViewModel @Inject constructor( .setStatusResponseType(ResponseType.StatusResponseType.DEFAULT_STATUS_RESPONSE) .build() bleManager.sendCommand(cmd, DefaultStatusResponse::class).ignoreElements().blockingAwait() + ensureActivationTimeNotExceeded() check(podStateManager.podStatus == PodStatus.RUNNING_ABOVE_MIN_VOLUME) { "Unexpected Pod status: got ${podStateManager.podStatus}, expected RUNNING_ABOVE_MIN_VOLUME" } @@ -383,9 +393,16 @@ class O5OmnipodWizardViewModel @Inject constructor( override fun isPodInAlarm(): Boolean = podStateManager.alarmType != null - override fun isPodActivationTimeExceeded(): Boolean = false + override fun isPodActivationTimeExceeded(): Boolean = podStateManager.isPodActivationTimeExceeded - override fun isPodDeactivatable(): Boolean = true + override fun isPodDeactivatable(): Boolean = + podStateManager.ltk != null && podStateManager.controllerId != null && podStateManager.podId != null + + private fun ensureActivationTimeNotExceeded() { + if (podStateManager.isPodActivationTimeExceeded) { + throw IllegalStateException(rh.gs(CommonR.string.omnipod_common_error_pod_fault_activation_time_exceeded)) + } + } diff --git a/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/O5PumpPluginTest.kt b/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/O5PumpPluginTest.kt index 4b204854e3fd..b12ad58c906b 100644 --- a/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/O5PumpPluginTest.kt +++ b/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/O5PumpPluginTest.kt @@ -9,6 +9,7 @@ import app.aaps.core.interfaces.pump.BlePreCheck import app.aaps.core.interfaces.pump.BolusProgressData import app.aaps.core.interfaces.pump.DetailedBolusInfo import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.pump.PumpInsulin import app.aaps.core.interfaces.notifications.NotificationId import app.aaps.core.interfaces.queue.CommandQueue import app.aaps.core.interfaces.queue.CustomCommand @@ -581,6 +582,30 @@ class O5PumpPluginTest : TestBaseWithProfile() { verify(podStateManager).pendingDoseCommand = null } + @Test + fun `an uncertain bolus the pod never received corrects conservative accounting to zero`() { + whenever(podStateManager.pendingDoseCommand).thenReturn( + pendingBolus(sequenceNumber = 4).copy(bolusRecordExpected = true) + ) + whenever(podStateManager.sequenceNumberOfLastProgrammingCommand).thenReturn(9) + whenever(podStateManager.deliveryStatus).thenReturn(DeliveryStatus.BASAL_ACTIVE) + whenever(podStateManager.podId).thenReturn(9999L) + + runBlocking { + plugin.reconcilePendingDose() + + verify(pumpSync).syncBolusWithPumpId( + eq(1_000L), + argThat { cU == 0.0 }, + eq(BS.Type.NORMAL), + eq(1_000L), + eq(PumpType.OMNIPOD_5), + eq("9999") + ) + } + verify(podStateManager).pendingDoseCommand = null + } + @Test fun `an uncertain bolus the pod did receive is finalized`() { whenever(podStateManager.pendingDoseCommand).thenReturn(pendingBolus(sequenceNumber = 9)) @@ -597,18 +622,61 @@ class O5PumpPluginTest : TestBaseWithProfile() { any(), any(), any(), any(), eq(PumpType.OMNIPOD_5), eq("9999") ) } - verify(podStateManager).pendingDoseCommand = null + verify(podStateManager).completeBolus(1_000L, 3.0, 3.0, 60) + } + + @Test + fun `a confirmed partial bolus updates accounting and cumulative pulses`() { + whenever(podStateManager.pendingDoseCommand).thenReturn(pendingBolus(sequenceNumber = 9)) + whenever(podStateManager.sequenceNumberOfLastProgrammingCommand).thenReturn(9) + whenever(podStateManager.deliveryStatus).thenReturn(DeliveryStatus.BASAL_ACTIVE) + whenever(podStateManager.bolusPulsesRemaining).thenReturn(40) + whenever(podStateManager.lastBolusDeliveredUnits).thenReturn(null) + whenever(podStateManager.cumulativeBolusPulsesDelivered).thenReturn(10) + whenever(podStateManager.podId).thenReturn(9999L) + + runBlocking { + plugin.reconcilePendingDose() + + verify(pumpSync).syncBolusWithPumpId( + eq(1_000L), + argThat { cU == 1.0 }, + eq(BS.Type.NORMAL), + eq(1_000L), + eq(PumpType.OMNIPOD_5), + eq("9999") + ) + } + verify(podStateManager).completeBolus(1_000L, 3.0, 1.0, 20) + } + + @Test + fun `a confirmed bolus remains unresolved when remaining pulses are unavailable`() { + whenever(podStateManager.pendingDoseCommand).thenReturn(pendingBolus(sequenceNumber = 9)) + whenever(podStateManager.sequenceNumberOfLastProgrammingCommand).thenReturn(9) + whenever(podStateManager.deliveryStatus).thenReturn(DeliveryStatus.BASAL_ACTIVE) + whenever(podStateManager.bolusPulsesRemaining).thenReturn(null) + + runBlocking { + plugin.reconcilePendingDose() + + verify(pumpSync, never()).syncBolusWithPumpId( + any(), any(), any(), any(), any(), any() + ) + } + verify(podStateManager, never()).pendingDoseCommand = null } @Test fun `a still-running bolus is confirmed by delivery status even when the sequence disagrees`() { - whenever(podStateManager.pendingDoseCommand).thenReturn(pendingBolus(sequenceNumber = 4)) + val pending = pendingBolus(sequenceNumber = 4) + whenever(podStateManager.pendingDoseCommand).thenReturn(pending) whenever(podStateManager.sequenceNumberOfLastProgrammingCommand).thenReturn(9) whenever(podStateManager.deliveryStatus).thenReturn(DeliveryStatus.BOLUS_AND_BASAL_ACTIVE) runBlocking { plugin.reconcilePendingDose() } - verify(podStateManager, never()).pendingDoseCommand = null + verify(podStateManager).pendingDoseCommand = pending.copy(confirmedByStatus = true) } @Test diff --git a/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/O5BleManagerImplTest.kt b/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/O5BleManagerImplTest.kt index 0885b7c33b96..e2a6b7650d53 100644 --- a/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/O5BleManagerImplTest.kt +++ b/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/O5BleManagerImplTest.kt @@ -8,7 +8,6 @@ import app.aaps.pump.omnipod.common.bledriver.comm.interfaces.device.BleDeviceMa import app.aaps.pump.omnipod.omnipod5.bledriver.comm.legacy.O5BleConnectionFactory import app.aaps.pump.omnipod.omnipod5.bledriver.comm.pair.O5RegistrationData import app.aaps.pump.omnipod.common.bledriver.comm.session.NotConnected -import app.aaps.pump.omnipod.common.bledriver.event.PodEvent import app.aaps.pump.omnipod.common.bledriver.pod.command.base.Command import app.aaps.pump.omnipod.common.bledriver.pod.response.DefaultStatusResponse import app.aaps.pump.omnipod.omnipod5.bledriver.pod.security.SecureO5RegistrationStorage @@ -92,14 +91,14 @@ class O5BleManagerImplTest { } @Test - fun `pairNewPod short-circuits with AlreadyPaired when an LTK is already present`() { + fun `pairNewPod requires a known address when an LTK is already present`() { whenever(podState.ltk).thenReturn(byteArrayOf(1, 2, 3)) + whenever(podState.bluetoothAddress).thenReturn(null) val manager = newManager() val observer = manager.pairNewPod().test() - observer.assertComplete() - observer.assertValue(PodEvent.AlreadyPaired) + observer.assertError(FailedToConnectException::class.java) } @Test diff --git a/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/O5IdRotationTest.kt b/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/O5IdRotationTest.kt index 12673d197728..1301c34fa0d7 100644 --- a/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/O5IdRotationTest.kt +++ b/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/O5IdRotationTest.kt @@ -3,10 +3,6 @@ package app.aaps.pump.omnipod.omnipod5.bledriver.comm import com.google.common.truth.Truth.assertThat import org.junit.jupiter.api.Test -/** - * [O5IdRotation] - pure podId rotation logic used to retry O5 pairing with the next of 3 - * predicted podIds after a failed attempt. - */ class O5IdRotationTest { @Test @@ -18,7 +14,17 @@ class O5IdRotationTest { } @Test - fun `nextPodId advances through the 3-way rotation`() { + fun `firstPodId normalizes every controller id suffix`() { + val base = 0xAABBCC00L + + assertThat(O5IdRotation.firstPodId(base)).isEqualTo(base + 1) + assertThat(O5IdRotation.firstPodId(base + 1)).isEqualTo(base + 1) + assertThat(O5IdRotation.firstPodId(base + 2)).isEqualTo(base + 1) + assertThat(O5IdRotation.firstPodId(base + 3)).isEqualTo(base + 1) + } + + @Test + fun `nextPodId advances to the identity for the next pod`() { val base = 0b1000L assertThat(O5IdRotation.nextPodId(base + 1)).isEqualTo(base + 2) @@ -26,7 +32,7 @@ class O5IdRotationTest { } @Test - fun `nextPodId wraps back to base plus 1 after the third attempt`() { + fun `nextPodId wraps back to base plus 1 after the third pod`() { val base = 0b10000L assertThat(O5IdRotation.nextPodId(base + 3)).isEqualTo(base + 1) diff --git a/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/state/PersistedO5PodStateManagerTest.kt b/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/state/PersistedO5PodStateManagerTest.kt index 9e1822b79857..6d17f3abe94f 100644 --- a/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/state/PersistedO5PodStateManagerTest.kt +++ b/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/state/PersistedO5PodStateManagerTest.kt @@ -108,7 +108,8 @@ class PersistedO5PodStateManagerTest : TestBase() { type = O5PodStateManager.PendingDoseType.BOLUS, requestedUnits = 1.25, bolusType = BS.Type.SMB, - startedAt = 123456789L + startedAt = 123456789L, + bolusRecordExpected = true ) val writer = newManager() writer.pendingDoseCommand = pending @@ -117,6 +118,7 @@ class PersistedO5PodStateManagerTest : TestBase() { assertThat(reader.pendingDoseCommand).isEqualTo(pending) assertThat(reader.pendingDoseCommand!!.bolusType).isEqualTo(BS.Type.SMB) + assertThat(reader.pendingDoseCommand!!.bolusRecordExpected).isTrue() } @Test @@ -141,6 +143,51 @@ class PersistedO5PodStateManagerTest : TestBase() { assertThat(reader.activeTempBasalDurationMinutes).isEqualTo(30.toShort()) } + @Test + fun `completeBolus persists accounting and clears pending in one state update`() { + val writer = newManager() + writer.cumulativeBolusPulsesDelivered = 10 + writer.pendingDoseCommand = O5PodStateManager.PendingDoseCommand( + type = O5PodStateManager.PendingDoseType.BOLUS, + requestedUnits = 1.0, + startedAt = 1_000L + ) + + writer.completeBolus(1_000L, 1.0, 0.75, 15) + + val reader = newManager() + assertThat(reader.cumulativeBolusPulsesDelivered).isEqualTo(25.toShort()) + assertThat(reader.lastBolusDeliveredUnits).isEqualTo(0.75) + assertThat(reader.pendingDoseCommand).isNull() + } + + @Test + fun `completeBolus does not add pulses twice`() { + val manager = newManager() + manager.cumulativeBolusPulsesDelivered = 10 + + manager.completeBolus(1_000L, 1.0, 0.75, 15) + manager.completeBolus(1_000L, 1.0, 0.75, 15) + + assertThat(manager.cumulativeBolusPulsesDelivered).isEqualTo(25.toShort()) + } + + @Test + fun `completeBolus records a new bolus when an older bolus was already completed`() { + val manager = newManager() + manager.cumulativeBolusPulsesDelivered = 10 + manager.lastBolusStartTime = 500L + manager.lastBolusRequestedUnits = 2.0 + manager.lastBolusDeliveredUnits = 2.0 + + manager.completeBolus(1_000L, 1.0, 0.75, 15) + + assertThat(manager.cumulativeBolusPulsesDelivered).isEqualTo(25.toShort()) + assertThat(manager.lastBolusStartTime).isEqualTo(1_000L) + assertThat(manager.lastBolusRequestedUnits).isEqualTo(1.0) + assertThat(manager.lastBolusDeliveredUnits).isEqualTo(0.75) + } + @Test fun `store() persists ltk but the logged copy strips it`() { val writer = newManager() @@ -171,6 +218,8 @@ class PersistedO5PodStateManagerTest : TestBase() { manager.pendingDoseCommand = O5PodStateManager.PendingDoseCommand( type = O5PodStateManager.PendingDoseType.BASAL_PROGRAM, startedAt = 1L ) + manager.controllerId = 0x11223340L + manager.podId = 0x11223341L manager.ltk = byteArrayOf(9) manager.reset() @@ -180,6 +229,9 @@ class PersistedO5PodStateManagerTest : TestBase() { assertThat(manager.primePulseRate).isNull() assertThat(manager.pendingDoseCommand).isNull() assertThat(manager.ltk).isNull() + assertThat(manager.controllerId).isEqualTo(0x11223340L) + assertThat(manager.podId).isNull() + assertThat(manager.nextPodId).isEqualTo(0x11223342L) } @Test @@ -188,6 +240,7 @@ class PersistedO5PodStateManagerTest : TestBase() { writer.bluetoothAddress = "AA:BB:CC:DD:EE:FF" writer.controllerId = 0x11223344L writer.podId = 0x55667788L + writer.nextPodId = 0x11223345L writer.connectionAttempts = 3 writer.successfulConnections = 2 writer.eapAkaSequenceNumber = 42L @@ -197,6 +250,7 @@ class PersistedO5PodStateManagerTest : TestBase() { assertThat(reader.bluetoothAddress).isEqualTo("AA:BB:CC:DD:EE:FF") assertThat(reader.controllerId).isEqualTo(0x11223344L) assertThat(reader.podId).isEqualTo(0x55667788L) + assertThat(reader.nextPodId).isEqualTo(0x11223345L) assertThat(reader.connectionAttempts).isEqualTo(3) assertThat(reader.successfulConnections).isEqualTo(2) assertThat(reader.eapAkaSequenceNumber).isEqualTo(42L) @@ -274,6 +328,17 @@ class PersistedO5PodStateManagerTest : TestBase() { assertThat(manager.isPodKaput).isTrue() } + @Test + fun `activation time exceeded is terminal`() { + val manager = newManager() + + manager.updateFromDefaultStatusResponse(DefaultStatusResponse(hexToBytes("1D1E00A02800000463FF"))) + + assertThat(manager.podStatus).isEqualTo(PodStatus.LUMP_OF_COAL) + assertThat(manager.isPodActivationTimeExceeded).isTrue() + assertThat(manager.isPodKaput).isTrue() + } + @Test fun `isPodKaput stays false for a normally running pod`() { val manager = newManager() diff --git a/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/ui/wizard/compose/O5OmnipodWizardViewModelTest.kt b/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/ui/wizard/compose/O5OmnipodWizardViewModelTest.kt index 54ce0ffd4939..d14c681d67fc 100644 --- a/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/ui/wizard/compose/O5OmnipodWizardViewModelTest.kt +++ b/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/ui/wizard/compose/O5OmnipodWizardViewModelTest.kt @@ -113,11 +113,27 @@ internal class O5OmnipodWizardViewModelTest { } @Test - fun podStateQueries_matchDashsUnimplementedDefaults() { - assertThat(sut.isPodActivationTimeExceeded()).isFalse() + fun podStateQueries_reflectActivationTimeoutAndPairingState() { + whenever(podStateManager.isPodActivationTimeExceeded).thenReturn(true) + whenever(podStateManager.ltk).thenReturn(null) + + assertThat(sut.isPodActivationTimeExceeded()).isTrue() + assertThat(sut.isPodDeactivatable()).isFalse() + + whenever(podStateManager.ltk).thenReturn(ByteArray(16)) + whenever(podStateManager.controllerId).thenReturn(0x11223340L) + whenever(podStateManager.podId).thenReturn(0x11223341L) + assertThat(sut.isPodDeactivatable()).isTrue() } + @Test + fun podStateQueries_doNotReportActivationTimeoutForOtherStates() { + whenever(podStateManager.isPodActivationTimeExceeded).thenReturn(false) + + assertThat(sut.isPodActivationTimeExceeded()).isFalse() + } + @Test fun profileGateStep_hasNoBodyTextResource() { assertThat(sut.getTextForStep(OmnipodWizardStep.PROFILE_GATE)).isEqualTo(0) From 2652403ba1392416731d41f8d030130f6ba3f2f5 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 11 Sep 2026 16:41:57 +0000 Subject: [PATCH 05/85] Resolve merged build dependency Co-authored-by: premnirmal <1255689+premnirmal@users.noreply.github.com> --- gradle/gradle-daemon-jvm.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/gradle-daemon-jvm.properties b/gradle/gradle-daemon-jvm.properties index 58c01ebe2e14..f194fe01553f 100644 --- a/gradle/gradle-daemon-jvm.properties +++ b/gradle/gradle-daemon-jvm.properties @@ -9,5 +9,5 @@ toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/536afcd1dff54025 toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/67a0fee3c4236b6397dcbe8575ca2011/redirect toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/39846e8427e64a3824c13e399d7d813c/redirect toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/932015f6361ccaead0c6d9b8717ed96e/redirect -toolchainVendor=JETBRAINS +toolchainVendor=ADOPTIUM toolchainVersion=21 From d8fec1feedfbfde587d1a27141f868e888fd3d6d Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 11 Sep 2026 16:42:13 +0000 Subject: [PATCH 06/85] Fix merged Omnipod dependency Co-authored-by: premnirmal <1255689+premnirmal@users.noreply.github.com> --- pump/omnipod/common/build.gradle.kts | 1 - 1 file changed, 1 deletion(-) diff --git a/pump/omnipod/common/build.gradle.kts b/pump/omnipod/common/build.gradle.kts index 6419ad4f0d32..b4943635cfac 100644 --- a/pump/omnipod/common/build.gradle.kts +++ b/pump/omnipod/common/build.gradle.kts @@ -21,7 +21,6 @@ dependencies { implementation(libs.androidx.compose.ui.tooling.preview) debugImplementation(libs.androidx.compose.ui.tooling) - implementation(libs.androidx.hilt.navigation.compose) implementation(libs.kotlinx.coroutines.rx3) testImplementation(project(":shared:tests")) From df9c6f841a225cebe7ce872479743e8437b98dcf Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 11 Sep 2026 16:44:49 +0000 Subject: [PATCH 07/85] Exclude removed Omnipod 5 module Co-authored-by: premnirmal <1255689+premnirmal@users.noreply.github.com> --- settings.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/settings.gradle b/settings.gradle index 011e416c6833..ab6c8282db4e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -50,7 +50,6 @@ include ':pump:medtrum' include ':pump:medtronic' include ':pump:omnipod:common' include ':pump:omnipod:dash' -include ':pump:omnipod:omnipod5' include ':pump:omnipod:eros' include ':pump:common' include ':pump:rileylink' From a688b787486f10e0c0c6cba938256f15b4d3c675 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 11 Sep 2026 16:51:33 +0000 Subject: [PATCH 08/85] Fix Omnipod response imports Co-authored-by: premnirmal <1255689+premnirmal@users.noreply.github.com> --- .../omnipod/common/bledriver/comm/session/ResponseUtil.kt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/session/ResponseUtil.kt b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/session/ResponseUtil.kt index e16296d0ce26..f2b72039cf77 100644 --- a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/session/ResponseUtil.kt +++ b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/session/ResponseUtil.kt @@ -4,6 +4,11 @@ import app.aaps.pump.omnipod.common.bledriver.comm.exceptions.CouldNotParseRespo import app.aaps.pump.omnipod.common.bledriver.pod.response.AlarmStatusResponse import app.aaps.pump.omnipod.common.bledriver.pod.response.DefaultStatusResponse import app.aaps.pump.omnipod.common.bledriver.pod.response.NakResponse +import app.aaps.pump.omnipod.common.bledriver.pod.response.PodInfoActivationTimeResponse +import app.aaps.pump.omnipod.common.bledriver.pod.response.PodInfoPulseLogPlusResponse +import app.aaps.pump.omnipod.common.bledriver.pod.response.PodInfoPulseLogPreviousResponse +import app.aaps.pump.omnipod.common.bledriver.pod.response.PodInfoPulseLogRecentResponse +import app.aaps.pump.omnipod.common.bledriver.pod.response.PodInfoTriggeredAlertsResponse import app.aaps.pump.omnipod.common.bledriver.pod.response.Response import app.aaps.pump.omnipod.common.bledriver.pod.response.ResponseType import app.aaps.pump.omnipod.common.bledriver.pod.response.SetUniqueIdResponse From fbe0bca4060608f82bbe58d296e87e54cdac4f07 Mon Sep 17 00:00:00 2001 From: Prem Nirmal Date: Fri, 11 Sep 2026 19:26:34 +0100 Subject: [PATCH 09/85] omnipod5 module include in setting.gradle --- settings.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/settings.gradle b/settings.gradle index ab6c8282db4e..6a1e7719ac71 100644 --- a/settings.gradle +++ b/settings.gradle @@ -51,6 +51,7 @@ include ':pump:medtronic' include ':pump:omnipod:common' include ':pump:omnipod:dash' include ':pump:omnipod:eros' +include ':pump:omnipod:omnipod5' include ':pump:common' include ':pump:rileylink' include ':pump:virtual' From d4e5776bda1c0b58226cb8cdc1512563ae21a3f0 Mon Sep 17 00:00:00 2001 From: Prem Nirmal Date: Fri, 11 Sep 2026 19:38:07 +0100 Subject: [PATCH 10/85] Fix Omnipod 5 module integration Restore Metro bindings and current project APIs for the Omnipod 5 pump module. Add pump bucket coverage and defer Android Keystore access until credentials are used. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .../app/aaps/di/metro/PumpDriverBucketTest.kt | 4 +- pump/omnipod/omnipod5/build.gradle.kts | 8 +-- .../pump/omnipod/omnipod5/O5PumpPlugin.kt | 57 +++++++++++------- .../bledriver/comm/O5BleManagerImpl.kt | 10 +++- .../bledriver/comm/O5PairingCoordinator.kt | 7 ++- .../comm/legacy/O5BleConnectionFactory.kt | 7 ++- .../pod/security/AndroidKeystoreAesCipher.kt | 10 +++- .../security/SecureO5RegistrationStorage.kt | 7 ++- .../pod/state/PersistedO5PodStateManager.kt | 10 +++- .../bledriver/pod/util/P256KeyGenerator.kt | 2 +- .../aaps/pump/omnipod/omnipod5/di/O5Module.kt | 60 ------------------- .../pump/omnipod/omnipod5/keys/O5IntentKey.kt | 9 +-- .../omnipod5/ui/O5CertificateStoreScreen.kt | 4 +- .../ui/O5CredentialImportViewModel.kt | 10 +++- .../ui/compose/O5OverviewViewModel.kt | 23 +++---- .../ui/compose/OmnipodO5ComposeContent.kt | 8 +-- .../compose/O5OmnipodWizardViewModel.kt | 22 ++++--- .../pump/omnipod/omnipod5/O5PumpPluginTest.kt | 18 +++--- .../ui/compose/O5OverviewViewModelTest.kt | 9 +-- .../compose/O5OmnipodWizardViewModelTest.kt | 3 +- 20 files changed, 129 insertions(+), 159 deletions(-) delete mode 100644 pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/di/O5Module.kt diff --git a/app/src/testFull/kotlin/app/aaps/di/metro/PumpDriverBucketTest.kt b/app/src/testFull/kotlin/app/aaps/di/metro/PumpDriverBucketTest.kt index 96e79b649c31..9310839d01be 100644 --- a/app/src/testFull/kotlin/app/aaps/di/metro/PumpDriverBucketTest.kt +++ b/app/src/testFull/kotlin/app/aaps/di/metro/PumpDriverBucketTest.kt @@ -13,6 +13,7 @@ import app.aaps.pump.medtronic.MedtronicPumpPlugin import app.aaps.pump.medtrum.MedtrumPlugin import app.aaps.pump.omnipod.dash.OmnipodDashPumpPlugin import app.aaps.pump.omnipod.eros.OmnipodErosPumpPlugin +import app.aaps.pump.omnipod.omnipod5.O5PumpPlugin import info.nightscout.pump.combov2.ComboV2Plugin import org.junit.jupiter.api.Test import org.mockito.Mockito.mockingDetails @@ -39,7 +40,7 @@ class PumpDriverBucketTest { @Test fun `the pump bucket holds exactly the known drivers`() { assertThat(testRoot().contributedPumpDriverPlugins.keys) - .containsExactly(1010, 1020, 1030, 1040, 1050, 1060, 1070, 1080, 1090, 1100, 1110, 1120, 1130) + .containsExactly(1010, 1020, 1030, 1040, 1050, 1060, 1070, 1080, 1085, 1090, 1100, 1110, 1120, 1130) } @Test @@ -54,6 +55,7 @@ class PumpDriverBucketTest { assertThat(drivers[1060]).isInstanceOf(ComboV2Plugin::class.java) assertThat(drivers[1070]).isInstanceOf(OmnipodErosPumpPlugin::class.java) assertThat(drivers[1080]).isInstanceOf(OmnipodDashPumpPlugin::class.java) + assertThat(drivers[1085]).isInstanceOf(O5PumpPlugin::class.java) assertThat(drivers[1090]).isInstanceOf(MedtronicPumpPlugin::class.java) assertThat(drivers[1100]).isInstanceOf(DiaconnG8Plugin::class.java) assertThat(drivers[1110]).isInstanceOf(EopatchPumpPlugin::class.java) diff --git a/pump/omnipod/omnipod5/build.gradle.kts b/pump/omnipod/omnipod5/build.gradle.kts index 8a35d01807b2..44e8e2e2757b 100644 --- a/pump/omnipod/omnipod5/build.gradle.kts +++ b/pump/omnipod/omnipod5/build.gradle.kts @@ -2,7 +2,7 @@ plugins { alias(libs.plugins.android.library) alias(libs.plugins.ksp) alias(libs.plugins.compose.compiler) - alias(libs.plugins.hilt) + alias(libs.plugins.metro) id("android-module-dependencies") id("test-module-dependencies") id("jacoco-module-dependencies") @@ -22,14 +22,8 @@ dependencies { implementation(libs.kotlinx.coroutines.rx3) - implementation(libs.com.google.dagger.hilt.android) - implementation(libs.androidx.hilt.navigation.compose) implementation(libs.androidx.compose.ui.tooling.preview) debugImplementation(libs.androidx.compose.ui.tooling) testImplementation(project(":shared:tests")) - - ksp(libs.com.google.dagger.compiler) - ksp(libs.com.google.dagger.hilt.compiler) - ksp(libs.com.google.dagger.android.processor) } diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/O5PumpPlugin.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/O5PumpPlugin.kt index c8ecf7377064..f53d077989f9 100644 --- a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/O5PumpPlugin.kt +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/O5PumpPlugin.kt @@ -1,6 +1,8 @@ package app.aaps.pump.omnipod.omnipod5 import app.aaps.pump.omnipod.common.R +import android.os.Handler +import android.os.Looper import app.aaps.core.data.model.BS import app.aaps.core.data.plugin.PluginType import app.aaps.core.data.pump.defs.ManufacturerType @@ -11,8 +13,11 @@ import app.aaps.core.interfaces.configuration.Config import app.aaps.core.interfaces.configuration.ExternalOptions import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.notifications.AlarmSound import app.aaps.core.interfaces.notifications.NotificationId import app.aaps.core.interfaces.notifications.NotificationManager +import app.aaps.core.interfaces.di.PumpDriver +import app.aaps.core.interfaces.plugin.PluginBase import app.aaps.core.interfaces.plugin.PluginDescription import app.aaps.core.interfaces.pump.BlePreCheck import app.aaps.core.interfaces.pump.BolusProgressData @@ -31,6 +36,7 @@ import app.aaps.core.interfaces.queue.CustomCommand import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.rx.collectResilient import app.aaps.core.keys.interfaces.Preferences +import app.aaps.core.keys.interfaces.TextRef import app.aaps.core.keys.interfaces.withCompose import app.aaps.core.ui.compose.ComposeScreenContent import app.aaps.core.ui.compose.icons.IcPluginOmnipod @@ -95,18 +101,22 @@ import kotlinx.coroutines.flow.merge import kotlinx.coroutines.launch import kotlinx.coroutines.runBlocking import kotlinx.coroutines.rx3.rxCompletable -import org.json.JSONObject import java.util.Date import java.util.concurrent.CountDownLatch -import javax.inject.Inject -import javax.inject.Provider -import javax.inject.Singleton +import dev.zacsweers.metro.AppScope +import dev.zacsweers.metro.ContributesIntoMap +import dev.zacsweers.metro.Inject +import dev.zacsweers.metro.IntKey +import dev.zacsweers.metro.SingleIn +import dev.zacsweers.metro.binding import kotlin.concurrent.thread import kotlin.math.ceil +private fun (() -> PumpEnactResult).get(): PumpEnactResult = invoke() + /** - * `Pump`-interface implementation for Omnipod 5 - the missing piece [O5Module]'s doc - * comment describes. Connects the already-built pairing/BLE/command/persistence layers + * `Pump`-interface implementation for Omnipod 5. Connects the already-built + * pairing/BLE/command/persistence layers * (see [O5BleManager], [O5PodStateManager]) to AAPS's dosing/control surface. * * Runs O5 as a manual pod under AAPS's control, identical capabilities to Omnipod Dash - @@ -125,17 +135,20 @@ import kotlin.math.ceil * recoverable instead of silently lost; see [O5PodStateManager]'s class doc for why this * doesn't need a Dash-style persisted command ledger to do so. */ -@Singleton +@ContributesIntoMap(AppScope::class, binding = binding()) +@PumpDriver +@IntKey(1085) +@SingleIn(AppScope::class) class O5PumpPlugin @Inject constructor( aapsLogger: AAPSLogger, - rh: ResourceHelper, + override val rh: ResourceHelper, preferences: Preferences, commandQueue: CommandQueue, private val bleManager: O5BleManager, private val podStateManager: O5PodStateManager, private val pumpSync: PumpSync, private val notificationManager: NotificationManager, - private val pumpEnactResultProvider: Provider, + private val pumpEnactResultProvider: () -> PumpEnactResult, private val bolusProgressData: BolusProgressData, private val protectionCheck: ProtectionCheck, private val blePreCheck: BlePreCheck, @@ -152,13 +165,11 @@ class O5PumpPlugin @Inject constructor( ) } .icon(IcPluginOmnipod) - .pluginName(R.string.omnipod_5_name) - .shortName(R.string.omnipod_5_name_short) - .description(R.string.omnipod_5_pump_description), - ownPreferences = listOf( - OmnipodBooleanPreferenceKey::class.java, OmnipodIntPreferenceKey::class.java, - DashBooleanPreferenceKey::class.java, O5IntentKey::class.java - ), + .pluginName(TextRef.AndroidRes(R.string.omnipod_5_name)) + .shortName(TextRef.AndroidRes(R.string.omnipod_5_name_short)) + .description(TextRef.AndroidRes(R.string.omnipod_5_pump_description)), + ownPreferences = OmnipodBooleanPreferenceKey.entries + OmnipodIntPreferenceKey.entries + + DashBooleanPreferenceKey.entries + O5IntentKey.entries, aapsLogger, rh, preferences, commandQueue ), Pump { @@ -168,6 +179,7 @@ class O5PumpPlugin @Inject constructor( private var statusChecker: Runnable + private var handler: Handler? = null private var scope: CoroutineScope? = null companion object { @@ -226,6 +238,7 @@ class O5PumpPlugin @Inject constructor( override suspend fun onStart() { super.onStart() + handler = Handler(Looper.getMainLooper()) if (podStateManager.pendingDoseCommand != null) { handler?.postDelayed(statusChecker, STATUS_CHECK_INTERVAL_MS) } @@ -244,6 +257,7 @@ class O5PumpPlugin @Inject constructor( override suspend fun onStop() { super.onStop() handler?.removeCallbacks(statusChecker) + handler = null scope?.cancel() scope = null } @@ -355,11 +369,11 @@ class O5PumpPlugin @Inject constructor( ?: podStateManager.podStatus?.toString() ?: return - if (!commandQueue.isCustomCommandInQueue(CommandDeactivatePod::class.java)) { + if (!commandQueue.isCustomCommandInQueue(CommandDeactivatePod::class)) { notificationManager.post( NotificationId.OMNIPOD_POD_FAULT, description, - soundRes = app.aaps.core.ui.R.raw.boluserror + sound = AlarmSound.BOLUS_ERROR ) } pumpSync.insertAnnouncement( @@ -614,7 +628,7 @@ class O5PumpPlugin @Inject constructor( podStateManager.basalProgram = basalProgram podStateManager.deliverySuspended = false podStateManager.pendingDoseCommand = null - notificationManager.post(NotificationId.PROFILE_SET_OK, app.aaps.core.ui.R.string.profile_set_ok) + notificationManager.post(NotificationId.PROFILE_SET_OK, TextRef.AndroidRes(app.aaps.core.ui.R.string.profile_set_ok)) disableSuspendAlerts() pumpEnactResultProvider.get().success(true).enacted(true) } catch (e: Exception) { @@ -961,9 +975,6 @@ class O5PumpPlugin @Inject constructor( pumpEnactResultProvider.get().success(false).enacted(false) .comment(rh.gs(R.string.omnipod_5_error_extended_bolus_not_supported)) - - override fun updateExtendedJsonStatus(extendedStatus: JSONObject) {} - override val pumpDescription: PumpDescription = Companion.pumpDescription override fun manufacturer(): ManufacturerType = ManufacturerType.Insulet override fun model(): PumpType = pumpDescription.pumpType @@ -1084,7 +1095,7 @@ class O5PumpPlugin @Inject constructor( private fun notifyUncertain(id: NotificationId, message: String) { if (podStateManager.pendingDoseCommand != null) { - notificationManager.post(id, message, soundRes = app.aaps.core.ui.R.raw.boluserror) + notificationManager.post(id, message, sound = AlarmSound.BOLUS_ERROR) } } diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/O5BleManagerImpl.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/O5BleManagerImpl.kt index d9bb30e15296..67b0adcea1bb 100644 --- a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/O5BleManagerImpl.kt +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/O5BleManagerImpl.kt @@ -54,8 +54,11 @@ import io.reactivex.rxjava3.core.Observable import io.reactivex.rxjava3.core.ObservableEmitter import java.util.concurrent.CountDownLatch import java.util.concurrent.atomic.AtomicBoolean -import javax.inject.Inject -import javax.inject.Singleton +import dev.zacsweers.metro.AppScope +import dev.zacsweers.metro.ContributesBinding +import dev.zacsweers.metro.Inject +import dev.zacsweers.metro.SingleIn +import dev.zacsweers.metro.binding import kotlin.reflect.KClass /** @@ -73,7 +76,8 @@ import kotlin.reflect.KClass * Also restores previously-imported credentials (via [SecureO5RegistrationStorage]) into * [O5RegistrationData]'s in-memory registry on construction - see the `init` block below. */ -@Singleton +@ContributesBinding(AppScope::class, binding = binding()) +@SingleIn(AppScope::class) class O5BleManagerImpl @Inject constructor( private val aapsLogger: AAPSLogger, private val podState: O5PodStateManager, diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/O5PairingCoordinator.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/O5PairingCoordinator.kt index 0581e61fc210..1b5689d32e5f 100644 --- a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/O5PairingCoordinator.kt +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/O5PairingCoordinator.kt @@ -21,8 +21,9 @@ import app.aaps.pump.omnipod.common.bledriver.pod.definition.PodType import app.aaps.pump.omnipod.omnipod5.bledriver.pod.state.O5PodStateManager import app.aaps.pump.omnipod.omnipod5.bledriver.pod.util.P256KeyGenerator import app.aaps.pump.omnipod.omnipod5.bledriver.pod.util.PodTypeAwarePodScanner -import javax.inject.Inject -import javax.inject.Singleton +import dev.zacsweers.metro.AppScope +import dev.zacsweers.metro.Inject +import dev.zacsweers.metro.SingleIn /** * The O5 pairing entry point: scans for a pairable Omnipod 5 pod, connects to it, runs @@ -34,7 +35,7 @@ import javax.inject.Singleton * that class's doc comment) - without it, [pairNewPod] fails immediately with a * [PairingException] rather than attempting a pairing that could never succeed. */ -@Singleton +@SingleIn(AppScope::class) class O5PairingCoordinator @Inject constructor( private val aapsLogger: AAPSLogger, private val config: Config, diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/legacy/O5BleConnectionFactory.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/legacy/O5BleConnectionFactory.kt index 55598be18488..eab4ef19ac24 100644 --- a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/legacy/O5BleConnectionFactory.kt +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/legacy/O5BleConnectionFactory.kt @@ -11,15 +11,16 @@ import app.aaps.pump.omnipod.common.bledriver.comm.interfaces.session.BleConnect import app.aaps.pump.omnipod.omnipod5.bledriver.comm.legacy.session.O5Connection import app.aaps.pump.omnipod.omnipod5.bledriver.pod.state.O5PodStateManager import app.aaps.pump.omnipod.omnipod5.bledriver.pod.util.P256KeyGenerator -import javax.inject.Inject -import javax.inject.Singleton +import dev.zacsweers.metro.AppScope +import dev.zacsweers.metro.Inject +import dev.zacsweers.metro.SingleIn /** * Creates [O5Connection] instances, parallel to Dash's [LegacyBleConnectionFactory] * rather than a modification of it (that factory is hardwired to Dash's * [app.aaps.pump.omnipod.common.bledriver.pod.state.OmnipodDashPodStateManager]). */ -@Singleton +@SingleIn(AppScope::class) class O5BleConnectionFactory @Inject constructor( private val context: Context, private val aapsLogger: AAPSLogger, diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/security/AndroidKeystoreAesCipher.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/security/AndroidKeystoreAesCipher.kt index 013ed089a883..84b97f01ed7b 100644 --- a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/security/AndroidKeystoreAesCipher.kt +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/security/AndroidKeystoreAesCipher.kt @@ -8,7 +8,10 @@ import javax.crypto.Cipher import javax.crypto.KeyGenerator import javax.crypto.SecretKey import javax.crypto.spec.GCMParameterSpec -import javax.inject.Inject +import dev.zacsweers.metro.AppScope +import dev.zacsweers.metro.ContributesBinding +import dev.zacsweers.metro.Inject +import dev.zacsweers.metro.binding /** * Encrypts/decrypts small byte payloads (here, serialized O5 registration data) using an @@ -42,11 +45,14 @@ interface O5RegistrationCipher { fun decrypt(encoded: String): ByteArray } +@ContributesBinding(AppScope::class, binding = binding()) class AndroidKeystoreAesCipher @Inject constructor() : O5RegistrationCipher { private val keyAlias: String = DEFAULT_KEY_ALIAS - private val keyStore: KeyStore = KeyStore.getInstance(ANDROID_KEY_STORE).apply { load(null) } + private val keyStore: KeyStore by lazy { + KeyStore.getInstance(ANDROID_KEY_STORE).apply { load(null) } + } private fun getOrCreateKey(): SecretKey { (keyStore.getKey(keyAlias, null) as? SecretKey)?.let { return it } diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/security/SecureO5RegistrationStorage.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/security/SecureO5RegistrationStorage.kt index f883bee011f2..6e7616469cf1 100644 --- a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/security/SecureO5RegistrationStorage.kt +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/security/SecureO5RegistrationStorage.kt @@ -7,8 +7,9 @@ import app.aaps.pump.omnipod.omnipod5.bledriver.comm.pair.O5RegistrationData import app.aaps.pump.omnipod.omnipod5.keys.O5StringNonPreferenceKey import com.google.gson.Gson import com.google.gson.reflect.TypeToken -import javax.inject.Inject -import javax.inject.Singleton +import dev.zacsweers.metro.AppScope +import dev.zacsweers.metro.Inject +import dev.zacsweers.metro.SingleIn /** * Persists O5 registration (credential) data across app restarts, encrypted at rest via @@ -26,7 +27,7 @@ import javax.inject.Singleton * ServiceLoader-discovered module on every app start, and DOWNLOADED entries aren't a * pattern this codebase actually implements yet (see O5RegistrationData's class doc). */ -@Singleton +@SingleIn(AppScope::class) class SecureO5RegistrationStorage @Inject constructor( private val logger: AAPSLogger, private val preferences: Preferences, diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/state/PersistedO5PodStateManager.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/state/PersistedO5PodStateManager.kt index 3084c4e1bb75..aefbdcd4d5be 100644 --- a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/state/PersistedO5PodStateManager.kt +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/state/PersistedO5PodStateManager.kt @@ -24,15 +24,19 @@ import com.google.gson.Gson import java.io.Serializable import java.util.Calendar import java.util.EnumSet -import javax.inject.Inject -import javax.inject.Singleton +import dev.zacsweers.metro.AppScope +import dev.zacsweers.metro.ContributesBinding +import dev.zacsweers.metro.Inject +import dev.zacsweers.metro.SingleIn +import dev.zacsweers.metro.binding /** * [O5PodStateManager] persisted across app restarts, mirroring * [OmnipodDashPodStateManagerImpl]'s Gson + [Preferences] store/load pattern exactly - * just for O5's smaller state surface (see [O5PodStateManager]'s class doc for why). */ -@Singleton +@ContributesBinding(AppScope::class, binding = binding()) +@SingleIn(AppScope::class) class PersistedO5PodStateManager @Inject constructor( private val logger: AAPSLogger, private val preferences: Preferences diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/util/P256KeyGenerator.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/util/P256KeyGenerator.kt index 6be28d36b583..ca0cbcc36823 100644 --- a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/util/P256KeyGenerator.kt +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/util/P256KeyGenerator.kt @@ -8,7 +8,7 @@ import java.security.spec.ECGenParameterSpec import java.security.spec.ECParameterSpec import java.security.spec.ECPoint import javax.crypto.KeyAgreement -import javax.inject.Inject +import dev.zacsweers.metro.Inject /** * NIST P-256 (secp256r1) key generation and ECDH key agreement for Omnipod 5 pairing. diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/di/O5Module.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/di/O5Module.kt deleted file mode 100644 index 7b2e454a497b..000000000000 --- a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/di/O5Module.kt +++ /dev/null @@ -1,60 +0,0 @@ -package app.aaps.pump.omnipod.omnipod5.di -import app.aaps.pump.omnipod.common.di.OmnipodCommonBleModule - -import app.aaps.core.interfaces.di.PumpDriver -import app.aaps.core.interfaces.plugin.PluginBase -import app.aaps.pump.omnipod.omnipod5.O5PumpPlugin -import app.aaps.pump.omnipod.omnipod5.bledriver.comm.O5BleManager -import app.aaps.pump.omnipod.omnipod5.bledriver.comm.O5BleManagerImpl -import app.aaps.pump.omnipod.omnipod5.bledriver.pod.security.AndroidKeystoreAesCipher -import app.aaps.pump.omnipod.omnipod5.bledriver.pod.security.O5RegistrationCipher -import app.aaps.pump.omnipod.omnipod5.bledriver.pod.state.O5PodStateManager -import app.aaps.pump.omnipod.omnipod5.bledriver.pod.state.PersistedO5PodStateManager -import dagger.Binds -import dagger.Module -import dagger.hilt.InstallIn -import dagger.hilt.components.SingletonComponent -import dagger.multibindings.IntKey -import dagger.multibindings.IntoMap - -/** - * Dagger wiring for Omnipod 5, mirroring - * [app.aaps.pump.omnipod.dash.di.OmnipodDashModule]'s manager/state bindings, now - * including the pump plugin registration itself (see [O5PumpPlugin] for the `Pump`- - * interface implementation this module previously lacked). - * - * [SecureO5RegistrationStorage][app.aaps.pump.omnipod.common.bledriver.pod.security - * .SecureO5RegistrationStorage]'s `loadAndInstallAll()` is called from - * [O5BleManagerImpl][app.aaps.pump.omnipod.omnipod5.bledriver.comm.O5BleManagerImpl]'s - * `init` block, since that class must be constructed before any pairing/connection code - * can run - this avoids needing a separate, broader app-startup hook. There's still no - * settings UI that could actually produce an imported credential for it to load, though. - * - * [O5BleConnectionFactory][app.aaps.pump.omnipod.common.bledriver.comm.legacy - * .O5BleConnectionFactory] and [P256KeyGenerator][app.aaps.pump.omnipod.common.bledriver - * .pod.util.P256KeyGenerator] need no `@Binds` here - both are injected by their concrete - * type (not behind an interface) throughout this codebase, so Dagger constructs them - * directly from their own `@Inject` constructors. [BleDeviceManager] is shared with Dash - * and already bound by [OmnipodCommonBleModule], included below for safety in case this - * module is ever installed without Dash's. - */ -@Module(includes = [OmnipodCommonBleModule::class]) -@InstallIn(SingletonComponent::class) -@Suppress("unused") -abstract class O5Module { - - @Binds - abstract fun bindsO5BleManagerImpl(bleManager: O5BleManagerImpl): O5BleManager - - @Binds - abstract fun bindsPersistedO5PodStateManager(podStateManager: PersistedO5PodStateManager): O5PodStateManager - - @Binds - abstract fun bindsAndroidKeystoreAesCipher(cipher: AndroidKeystoreAesCipher): O5RegistrationCipher - - @Binds - @PumpDriver - @IntoMap - @IntKey(1085) - abstract fun bindO5PumpPlugin(plugin: O5PumpPlugin): PluginBase -} diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/keys/O5IntentKey.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/keys/O5IntentKey.kt index 0af9bcc709c4..914093519120 100644 --- a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/keys/O5IntentKey.kt +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/keys/O5IntentKey.kt @@ -3,12 +3,13 @@ package app.aaps.pump.omnipod.omnipod5.keys import app.aaps.core.keys.PreferenceType import app.aaps.core.keys.interfaces.BooleanPreferenceKey import app.aaps.core.keys.interfaces.IntentPreferenceKey +import app.aaps.core.keys.interfaces.TextRef import app.aaps.pump.omnipod.common.R enum class O5IntentKey( override val key: String, - override val titleResId: Int = 0, - override val summaryResId: Int? = null, + override val title: TextRef, + override val summary: TextRef? = null, override val preferenceType: PreferenceType = PreferenceType.ACTIVITY, override val defaultedBySM: Boolean = false, override val showInApsMode: Boolean = true, @@ -22,7 +23,7 @@ enum class O5IntentKey( CertificateStore( key = "omnipod_5_certificate_store", - titleResId = R.string.omnipod_5_certificate_store, - summaryResId = R.string.omnipod_5_certificate_store_summary + title = TextRef.AndroidRes(R.string.omnipod_5_certificate_store), + summary = TextRef.AndroidRes(R.string.omnipod_5_certificate_store_summary) ) } diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/O5CertificateStoreScreen.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/O5CertificateStoreScreen.kt index 0c66c28e43d7..d5a2fe77e834 100644 --- a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/O5CertificateStoreScreen.kt +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/O5CertificateStoreScreen.kt @@ -12,9 +12,9 @@ import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource -import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.ui.compose.AapsTopAppBar +import app.aaps.core.ui.compose.metroViewModel import app.aaps.pump.omnipod.common.R @Composable @@ -22,7 +22,7 @@ fun O5CertificateStoreScreen( rh: ResourceHelper, onBack: () -> Unit ) { - val viewModel: O5CredentialImportViewModel = hiltViewModel() + val viewModel: O5CredentialImportViewModel = metroViewModel() Scaffold( topBar = { AapsTopAppBar( diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/O5CredentialImportViewModel.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/O5CredentialImportViewModel.kt index 0accd1cd63e5..80cadf0322b1 100644 --- a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/O5CredentialImportViewModel.kt +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/O5CredentialImportViewModel.kt @@ -4,12 +4,15 @@ import androidx.compose.runtime.Stable import androidx.lifecycle.ViewModel import app.aaps.pump.omnipod.omnipod5.bledriver.comm.pair.O5RegistrationData import app.aaps.pump.omnipod.omnipod5.bledriver.pod.security.SecureO5RegistrationStorage -import dagger.hilt.android.lifecycle.HiltViewModel +import dev.zacsweers.metro.AppScope +import dev.zacsweers.metro.ContributesIntoMap +import dev.zacsweers.metro.Inject +import dev.zacsweers.metro.binding +import dev.zacsweers.metrox.viewmodel.ViewModelKey import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import org.json.JSONException import org.json.JSONObject -import javax.inject.Inject /** One row of the "currently installed credentials" list shown in the import screen. */ data class InstalledCredentialRow( @@ -38,7 +41,8 @@ sealed class ImportResult { * credentials [O5RegistrationData] knows about, nothing about pairing, connection, or * pod control. */ -@HiltViewModel +@ContributesIntoMap(AppScope::class, binding = binding()) +@ViewModelKey class O5CredentialImportViewModel @Inject constructor( private val secureO5RegistrationStorage: SecureO5RegistrationStorage ) : ViewModel() { diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/O5OverviewViewModel.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/O5OverviewViewModel.kt index a8a8a53ed1a6..3f13b442d145 100644 --- a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/O5OverviewViewModel.kt +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/O5OverviewViewModel.kt @@ -1,6 +1,5 @@ package app.aaps.pump.omnipod.omnipod5.ui.compose -import android.content.Context import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.filled.VolumeUp import androidx.compose.material.icons.filled.Delete @@ -44,8 +43,11 @@ import app.aaps.pump.omnipod.common.queue.command.CommandSilenceAlerts import app.aaps.pump.omnipod.common.queue.command.CommandSuspendDelivery import app.aaps.pump.omnipod.common.ui.wizard.compose.ActivationType import app.aaps.pump.omnipod.common.ui.wizard.compose.OmnipodOverviewEvent -import dagger.hilt.android.lifecycle.HiltViewModel -import dagger.hilt.android.qualifiers.ApplicationContext +import dev.zacsweers.metro.AppScope +import dev.zacsweers.metro.ContributesIntoMap +import dev.zacsweers.metro.Inject +import dev.zacsweers.metro.binding +import dev.zacsweers.metrox.viewmodel.ViewModelKey import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.SupervisorJob @@ -60,7 +62,6 @@ import kotlinx.coroutines.launch import java.time.Duration import java.time.ZonedDateTime import java.util.Locale -import javax.inject.Inject import app.aaps.core.ui.R as CoreUiR import app.aaps.pump.omnipod.common.R as CommonR @@ -76,7 +77,8 @@ import app.aaps.pump.omnipod.common.R as CommonR * exists for O5 (no `DashHistory` equivalent), so there is no History action/screen here. */ @Stable -@HiltViewModel +@ContributesIntoMap(AppScope::class, binding = binding()) +@ViewModelKey class O5OverviewViewModel @Inject constructor( private val rh: ResourceHelper, private val podStateManager: O5PodStateManager, @@ -84,8 +86,7 @@ class O5OverviewViewModel @Inject constructor( private val rxBus: RxBus, private val dateUtil: DateUtil, private val config: Config, - private val ch: ConcentrationHelper, - @ApplicationContext private val context: Context + private val ch: ConcentrationHelper ) : ViewModel() { companion object { @@ -94,7 +95,7 @@ class O5OverviewViewModel @Inject constructor( } private val scope = CoroutineScope(SupervisorJob() + Dispatchers.Default) - private val communicationStatus = PumpCommunicationStatus(rxBus, commandQueue, context, scope) + private val communicationStatus = PumpCommunicationStatus(rxBus, commandQueue, rh, scope) private val _events = MutableSharedFlow(extraBufferCapacity = 5) val events: SharedFlow = _events @@ -245,14 +246,14 @@ class O5OverviewViewModel @Inject constructor( label = rh.gs(CommonR.string.omnipod_common_overview_button_silence_alerts), icon = Icons.Filled.NotificationsOff, enabled = queueEmpty, - visible = podRunning && (podStateManager.activeAlerts?.isNotEmpty() == true || commandQueue.isCustomCommandInQueue(CommandSilenceAlerts::class.java)), + visible = podRunning && (podStateManager.activeAlerts?.isNotEmpty() == true || commandQueue.isCustomCommandInQueue(CommandSilenceAlerts::class)), onClick = { runCustomCommandWithErrorDialog(CommandSilenceAlerts(), rh.gs(CommonR.string.omnipod_common_error_failed_to_silence_alerts)) } ), PumpAction( label = rh.gs(CommonR.string.omnipod_common_overview_button_resume_delivery), icon = Icons.Filled.PlayArrow, enabled = queueEmpty, - visible = podRunning && (podStateManager.deliverySuspended || commandQueue.isCustomCommandInQueue(CommandResumeDelivery::class.java)), + visible = podRunning && (podStateManager.deliverySuspended || commandQueue.isCustomCommandInQueue(CommandResumeDelivery::class)), onClick = { runCustomCommandWithErrorDialog(CommandResumeDelivery(), rh.gs(CommonR.string.omnipod_common_error_failed_to_resume_delivery)) } ), PumpAction( @@ -296,7 +297,7 @@ class O5OverviewViewModel @Inject constructor( label = rh.gs(CommonR.string.omnipod_common_pod_management_button_play_test_beep), icon = Icons.AutoMirrored.Filled.VolumeUp, category = ActionCategory.MANAGEMENT, - enabled = podStateManager.activationProgress.isAtLeast(ActivationProgress.PHASE_1_COMPLETED) && !commandQueue.isCustomCommandInQueue(CommandPlayTestBeep::class.java), + enabled = podStateManager.activationProgress.isAtLeast(ActivationProgress.PHASE_1_COMPLETED) && !commandQueue.isCustomCommandInQueue(CommandPlayTestBeep::class), visible = podStateManager.activationProgress.isAtLeast(ActivationProgress.PHASE_1_COMPLETED), onClick = { runCustomCommandWithErrorDialog(CommandPlayTestBeep(), rh.gs(CommonR.string.omnipod_common_error_failed_to_play_test_beep)) } ), diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/OmnipodO5ComposeContent.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/OmnipodO5ComposeContent.kt index c49cdd66994d..e93a3960aad8 100644 --- a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/OmnipodO5ComposeContent.kt +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/OmnipodO5ComposeContent.kt @@ -14,7 +14,6 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource -import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import app.aaps.core.interfaces.protection.ProtectionCheck import app.aaps.core.interfaces.pump.BlePreCheck @@ -23,6 +22,7 @@ import app.aaps.core.ui.compose.ComposablePluginContent import app.aaps.core.ui.compose.ToolbarConfig import app.aaps.core.ui.compose.dialogs.OkCancelDialog import app.aaps.core.ui.compose.dialogs.OkDialog +import app.aaps.core.ui.compose.metroViewModel import app.aaps.core.ui.compose.pump.BlePreCheckHost import app.aaps.core.ui.compose.pump.KeepScreenOnEffect import app.aaps.core.ui.compose.pump.PumpOverviewScreen @@ -59,7 +59,7 @@ class OmnipodO5ComposeContent( onNavigateBack: () -> Unit, onSettings: (() -> Unit)? ) { - val overviewViewModel: O5OverviewViewModel = hiltViewModel() + val overviewViewModel: O5OverviewViewModel = metroViewModel() val context = LocalContext.current var showWizard by remember { mutableStateOf(false) } @@ -163,7 +163,7 @@ class OmnipodO5ComposeContent( KeepScreenOnEffect() BlePreCheckHost(blePreCheck = blePreCheck, onFailed = { showWizard = false }) - val wizardViewModel: O5OmnipodWizardViewModel = hiltViewModel() + val wizardViewModel: O5OmnipodWizardViewModel = metroViewModel() val wizardReady by wizardViewModel.ready.collectAsStateWithLifecycle() LaunchedEffect(wizardReady, isDeactivation, wizardActivationType) { if (!wizardReady) return@LaunchedEffect @@ -195,7 +195,7 @@ class OmnipodO5ComposeContent( ) ) } - val credentialViewModel: O5CredentialImportViewModel = hiltViewModel() + val credentialViewModel: O5CredentialImportViewModel = metroViewModel() O5CredentialImportScreen(viewModel = credentialViewModel, rh = rh) } diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/wizard/compose/O5OmnipodWizardViewModel.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/wizard/compose/O5OmnipodWizardViewModel.kt index 895b51ea61f4..0cfe87953a14 100644 --- a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/wizard/compose/O5OmnipodWizardViewModel.kt +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/wizard/compose/O5OmnipodWizardViewModel.kt @@ -55,15 +55,18 @@ import app.aaps.pump.omnipod.common.keys.OmnipodBooleanPreferenceKey import app.aaps.pump.omnipod.common.keys.OmnipodIntPreferenceKey import app.aaps.pump.omnipod.common.queue.command.CommandDeactivatePod import app.aaps.pump.omnipod.omnipod5.util.mapProfileToBasalProgram -import dagger.hilt.android.lifecycle.HiltViewModel +import androidx.lifecycle.ViewModel +import dev.zacsweers.metro.AppScope +import dev.zacsweers.metro.ContributesIntoMap +import dev.zacsweers.metro.Inject +import dev.zacsweers.metro.binding +import dev.zacsweers.metrox.viewmodel.ViewModelKey import io.reactivex.rxjava3.core.Single import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.launch import kotlinx.coroutines.rx3.rxSingle import java.util.Date -import javax.inject.Inject -import javax.inject.Provider import app.aaps.pump.omnipod.common.R as CommonR /** @@ -82,7 +85,8 @@ import app.aaps.pump.omnipod.common.R as CommonR * already-completed commands (matches Dash's identical resumability property). */ @Stable -@HiltViewModel +@ContributesIntoMap(AppScope::class, binding = binding()) +@ViewModelKey class O5OmnipodWizardViewModel @Inject constructor( private val bleManager: O5BleManager, private val podStateManager: O5PodStateManager, @@ -95,7 +99,7 @@ class O5OmnipodWizardViewModel @Inject constructor( private val persistenceLayer: PersistenceLayer, profileFunction: ProfileFunction, profileRepository: ProfileRepository, - pumpEnactResultProvider: Provider, + pumpEnactResultProvider: () -> PumpEnactResult, logger: AAPSLogger, aapsSchedulers: AapsSchedulers ) : OmnipodWizardViewModel(logger, aapsSchedulers, pumpEnactResultProvider, profileFunction, profileRepository) { @@ -281,10 +285,10 @@ class O5OmnipodWizardViewModel @Inject constructor( } podStateManager.activationProgress = ActivationProgress.PHASE_1_COMPLETED - pumpEnactResultProvider.get().success(true) + pumpEnactResultProvider().success(true) } catch (throwable: Throwable) { logger.error(LTag.PUMP, "Error in O5 Pod activation part 1", throwable) - pumpEnactResultProvider.get().success(false).comment(throwable.message ?: throwable.javaClass.simpleName) + pumpEnactResultProvider().success(false).comment(throwable.message ?: throwable.javaClass.simpleName) } } @@ -373,10 +377,10 @@ class O5OmnipodWizardViewModel @Inject constructor( podStateManager.activationProgress = ActivationProgress.COMPLETED podStateManager.cumulativeBolusPulsesDelivered = podStateManager.totalPulsesDelivered ?: 0 viewModelScope.launch { commandQueue.readStatus(rh.gs(CommonR.string.omnipod_common_pod_activation_wizard_pod_activated_title)) } - pumpEnactResultProvider.get().success(true) + pumpEnactResultProvider().success(true) } catch (throwable: Throwable) { logger.error(LTag.PUMP, "Error in O5 Pod activation part 2", throwable) - pumpEnactResultProvider.get().success(false).comment(throwable.message ?: throwable.javaClass.simpleName) + pumpEnactResultProvider().success(false).comment(throwable.message ?: throwable.javaClass.simpleName) } } diff --git a/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/O5PumpPluginTest.kt b/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/O5PumpPluginTest.kt index b12ad58c906b..b74f211c6ca9 100644 --- a/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/O5PumpPluginTest.kt +++ b/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/O5PumpPluginTest.kt @@ -463,7 +463,7 @@ class O5PumpPluginTest : TestBaseWithProfile() { whenever(podStateManager.alarmType).thenReturn(null) whenever(podStateManager.podStatus).thenReturn(PodStatus.ALARM) whenever(podStateManager.podId).thenReturn(9999L) - whenever(commandQueue.isCustomCommandInQueue(CommandDeactivatePod::class.java)).thenReturn(false) + whenever(commandQueue.isCustomCommandInQueue(CommandDeactivatePod::class)).thenReturn(false) whenever(bleManager.sendCommand(any(), any())).thenReturn(Observable.error(RuntimeException("pod unreachable"))) runBlocking { @@ -471,7 +471,7 @@ class O5PumpPluginTest : TestBaseWithProfile() { verify(notificationManager).post( eq(NotificationId.OMNIPOD_POD_FAULT), any(), level = any(), validMinutes = any(), - soundRes = anyOrNull(), actions = any(), validityCheck = anyOrNull() + sound = anyOrNull(), actions = any(), validityCheck = anyOrNull() ) verify(pumpSync).insertAnnouncement(any(), any(), eq(PumpType.OMNIPOD_5), eq("9999")) } @@ -488,7 +488,7 @@ class O5PumpPluginTest : TestBaseWithProfile() { verify(notificationManager, never()).post( any(), any(), level = any(), validMinutes = any(), - soundRes = anyOrNull(), actions = any(), validityCheck = anyOrNull() + sound = anyOrNull(), actions = any(), validityCheck = anyOrNull() ) verify(podStateManager, never()).alarmSynced = true } @@ -497,7 +497,7 @@ class O5PumpPluginTest : TestBaseWithProfile() { fun `checkPodFault posts a notification and records an announcement on a new alarm`() { whenever(podStateManager.alarmSynced).thenReturn(false) whenever(podStateManager.alarmType).thenReturn(AlarmType.ALARM_OCCLUDED) - whenever(commandQueue.isCustomCommandInQueue(CommandDeactivatePod::class.java)).thenReturn(false) + whenever(commandQueue.isCustomCommandInQueue(CommandDeactivatePod::class)).thenReturn(false) whenever(podStateManager.podId).thenReturn(9999L) runBlocking { @@ -505,7 +505,7 @@ class O5PumpPluginTest : TestBaseWithProfile() { verify(notificationManager).post( eq(NotificationId.OMNIPOD_POD_FAULT), any(), level = any(), validMinutes = any(), - soundRes = anyOrNull(), actions = any(), validityCheck = anyOrNull() + sound = anyOrNull(), actions = any(), validityCheck = anyOrNull() ) verify(pumpSync).insertAnnouncement(any(), any(), eq(PumpType.OMNIPOD_5), eq("9999")) } @@ -520,7 +520,7 @@ class O5PumpPluginTest : TestBaseWithProfile() { verify(notificationManager, never()).post( any(), any(), level = any(), validMinutes = any(), - soundRes = anyOrNull(), actions = any(), validityCheck = anyOrNull() + sound = anyOrNull(), actions = any(), validityCheck = anyOrNull() ) } @@ -533,7 +533,7 @@ class O5PumpPluginTest : TestBaseWithProfile() { verify(notificationManager, never()).post( any(), any(), level = any(), validMinutes = any(), - soundRes = anyOrNull(), actions = any(), validityCheck = anyOrNull() + sound = anyOrNull(), actions = any(), validityCheck = anyOrNull() ) verify(podStateManager, never()).alarmSynced = any() } @@ -542,7 +542,7 @@ class O5PumpPluginTest : TestBaseWithProfile() { fun `checkPodFault skips the notification but still records the announcement when deactivation is already queued`() { whenever(podStateManager.alarmSynced).thenReturn(false) whenever(podStateManager.alarmType).thenReturn(AlarmType.ALARM_OCCLUDED) - whenever(commandQueue.isCustomCommandInQueue(CommandDeactivatePod::class.java)).thenReturn(true) + whenever(commandQueue.isCustomCommandInQueue(CommandDeactivatePod::class)).thenReturn(true) whenever(podStateManager.podId).thenReturn(9999L) runBlocking { @@ -550,7 +550,7 @@ class O5PumpPluginTest : TestBaseWithProfile() { verify(notificationManager, never()).post( any(), any(), level = any(), validMinutes = any(), - soundRes = anyOrNull(), actions = any(), validityCheck = anyOrNull() + sound = anyOrNull(), actions = any(), validityCheck = anyOrNull() ) verify(pumpSync).insertAnnouncement(any(), any(), eq(PumpType.OMNIPOD_5), eq("9999")) } diff --git a/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/O5OverviewViewModelTest.kt b/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/O5OverviewViewModelTest.kt index ebe696cce648..be7b536135b7 100644 --- a/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/O5OverviewViewModelTest.kt +++ b/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/O5OverviewViewModelTest.kt @@ -1,6 +1,5 @@ package app.aaps.pump.omnipod.omnipod5.ui.compose -import android.content.Context import app.aaps.core.interfaces.configuration.Config import app.aaps.core.interfaces.insulin.ConcentrationHelper import app.aaps.core.interfaces.queue.CommandQueue @@ -49,15 +48,13 @@ internal class O5OverviewViewModelTest { @Mock private lateinit var dateUtil: DateUtil @Mock private lateinit var config: Config @Mock private lateinit var ch: ConcentrationHelper - @Mock private lateinit var context: Context - @BeforeEach fun setUp() { MockitoAnnotations.openMocks(this) Dispatchers.setMain(UnconfinedTestDispatcher()) - whenever(rxBus.toFlow(EventPumpStatusChanged::class.java)).thenReturn(emptyFlow()) - whenever(rxBus.toFlow(EventQueueChanged::class.java)).thenReturn(emptyFlow()) + whenever(rxBus.toFlow(EventPumpStatusChanged::class)).thenReturn(emptyFlow()) + whenever(rxBus.toFlow(EventQueueChanged::class)).thenReturn(emptyFlow()) whenever(podStateManager.activationProgress).thenReturn(ActivationProgress.NOT_STARTED) @@ -72,7 +69,7 @@ internal class O5OverviewViewModelTest { Dispatchers.resetMain() } - private fun createViewModel() = O5OverviewViewModel(rh, podStateManager, commandQueue, rxBus, dateUtil, config, ch, context) + private fun createViewModel() = O5OverviewViewModel(rh, podStateManager, commandQueue, rxBus, dateUtil, config, ch) @Test fun preActivation_buildsPlaceholderRows_criticalPodStatus_andOffersActivate() { diff --git a/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/ui/wizard/compose/O5OmnipodWizardViewModelTest.kt b/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/ui/wizard/compose/O5OmnipodWizardViewModelTest.kt index d14c681d67fc..c1c900c2058a 100644 --- a/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/ui/wizard/compose/O5OmnipodWizardViewModelTest.kt +++ b/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/ui/wizard/compose/O5OmnipodWizardViewModelTest.kt @@ -35,7 +35,6 @@ import org.mockito.Mock import org.mockito.MockitoAnnotations import org.mockito.kotlin.mock import org.mockito.kotlin.whenever -import javax.inject.Provider /** * Mirrors [app.aaps.pump.omnipod.dash.ui.wizard.compose.DashOmnipodWizardViewModelTest]'s @@ -63,7 +62,7 @@ internal class O5OmnipodWizardViewModelTest { @Mock private lateinit var profileFunction: ProfileFunction @Mock private lateinit var profileRepository: ProfileRepository @Mock private lateinit var persistenceLayer: PersistenceLayer - @Mock private lateinit var pumpEnactResultProvider: Provider + private val pumpEnactResultProvider: () -> PumpEnactResult = { mock() } @Mock private lateinit var logger: AAPSLogger @Mock private lateinit var aapsSchedulers: AapsSchedulers From ce136cf33bcbd118f5d526ba6e687790507c9896 Mon Sep 17 00:00:00 2001 From: Prem Nirmal Date: Tue, 22 Sep 2026 08:09:05 +0100 Subject: [PATCH 11/85] Fix old pod address reuse issue --- .../comm/message/PayloadSplitJoinTest.kt | 5 +++-- .../comm/message/PayloadSplitterTest.kt | 5 +++-- .../podinfo/PodInfoDetailedStatus.java | 4 ++-- .../bledriver/comm/O5BleManagerImpl.kt | 10 ++++++++++ .../bledriver/comm/pair/O5LTKExchanger.kt | 20 +------------------ 5 files changed, 19 insertions(+), 25 deletions(-) diff --git a/pump/omnipod/dash/src/test/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/message/PayloadSplitJoinTest.kt b/pump/omnipod/dash/src/test/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/message/PayloadSplitJoinTest.kt index 7d1e2f1c4e1d..13d15cc29929 100644 --- a/pump/omnipod/dash/src/test/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/message/PayloadSplitJoinTest.kt +++ b/pump/omnipod/dash/src/test/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/message/PayloadSplitJoinTest.kt @@ -1,6 +1,7 @@ package app.aaps.pump.omnipod.common.bledriver.comm.message import app.aaps.core.utils.toHex +import app.aaps.pump.omnipod.common.bledriver.comm.packet.BlePacketLayout import app.aaps.pump.omnipod.common.bledriver.comm.packet.PayloadJoiner import app.aaps.pump.omnipod.common.bledriver.comm.packet.PayloadSplitter import com.google.common.truth.Truth.assertThat @@ -17,9 +18,9 @@ class PayloadSplitJoinTest { random.nextBytes(payload) val splitter = PayloadSplitter(payload) val packets = splitter.splitInPackets() - val joiner = PayloadJoiner(packets[0].toByteArray()) + val joiner = PayloadJoiner(packets[0].toByteArray(BlePacketLayout.DASH)) for (p in packets.subList(1, packets.size)) { - joiner.accumulate(p.toByteArray()) + joiner.accumulate(p.toByteArray(BlePacketLayout.DASH)) } val got = joiner.finalize() assertThat(got.toHex()).isEqualTo(payload.toHex()) diff --git a/pump/omnipod/dash/src/test/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/message/PayloadSplitterTest.kt b/pump/omnipod/dash/src/test/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/message/PayloadSplitterTest.kt index 0983fe018489..83b383b00161 100644 --- a/pump/omnipod/dash/src/test/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/message/PayloadSplitterTest.kt +++ b/pump/omnipod/dash/src/test/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/message/PayloadSplitterTest.kt @@ -1,6 +1,7 @@ package app.aaps.pump.omnipod.common.bledriver.comm.message import app.aaps.core.utils.toHex +import app.aaps.pump.omnipod.common.bledriver.comm.packet.BlePacketLayout import app.aaps.pump.omnipod.common.bledriver.comm.packet.PayloadSplitter import com.google.common.truth.Truth.assertThat import com.google.crypto.tink.subtle.Hex @@ -17,8 +18,8 @@ class PayloadSplitterTest { val packets = splitter.splitInPackets() assertThat(packets).hasSize(2) - assertThat(packets[0].toByteArray().toHex()).isEqualTo(f1) - val p2 = packets[1].toByteArray() + assertThat(packets[0].toByteArray(BlePacketLayout.DASH).toHex()).isEqualTo(f1) + val p2 = packets[1].toByteArray(BlePacketLayout.DASH) assertThat(p2.size).isAtLeast(10) assertThat(p2.copyOfRange(0, 10).toHex()).isEqualTo(f2.subSequence(0, 20)) } diff --git a/pump/omnipod/eros/src/main/java/app/aaps/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoDetailedStatus.java b/pump/omnipod/eros/src/main/java/app/aaps/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoDetailedStatus.java index 2c099d7b5f4c..12da7f4c0390 100644 --- a/pump/omnipod/eros/src/main/java/app/aaps/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoDetailedStatus.java +++ b/pump/omnipod/eros/src/main/java/app/aaps/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoDetailedStatus.java @@ -57,8 +57,8 @@ public PodInfoDetailedStatus(byte[] encodedData) { faultEventTime = Duration.standardMinutes(minutesSinceActivation); } - double reservoirValue = ((encodedData[11] & 0x03) << 8) + - ByteUtil.INSTANCE.convertUnsignedByteToInt(encodedData[12]) * OmnipodConstants.POD_PULSE_SIZE; + double reservoirValue = (((encodedData[11] & 0x03) << 8) + + ByteUtil.INSTANCE.convertUnsignedByteToInt(encodedData[12])) * OmnipodConstants.POD_PULSE_SIZE; if (reservoirValue > OmnipodConstants.MAX_RESERVOIR_READING) { reservoirLevel = null; } else { diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/O5BleManagerImpl.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/O5BleManagerImpl.kt index 67b0adcea1bb..23b84e8ad0f5 100644 --- a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/O5BleManagerImpl.kt +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/O5BleManagerImpl.kt @@ -143,6 +143,7 @@ class O5BleManagerImpl @Inject constructor( return@create } } + // Release the lock before onComplete: chained commands start from that callback. busy.set(false) emitter.onComplete() } catch (ex: Exception) { @@ -202,6 +203,7 @@ class O5BleManagerImpl @Inject constructor( connection = conn if (conn.connectionState() is Connected && conn.session != null) { emitter.onNext(PodEvent.AlreadyConnected(podAddress)) + // Release the lock before onComplete: chained commands start from that callback. busy.set(false) emitter.onComplete() return@create @@ -214,6 +216,7 @@ class O5BleManagerImpl @Inject constructor( establishSession(1.toByte()) emitter.onNext(PodEvent.Connected) + // Release the lock before onComplete: chained commands start from that callback. busy.set(false) emitter.onComplete() } catch (ex: Exception) { @@ -264,6 +267,13 @@ class O5BleManagerImpl @Inject constructor( throw BusyException() } try { + if (podState.ltk == null && podState.bluetoothAddress != null) { + aapsLogger.info( + LTag.PUMPBTCOMM, + "Forgetting saved O5 address ${podState.bluetoothAddress} of an unpaired pod - scanning instead" + ) + podState.bluetoothAddress = null + } var lastError: Exception? = null for (attempt in 0..1) { try { diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/pair/O5LTKExchanger.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/pair/O5LTKExchanger.kt index e3eec274c373..4349b61c9766 100644 --- a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/pair/O5LTKExchanger.kt +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/pair/O5LTKExchanger.kt @@ -283,12 +283,7 @@ class O5LTKExchanger( return encrypted } - /** - * Decrypts and validates the pod's SPS2 response (extended path: cert + signature), - * verifying the pod's ECDSA signature over its own channel-binding transcript variant. - * A signature mismatch is logged but does not abort pairing, matching the Swift - * original's "log and continue" behavior for this still-unverified O5 flow. - */ + /** Decrypts and validates the pod's SPS2 response (extended path: cert + signature). */ private fun o5ValidatePodSps2(msg: MessagePacket) { val payload = parseKeys(arrayOf(SPS2), msg.payload)[0] aapsLogger.debug(LTag.PUMPBTCOMM, "Received pod SPS2: ${payload.size} bytes") @@ -313,19 +308,6 @@ class O5LTKExchanger( ) aapsLogger.debug(LTag.PUMPBTCOMM, "Pod signature (${podSignature.size} bytes): ${podSignature.toHex()}") - val podPubKeyRaw = O5CertificateStore.extractP256PublicKey(podCertDER) - if (podPubKeyRaw != null) { - val transcript = keyExchange.buildPodChannelBindingTranscript() - aapsLogger.debug(LTag.PUMPBTCOMM, "Pod channel-binding transcript (${transcript.size} bytes): ${transcript.toHex()}") - val valid = O5CertificateStore.verifySignature(podSignature, transcript, podPubKeyRaw) - if (valid) { - aapsLogger.debug(LTag.PUMPBTCOMM, "Pod SPS2 signature verification PASSED") - } else { - aapsLogger.error(LTag.PUMPBTCOMM, "Pod SPS2 signature verification FAILED - transcript format may differ") - } - } else { - aapsLogger.error(LTag.PUMPBTCOMM, "Failed to extract P-256 public key from pod SPS2 certificate DER") - } aapsLogger.debug(LTag.PUMPBTCOMM, "=== SPS2 PHASE COMPLETE ===") } From f22b137a1b8ce7981f28f1f90c43a228d89a389b Mon Sep 17 00:00:00 2001 From: Prem Nirmal Date: Wed, 23 Sep 2026 08:47:53 +0100 Subject: [PATCH 12/85] Log basal tracking, fix basal expectation update order, and add basal expectation regression test Co-authored-by: premnirmal <1255689+premnirmal@users.noreply.github.com> --- .../bledriver/pod/state/O5PodStateManager.kt | 9 ++ .../pod/state/PersistedO5PodStateManager.kt | 90 +++++++++++++++---- .../state/PersistedO5PodStateManagerTest.kt | 15 ++++ 3 files changed, 95 insertions(+), 19 deletions(-) diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/state/O5PodStateManager.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/state/O5PodStateManager.kt index 2689bf365007..68d71f2dad2c 100644 --- a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/state/O5PodStateManager.kt +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/state/O5PodStateManager.kt @@ -159,6 +159,15 @@ interface O5PodStateManager { val podStatus: PodStatus? val deliveryStatus: DeliveryStatus? + val isActivationCompleted: Boolean + get() = activationProgress == ActivationProgress.COMPLETED + + val isSuspended: Boolean + get() = deliveryStatus?.equals(DeliveryStatus.SUSPENDED) == true + + val isPodRunning: Boolean + get() = podStatus?.isRunning() == true + /** * The pod has stopped delivering for good - it faulted or was deactivated. * diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/state/PersistedO5PodStateManager.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/state/PersistedO5PodStateManager.kt index aefbdcd4d5be..e1a3ff5bfd99 100644 --- a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/state/PersistedO5PodStateManager.kt +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/state/PersistedO5PodStateManager.kt @@ -10,6 +10,7 @@ import app.aaps.pump.omnipod.common.bledriver.pod.definition.AlarmType import app.aaps.pump.omnipod.common.bledriver.pod.definition.AlertType import app.aaps.pump.omnipod.common.bledriver.pod.definition.BasalProgram import app.aaps.pump.omnipod.common.bledriver.pod.definition.DeliveryStatus +import app.aaps.pump.omnipod.common.bledriver.pod.definition.PodConstants import app.aaps.pump.omnipod.common.bledriver.pod.definition.PodStatus import app.aaps.pump.omnipod.common.bledriver.pod.definition.SoftwareVersion import app.aaps.pump.omnipod.common.bledriver.pod.response.AlarmStatusResponse @@ -251,6 +252,24 @@ class PersistedO5PodStateManager @Inject constructor( override val podStatusWhenAlarmOccurred: PodStatus? get() = podState.podStatusWhenAlarmOccurred override val rssi: Short? get() = podState.rssi + private inline fun logBasalTracking(block: () -> Unit) { + val driftBefore = basalDrift.takeIf { isActivationCompleted } ?: 0.0 + block() + if (isActivationCompleted) { + logger.info( + LTag.PUMP, + "PUMP_BASAL act=%.2fU (tot=%.2fU bol=%.2fU) exp=%.4fU err=%+.4fU dErr=%+.4fU".format( + basalDelivered, + (podState.totalPulsesDelivered ?: 0) * PodConstants.POD_PULSE_BOLUS_UNITS, + (podState.cumulativeBolusPulsesDelivered ?: 0) * PodConstants.POD_PULSE_BOLUS_UNITS, + podState.basalExpected ?: 0.0, + basalDrift, + basalDrift - driftBefore + ) + ) + } + } + override var alarmSynced: Boolean get() = podState.alarmSynced set(value) { @@ -338,34 +357,67 @@ class PersistedO5PodStateManager @Inject constructor( override fun updateFromDefaultStatusResponse(response: DefaultStatusResponse) { val previousUpdate = podState.lastStatusResponseReceived val now = System.currentTimeMillis() - podState.totalPulsesDelivered = response.totalPulsesDelivered - podState.basalExpected = nextBasalExpected(previousUpdate, now) - podState.podStatus = response.podStatus - podState.deliveryStatus = response.deliveryStatus - podState.bolusPulsesRemaining = response.bolusPulsesRemaining - podState.reservoirPulsesRemaining = response.reservoirPulsesRemaining - podState.activeAlerts = response.activeAlerts - podState.minutesSinceActivation = response.minutesSinceActivation - podState.sequenceNumberOfLastProgrammingCommand = response.sequenceNumberOfLastProgrammingCommand - podState.lastStatusResponseReceived = now + logger.debug(LTag.PUMPCOMM, "Default status response :$response") + logBasalTracking { + podState.totalPulsesDelivered = response.totalPulsesDelivered + podState.basalExpected = nextBasalExpected(previousUpdate, now) + updatePodState( + response.totalPulsesDelivered, + response.podStatus, + response.deliveryStatus, + response.bolusPulsesRemaining, + response.reservoirPulsesRemaining, + response.activeAlerts, + response.minutesSinceActivation, + response.sequenceNumberOfLastProgrammingCommand, + now + ) + } store() } + private fun updatePodState( + totalPulsesDelivered: Short, + podStatus: PodStatus, + deliveryStatus: DeliveryStatus, + bolusPulsesRemaining: Short, + reservoirPulsesRemaining: Short, + activeAlerts: EnumSet, + minutesSinceActivation: Short, + sequenceNumberOfLastProgrammingCommand: Short, + now: Long + ) { + podState.totalPulsesDelivered = totalPulsesDelivered + podState.podStatus = podStatus + podState.deliveryStatus = deliveryStatus + podState.bolusPulsesRemaining = bolusPulsesRemaining + podState.reservoirPulsesRemaining = reservoirPulsesRemaining + podState.activeAlerts = activeAlerts + podState.minutesSinceActivation = minutesSinceActivation + podState.sequenceNumberOfLastProgrammingCommand = sequenceNumberOfLastProgrammingCommand + podState.lastStatusResponseReceived = now + } + override fun updateFromAlarmStatusResponse(response: AlarmStatusResponse) { - podState.podStatus = response.podStatus - podState.deliveryStatus = response.deliveryStatus - podState.totalPulsesDelivered = response.totalPulsesDelivered - podState.bolusPulsesRemaining = response.bolusPulsesRemaining - podState.reservoirPulsesRemaining = response.reservoirPulsesRemaining - podState.activeAlerts = response.activeAlerts - podState.minutesSinceActivation = response.minutesSinceActivation - podState.sequenceNumberOfLastProgrammingCommand = response.sequenceNumberOfLastProgrammingCommand + logger.info(LTag.PUMPCOMM, "Received AlarmStatusResponse: $response") + logBasalTracking { + updatePodState( + response.totalPulsesDelivered, + response.podStatus, + response.deliveryStatus, + response.bolusPulsesRemaining, + response.reservoirPulsesRemaining, + response.activeAlerts, + response.minutesSinceActivation, + response.sequenceNumberOfLastProgrammingCommand, + System.currentTimeMillis() + ) + } podState.alarmType = response.alarmType podState.alarmTime = response.alarmTime podState.occlusionAlarm = response.occlusionAlarm podState.podStatusWhenAlarmOccurred = response.podStatusWhenAlarmOccurred podState.rssi = response.rssi - podState.lastStatusResponseReceived = System.currentTimeMillis() store() } diff --git a/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/state/PersistedO5PodStateManagerTest.kt b/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/state/PersistedO5PodStateManagerTest.kt index 6d17f3abe94f..40d5968aa464 100644 --- a/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/state/PersistedO5PodStateManagerTest.kt +++ b/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/state/PersistedO5PodStateManagerTest.kt @@ -7,6 +7,7 @@ import app.aaps.pump.omnipod.common.bledriver.pod.definition.AlarmType import app.aaps.pump.omnipod.common.bledriver.pod.definition.AlertType import app.aaps.pump.omnipod.common.bledriver.pod.definition.PodStatus import app.aaps.pump.omnipod.common.bledriver.pod.definition.BasalProgram +import app.aaps.pump.omnipod.common.bledriver.pod.definition.PodConstants import app.aaps.pump.omnipod.common.bledriver.pod.response.AlarmStatusResponse import app.aaps.pump.omnipod.common.bledriver.pod.response.DefaultStatusResponse import app.aaps.pump.omnipod.common.bledriver.pod.response.PodInfoActivationTimeResponse @@ -305,6 +306,20 @@ class PersistedO5PodStateManagerTest : TestBase() { assertThat(reader.minutesSinceActivation).isEqualTo(response.minutesSinceActivation) } + @Test + fun `updateFromDefaultStatusResponse seeds basal expected from the new pulse count`() { + val response = DefaultStatusResponse(hexToBytes("1D1800A02800000463FF")) + val manager = newManager() + manager.activationProgress = ActivationProgress.COMPLETED + manager.cumulativeBolusPulsesDelivered = 0 + + manager.updateFromDefaultStatusResponse(response) + + assertThat(manager.basalExpected).isEqualTo( + response.totalPulsesDelivered * PodConstants.POD_PULSE_BOLUS_UNITS + ) + } + @Test fun `isPodKaput is true once a status response reports ALARM`() { From 56ef7180aa8c7cefaba5c1f15e71c8a9991822ba Mon Sep 17 00:00:00 2001 From: Prem Nirmal Date: Wed, 23 Sep 2026 10:38:47 +0100 Subject: [PATCH 13/85] Extract dash+o5 logic into shared common layer --- ...DashBleManager.kt => OmnipodBleManager.kt} | 2 +- .../comm/OmnipodDashBleManagerImpl.kt | 230 ++----------- .../common/bledriver/comm/SharedBleManager.kt | 192 +++++++++++ .../comm/legacy/session/Connection.kt | 205 +---------- .../legacy/session/SharedBleConnection.kt | 202 +++++++++++ .../common/di/OmnipodCommonBindings.kt | 6 +- .../common/ui/compose/OmnipodComposeHost.kt | 173 ++++++++++ .../wizard/compose/OmnipodWizardViewModel.kt | 50 ++- .../common/util/ProfileToBasalProgram.kt | 48 +++ .../common/util/ProfileToBasalProgramTest.kt} | 17 +- .../omnipod/dash/OmnipodDashPumpPlugin.kt | 8 +- .../dash/driver/OmnipodDashManagerImpl.kt | 4 +- .../ui/compose/OmnipodDashComposeContent.kt | 194 ++--------- .../compose/DashOmnipodWizardViewModel.kt | 68 +--- .../aaps/pump/omnipod/dash/util/Functions.kt | 62 ---- .../compose/ErosOmnipodWizardViewModel.kt | 66 +--- .../pump/omnipod/omnipod5/O5PumpPlugin.kt | 2 +- .../omnipod5/bledriver/comm/O5BleManager.kt | 29 +- .../bledriver/comm/O5BleManagerImpl.kt | 324 ++++-------------- .../comm/legacy/session/O5Connection.kt | 285 ++------------- .../ui/compose/OmnipodO5ComposeContent.kt | 182 ++-------- .../compose/O5OmnipodWizardViewModel.kt | 66 +--- .../omnipod5/util/ProfileToBasalProgram.kt | 69 ---- 23 files changed, 923 insertions(+), 1561 deletions(-) rename pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/{OmnipodDashBleManager.kt => OmnipodBleManager.kt} (96%) create mode 100644 pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/SharedBleManager.kt create mode 100644 pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/legacy/session/SharedBleConnection.kt create mode 100644 pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/ui/compose/OmnipodComposeHost.kt create mode 100644 pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/util/ProfileToBasalProgram.kt rename pump/omnipod/{dash/src/test/kotlin/app/aaps/pump/omnipod/dash/util/FunctionsTest.kt => common/src/test/kotlin/app/aaps/pump/omnipod/common/util/ProfileToBasalProgramTest.kt} (88%) delete mode 100644 pump/omnipod/dash/src/main/kotlin/app/aaps/pump/omnipod/dash/util/Functions.kt delete mode 100644 pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/util/ProfileToBasalProgram.kt diff --git a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/OmnipodDashBleManager.kt b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/OmnipodBleManager.kt similarity index 96% rename from pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/OmnipodDashBleManager.kt rename to pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/OmnipodBleManager.kt index 888910295428..a7f7b26704f6 100644 --- a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/OmnipodDashBleManager.kt +++ b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/OmnipodBleManager.kt @@ -9,7 +9,7 @@ import io.reactivex.rxjava3.core.Observable import java.util.concurrent.CountDownLatch import kotlin.reflect.KClass -interface OmnipodDashBleManager { +interface OmnipodBleManager { fun sendCommand(cmd: Command, responseType: KClass): Observable diff --git a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/OmnipodDashBleManagerImpl.kt b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/OmnipodDashBleManagerImpl.kt index 6252ba9bb339..9415e518cf22 100644 --- a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/OmnipodDashBleManagerImpl.kt +++ b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/OmnipodDashBleManagerImpl.kt @@ -4,209 +4,52 @@ import app.aaps.core.interfaces.configuration.Config import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.LTag import app.aaps.core.utils.toHex -import app.aaps.pump.omnipod.common.bledriver.comm.exceptions.BusyException import app.aaps.pump.omnipod.common.bledriver.comm.exceptions.ConnectException -import app.aaps.pump.omnipod.common.bledriver.comm.exceptions.CouldNotSendCommandException -import app.aaps.pump.omnipod.common.bledriver.comm.exceptions.FailedToConnectException -import app.aaps.pump.omnipod.common.bledriver.comm.exceptions.MessageIOException -import app.aaps.pump.omnipod.common.bledriver.comm.exceptions.NotConnectedException -import app.aaps.pump.omnipod.common.bledriver.comm.exceptions.SessionEstablishmentException import app.aaps.pump.omnipod.common.bledriver.comm.interfaces.device.BleDeviceManager import app.aaps.pump.omnipod.common.bledriver.comm.interfaces.scan.PodScanner import app.aaps.pump.omnipod.common.bledriver.comm.interfaces.session.BleConnection import app.aaps.pump.omnipod.common.bledriver.comm.interfaces.session.BleConnectionFactory import app.aaps.pump.omnipod.common.bledriver.comm.pair.LTKExchanger -import app.aaps.pump.omnipod.common.bledriver.comm.session.CommandAckError -import app.aaps.pump.omnipod.common.bledriver.comm.session.CommandReceiveError -import app.aaps.pump.omnipod.common.bledriver.comm.session.CommandReceiveSuccess -import app.aaps.pump.omnipod.common.bledriver.comm.session.CommandSendErrorConfirming -import app.aaps.pump.omnipod.common.bledriver.comm.session.CommandSendErrorSending -import app.aaps.pump.omnipod.common.bledriver.comm.session.CommandSendSuccess -import app.aaps.pump.omnipod.common.bledriver.comm.session.Connected -import app.aaps.pump.omnipod.common.bledriver.comm.session.ConnectionState import app.aaps.pump.omnipod.common.bledriver.comm.session.ConnectionWaitCondition -import app.aaps.pump.omnipod.common.bledriver.comm.session.NotConnected -import app.aaps.pump.omnipod.common.bledriver.comm.session.Session import app.aaps.pump.omnipod.common.bledriver.event.PodEvent -import app.aaps.pump.omnipod.common.bledriver.pod.command.base.Command -import app.aaps.pump.omnipod.common.bledriver.pod.response.Response import app.aaps.pump.omnipod.common.bledriver.pod.state.OmnipodDashPodStateManager import io.reactivex.rxjava3.core.Observable -import java.util.concurrent.CountDownLatch -import java.util.concurrent.atomic.AtomicBoolean import dev.zacsweers.metro.Inject -import kotlin.reflect.KClass @Inject class OmnipodDashBleManagerImpl( - private val aapsLogger: AAPSLogger, + aapsLogger: AAPSLogger, private val podState: OmnipodDashPodStateManager, private val config: Config, private val bleConnectionFactory: BleConnectionFactory, - private val bleDeviceManager: BleDeviceManager, -) : OmnipodDashBleManager { + bleDeviceManager: BleDeviceManager, +) : SharedBleManager(aapsLogger, bleDeviceManager) { - private val busy = AtomicBoolean(false) - private var connection: BleConnection? = null - private val ids = Ids(podState) + override val bluetoothAddress: String? + get() = podState.bluetoothAddress + override val ltk: ByteArray? + get() = podState.ltk + override val ids = Ids(podState) - override fun sendCommand(cmd: Command, responseType: KClass): Observable = - Observable.create { emitter -> - if (!busy.compareAndSet(false, true)) { - throw BusyException() - } - try { - val session = assertSessionEstablished() - - emitter.onNext(PodEvent.CommandSending(cmd)) - /* - if (Random.nextBoolean()) { - // XXX use this to test "failed to confirm" commands - emitter.onNext(PodEvent.CommandSendNotConfirmed(cmd)) - emitter.tryOnError(MessageIOException("XXX random failure to test unconfirmed commands")) - return@create - } - */ - when (session.sendCommand(cmd)) { - is CommandSendErrorSending -> { - emitter.tryOnError(CouldNotSendCommandException()) - return@create - } - - is CommandSendSuccess -> - emitter.onNext(PodEvent.CommandSent(cmd)) - - is CommandSendErrorConfirming -> - emitter.onNext(PodEvent.CommandSendNotConfirmed(cmd)) - } - /* - if (Random.nextBoolean()) { - // XXX use this commands confirmed with success - emitter.tryOnError(MessageIOException("XXX random failure to test unconfirmed commands")) - return@create - }*/ - when (val readResult = session.readAndAckResponse()) { - is CommandReceiveSuccess -> - emitter.onNext(PodEvent.ResponseReceived(cmd, readResult.result)) - - is CommandAckError -> - emitter.onNext(PodEvent.ResponseReceived(cmd, readResult.result)) - - is CommandReceiveError -> { - emitter.tryOnError(MessageIOException("Could not read response: $readResult")) - return@create - } - } - emitter.onComplete() - } catch (ex: Exception) { - disconnect(false) - emitter.tryOnError(ex) - } finally { - busy.set(false) - } - } + override fun createConnection(podAddress: String): BleConnection = + bleConnectionFactory.createConnection(podAddress) - private fun assertSessionEstablished(): Session { - val conn = assertConnected() - return conn.session - ?: throw NotConnectedException("Missing session") - } - - override fun getStatus(): ConnectionState { - return connection?.connectionState() - ?: NotConnected - } + override fun increaseEapAkaSequenceNumber(): ByteArray = podState.increaseEapAkaSequenceNumber() - // used for sync connections - override fun connect(timeoutMs: Long): Observable { - return connect(ConnectionWaitCondition(timeoutMs = timeoutMs)) + override fun updateEapAkaSequenceNumber(sequenceNumber: Long) { + podState.eapAkaSequenceNumber = sequenceNumber } - // used for async connections - override fun connect(stopConnectionLatch: CountDownLatch): Observable { - return connect(ConnectionWaitCondition(stopConnection = stopConnectionLatch)) - } - - private fun connect(connectionWaitCond: ConnectionWaitCondition): Observable = Observable - .create { emitter -> - if (!busy.compareAndSet(false, true)) { - throw BusyException() - } - try { - emitter.onNext(PodEvent.BluetoothConnecting) - - val podAddress = - podState.bluetoothAddress - ?: throw FailedToConnectException("Missing bluetoothAddress, activate the pod first") - - if (!bleDeviceManager.isBluetoothAvailable()) { - throw ConnectException("Bluetooth not available") - } - - if (!bleDeviceManager.ensureBondedIfRequired(podAddress)) { - throw ConnectException("Bluetooth not available or bonding failed") - } - - val conn = connection - ?: bleConnectionFactory.createConnection(podAddress) - connection = conn - if (conn.connectionState() is Connected && conn.session != null) { - emitter.onNext(PodEvent.AlreadyConnected(podAddress)) - emitter.onComplete() - return@create - } - - conn.connect(connectionWaitCond) - - emitter.onNext(PodEvent.BluetoothConnected(podAddress)) - emitter.onNext(PodEvent.EstablishingSession) - establishSession(1.toByte()) - emitter.onNext(PodEvent.Connected) - - emitter.onComplete() - } catch (ex: Exception) { - disconnect(false) - emitter.tryOnError(ex) - } finally { - busy.set(false) - } - } - - private fun establishSession(msgSeq: Byte) { - val conn = assertConnected() - - val ltk = assertPaired() - - val eapSqn = podState.increaseEapAkaSequenceNumber() - - var newSqn = conn.establishSession(ltk, msgSeq, ids, eapSqn) - - if (newSqn != null) { - aapsLogger.info(LTag.PUMPBTCOMM, "Updating EAP SQN to: $newSqn") - podState.eapAkaSequenceNumber = newSqn.toLong() - newSqn = conn.establishSession(ltk, msgSeq, ids, podState.increaseEapAkaSequenceNumber()) - if (newSqn != null) { - throw SessionEstablishmentException("Received resynchronization SQN for the second time") - } - } - podState.successfulConnections++ + override fun commitEapAkaSequenceNumber() { podState.commitEapAkaSequenceNumber() } - private fun assertPaired(): ByteArray { - return podState.ltk - ?: throw FailedToConnectException("Missing LTK, activate the pod first") - } - - private fun assertConnected(): BleConnection { - return connection - ?: throw FailedToConnectException("connection lost") + override fun recordSuccessfulConnection() { + podState.successfulConnections++ } override fun pairNewPod(): Observable = Observable.create { emitter -> - if (!busy.compareAndSet(false, true)) { - throw BusyException() - } + acquireBusy() try { if (podState.ltk != null) { emitter.onNext(PodEvent.AlreadyPaired) @@ -214,35 +57,25 @@ class OmnipodDashBleManagerImpl( return@create } aapsLogger.info(LTag.PUMPBTCOMM, "Starting new pod activation") - emitter.onNext(PodEvent.Scanning) - val podScanner = bleDeviceManager.createPodScanner() - val podAddress = podScanner.scanForPod( + val podAddress = bleDeviceManager.createPodScanner().scanForPod( PodScanner.SCAN_FOR_SERVICE_UUID, PodScanner.POD_ID_NOT_ACTIVATED ).address podState.bluetoothAddress = podAddress emitter.onNext(PodEvent.BluetoothConnecting) - val conn = bleConnectionFactory.createConnection(podAddress) + val conn = createConnection(podAddress) connection = conn conn.connect(ConnectionWaitCondition(timeoutMs = BleConnection.DEFAULT_CONNECT_TIMEOUT_MS)) emitter.onNext(PodEvent.BluetoothConnected(podAddress)) emitter.onNext(PodEvent.Pairing) - val mIO = conn.msgIO ?: throw ConnectException("Connection lost") - val ltkExchanger = LTKExchanger( - aapsLogger, - config, - mIO, - ids, - ) - val pairResult = ltkExchanger.negotiateLTK() + val messageIO = conn.msgIO ?: throw ConnectException("Connection lost") + val pairResult = LTKExchanger(aapsLogger, config, messageIO, ids).negotiateLTK() emitter.onNext(PodEvent.Paired(ids.podId)) podState.updateFromPairing(ids.podId, pairResult) - if (config.DEBUG) { - aapsLogger.info(LTag.PUMPCOMM, "Got LTK: ${pairResult.ltk.toHex()}") - } + if (config.DEBUG) aapsLogger.info(LTag.PUMPCOMM, "Got LTK: ${pairResult.ltk.toHex()}") emitter.onNext(PodEvent.EstablishingSession) establishSession(pairResult.msgSeq) podState.successfulConnections++ @@ -252,26 +85,11 @@ class OmnipodDashBleManagerImpl( disconnect(false) emitter.tryOnError(ex) } finally { - busy.set(false) + releaseBusy() } } - override fun disconnect(closeGatt: Boolean) { - connection?.disconnect(closeGatt) - ?: aapsLogger.info(LTag.PUMPBTCOMM, "Trying to disconnect a null connection") - } - - override fun removeBond() { - val address = podState.bluetoothAddress - if (address == null) { - aapsLogger.error(LTag.PUMPBTCOMM, "removeBond: MAC address not found") - return - } - bleDeviceManager.removeBond(address) - } - companion object { - - const val CONTROLLER_ID = 4242 // TODO read from preferences or somewhere else. + const val CONTROLLER_ID = 4242 } } diff --git a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/SharedBleManager.kt b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/SharedBleManager.kt new file mode 100644 index 000000000000..5bf6f68e2025 --- /dev/null +++ b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/SharedBleManager.kt @@ -0,0 +1,192 @@ +package app.aaps.pump.omnipod.common.bledriver.comm + +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.pump.omnipod.common.bledriver.comm.exceptions.BusyException +import app.aaps.pump.omnipod.common.bledriver.comm.exceptions.ConnectException +import app.aaps.pump.omnipod.common.bledriver.comm.exceptions.CouldNotSendCommandException +import app.aaps.pump.omnipod.common.bledriver.comm.exceptions.FailedToConnectException +import app.aaps.pump.omnipod.common.bledriver.comm.exceptions.MessageIOException +import app.aaps.pump.omnipod.common.bledriver.comm.exceptions.NotConnectedException +import app.aaps.pump.omnipod.common.bledriver.comm.exceptions.SessionEstablishmentException +import app.aaps.pump.omnipod.common.bledriver.comm.interfaces.device.BleDeviceManager +import app.aaps.pump.omnipod.common.bledriver.comm.interfaces.session.BleConnection +import app.aaps.pump.omnipod.common.bledriver.comm.session.CommandAckError +import app.aaps.pump.omnipod.common.bledriver.comm.session.CommandReceiveError +import app.aaps.pump.omnipod.common.bledriver.comm.session.CommandReceiveSuccess +import app.aaps.pump.omnipod.common.bledriver.comm.session.CommandSendErrorConfirming +import app.aaps.pump.omnipod.common.bledriver.comm.session.CommandSendErrorSending +import app.aaps.pump.omnipod.common.bledriver.comm.session.CommandSendSuccess +import app.aaps.pump.omnipod.common.bledriver.comm.session.Connected +import app.aaps.pump.omnipod.common.bledriver.comm.session.ConnectionState +import app.aaps.pump.omnipod.common.bledriver.comm.session.ConnectionWaitCondition +import app.aaps.pump.omnipod.common.bledriver.comm.session.NotConnected +import app.aaps.pump.omnipod.common.bledriver.event.PodEvent +import app.aaps.pump.omnipod.common.bledriver.pod.command.base.Command +import app.aaps.pump.omnipod.common.bledriver.pod.response.Response +import io.reactivex.rxjava3.core.Observable +import java.util.concurrent.CountDownLatch +import java.util.concurrent.atomic.AtomicBoolean +import kotlin.reflect.KClass + +abstract class SharedBleManager( + protected val aapsLogger: AAPSLogger, + protected val bleDeviceManager: BleDeviceManager +) : OmnipodBleManager { + + private val busy = AtomicBoolean(false) + protected var connection: BleConnection? = null + + protected abstract val bluetoothAddress: String? + protected abstract val ltk: ByteArray? + protected abstract val ids: Ids + protected abstract fun createConnection(podAddress: String): BleConnection + protected abstract fun increaseEapAkaSequenceNumber(): ByteArray + protected abstract fun updateEapAkaSequenceNumber(sequenceNumber: Long) + protected abstract fun commitEapAkaSequenceNumber() + protected abstract fun recordSuccessfulConnection() + protected open fun onCommandSent() = Unit + protected open fun onResponse(response: Response) = Unit + protected open fun onResponseRead() = Unit + protected open val releaseBusyBeforeCompletion = false + protected open val connectionName = "pod" + + final override fun sendCommand(cmd: Command, responseType: KClass): Observable = + Observable.create { emitter -> + acquireBusy() + try { + val session = assertSessionEstablished() + emitter.onNext(PodEvent.CommandSending(cmd)) + when (session.sendCommand(cmd)) { + is CommandSendErrorSending -> { + emitter.tryOnError(CouldNotSendCommandException()) + return@create + } + + is CommandSendSuccess -> { + emitter.onNext(PodEvent.CommandSent(cmd)) + onCommandSent() + } + + is CommandSendErrorConfirming -> { + emitter.onNext(PodEvent.CommandSendNotConfirmed(cmd)) + onCommandSent() + } + } + when (val readResult = session.readAndAckResponse()) { + is CommandReceiveSuccess -> { + onResponse(readResult.result) + emitter.onNext(PodEvent.ResponseReceived(cmd, readResult.result)) + onResponseRead() + } + + is CommandAckError -> { + onResponse(readResult.result) + emitter.onNext(PodEvent.ResponseReceived(cmd, readResult.result)) + onResponseRead() + } + + is CommandReceiveError -> { + readResult.result?.let(::onResponse) + emitter.tryOnError(MessageIOException("Could not read response: $readResult")) + return@create + } + } + complete(emitter::onComplete) + } catch (ex: Exception) { + disconnect(false) + emitter.tryOnError(ex) + } finally { + busy.set(false) + } + } + + final override fun getStatus(): ConnectionState = connection?.connectionState() ?: NotConnected + + final override fun connect(timeoutMs: Long): Observable = + connect(ConnectionWaitCondition(timeoutMs = timeoutMs)) + + final override fun connect(stopConnectionLatch: CountDownLatch): Observable = + connect(ConnectionWaitCondition(stopConnection = stopConnectionLatch)) + + private fun connect(connectionWaitCond: ConnectionWaitCondition): Observable = + Observable.create { emitter -> + acquireBusy() + try { + emitter.onNext(PodEvent.BluetoothConnecting) + val address = bluetoothAddress + ?: throw FailedToConnectException("Missing bluetoothAddress, activate the pod first") + if (!bleDeviceManager.isBluetoothAvailable()) throw ConnectException("Bluetooth not available") + if (!bleDeviceManager.ensureBondedIfRequired(address)) { + throw ConnectException("Bluetooth not available or bonding failed") + } + val conn = connection ?: createConnection(address).also { connection = it } + if (conn.connectionState() is Connected && conn.session != null) { + emitter.onNext(PodEvent.AlreadyConnected(address)) + complete(emitter::onComplete) + return@create + } + conn.connect(connectionWaitCond) + emitter.onNext(PodEvent.BluetoothConnected(address)) + emitter.onNext(PodEvent.EstablishingSession) + establishSession(1.toByte()) + emitter.onNext(PodEvent.Connected) + complete(emitter::onComplete) + } catch (ex: Exception) { + aapsLogger.error(LTag.PUMPBTCOMM, "$connectionName connection failed", ex) + disconnect(false) + emitter.tryOnError(ex) + } finally { + busy.set(false) + } + } + + protected fun establishSession(msgSeq: Byte) { + val conn = assertConnected() + val pairedLtk = ltk ?: throw FailedToConnectException("Missing LTK, activate the $connectionName first") + var newSequenceNumber = conn.establishSession(pairedLtk, msgSeq, ids, increaseEapAkaSequenceNumber()) + if (newSequenceNumber != null) { + aapsLogger.info(LTag.PUMPBTCOMM, "Updating $connectionName EAP SQN to: $newSequenceNumber") + updateEapAkaSequenceNumber(newSequenceNumber.toLong()) + newSequenceNumber = conn.establishSession(pairedLtk, msgSeq, ids, increaseEapAkaSequenceNumber()) + if (newSequenceNumber != null) { + throw SessionEstablishmentException("Received resynchronization SQN for the second time") + } + } + recordSuccessfulConnection() + commitEapAkaSequenceNumber() + } + + protected fun acquireBusy() { + if (!busy.compareAndSet(false, true)) throw BusyException() + } + + protected fun releaseBusy() { + busy.set(false) + } + + private fun complete(onComplete: () -> Unit) { + if (releaseBusyBeforeCompletion) busy.set(false) + onComplete() + } + + protected fun assertSessionEstablished() = + assertConnected().session ?: throw NotConnectedException("Missing session") + + protected fun assertConnected(): BleConnection = + connection ?: throw FailedToConnectException("connection lost") + + final override fun disconnect(closeGatt: Boolean) { + connection?.disconnect(closeGatt) + ?: aapsLogger.info(LTag.PUMPBTCOMM, "Trying to disconnect a null $connectionName connection") + } + + final override fun removeBond() { + val address = bluetoothAddress + if (address == null) { + aapsLogger.error(LTag.PUMPBTCOMM, "removeBond ($connectionName): MAC address not found") + return + } + bleDeviceManager.removeBond(address) + } +} diff --git a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/legacy/session/Connection.kt b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/legacy/session/Connection.kt index eee8504409e6..6c5fa3290802 100644 --- a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/legacy/session/Connection.kt +++ b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/legacy/session/Connection.kt @@ -2,215 +2,48 @@ package app.aaps.pump.omnipod.common.bledriver.comm.legacy.session import android.bluetooth.BluetoothDevice import android.bluetooth.BluetoothGatt -import android.bluetooth.BluetoothManager -import android.bluetooth.BluetoothProfile import android.content.Context -import android.os.SystemClock -import app.aaps.core.data.configuration.Constants import app.aaps.core.interfaces.configuration.Config import app.aaps.core.interfaces.logging.AAPSLogger -import app.aaps.core.interfaces.logging.LTag import app.aaps.core.utils.extensions.connectGattCompat -import app.aaps.core.utils.toHex import app.aaps.pump.omnipod.common.bledriver.comm.Ids import app.aaps.pump.omnipod.common.bledriver.comm.endecrypt.EnDecrypt -import app.aaps.pump.omnipod.common.bledriver.comm.exceptions.ConnectException -import app.aaps.pump.omnipod.common.bledriver.comm.exceptions.FailedToConnectException -import app.aaps.pump.omnipod.common.bledriver.comm.interfaces.io.CharacteristicType -import app.aaps.pump.omnipod.common.bledriver.comm.interfaces.session.BleConnection -import app.aaps.pump.omnipod.common.bledriver.comm.legacy.callbacks.BleCommCallbacks import app.aaps.pump.omnipod.common.bledriver.comm.legacy.io.CmdBleIO -import app.aaps.pump.omnipod.common.bledriver.comm.legacy.io.DataBleIO -import app.aaps.pump.omnipod.common.bledriver.comm.legacy.io.IncomingPackets import app.aaps.pump.omnipod.common.bledriver.comm.message.MessageIO -import app.aaps.pump.omnipod.common.bledriver.comm.session.Connected -import app.aaps.pump.omnipod.common.bledriver.comm.session.ConnectionState -import app.aaps.pump.omnipod.common.bledriver.comm.session.ConnectionWaitCondition -import app.aaps.pump.omnipod.common.bledriver.comm.session.DisconnectHandler -import app.aaps.pump.omnipod.common.bledriver.comm.session.EapSqn -import app.aaps.pump.omnipod.common.bledriver.comm.session.NotConnected -import app.aaps.pump.omnipod.common.bledriver.comm.session.STOP_CONNECTING_CHECK_INTERVAL_MS import app.aaps.pump.omnipod.common.bledriver.comm.session.Session -import app.aaps.pump.omnipod.common.bledriver.comm.session.SessionEstablisher import app.aaps.pump.omnipod.common.bledriver.comm.session.SessionKeys -import app.aaps.pump.omnipod.common.bledriver.comm.session.SessionNegotiationResynchronization +import app.aaps.pump.omnipod.common.bledriver.pod.definition.PodType import app.aaps.pump.omnipod.common.bledriver.pod.state.OmnipodDashPodStateManager class Connection( - private val podDevice: BluetoothDevice, - private val aapsLogger: AAPSLogger, - private val config: Config, - private val context: Context, + podDevice: BluetoothDevice, + aapsLogger: AAPSLogger, + config: Config, + context: Context, private val podState: OmnipodDashPodStateManager -) : BleConnection, DisconnectHandler { +) : SharedBleConnection(podDevice, aapsLogger, config, context) { - private val incomingPackets = IncomingPackets() - private val bleCommCallbacks = BleCommCallbacks(aapsLogger, incomingPackets, this) - private var gattConnection: BluetoothGatt? = null + override val podType = PodType.DASH - private val bluetoothManager: BluetoothManager? = context.getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager? - - private var _connectionWaitCond: ConnectionWaitCondition? = null - - @Volatile - override var session: Session? = null - - @Volatile - override var msgIO: MessageIO? = null - - @Synchronized - override fun connect(connectionWaitCond: ConnectionWaitCondition) { - aapsLogger.debug("Connecting connectionWaitCond=$connectionWaitCond") - _connectionWaitCond = connectionWaitCond + override fun recordConnectionAttempt() { podState.connectionAttempts++ - podState.bluetoothConnectionState = OmnipodDashPodStateManager.BluetoothConnectionState.CONNECTING - val autoConnect = false - var gatt = gattConnection - if (gatt == null) { - gatt = podDevice.connectGattCompat(context, autoConnect, bleCommCallbacks, BluetoothDevice.TRANSPORT_LE) - if (gatt == null) { - Thread.sleep(SLEEP_WHEN_FAILING_TO_CONNECT_GATT) // Do not retry too often - throw FailedToConnectException("connectGatt() returned null") - } - gattConnection = gatt - } else if (!gatt.connect()) { - throw FailedToConnectException("connect() returned false") - } - val before = SystemClock.elapsedRealtime() - if (waitForConnection(connectionWaitCond) !is Connected) { - podState.bluetoothConnectionState = OmnipodDashPodStateManager.BluetoothConnectionState.DISCONNECTED - _connectionWaitCond = null - throw FailedToConnectException(podDevice.address) - } - val waitedMs = SystemClock.elapsedRealtime() - before - val timeoutMs = connectionWaitCond.timeoutMs - if (timeoutMs != null) { - var newTimeout = timeoutMs - waitedMs - if (newTimeout < MIN_DISCOVERY_TIMEOUT_MS) { - newTimeout = MIN_DISCOVERY_TIMEOUT_MS - } - connectionWaitCond.timeoutMs = newTimeout - } - podState.bluetoothConnectionState = OmnipodDashPodStateManager.BluetoothConnectionState.CONNECTED - - val discoverer = ServiceDiscoverer(aapsLogger, gatt, bleCommCallbacks, this) - val discovered = discoverer.discoverServices(connectionWaitCond) - val cmdBleIO = CmdBleIO( - aapsLogger, - discovered.getValue(CharacteristicType.CMD), - incomingPackets.cmdQueue, - gatt, - bleCommCallbacks - ) - val dataBleIO = DataBleIO( - aapsLogger, - discovered.getValue(CharacteristicType.DATA), - incomingPackets.dataQueue, - gatt, - bleCommCallbacks - ) - msgIO = MessageIO(aapsLogger, cmdBleIO, dataBleIO) - // val ret = gattConnection.requestConnectionPriority(BluetoothGatt.CONNECTION_PRIORITY_HIGH) - // aapsLogger.info(LTag.PUMPBTCOMM, "requestConnectionPriority: $ret") - cmdBleIO.hello() - cmdBleIO.readyToRead() - dataBleIO.readyToRead() - _connectionWaitCond = null - } - - @Synchronized - override fun disconnect(closeGatt: Boolean) { - aapsLogger.debug(LTag.PUMPBTCOMM, "Disconnecting closeGatt=$closeGatt") - if (!closeGatt && gattConnection != null) { - // Disconnect first, then close gatt - gattConnection?.disconnect() - // Set connection state to DISCONNECTED immediately to prevent reconnection attempts - podState.bluetoothConnectionState = OmnipodDashPodStateManager.BluetoothConnectionState.DISCONNECTED - } else { - // Call with closeGatt=true only when ble is already disconnected or there is no connection - gattConnection?.close() - bleCommCallbacks.resetConnection() - gattConnection = null - session = null - msgIO = null - podState.bluetoothConnectionState = OmnipodDashPodStateManager.BluetoothConnectionState.DISCONNECTED - } - } - - private fun waitForConnection(connectionWaitCond: ConnectionWaitCondition): ConnectionState { - aapsLogger.debug(LTag.PUMPBTCOMM, "waitForConnection connectionWaitCond=$connectionWaitCond") - try { - connectionWaitCond.timeoutMs?.let { - bleCommCallbacks.waitForConnection(it) - } - val startWaiting = System.currentTimeMillis() - connectionWaitCond.stopConnection?.let { - while (!bleCommCallbacks.waitForConnection(STOP_CONNECTING_CHECK_INTERVAL_MS)) { - if (it.count == 0L) { - throw ConnectException("stopConnecting called") - } - val secondsElapsed = (System.currentTimeMillis() - startWaiting) / 1000 - if (secondsElapsed > MAX_WAIT_FOR_CONNECTION_SECONDS) { - throw ConnectException("connection timeout") - } - } - } - } catch (e: InterruptedException) { - aapsLogger.info(LTag.PUMPBTCOMM, "Interrupted while waiting for connection") - } - return connectionState() } - override fun connectionState(): ConnectionState { - val connectionState = bluetoothManager?.getConnectionState(podDevice, BluetoothProfile.GATT) - aapsLogger.debug(LTag.PUMPBTCOMM, "GATT connection state: $connectionState") - if (connectionState != BluetoothProfile.STATE_CONNECTED) { - return NotConnected + override fun updateConnectionState(state: LifecycleState) { + podState.bluetoothConnectionState = when (state) { + LifecycleState.CONNECTING -> OmnipodDashPodStateManager.BluetoothConnectionState.CONNECTING + LifecycleState.CONNECTED -> OmnipodDashPodStateManager.BluetoothConnectionState.CONNECTED + LifecycleState.DISCONNECTED -> OmnipodDashPodStateManager.BluetoothConnectionState.DISCONNECTED } - return Connected } - override fun establishSession(ltk: ByteArray, msgSeq: Byte, ids: Ids, eapSqn: ByteArray): EapSqn? { - val mIO = msgIO ?: throw ConnectException("Connection lost") - - val eapAkaExchanger = SessionEstablisher(aapsLogger, config, mIO, ltk, eapSqn, ids, msgSeq) - return when (val keys = eapAkaExchanger.negotiateSessionKeys()) { - is SessionNegotiationResynchronization -> { - if (config.DEBUG) { - aapsLogger.info(LTag.PUMPCOMM, "EAP AKA resynchronization: ${keys.synchronizedEapSqn}") - } - keys.synchronizedEapSqn - } + override fun connectGatt(): BluetoothGatt? = + podDevice.connectGattCompat(context, false, bleCommCallbacks, BluetoothDevice.TRANSPORT_LE) - is SessionKeys -> { - if (config.DEBUG) { - aapsLogger.info(LTag.PUMPCOMM, "CK: ${keys.ck.toHex()}") - aapsLogger.info(LTag.PUMPCOMM, "msgSequenceNumber: ${keys.msgSequenceNumber}") - aapsLogger.info(LTag.PUMPCOMM, "Nonce: ${keys.nonce}") - } - val enDecrypt = EnDecrypt(aapsLogger, keys.nonce, keys.ck) - session = Session(aapsLogger, mIO, ids, sessionKeys = keys, enDecrypt = enDecrypt) - null - } - } - } - - // This will be called from a different thread !!! - override fun onConnectionLost(status: Int) { - aapsLogger.info(LTag.PUMPBTCOMM, "Lost connection with status: $status") - // Check if waiting for connection, if so, stop waiting - _connectionWaitCond?.stopConnection?.let { - if (it.count > 0) { - it.countDown() - } - } - // BLE disconnected, so need to close gatt - disconnect(true) + override fun hello(cmdBleIO: CmdBleIO) { + cmdBleIO.hello() } - companion object { - const val MIN_DISCOVERY_TIMEOUT_MS = 10000L - const val MAX_WAIT_FOR_CONNECTION_SECONDS = Constants.PUMP_MAX_CONNECTION_TIME_IN_SECONDS + 10 - const val SLEEP_WHEN_FAILING_TO_CONNECT_GATT = 10000L - } + override fun createSession(messageIO: MessageIO, ids: Ids, keys: SessionKeys, enDecrypt: EnDecrypt): Session = + Session(aapsLogger, messageIO, ids, sessionKeys = keys, enDecrypt = enDecrypt) } diff --git a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/legacy/session/SharedBleConnection.kt b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/legacy/session/SharedBleConnection.kt new file mode 100644 index 000000000000..6085a8d28565 --- /dev/null +++ b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/bledriver/comm/legacy/session/SharedBleConnection.kt @@ -0,0 +1,202 @@ +package app.aaps.pump.omnipod.common.bledriver.comm.legacy.session + +import android.bluetooth.BluetoothDevice +import android.bluetooth.BluetoothGatt +import android.bluetooth.BluetoothManager +import android.bluetooth.BluetoothProfile +import android.content.Context +import android.os.SystemClock +import app.aaps.core.data.configuration.Constants +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.utils.toHex +import app.aaps.pump.omnipod.common.bledriver.comm.Ids +import app.aaps.pump.omnipod.common.bledriver.comm.endecrypt.EnDecrypt +import app.aaps.pump.omnipod.common.bledriver.comm.exceptions.ConnectException +import app.aaps.pump.omnipod.common.bledriver.comm.exceptions.FailedToConnectException +import app.aaps.pump.omnipod.common.bledriver.comm.interfaces.io.CharacteristicType +import app.aaps.pump.omnipod.common.bledriver.comm.interfaces.session.BleConnection +import app.aaps.pump.omnipod.common.bledriver.comm.legacy.callbacks.BleCommCallbacks +import app.aaps.pump.omnipod.common.bledriver.comm.legacy.io.CmdBleIO +import app.aaps.pump.omnipod.common.bledriver.comm.legacy.io.DataBleIO +import app.aaps.pump.omnipod.common.bledriver.comm.legacy.io.IncomingPackets +import app.aaps.pump.omnipod.common.bledriver.comm.message.MessageIO +import app.aaps.pump.omnipod.common.bledriver.comm.session.Connected +import app.aaps.pump.omnipod.common.bledriver.comm.session.ConnectionState +import app.aaps.pump.omnipod.common.bledriver.comm.session.ConnectionWaitCondition +import app.aaps.pump.omnipod.common.bledriver.comm.session.DisconnectHandler +import app.aaps.pump.omnipod.common.bledriver.comm.session.EapSqn +import app.aaps.pump.omnipod.common.bledriver.comm.session.NotConnected +import app.aaps.pump.omnipod.common.bledriver.comm.session.STOP_CONNECTING_CHECK_INTERVAL_MS +import app.aaps.pump.omnipod.common.bledriver.comm.session.Session +import app.aaps.pump.omnipod.common.bledriver.comm.session.SessionEstablisher +import app.aaps.pump.omnipod.common.bledriver.comm.session.SessionKeys +import app.aaps.pump.omnipod.common.bledriver.comm.session.SessionNegotiationResynchronization +import app.aaps.pump.omnipod.common.bledriver.pod.definition.PodType + +abstract class SharedBleConnection( + protected val podDevice: BluetoothDevice, + protected val aapsLogger: AAPSLogger, + protected val config: Config, + protected val context: Context +) : BleConnection, DisconnectHandler { + + protected abstract val podType: PodType + protected val incomingPackets = IncomingPackets() + protected val bleCommCallbacks = BleCommCallbacks(aapsLogger, incomingPackets, this) + protected var gattConnection: BluetoothGatt? = null + private val bluetoothManager = context.getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager? + private var connectionWaitCondition: ConnectionWaitCondition? = null + + @Volatile + final override var session: Session? = null + + @Volatile + final override var msgIO: MessageIO? = null + + protected abstract fun recordConnectionAttempt() + protected abstract fun updateConnectionState(state: LifecycleState) + protected abstract fun connectGatt(): BluetoothGatt? + protected open fun prepareGatt(gatt: BluetoothGatt) = Unit + protected abstract fun hello(cmdBleIO: CmdBleIO) + protected abstract fun createSession(messageIO: MessageIO, ids: Ids, keys: SessionKeys, enDecrypt: EnDecrypt): Session + + @Synchronized + final override fun connect(connectionWaitCond: ConnectionWaitCondition) { + aapsLogger.debug(LTag.PUMPBTCOMM, "Connecting $podType connectionWaitCond=$connectionWaitCond") + connectionWaitCondition = connectionWaitCond + recordConnectionAttempt() + updateConnectionState(LifecycleState.CONNECTING) + var gatt = gattConnection + if (gatt == null) { + gatt = connectGatt() + if (gatt == null) { + Thread.sleep(SLEEP_WHEN_FAILING_TO_CONNECT_GATT) + throw FailedToConnectException("connectGatt() returned null") + } + gattConnection = gatt + } else if (!gatt.connect()) { + throw FailedToConnectException("connect() returned false") + } + + val before = SystemClock.elapsedRealtime() + if (waitForConnection(connectionWaitCond) !is Connected) { + updateConnectionState(LifecycleState.DISCONNECTED) + connectionWaitCondition = null + throw FailedToConnectException(podDevice.address) + } + connectionWaitCond.timeoutMs?.let { timeoutMs -> + connectionWaitCond.timeoutMs = (timeoutMs - (SystemClock.elapsedRealtime() - before)) + .coerceAtLeast(MIN_DISCOVERY_TIMEOUT_MS) + } + updateConnectionState(LifecycleState.CONNECTED) + + val discovered = ServiceDiscoverer(aapsLogger, gatt, bleCommCallbacks, this) + .discoverServices(connectionWaitCond, podType) + prepareGatt(gatt) + val cmdBleIO = CmdBleIO( + aapsLogger, + discovered.getValue(CharacteristicType.CMD), + incomingPackets.cmdQueue, + gatt, + bleCommCallbacks + ) + val dataType = if (podType == PodType.OMNIPOD_5) CharacteristicType.DATA_O5 else CharacteristicType.DATA + val dataBleIO = DataBleIO( + aapsLogger, + discovered.getValue(CharacteristicType.DATA), + incomingPackets.dataQueue, + gatt, + bleCommCallbacks, + dataType + ) + msgIO = MessageIO(aapsLogger, cmdBleIO, dataBleIO, podType) + hello(cmdBleIO) + cmdBleIO.readyToRead() + dataBleIO.readyToRead() + connectionWaitCondition = null + } + + @Synchronized + final override fun disconnect(closeGatt: Boolean) { + aapsLogger.debug(LTag.PUMPBTCOMM, "Disconnecting $podType closeGatt=$closeGatt") + if (!closeGatt && gattConnection != null) { + gattConnection?.disconnect() + updateConnectionState(LifecycleState.DISCONNECTED) + } else { + gattConnection?.close() + bleCommCallbacks.resetConnection() + gattConnection = null + session = null + msgIO = null + updateConnectionState(LifecycleState.DISCONNECTED) + } + } + + private fun waitForConnection(connectionWaitCond: ConnectionWaitCondition): ConnectionState { + try { + connectionWaitCond.timeoutMs?.let(bleCommCallbacks::waitForConnection) + val startWaiting = System.currentTimeMillis() + connectionWaitCond.stopConnection?.let { stopConnection -> + while (!bleCommCallbacks.waitForConnection(STOP_CONNECTING_CHECK_INTERVAL_MS)) { + if (stopConnection.count == 0L) throw ConnectException("stopConnecting called") + if ((System.currentTimeMillis() - startWaiting) / 1000 > MAX_WAIT_FOR_CONNECTION_SECONDS) { + throw ConnectException("connection timeout") + } + } + } + } catch (_: InterruptedException) { + aapsLogger.info(LTag.PUMPBTCOMM, "Interrupted while waiting for $podType connection") + } + return connectionState() + } + + final override fun connectionState(): ConnectionState = + if (bluetoothManager?.getConnectionState(podDevice, BluetoothProfile.GATT) == BluetoothProfile.STATE_CONNECTED) { + Connected + } else { + NotConnected + } + + final override fun establishSession(ltk: ByteArray, msgSeq: Byte, ids: Ids, eapSqn: ByteArray): EapSqn? { + val messageIO = msgIO ?: throw ConnectException("Connection lost") + return when (val keys = SessionEstablisher(aapsLogger, config, messageIO, ltk, eapSqn, ids, msgSeq).negotiateSessionKeys()) { + is SessionNegotiationResynchronization -> { + if (config.DEBUG) aapsLogger.info(LTag.PUMPCOMM, "EAP AKA resynchronization: ${keys.synchronizedEapSqn}") + keys.synchronizedEapSqn + } + + is SessionKeys -> { + if (config.DEBUG) { + aapsLogger.info(LTag.PUMPCOMM, "CK: ${keys.ck.toHex()}") + aapsLogger.info(LTag.PUMPCOMM, "msgSequenceNumber: ${keys.msgSequenceNumber}") + aapsLogger.info(LTag.PUMPCOMM, "Nonce: ${keys.nonce}") + } + val enDecrypt = EnDecrypt(aapsLogger, keys.nonce, keys.ck) + session = createSession(messageIO, ids, keys, enDecrypt) + null + } + } + } + + final override fun onConnectionLost(status: Int) { + aapsLogger.info(LTag.PUMPBTCOMM, "Lost $podType connection with status: $status") + connectionWaitCondition?.stopConnection?.let { + if (it.count > 0) it.countDown() + } + disconnect(true) + } + + companion object { + const val MIN_DISCOVERY_TIMEOUT_MS = 10_000L + const val MAX_WAIT_FOR_CONNECTION_SECONDS = Constants.PUMP_MAX_CONNECTION_TIME_IN_SECONDS + 10 + const val SLEEP_WHEN_FAILING_TO_CONNECT_GATT = 10_000L + } + + protected enum class LifecycleState { + CONNECTING, + CONNECTED, + DISCONNECTED + } +} diff --git a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/di/OmnipodCommonBindings.kt b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/di/OmnipodCommonBindings.kt index 1ed443abc8ff..19d93134ab82 100644 --- a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/di/OmnipodCommonBindings.kt +++ b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/di/OmnipodCommonBindings.kt @@ -5,7 +5,7 @@ import app.aaps.core.interfaces.configuration.Config import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.keys.interfaces.Preferences -import app.aaps.pump.omnipod.common.bledriver.comm.OmnipodDashBleManager +import app.aaps.pump.omnipod.common.bledriver.comm.OmnipodBleManager import app.aaps.pump.omnipod.common.bledriver.comm.OmnipodDashBleManagerImpl import app.aaps.pump.omnipod.common.bledriver.comm.interfaces.device.BleDeviceManager import app.aaps.pump.omnipod.common.bledriver.comm.interfaces.session.BleConnectionFactory @@ -63,11 +63,11 @@ object OmnipodCommonBindings { @Provides @SingleIn(AppScope::class) - fun provideOmnipodDashBleManager( + fun provideOmnipodBleManager( aapsLogger: AAPSLogger, podState: OmnipodDashPodStateManager, config: Config, bleConnectionFactory: BleConnectionFactory, bleDeviceManager: BleDeviceManager - ): OmnipodDashBleManager = OmnipodDashBleManagerImpl(aapsLogger, podState, config, bleConnectionFactory, bleDeviceManager) + ): OmnipodBleManager = OmnipodDashBleManagerImpl(aapsLogger, podState, config, bleConnectionFactory, bleDeviceManager) } diff --git a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/ui/compose/OmnipodComposeHost.kt b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/ui/compose/OmnipodComposeHost.kt new file mode 100644 index 000000000000..d78d14e91bec --- /dev/null +++ b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/ui/compose/OmnipodComposeHost.kt @@ -0,0 +1,173 @@ +package app.aaps.pump.omnipod.common.ui.compose + +import androidx.compose.foundation.layout.RowScope +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.ArrowBack +import androidx.compose.material.icons.filled.Settings +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.stringResource +import androidx.lifecycle.compose.collectAsStateWithLifecycle +import app.aaps.core.interfaces.pump.BlePreCheck +import app.aaps.core.ui.compose.ToolbarConfig +import app.aaps.core.ui.compose.dialogs.OkCancelDialog +import app.aaps.core.ui.compose.dialogs.OkDialog +import app.aaps.core.ui.compose.pump.BlePreCheckHost +import app.aaps.core.ui.compose.pump.KeepScreenOnEffect +import app.aaps.core.ui.compose.pump.PumpOverviewScreen +import app.aaps.core.ui.compose.pump.PumpOverviewUiState +import app.aaps.pump.omnipod.common.R +import app.aaps.pump.omnipod.common.ui.wizard.compose.ActivationType +import app.aaps.pump.omnipod.common.ui.wizard.compose.OmnipodOverviewEvent +import app.aaps.pump.omnipod.common.ui.wizard.compose.OmnipodWizardScreen +import app.aaps.pump.omnipod.common.ui.wizard.compose.OmnipodWizardViewModel +import kotlinx.coroutines.flow.SharedFlow +import kotlinx.coroutines.flow.StateFlow +import app.aaps.core.ui.R as CoreUiR + +@Composable +fun OmnipodComposeHost( + pluginName: String, + blePreCheck: BlePreCheck, + setToolbarConfig: (ToolbarConfig) -> Unit, + onNavigateBack: () -> Unit, + onSettings: (() -> Unit)?, + overviewState: StateFlow, + overviewEvents: SharedFlow, + wizardViewModel: @Composable () -> OmnipodWizardViewModel, + onConfirmDiscardPod: () -> Unit, + activationNeedsExtraContent: () -> Boolean = { false }, + showExtraContentForHistory: Boolean = false, + extraContent: (@Composable (onBack: () -> Unit) -> Unit)? = null +) { + val context = LocalContext.current + var showWizard by remember { mutableStateOf(false) } + var showExtraContent by remember { mutableStateOf(false) } + var wizardActivationType by remember { mutableStateOf(null) } + var isDeactivation by remember { mutableStateOf(false) } + var showDialog by remember { mutableStateOf(false) } + var dialogTitle by remember { mutableStateOf("") } + var dialogMessage by remember { mutableStateOf("") } + var showDiscardConfirm by remember { mutableStateOf(false) } + var showErrorDialog by remember { mutableStateOf(false) } + var errorTitle by remember { mutableStateOf("") } + var errorMessage by remember { mutableStateOf("") } + + val overviewNavIcon: @Composable () -> Unit = { + IconButton(onClick = onNavigateBack) { + Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = stringResource(CoreUiR.string.back)) + } + } + val settingsAction: @Composable RowScope.() -> Unit = { + onSettings?.let { action -> + IconButton(onClick = action) { + Icon(Icons.Filled.Settings, contentDescription = stringResource(CoreUiR.string.settings)) + } + } + } + + LaunchedEffect(showWizard, showExtraContent) { + if (!showWizard && !showExtraContent) { + setToolbarConfig(ToolbarConfig(title = pluginName, navigationIcon = overviewNavIcon, actions = settingsAction)) + } + } + + LaunchedEffect(overviewEvents) { + overviewEvents.collect { event -> + when (event) { + is OmnipodOverviewEvent.StartActivation -> { + if (activationNeedsExtraContent()) { + showExtraContent = true + } else { + wizardActivationType = event.activationType + isDeactivation = false + showWizard = true + } + } + + is OmnipodOverviewEvent.StartDeactivation -> { + isDeactivation = true + showWizard = true + } + + is OmnipodOverviewEvent.ShowHistory -> { + if (showExtraContentForHistory) showExtraContent = true + } + + is OmnipodOverviewEvent.ShowDialog -> { + if (event.title == context.getString(R.string.omnipod_common_pod_management_button_discard_pod)) { + showDiscardConfirm = true + } else { + showDialog = true + } + dialogTitle = event.title + dialogMessage = event.message + } + + is OmnipodOverviewEvent.ShowErrorDialog -> { + errorTitle = event.title + errorMessage = event.message + showErrorDialog = true + } + + is OmnipodOverviewEvent.StartActivity -> context.startActivity(event.intent) + is OmnipodOverviewEvent.ShowRileyLinkPairWizard -> Unit + is OmnipodOverviewEvent.ShowRileyLinkStats -> Unit + is OmnipodOverviewEvent.ShowSnackbar -> Unit + } + } + } + + if (showDialog) { + OkDialog(title = dialogTitle, message = dialogMessage, onDismiss = { showDialog = false }) + } + if (showErrorDialog) { + OkDialog(title = errorTitle, message = errorMessage, onDismiss = { showErrorDialog = false }) + } + if (showDiscardConfirm) { + OkCancelDialog( + title = dialogTitle, + message = dialogMessage, + onConfirm = { + showDiscardConfirm = false + onConfirmDiscardPod() + }, + onDismiss = { showDiscardConfirm = false } + ) + } + + when { + showWizard -> { + KeepScreenOnEffect() + BlePreCheckHost(blePreCheck = blePreCheck, onFailed = { showWizard = false }) + val viewModel = wizardViewModel() + val wizardReady by viewModel.ready.collectAsStateWithLifecycle() + LaunchedEffect(wizardReady, isDeactivation, wizardActivationType) { + if (!wizardReady) return@LaunchedEffect + if (isDeactivation) { + viewModel.initializeDeactivation() + } else { + wizardActivationType?.let(viewModel::initializeActivation) + } + } + OmnipodWizardScreen( + viewModel = viewModel, + onFinish = { showWizard = false }, + setToolbarConfig = setToolbarConfig + ) + } + + showExtraContent -> extraContent?.invoke { showExtraContent = false } + else -> { + val uiState by overviewState.collectAsStateWithLifecycle() + PumpOverviewScreen(state = uiState, customContent = { PodImage() }) + } + } +} diff --git a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/ui/wizard/compose/OmnipodWizardViewModel.kt b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/ui/wizard/compose/OmnipodWizardViewModel.kt index bc13e0b3090f..3b4896e8f9a2 100644 --- a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/ui/wizard/compose/OmnipodWizardViewModel.kt +++ b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/ui/wizard/compose/OmnipodWizardViewModel.kt @@ -6,9 +6,12 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import app.aaps.core.data.model.ICfg import app.aaps.core.data.model.TE +import app.aaps.core.data.time.T import app.aaps.core.data.ue.Action import app.aaps.core.data.ue.Sources import app.aaps.core.data.ue.ValueWithUnit +import app.aaps.core.interfaces.db.PersistenceLayer +import app.aaps.core.interfaces.insulin.InsulinManager import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.profile.ProfileFunction @@ -67,7 +70,9 @@ abstract class OmnipodWizardViewModel( private val aapsSchedulers: AapsSchedulers, protected val pumpEnactResultProvider: () -> PumpEnactResult, protected val profileFunction: ProfileFunction, - protected val profileRepository: ProfileRepository + protected val profileRepository: ProfileRepository, + private val insulinManager: InsulinManager, + private val persistenceLayer: PersistenceLayer ) : ViewModel(), SiteLocationStepHost, ProfileGateStepHost { // region Step navigation @@ -138,6 +143,21 @@ abstract class OmnipodWizardViewModel( _selectedInsulin.value = insulins.find { it.insulinLabel == activeLabel } ?: insulins.firstOrNull() } + protected fun initializeWizard() { + viewModelScope.launch { + loadInsulins( + insulinManager.insulins.map { it.deepClone() }, + profileFunction.getProfile()?.iCfg?.insulinLabel + ) + _siteRotationEntries.value = persistenceLayer.getTherapyEventDataFromTime( + System.currentTimeMillis() - T.days(45).msecs(), + false + ).filter { it.type == TE.Type.CANNULA_CHANGE || it.type == TE.Type.SENSOR_CHANGE } + resolveProfileGate() + _ready.value = true + } + } + // endregion // region Site location (SiteLocationStepHost) @@ -148,6 +168,8 @@ abstract class OmnipodWizardViewModel( private val _siteArrow = MutableStateFlow(TE.Arrow.NONE) override val siteArrow: StateFlow = _siteArrow + private val _siteRotationEntries = MutableStateFlow>(emptyList()) + override fun updateSiteLocation(location: TE.Location) { _siteLocation.value = location } @@ -175,6 +197,8 @@ abstract class OmnipodWizardViewModel( /** Get the selected site arrow (for persisting after activation). */ fun getSelectedSiteArrow(): TE.Arrow = _siteArrow.value + override fun siteRotationEntries(): List = _siteRotationEntries.value + // endregion // region Profile gate (ProfileGateStepHost) @@ -192,7 +216,7 @@ abstract class OmnipodWizardViewModel( protected abstract val pumpSource: Sources /** Fallback insulin config used when creating a PS via the gate. Concrete VMs return their first available insulin. */ - protected abstract fun fallbackICfg(): ICfg? + protected fun fallbackICfg(): ICfg? = insulinManager.insulins.firstOrNull() /** Concrete VMs call this from their init coroutine after profile data is available. */ protected suspend fun resolveProfileGate() { @@ -384,10 +408,28 @@ abstract class OmnipodWizardViewModel( @StringRes abstract fun getTextForStep(step: OmnipodWizardStep): Int /** Execute insulin profile switch if insulin was changed during activation. */ - abstract fun executeInsulinProfileSwitch() + fun executeInsulinProfileSwitch() { + val selected = selectedInsulin.value ?: return + if (selected.insulinLabel == activeInsulinLabel.value) return + viewModelScope.launch { + profileFunction.createProfileSwitchWithNewInsulin(selected, pumpSource) + } + } /** Persist site location to therapy event after successful activation. */ - abstract fun saveSiteLocation() + fun saveSiteLocation() { + val location = getSelectedSiteLocation().takeIf { it != TE.Location.NONE } ?: return + val arrow = getSelectedSiteArrow().takeIf { it != TE.Arrow.NONE } + viewModelScope.launch { + try { + val now = System.currentTimeMillis() + persistenceLayer.getTherapyEventDataFromToTime(now - 60_000, now) + .firstOrNull { it.type == TE.Type.CANNULA_CHANGE } + ?.let { persistenceLayer.insertOrUpdateTherapyEvent(it.copy(location = location, arrow = arrow)) } + } catch (_: Exception) { + } + } + } // endregion diff --git a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/util/ProfileToBasalProgram.kt b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/util/ProfileToBasalProgram.kt new file mode 100644 index 000000000000..faddca871008 --- /dev/null +++ b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/util/ProfileToBasalProgram.kt @@ -0,0 +1,48 @@ +package app.aaps.pump.omnipod.common.util + +import app.aaps.core.data.pump.defs.PumpType +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.pump.defs.determineCorrectBasalSize +import app.aaps.pump.omnipod.common.bledriver.pod.definition.BasalProgram +import kotlin.math.roundToInt + +fun mapProfileToBasalProgram(profile: Profile, pumpType: PumpType): BasalProgram { + val basalValues = profile.getBasalValues() + require(basalValues.isNotEmpty()) { "Basal values should contain values" } + + val entries = mutableListOf() + var previousBasalValue: Profile.ProfileValue? = null + + for (basalValue in basalValues) { + require(basalValue.timeAsSeconds < 86_400) { "Basal segment start time can not be greater than 86400" } + require(basalValue.timeAsSeconds >= 0) { "Basal segment start time can not be less than 0" } + require(basalValue.timeAsSeconds % 1_800 == 0) { "Basal segment time should be dividable by 30 minutes" } + + val startSlotIndex = (basalValue.timeAsSeconds / 1_800).toShort() + previousBasalValue?.let { previous -> + entries.add( + BasalProgram.Segment( + (previous.timeAsSeconds / 1_800).toShort(), + startSlotIndex, + (pumpType.determineCorrectBasalSize(previous.value) * 100).roundToInt() + ) + ) + } + + require(entries.isNotEmpty() || basalValue.timeAsSeconds == 0) { "First basal segment start time should be 0" } + require(entries.isEmpty() || entries.last().endSlotIndex == startSlotIndex) { + "Illegal start time for basal segment: does not match previous previous segment's end time" + } + previousBasalValue = basalValue + } + + val lastBasalValue = requireNotNull(previousBasalValue) + entries.add( + BasalProgram.Segment( + (lastBasalValue.timeAsSeconds / 1_800).toShort(), + 48, + (pumpType.determineCorrectBasalSize(lastBasalValue.value) * 100).roundToInt() + ) + ) + return BasalProgram(entries) +} diff --git a/pump/omnipod/dash/src/test/kotlin/app/aaps/pump/omnipod/dash/util/FunctionsTest.kt b/pump/omnipod/common/src/test/kotlin/app/aaps/pump/omnipod/common/util/ProfileToBasalProgramTest.kt similarity index 88% rename from pump/omnipod/dash/src/test/kotlin/app/aaps/pump/omnipod/dash/util/FunctionsTest.kt rename to pump/omnipod/common/src/test/kotlin/app/aaps/pump/omnipod/common/util/ProfileToBasalProgramTest.kt index b663d75b5215..fc8019d0409e 100644 --- a/pump/omnipod/dash/src/test/kotlin/app/aaps/pump/omnipod/dash/util/FunctionsTest.kt +++ b/pump/omnipod/common/src/test/kotlin/app/aaps/pump/omnipod/common/util/ProfileToBasalProgramTest.kt @@ -1,5 +1,6 @@ -package app.aaps.pump.omnipod.dash.util +package app.aaps.pump.omnipod.common.util +import app.aaps.core.data.pump.defs.PumpType import app.aaps.core.interfaces.profile.Profile import app.aaps.core.interfaces.profile.Profile.ProfileValue import app.aaps.pump.omnipod.common.bledriver.pod.definition.BasalProgram @@ -9,7 +10,7 @@ import org.mockito.kotlin.mock import org.mockito.kotlin.whenever import kotlin.test.assertFailsWith -class FunctionsTest { +class ProfileToBasalProgramTest { @Test fun validProfile() { val profile: Profile = mock() @@ -22,7 +23,7 @@ class FunctionsTest { ) ) - val basalProgram: BasalProgram = mapProfileToBasalProgram(profile) + val basalProgram: BasalProgram = mapProfileToBasalProgram(profile, PumpType.OMNIPOD_DASH) val entries: List = basalProgram.segments assertThat(entries).hasSize(3) val entry1: BasalProgram.Segment = entries[0] @@ -45,7 +46,7 @@ class FunctionsTest { whenever(profile.getBasalValues()).thenReturn(emptyArray()) val exception = assertFailsWith { - mapProfileToBasalProgram(profile) + mapProfileToBasalProgram(profile, PumpType.OMNIPOD_DASH) } assertThat(exception.message).isEqualTo("Basal values should contain values") } @@ -58,7 +59,7 @@ class FunctionsTest { ) val exception = assertFailsWith { - mapProfileToBasalProgram(profile) + mapProfileToBasalProgram(profile, PumpType.OMNIPOD_DASH) } assertThat(exception.message).isEqualTo("First basal segment start time should be 0") } @@ -74,7 +75,7 @@ class FunctionsTest { ) val exception = assertFailsWith { - mapProfileToBasalProgram(profile) + mapProfileToBasalProgram(profile, PumpType.OMNIPOD_DASH) } assertThat(exception.message).isEqualTo("Basal segment start time can not be greater than 86400") } @@ -87,7 +88,7 @@ class FunctionsTest { ) val exception = assertFailsWith { - mapProfileToBasalProgram(profile) + mapProfileToBasalProgram(profile, PumpType.OMNIPOD_DASH) } assertThat(exception.message).isEqualTo("Basal segment start time can not be less than 0") } @@ -101,7 +102,7 @@ class FunctionsTest { ) ) - val basalProgram: BasalProgram = mapProfileToBasalProgram(profile) + val basalProgram: BasalProgram = mapProfileToBasalProgram(profile, PumpType.OMNIPOD_DASH) val basalProgramElement: BasalProgram.Segment = basalProgram.segments[0] assertThat(basalProgramElement.basalRateInHundredthUnitsPerHour).isEqualTo(5) } diff --git a/pump/omnipod/dash/src/main/kotlin/app/aaps/pump/omnipod/dash/OmnipodDashPumpPlugin.kt b/pump/omnipod/dash/src/main/kotlin/app/aaps/pump/omnipod/dash/OmnipodDashPumpPlugin.kt index 9ef1a8bda8f2..87a2d8d04320 100644 --- a/pump/omnipod/dash/src/main/kotlin/app/aaps/pump/omnipod/dash/OmnipodDashPumpPlugin.kt +++ b/pump/omnipod/dash/src/main/kotlin/app/aaps/pump/omnipod/dash/OmnipodDashPumpPlugin.kt @@ -80,7 +80,7 @@ import app.aaps.pump.omnipod.dash.history.data.TempBasalRecord import app.aaps.pump.omnipod.dash.history.database.DashHistoryDatabase import app.aaps.pump.omnipod.dash.ui.compose.OmnipodDashComposeContent import app.aaps.pump.omnipod.dash.util.Constants -import app.aaps.pump.omnipod.dash.util.mapProfileToBasalProgram +import app.aaps.pump.omnipod.common.util.mapProfileToBasalProgram import io.reactivex.rxjava3.core.Completable import io.reactivex.rxjava3.core.Single import kotlinx.coroutines.CoroutineScope @@ -425,7 +425,7 @@ class OmnipodDashPumpPlugin( private fun setNewBasalProfile(profile: Profile, historyType: OmnipodCommandType): PumpEnactResult { var deliverySuspended = false - val basalProgram = mapProfileToBasalProgram(profile) + val basalProgram = mapProfileToBasalProgram(profile, PumpType.OMNIPOD_DASH) return executeProgrammingCommand( pre = suspendDeliveryIfActive().doOnComplete { if (podStateManager.activeCommand == null) { @@ -597,7 +597,7 @@ class OmnipodDashPumpPlugin( return false } val running = podStateManager.basalProgram - val equal = (mapProfileToBasalProgram(profile) == running) + val equal = (mapProfileToBasalProgram(profile, PumpType.OMNIPOD_DASH) == running) aapsLogger.info(LTag.PUMP, "set: $equal. profile=$profile, running=$running") return equal } @@ -1140,7 +1140,7 @@ class OmnipodDashPumpPlugin( executeProgrammingCommand( pre = observeDeliverySuspended(), historyEntry = history.createRecord(OmnipodCommandType.RESUME_DELIVERY, basalProfileRecord = BasalValuesRecord(it.getBasalValues().toList())), - command = omnipodManager.setBasalProgram(mapProfileToBasalProgram(it), hasBasalBeepEnabled()) + command = omnipodManager.setBasalProgram(mapProfileToBasalProgram(it, PumpType.OMNIPOD_DASH), hasBasalBeepEnabled()) .ignoreElements() ).doFinally { notifyOnUnconfirmed( diff --git a/pump/omnipod/dash/src/main/kotlin/app/aaps/pump/omnipod/dash/driver/OmnipodDashManagerImpl.kt b/pump/omnipod/dash/src/main/kotlin/app/aaps/pump/omnipod/dash/driver/OmnipodDashManagerImpl.kt index 8822fa83ceb3..d0d5bbabf7fe 100644 --- a/pump/omnipod/dash/src/main/kotlin/app/aaps/pump/omnipod/dash/driver/OmnipodDashManagerImpl.kt +++ b/pump/omnipod/dash/src/main/kotlin/app/aaps/pump/omnipod/dash/driver/OmnipodDashManagerImpl.kt @@ -5,7 +5,7 @@ import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.rx.AapsSchedulers import app.aaps.core.interfaces.utils.Round -import app.aaps.pump.omnipod.common.bledriver.comm.OmnipodDashBleManager +import app.aaps.pump.omnipod.common.bledriver.comm.OmnipodBleManager import app.aaps.pump.omnipod.common.bledriver.event.PodEvent import app.aaps.pump.omnipod.common.bledriver.pod.command.DeactivateCommand import app.aaps.pump.omnipod.common.bledriver.pod.command.GetStatusCommand @@ -62,7 +62,7 @@ import kotlin.time.Duration.Companion.hours class OmnipodDashManagerImpl( private val logger: AAPSLogger, private val podStateManager: OmnipodDashPodStateManager, - private val bleManager: OmnipodDashBleManager, + private val bleManager: OmnipodBleManager, private val aapsSchedulers: AapsSchedulers ) : OmnipodDashManager { diff --git a/pump/omnipod/dash/src/main/kotlin/app/aaps/pump/omnipod/dash/ui/compose/OmnipodDashComposeContent.kt b/pump/omnipod/dash/src/main/kotlin/app/aaps/pump/omnipod/dash/ui/compose/OmnipodDashComposeContent.kt index f259684b5d3f..10112317143c 100644 --- a/pump/omnipod/dash/src/main/kotlin/app/aaps/pump/omnipod/dash/ui/compose/OmnipodDashComposeContent.kt +++ b/pump/omnipod/dash/src/main/kotlin/app/aaps/pump/omnipod/dash/ui/compose/OmnipodDashComposeContent.kt @@ -1,35 +1,23 @@ package app.aaps.pump.omnipod.dash.ui.compose -import androidx.compose.foundation.layout.RowScope import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.filled.ArrowBack -import androidx.compose.material.icons.filled.Settings import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue -import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.remember -import androidx.compose.runtime.setValue -import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.lifecycle.compose.collectAsStateWithLifecycle import app.aaps.core.interfaces.protection.ProtectionCheck import app.aaps.core.interfaces.pump.BlePreCheck import app.aaps.core.ui.compose.ComposablePluginContent import app.aaps.core.ui.compose.ToolbarConfig -import app.aaps.core.ui.compose.dialogs.OkCancelDialog -import app.aaps.core.ui.compose.dialogs.OkDialog import app.aaps.core.ui.compose.metroViewModel -import app.aaps.core.ui.compose.pump.BlePreCheckHost -import app.aaps.core.ui.compose.pump.KeepScreenOnEffect -import app.aaps.core.ui.compose.pump.PumpOverviewScreen -import app.aaps.pump.omnipod.common.ui.compose.PodImage -import app.aaps.pump.omnipod.common.ui.wizard.compose.ActivationType -import app.aaps.pump.omnipod.common.ui.wizard.compose.OmnipodOverviewEvent -import app.aaps.pump.omnipod.common.ui.wizard.compose.OmnipodWizardScreen +import app.aaps.pump.omnipod.common.R +import app.aaps.pump.omnipod.common.ui.compose.OmnipodComposeHost import app.aaps.pump.omnipod.dash.ui.wizard.compose.DashOmnipodWizardViewModel +import app.aaps.core.ui.R as CoreUiR class OmnipodDashComposeContent( private val pluginName: String, @@ -44,173 +32,43 @@ class OmnipodDashComposeContent( onSettings: (() -> Unit)? ) { val overviewViewModel: DashOverviewViewModel = metroViewModel() - val context = LocalContext.current - - // Workflow state - var showWizard by remember { mutableStateOf(false) } - var showHistory by remember { mutableStateOf(false) } - var wizardActivationType by remember { mutableStateOf(null) } - var isDeactivation by remember { mutableStateOf(false) } - - // Dialog state - var showDialog by remember { mutableStateOf(false) } - var dialogTitle by remember { mutableStateOf("") } - var dialogMessage by remember { mutableStateOf("") } - var showDiscardConfirm by remember { mutableStateOf(false) } - var showErrorDialog by remember { mutableStateOf(false) } - var errorTitle by remember { mutableStateOf("") } - var errorMessage by remember { mutableStateOf("") } - - // Overview toolbar - val overviewNavIcon: @Composable () -> Unit = { - IconButton(onClick = onNavigateBack) { - Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = stringResource(app.aaps.core.ui.R.string.back)) - } - } - val settingsAction: @Composable RowScope.() -> Unit = { - onSettings?.let { action -> - IconButton(onClick = action) { - Icon(Icons.Filled.Settings, contentDescription = stringResource(app.aaps.core.ui.R.string.settings)) - } - } - } - - // Restore overview toolbar when not in wizard or history - LaunchedEffect(showWizard, showHistory) { - if (!showWizard && !showHistory) { - setToolbarConfig(ToolbarConfig(title = pluginName, navigationIcon = overviewNavIcon, actions = settingsAction)) - } - } - - // Handle overview events - LaunchedEffect(overviewViewModel) { - overviewViewModel.events.collect { event -> - when (event) { - is OmnipodOverviewEvent.StartActivation -> { - wizardActivationType = event.activationType - isDeactivation = false - showWizard = true - } - - is OmnipodOverviewEvent.StartDeactivation -> { - isDeactivation = true - showWizard = true - } - - is OmnipodOverviewEvent.ShowHistory -> { - showHistory = true - } - - is OmnipodOverviewEvent.ShowDialog -> { - // Check if this is a discard confirmation - if (event.title == context.getString(app.aaps.pump.omnipod.common.R.string.omnipod_common_pod_management_button_discard_pod)) { - showDiscardConfirm = true - dialogTitle = event.title - dialogMessage = event.message - } else { - dialogTitle = event.title - dialogMessage = event.message - showDialog = true - } - } - - is OmnipodOverviewEvent.ShowErrorDialog -> { - errorTitle = event.title - errorMessage = event.message - showErrorDialog = true - } - - is OmnipodOverviewEvent.StartActivity -> { - context.startActivity(event.intent) - } - - is OmnipodOverviewEvent.ShowRileyLinkPairWizard -> Unit // Not applicable for Dash - is OmnipodOverviewEvent.ShowRileyLinkStats -> Unit // Not applicable for Dash - is OmnipodOverviewEvent.ShowSnackbar -> Unit // Not used by Dash - } - } - } - - // Dialogs - if (showDialog) { - OkDialog(title = dialogTitle, message = dialogMessage, onDismiss = { showDialog = false }) - } - - if (showErrorDialog) { - OkDialog(title = errorTitle, message = errorMessage, onDismiss = { showErrorDialog = false }) - } - - if (showDiscardConfirm) { - OkCancelDialog( - title = dialogTitle, - message = dialogMessage, - onConfirm = { - showDiscardConfirm = false - overviewViewModel.confirmDiscardPod() - }, - onDismiss = { showDiscardConfirm = false } - ) - } - - // Content: overview, wizard, or history - when { - showWizard -> { - KeepScreenOnEffect() - BlePreCheckHost( - blePreCheck = blePreCheck, - onFailed = { showWizard = false } - ) - - val wizardViewModel: DashOmnipodWizardViewModel = metroViewModel() - val wizardReady by wizardViewModel.ready.collectAsStateWithLifecycle() - LaunchedEffect(wizardReady, isDeactivation, wizardActivationType) { - if (!wizardReady) return@LaunchedEffect - if (isDeactivation) { - wizardViewModel.initializeDeactivation() - } else { - wizardActivationType?.let { wizardViewModel.initializeActivation(it) } - } - } - - OmnipodWizardScreen( - viewModel = wizardViewModel, - onFinish = { showWizard = false }, - setToolbarConfig = setToolbarConfig - ) - } - - showHistory -> { + OmnipodComposeHost( + pluginName = pluginName, + blePreCheck = blePreCheck, + setToolbarConfig = setToolbarConfig, + onNavigateBack = onNavigateBack, + onSettings = onSettings, + overviewState = overviewViewModel.uiState, + overviewEvents = overviewViewModel.events, + wizardViewModel = { + val viewModel: DashOmnipodWizardViewModel = metroViewModel() + viewModel + }, + onConfirmDiscardPod = overviewViewModel::confirmDiscardPod, + showExtraContentForHistory = true, + extraContent = { onBack -> val historyViewModel: DashPodHistoryViewModel = metroViewModel() val records by historyViewModel.records.collectAsStateWithLifecycle() - - // Set toolbar with back arrow for history - LaunchedEffect(Unit) { + val title = stringResource(R.string.omnipod_common_pod_management_button_pod_history) + LaunchedEffect(title) { setToolbarConfig( ToolbarConfig( - title = context.getString(app.aaps.pump.omnipod.common.R.string.omnipod_common_pod_management_button_pod_history), + title = title, navigationIcon = { - IconButton(onClick = { showHistory = false }) { - Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = stringResource(app.aaps.core.ui.R.string.back)) + IconButton(onClick = onBack) { + Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = stringResource(CoreUiR.string.back)) } }, actions = {} - )) + ) + ) } - DashPodHistoryScreen( records = records, rh = historyViewModel.rh, profileUtil = historyViewModel.profileUtil ) } - - else -> { - val uiState by overviewViewModel.uiState.collectAsStateWithLifecycle() - PumpOverviewScreen( - state = uiState, - customContent = { PodImage() } - ) - } - } + ) } } diff --git a/pump/omnipod/dash/src/main/kotlin/app/aaps/pump/omnipod/dash/ui/wizard/compose/DashOmnipodWizardViewModel.kt b/pump/omnipod/dash/src/main/kotlin/app/aaps/pump/omnipod/dash/ui/wizard/compose/DashOmnipodWizardViewModel.kt index 5c76b1adbd7b..ab222930839e 100644 --- a/pump/omnipod/dash/src/main/kotlin/app/aaps/pump/omnipod/dash/ui/wizard/compose/DashOmnipodWizardViewModel.kt +++ b/pump/omnipod/dash/src/main/kotlin/app/aaps/pump/omnipod/dash/ui/wizard/compose/DashOmnipodWizardViewModel.kt @@ -4,10 +4,8 @@ import androidx.annotation.StringRes import androidx.compose.runtime.Stable import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import app.aaps.core.data.model.ICfg import app.aaps.core.data.model.TE import app.aaps.core.data.pump.defs.PumpType -import app.aaps.core.data.time.T import app.aaps.core.data.ue.Sources import app.aaps.core.interfaces.db.PersistenceLayer import app.aaps.core.interfaces.insulin.InsulinManager @@ -43,7 +41,7 @@ import app.aaps.pump.omnipod.dash.history.data.InitialResult import app.aaps.pump.omnipod.dash.history.data.ResolvedResult import app.aaps.pump.omnipod.dash.util.Constants import app.aaps.pump.omnipod.dash.util.I8n -import app.aaps.pump.omnipod.dash.util.mapProfileToBasalProgram +import app.aaps.pump.omnipod.common.util.mapProfileToBasalProgram import dev.zacsweers.metro.AppScope import dev.zacsweers.metro.ContributesIntoMap import dev.zacsweers.metro.binding @@ -52,7 +50,6 @@ import io.reactivex.rxjava3.core.Single import io.reactivex.rxjava3.kotlin.plusAssign import io.reactivex.rxjava3.kotlin.subscribeBy import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.launch import kotlinx.coroutines.rx3.await import kotlinx.coroutines.rx3.rxSingle @@ -75,32 +72,29 @@ class DashOmnipodWizardViewModel( private val notificationManager: NotificationManager, private val pumpSync: PumpSync, private val fabricPrivacy: FabricPrivacy, - private val insulinManager: InsulinManager, + insulinManager: InsulinManager, profileFunction: ProfileFunction, profileRepository: ProfileRepository, - private val persistenceLayer: PersistenceLayer, + persistenceLayer: PersistenceLayer, pumpEnactResultProvider: () -> PumpEnactResult, logger: AAPSLogger, aapsSchedulers: AapsSchedulers -) : OmnipodWizardViewModel(logger, aapsSchedulers, pumpEnactResultProvider, profileFunction, profileRepository) { +) : OmnipodWizardViewModel( + logger, + aapsSchedulers, + pumpEnactResultProvider, + profileFunction, + profileRepository, + insulinManager, + persistenceLayer +) { - private val _siteRotationEntries = MutableStateFlow>(emptyList()) + override val pumpSource: Sources = Sources.OmnipodDash init { - viewModelScope.launch { - val insulins = insulinManager.insulins.map { it.deepClone() } - val activeLabel = profileFunction.getProfile()?.iCfg?.insulinLabel - loadInsulins(insulins, activeLabel) - loadSiteRotationEntriesInternal() - resolveProfileGate() - _ready.value = true - } + initializeWizard() } - override val pumpSource: Sources = Sources.OmnipodDash - - override fun fallbackICfg(): ICfg? = insulinManager.insulins.firstOrNull() - override val concentrationEnabled: Boolean get() = preferences.get(BooleanKey.GeneralInsulinConcentration) @@ -110,38 +104,6 @@ class DashOmnipodWizardViewModel( override fun bodyType(): BodyType = BodyType.fromPref(preferences.get(IntKey.SiteRotationUserProfile)) - override fun siteRotationEntries(): List = _siteRotationEntries.value - - private suspend fun loadSiteRotationEntriesInternal() { - _siteRotationEntries.value = persistenceLayer.getTherapyEventDataFromTime( - System.currentTimeMillis() - T.days(45).msecs(), false - ).filter { it.type == TE.Type.CANNULA_CHANGE || it.type == TE.Type.SENSOR_CHANGE } - } - - override fun executeInsulinProfileSwitch() { - val selected = selectedInsulin.value ?: return - val activeLabel = activeInsulinLabel.value - if (selected.insulinLabel == activeLabel) return - viewModelScope.launch { - profileFunction.createProfileSwitchWithNewInsulin(selected, Sources.OmnipodDash) - } - } - - override fun saveSiteLocation() { - val location = getSelectedSiteLocation().takeIf { it != TE.Location.NONE } ?: return - val arrow = getSelectedSiteArrow().takeIf { it != TE.Arrow.NONE } - viewModelScope.launch { - try { - val now = System.currentTimeMillis() - val entries = persistenceLayer.getTherapyEventDataFromToTime(now - 60_000, now) - .filter { it.type == TE.Type.CANNULA_CHANGE } - entries.firstOrNull()?.let { te -> - persistenceLayer.insertOrUpdateTherapyEvent(te.copy(location = location, arrow = arrow)) - } - } catch (_: Exception) { - } - } - } // region Action implementations — code copied verbatim from existing VMs @@ -184,7 +146,7 @@ class DashOmnipodWizardViewModel( override fun doInsertCannula(): Single = rxSingle(Dispatchers.IO) { val profile = pumpSync.expectedPumpState().profile ?: throw IllegalStateException("No profile set") - val basalProgram = mapProfileToBasalProgram(profile) + val basalProgram = mapProfileToBasalProgram(profile, PumpType.OMNIPOD_DASH) logger.debug( LTag.PUMPCOMM, "Mapped profile to basal program. profile={}, basalProgram={}", diff --git a/pump/omnipod/dash/src/main/kotlin/app/aaps/pump/omnipod/dash/util/Functions.kt b/pump/omnipod/dash/src/main/kotlin/app/aaps/pump/omnipod/dash/util/Functions.kt deleted file mode 100644 index 04f6d9d2f335..000000000000 --- a/pump/omnipod/dash/src/main/kotlin/app/aaps/pump/omnipod/dash/util/Functions.kt +++ /dev/null @@ -1,62 +0,0 @@ -package app.aaps.pump.omnipod.dash.util - -import app.aaps.core.data.pump.defs.PumpType -import app.aaps.core.interfaces.profile.Profile -import app.aaps.core.interfaces.pump.defs.determineCorrectBasalSize -import app.aaps.pump.omnipod.common.bledriver.pod.definition.BasalProgram -import kotlin.math.roundToInt - -fun mapProfileToBasalProgram(profile: Profile): BasalProgram { - val basalValues = profile.getBasalValues() - if (basalValues.isEmpty()) { - throw IllegalArgumentException("Basal values should contain values") - } - - val entries: MutableList = ArrayList() - - var previousBasalValue: Profile.ProfileValue? = null - - for (basalValue in basalValues) { - if (basalValue.timeAsSeconds >= 86_400) { - throw IllegalArgumentException("Basal segment start time can not be greater than 86400") - } - if (basalValue.timeAsSeconds < 0) { - throw IllegalArgumentException("Basal segment start time can not be less than 0") - } - if (basalValue.timeAsSeconds % 1_800 != 0) { - throw IllegalArgumentException("Basal segment time should be dividable by 30 minutes") - } - - val startSlotIndex = (basalValue.timeAsSeconds / 1800).toShort() - - if (previousBasalValue != null) { - entries.add( - BasalProgram.Segment( - (previousBasalValue.timeAsSeconds / 1800).toShort(), - startSlotIndex, - (PumpType.OMNIPOD_DASH.determineCorrectBasalSize(previousBasalValue.value) * 100).roundToInt() - ) - ) - } - - if (entries.isEmpty() && basalValue.timeAsSeconds != 0) { - throw IllegalArgumentException("First basal segment start time should be 0") - } - - if (entries.isNotEmpty() && entries[entries.size - 1].endSlotIndex != startSlotIndex) { - throw IllegalArgumentException("Illegal start time for basal segment: does not match previous previous segment's end time") - } - - previousBasalValue = basalValue - } - - entries.add( - BasalProgram.Segment( - (previousBasalValue!!.timeAsSeconds / 1800).toShort(), - 48, - (PumpType.OMNIPOD_DASH.determineCorrectBasalSize(previousBasalValue.value) * 100).roundToInt() - ) - ) - - return BasalProgram(entries) -} diff --git a/pump/omnipod/eros/src/main/java/app/aaps/pump/omnipod/eros/ui/wizard/compose/ErosOmnipodWizardViewModel.kt b/pump/omnipod/eros/src/main/java/app/aaps/pump/omnipod/eros/ui/wizard/compose/ErosOmnipodWizardViewModel.kt index f6ac5dd5ad78..cc10543e3e93 100644 --- a/pump/omnipod/eros/src/main/java/app/aaps/pump/omnipod/eros/ui/wizard/compose/ErosOmnipodWizardViewModel.kt +++ b/pump/omnipod/eros/src/main/java/app/aaps/pump/omnipod/eros/ui/wizard/compose/ErosOmnipodWizardViewModel.kt @@ -4,9 +4,6 @@ import androidx.annotation.StringRes import androidx.compose.runtime.Stable import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import app.aaps.core.data.model.ICfg -import app.aaps.core.data.model.TE -import app.aaps.core.data.time.T import app.aaps.core.data.ue.Sources import app.aaps.core.interfaces.db.PersistenceLayer import app.aaps.core.interfaces.insulin.InsulinManager @@ -34,8 +31,6 @@ import dev.zacsweers.metro.binding import dev.zacsweers.metrox.viewmodel.ViewModelKey import io.reactivex.rxjava3.core.Single import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.flow.MutableStateFlow -import kotlinx.coroutines.launch import kotlinx.coroutines.rx3.rxSingle import dev.zacsweers.metro.Inject import app.aaps.pump.omnipod.common.R as CommonR @@ -51,33 +46,30 @@ class ErosOmnipodWizardViewModel( private val podStateManager: AapsErosPodStateManager, private val commandQueue: CommandQueue, private val pumpSync: PumpSync, - private val insulinManager: InsulinManager, + insulinManager: InsulinManager, profileFunction: ProfileFunction, profileRepository: ProfileRepository, - private val persistenceLayer: PersistenceLayer, + persistenceLayer: PersistenceLayer, private val preferences: Preferences, pumpEnactResultProvider: () -> PumpEnactResult, logger: AAPSLogger, aapsSchedulers: AapsSchedulers -) : OmnipodWizardViewModel(logger, aapsSchedulers, pumpEnactResultProvider, profileFunction, profileRepository) { +) : OmnipodWizardViewModel( + logger, + aapsSchedulers, + pumpEnactResultProvider, + profileFunction, + profileRepository, + insulinManager, + persistenceLayer +) { - private val _siteRotationEntries = MutableStateFlow>(emptyList()) + override val pumpSource: Sources = Sources.OmnipodEros init { - viewModelScope.launch { - val insulins = insulinManager.insulins.map { it.deepClone() } - val activeLabel = profileFunction.getProfile()?.iCfg?.insulinLabel - loadInsulins(insulins, activeLabel) - loadSiteRotationEntriesInternal() - resolveProfileGate() - _ready.value = true - } + initializeWizard() } - override val pumpSource: Sources = Sources.OmnipodEros - - override fun fallbackICfg(): ICfg? = insulinManager.insulins.firstOrNull() - override val concentrationEnabled: Boolean get() = preferences.get(BooleanKey.GeneralInsulinConcentration) @@ -87,38 +79,6 @@ class ErosOmnipodWizardViewModel( override fun bodyType(): BodyType = BodyType.fromPref(preferences.get(IntKey.SiteRotationUserProfile)) - override fun siteRotationEntries(): List = _siteRotationEntries.value - - private suspend fun loadSiteRotationEntriesInternal() { - _siteRotationEntries.value = persistenceLayer.getTherapyEventDataFromTime( - System.currentTimeMillis() - T.days(45).msecs(), false - ).filter { it.type == TE.Type.CANNULA_CHANGE || it.type == TE.Type.SENSOR_CHANGE } - } - - override fun executeInsulinProfileSwitch() { - val selected = selectedInsulin.value ?: return - val activeLabel = activeInsulinLabel.value - if (selected.insulinLabel == activeLabel) return - viewModelScope.launch { - profileFunction.createProfileSwitchWithNewInsulin(selected, Sources.OmnipodEros) - } - } - - override fun saveSiteLocation() { - val location = getSelectedSiteLocation().takeIf { it != TE.Location.NONE } ?: return - val arrow = getSelectedSiteArrow().takeIf { it != TE.Arrow.NONE } - viewModelScope.launch { - try { - val now = System.currentTimeMillis() - val entries = persistenceLayer.getTherapyEventDataFromToTime(now - 60_000, now) - .filter { it.type == TE.Type.CANNULA_CHANGE } - entries.firstOrNull()?.let { te -> - persistenceLayer.insertOrUpdateTherapyEvent(te.copy(location = location, arrow = arrow)) - } - } catch (_: Exception) { - } - } - } // region Action implementations — code copied verbatim from existing VMs diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/O5PumpPlugin.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/O5PumpPlugin.kt index f53d077989f9..0c85ab0b1e28 100644 --- a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/O5PumpPlugin.kt +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/O5PumpPlugin.kt @@ -86,7 +86,7 @@ import app.aaps.pump.omnipod.common.queue.command.CommandUpdateAlertConfiguratio import app.aaps.pump.omnipod.omnipod5.keys.O5IntentKey import app.aaps.pump.omnipod.omnipod5.ui.O5CertificateStoreScreen import app.aaps.pump.omnipod.omnipod5.ui.compose.OmnipodO5ComposeContent -import app.aaps.pump.omnipod.omnipod5.util.mapProfileToBasalProgram +import app.aaps.pump.omnipod.common.util.mapProfileToBasalProgram import io.reactivex.rxjava3.core.Completable import io.reactivex.rxjava3.core.Single import kotlinx.coroutines.CoroutineScope diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/O5BleManager.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/O5BleManager.kt index c48ce87d20c0..577a394b076d 100644 --- a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/O5BleManager.kt +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/O5BleManager.kt @@ -1,39 +1,16 @@ package app.aaps.pump.omnipod.omnipod5.bledriver.comm -import app.aaps.pump.omnipod.common.bledriver.comm.interfaces.session.BleConnection -import app.aaps.pump.omnipod.common.bledriver.comm.session.ConnectionState -import app.aaps.pump.omnipod.common.bledriver.event.PodEvent -import app.aaps.pump.omnipod.common.bledriver.pod.command.base.Command -import app.aaps.pump.omnipod.common.bledriver.pod.response.Response +import app.aaps.pump.omnipod.common.bledriver.comm.OmnipodBleManager import io.reactivex.rxjava3.core.Completable -import io.reactivex.rxjava3.core.Observable -import java.util.concurrent.CountDownLatch -import kotlin.reflect.KClass /** - * Omnipod 5 equivalent of [OmnipodDashBleManager]. Identical surface deliberately - the - * two pod types share the same [Command]/[Response]/[PodEvent] model (see - * [O5BleManagerImpl]'s class doc for why), so callers that already work against - * [OmnipodDashBleManager] can use this the same way. + * Omnipod 5 BLE manager with support for the O5-only AID setup command batch. */ -interface O5BleManager { - - fun sendCommand(cmd: Command, responseType: KClass): Observable - - fun getStatus(): ConnectionState - - fun connect(timeoutMs: Long = BleConnection.DEFAULT_CONNECT_TIMEOUT_MS): Observable - - fun connect(stopConnectionLatch: CountDownLatch): Observable - - fun pairNewPod(): Observable +interface O5BleManager : OmnipodBleManager { /** Sends the O5-only AID setup command batch (see [app.aaps.pump.omnipod.common * .bledriver.pod.command.aid.O5AidSetupCommands]) over the already-established * session. Must be called after [pairNewPod] completes and before any other * activation command - see that object's class doc for why. */ fun sendAidSetupCommands(): Completable - - fun disconnect(closeGatt: Boolean = false) - fun removeBond() } diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/O5BleManagerImpl.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/O5BleManagerImpl.kt index 23b84e8ad0f5..cbc1a95dfda8 100644 --- a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/O5BleManagerImpl.kt +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/O5BleManagerImpl.kt @@ -1,6 +1,4 @@ package app.aaps.pump.omnipod.omnipod5.bledriver.comm -import app.aaps.pump.omnipod.common.bledriver.comm.Id -import app.aaps.pump.omnipod.common.bledriver.comm.Ids import android.bluetooth.BluetoothAdapter import android.bluetooth.BluetoothManager @@ -9,34 +7,16 @@ import app.aaps.core.interfaces.configuration.Config import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.LTag import app.aaps.core.utils.toHex -import app.aaps.pump.omnipod.common.bledriver.comm.exceptions.BusyException +import app.aaps.pump.omnipod.common.bledriver.comm.Id +import app.aaps.pump.omnipod.common.bledriver.comm.Ids +import app.aaps.pump.omnipod.common.bledriver.comm.SharedBleManager import app.aaps.pump.omnipod.common.bledriver.comm.exceptions.ConnectException -import app.aaps.pump.omnipod.common.bledriver.comm.exceptions.CouldNotSendCommandException import app.aaps.pump.omnipod.common.bledriver.comm.exceptions.FailedToConnectException -import app.aaps.pump.omnipod.common.bledriver.comm.exceptions.MessageIOException -import app.aaps.pump.omnipod.common.bledriver.comm.exceptions.NotConnectedException import app.aaps.pump.omnipod.common.bledriver.comm.exceptions.PairingException -import app.aaps.pump.omnipod.common.bledriver.comm.exceptions.SessionEstablishmentException import app.aaps.pump.omnipod.common.bledriver.comm.interfaces.device.BleDeviceManager import app.aaps.pump.omnipod.common.bledriver.comm.interfaces.session.BleConnection -import app.aaps.pump.omnipod.omnipod5.bledriver.comm.legacy.O5BleConnectionFactory -import app.aaps.pump.omnipod.omnipod5.bledriver.comm.pair.O5CertificateStore -import app.aaps.pump.omnipod.omnipod5.bledriver.comm.pair.O5LTKExchanger -import app.aaps.pump.omnipod.omnipod5.bledriver.comm.pair.O5RegistrationData -import app.aaps.pump.omnipod.common.bledriver.comm.session.CommandAckError -import app.aaps.pump.omnipod.common.bledriver.comm.session.CommandReceiveError -import app.aaps.pump.omnipod.common.bledriver.comm.session.CommandReceiveSuccess -import app.aaps.pump.omnipod.common.bledriver.comm.session.CommandSendErrorConfirming -import app.aaps.pump.omnipod.common.bledriver.comm.session.CommandSendErrorSending -import app.aaps.pump.omnipod.common.bledriver.comm.session.CommandSendSuccess -import app.aaps.pump.omnipod.common.bledriver.comm.session.Connected -import app.aaps.pump.omnipod.common.bledriver.comm.session.ConnectionState import app.aaps.pump.omnipod.common.bledriver.comm.session.ConnectionWaitCondition -import app.aaps.pump.omnipod.common.bledriver.comm.session.NotConnected -import app.aaps.pump.omnipod.common.bledriver.comm.session.Session import app.aaps.pump.omnipod.common.bledriver.event.PodEvent -import app.aaps.pump.omnipod.omnipod5.bledriver.pod.command.aid.O5AidSetupCommands -import app.aaps.pump.omnipod.common.bledriver.pod.command.base.Command import app.aaps.pump.omnipod.common.bledriver.pod.definition.PodType import app.aaps.pump.omnipod.common.bledriver.pod.response.AlarmStatusResponse import app.aaps.pump.omnipod.common.bledriver.pod.response.DefaultStatusResponse @@ -45,116 +25,85 @@ import app.aaps.pump.omnipod.common.bledriver.pod.response.PodInfoTriggeredAlert import app.aaps.pump.omnipod.common.bledriver.pod.response.Response import app.aaps.pump.omnipod.common.bledriver.pod.response.SetUniqueIdResponse import app.aaps.pump.omnipod.common.bledriver.pod.response.VersionResponse -import app.aaps.pump.omnipod.omnipod5.bledriver.pod.state.O5PodStateManager +import app.aaps.pump.omnipod.omnipod5.bledriver.comm.legacy.O5BleConnectionFactory +import app.aaps.pump.omnipod.omnipod5.bledriver.comm.pair.O5CertificateStore +import app.aaps.pump.omnipod.omnipod5.bledriver.comm.pair.O5LTKExchanger +import app.aaps.pump.omnipod.omnipod5.bledriver.comm.pair.O5RegistrationData +import app.aaps.pump.omnipod.omnipod5.bledriver.pod.command.aid.O5AidSetupCommands import app.aaps.pump.omnipod.omnipod5.bledriver.pod.security.SecureO5RegistrationStorage +import app.aaps.pump.omnipod.omnipod5.bledriver.pod.state.O5PodStateManager import app.aaps.pump.omnipod.omnipod5.bledriver.pod.util.P256KeyGenerator import app.aaps.pump.omnipod.omnipod5.bledriver.pod.util.PodTypeAwarePodScanner import io.reactivex.rxjava3.core.Completable import io.reactivex.rxjava3.core.Observable import io.reactivex.rxjava3.core.ObservableEmitter -import java.util.concurrent.CountDownLatch -import java.util.concurrent.atomic.AtomicBoolean import dev.zacsweers.metro.AppScope import dev.zacsweers.metro.ContributesBinding import dev.zacsweers.metro.Inject import dev.zacsweers.metro.SingleIn import dev.zacsweers.metro.binding -import kotlin.reflect.KClass -/** - * Omnipod 5 equivalent of [OmnipodDashBleManagerImpl] - parallel to it rather than a - * modification, for the same reason [O5Connection] is parallel to [Connection]: that - * class is coupled throughout to [app.aaps.pump.omnipod.common.bledriver.pod.state - * .OmnipodDashPodStateManager]'s much larger state surface. - * - * The command/response layer itself ([Command], [Response], [PodEvent], [Session]) is - * reused completely unmodified - it turns out to have no Dash-specific assumptions baked - * in (see [app.aaps.pump.omnipod.common.bledriver.pod.command.base.HeaderEnabledCommand], - * which only needs a generic `uniqueId: Int` supplied externally). Only pairing and - * connection setup actually differ between the two pod types. - * - * Also restores previously-imported credentials (via [SecureO5RegistrationStorage]) into - * [O5RegistrationData]'s in-memory registry on construction - see the `init` block below. - */ @ContributesBinding(AppScope::class, binding = binding()) @SingleIn(AppScope::class) class O5BleManagerImpl @Inject constructor( - private val aapsLogger: AAPSLogger, + aapsLogger: AAPSLogger, private val podState: O5PodStateManager, private val config: Config, private val context: Context, private val bleConnectionFactory: O5BleConnectionFactory, - private val bleDeviceManager: BleDeviceManager, - private val secureO5RegistrationStorage: SecureO5RegistrationStorage, + bleDeviceManager: BleDeviceManager, + secureO5RegistrationStorage: SecureO5RegistrationStorage, private val p256KeyGenerator: P256KeyGenerator -) : O5BleManager { +) : SharedBleManager(aapsLogger, bleDeviceManager), O5BleManager { init { secureO5RegistrationStorage.loadAndInstallAll() } - private val busy = AtomicBoolean(false) - private var connection: BleConnection? = null - private val bluetoothAdapter: BluetoothAdapter? get() = (context.getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager?)?.adapter - override fun sendCommand(cmd: Command, responseType: KClass): Observable = - Observable.create { emitter -> - if (!busy.compareAndSet(false, true)) { - throw BusyException() - } - try { - val session = assertSessionEstablished() + override val bluetoothAddress: String? + get() = podState.bluetoothAddress + override val ltk: ByteArray? + get() = podState.ltk + override val ids: Ids + get() { + val controllerId = podState.controllerId + ?: throw FailedToConnectException("Missing controllerId, activate the O5 pod first") + val podId = podState.podId + ?: throw FailedToConnectException("Missing podId, activate the O5 pod first") + return Ids.forController(Id.fromLong(controllerId), Id.fromLong(podId)) + } + override val releaseBusyBeforeCompletion = true + override val connectionName = "O5 pod" - emitter.onNext(PodEvent.CommandSending(cmd)) - when (session.sendCommand(cmd)) { - is CommandSendErrorSending -> { - emitter.tryOnError(CouldNotSendCommandException()) - return@create - } + override fun createConnection(podAddress: String): BleConnection = + bleConnectionFactory.createConnection(podAddress) - is CommandSendSuccess -> { - emitter.onNext(PodEvent.CommandSent(cmd)) - podState.increaseMessageSequenceNumber() - } + override fun increaseEapAkaSequenceNumber(): ByteArray = podState.increaseEapAkaSequenceNumber() - is CommandSendErrorConfirming -> { - emitter.onNext(PodEvent.CommandSendNotConfirmed(cmd)) - podState.increaseMessageSequenceNumber() - } - } - when (val readResult = session.readAndAckResponse()) { - is CommandReceiveSuccess -> { - recordStatusIfPresent(readResult.result) - emitter.onNext(PodEvent.ResponseReceived(cmd, readResult.result)) - podState.increaseMessageSequenceNumber() - } + override fun updateEapAkaSequenceNumber(sequenceNumber: Long) { + podState.eapAkaSequenceNumber = sequenceNumber + } - is CommandAckError -> { - recordStatusIfPresent(readResult.result) - emitter.onNext(PodEvent.ResponseReceived(cmd, readResult.result)) - podState.increaseMessageSequenceNumber() - } + override fun commitEapAkaSequenceNumber() { + podState.commitEapAkaSequenceNumber() + } - is CommandReceiveError -> { - readResult.result?.let { recordStatusIfPresent(it) } - emitter.tryOnError(MessageIOException("Could not read response: $readResult")) - return@create - } - } - // Release the lock before onComplete: chained commands start from that callback. - busy.set(false) - emitter.onComplete() - } catch (ex: Exception) { - disconnect(false) - emitter.tryOnError(ex) - } finally { - busy.set(false) - } - } + override fun recordSuccessfulConnection() { + podState.successfulConnections++ + } + + override fun onCommandSent() { + podState.increaseMessageSequenceNumber() + } + + override fun onResponseRead() { + podState.increaseMessageSequenceNumber() + } - private fun recordStatusIfPresent(response: Response) { + override fun onResponse(response: Response) { when (response) { is VersionResponse -> podState.updateFromVersionResponse(response) is DefaultStatusResponse -> podState.updateFromDefaultStatusResponse(response) @@ -166,112 +115,11 @@ class O5BleManagerImpl @Inject constructor( } } - private fun assertSessionEstablished(): Session { - val conn = assertConnected() - return conn.session - ?: throw NotConnectedException("Missing session") - } - - override fun getStatus(): ConnectionState = - connection?.connectionState() ?: NotConnected - - override fun connect(timeoutMs: Long): Observable = - connect(ConnectionWaitCondition(timeoutMs = timeoutMs)) - - override fun connect(stopConnectionLatch: CountDownLatch): Observable = - connect(ConnectionWaitCondition(stopConnection = stopConnectionLatch)) - - private fun connect(connectionWaitCond: ConnectionWaitCondition): Observable = Observable - .create { emitter -> - if (!busy.compareAndSet(false, true)) { - throw BusyException() - } - try { - emitter.onNext(PodEvent.BluetoothConnecting) - - val podAddress = podState.bluetoothAddress - ?: throw FailedToConnectException("Missing bluetoothAddress, activate the pod first") - - if (!bleDeviceManager.isBluetoothAvailable()) { - throw ConnectException("Bluetooth not available") - } - if (!bleDeviceManager.ensureBondedIfRequired(podAddress)) { - throw ConnectException("Bluetooth not available or bonding failed") - } - - val conn = connection ?: bleConnectionFactory.createConnection(podAddress) - connection = conn - if (conn.connectionState() is Connected && conn.session != null) { - emitter.onNext(PodEvent.AlreadyConnected(podAddress)) - // Release the lock before onComplete: chained commands start from that callback. - busy.set(false) - emitter.onComplete() - return@create - } - - conn.connect(connectionWaitCond) - - emitter.onNext(PodEvent.BluetoothConnected(podAddress)) - emitter.onNext(PodEvent.EstablishingSession) - establishSession(1.toByte()) - emitter.onNext(PodEvent.Connected) - - // Release the lock before onComplete: chained commands start from that callback. - busy.set(false) - emitter.onComplete() - } catch (ex: Exception) { - aapsLogger.error(LTag.PUMPBTCOMM, "O5 connection failed", ex) - disconnect(false) - emitter.tryOnError(ex) - } finally { - busy.set(false) - } - } - - private fun establishSession(msgSeq: Byte) { - val conn = assertConnected() - val ltk = assertPaired() - val ids = assertIdentity() - - val eapSqn = podState.increaseEapAkaSequenceNumber() - var newSqn = conn.establishSession(ltk, msgSeq, ids, eapSqn) - - if (newSqn != null) { - aapsLogger.info(LTag.PUMPBTCOMM, "Updating O5 EAP SQN to: $newSqn") - podState.eapAkaSequenceNumber = newSqn.toLong() - newSqn = conn.establishSession(ltk, msgSeq, ids, podState.increaseEapAkaSequenceNumber()) - if (newSqn != null) { - throw SessionEstablishmentException("Received resynchronization SQN for the second time (O5)") - } - } - podState.successfulConnections++ - podState.commitEapAkaSequenceNumber() - } - - private fun assertPaired(): ByteArray = - podState.ltk ?: throw FailedToConnectException("Missing LTK, activate the O5 pod first") - - private fun assertIdentity(): Ids { - val controllerId = podState.controllerId - ?: throw FailedToConnectException("Missing controllerId, activate the O5 pod first") - val podId = podState.podId - ?: throw FailedToConnectException("Missing podId, activate the O5 pod first") - return Ids.forController(Id.fromLong(controllerId), Id.fromLong(podId)) - } - - private fun assertConnected(): BleConnection = - connection ?: throw FailedToConnectException("connection lost (O5)") - override fun pairNewPod(): Observable = Observable.create { emitter -> - if (!busy.compareAndSet(false, true)) { - throw BusyException() - } + acquireBusy() try { if (podState.ltk == null && podState.bluetoothAddress != null) { - aapsLogger.info( - LTag.PUMPBTCOMM, - "Forgetting saved O5 address ${podState.bluetoothAddress} of an unpaired pod - scanning instead" - ) + aapsLogger.info(LTag.PUMPBTCOMM, "Forgetting saved O5 address ${podState.bluetoothAddress} of an unpaired pod") podState.bluetoothAddress = null } var lastError: Exception? = null @@ -283,11 +131,7 @@ class O5BleManagerImpl @Inject constructor( } catch (ex: Exception) { lastError = ex disconnect(true) - if (attempt == 0 && podState.podId != null && !podState.isPodKaput) { - Thread.sleep(3_000) - } else { - break - } + if (attempt == 0 && podState.podId != null && !podState.isPodKaput) Thread.sleep(3_000) else break } } throw requireNotNull(lastError) @@ -296,107 +140,75 @@ class O5BleManagerImpl @Inject constructor( disconnect(true) emitter.tryOnError(ex) } finally { - busy.set(false) + releaseBusy() } } private fun pairNewPodAttempt(emitter: ObservableEmitter) { if (podState.ltk != null) { emitter.onNext(PodEvent.AlreadyPaired) - val podAddress = podState.bluetoothAddress + val address = podState.bluetoothAddress ?: throw FailedToConnectException("Missing bluetoothAddress, activate the pod first") emitter.onNext(PodEvent.BluetoothConnecting) - val conn = bleConnectionFactory.createConnection(podAddress) + val conn = createConnection(address) connection = conn conn.connect(ConnectionWaitCondition(timeoutMs = BleConnection.DEFAULT_CONNECT_TIMEOUT_MS)) - emitter.onNext(PodEvent.BluetoothConnected(podAddress)) + emitter.onNext(PodEvent.BluetoothConnected(address)) emitter.onNext(PodEvent.EstablishingSession) establishSession(podState.msgSequenceNumber) emitter.onNext(PodEvent.Connected) return } - aapsLogger.info(LTag.PUMPBTCOMM, "Starting new O5 pod activation") val controllerId = podState.controllerId ?.takeIf(O5RegistrationData::contains) ?: O5RegistrationData.pickControllerId if (controllerId == 0L) { - throw PairingException( - "No O5 registration data available - cannot pair an Omnipod 5 pod without " + - "real Insulet-issued controller credentials (see O5RegistrationData)" - ) + throw PairingException("No O5 registration data available") } val certStore = O5CertificateStore(aapsLogger, p256KeyGenerator, controllerId) - - val podAddress = podState.bluetoothAddress ?: run { + val address = podState.bluetoothAddress ?: run { val adapter = bluetoothAdapter ?: throw ConnectException("Bluetooth not available") emitter.onNext(PodEvent.Scanning) - val scanner = PodTypeAwarePodScanner(aapsLogger, adapter) - scanner.scanForPod(PodType.OMNIPOD_5).address.also { podState.bluetoothAddress = it } + PodTypeAwarePodScanner(aapsLogger, adapter).scanForPod(PodType.OMNIPOD_5).address + .also { podState.bluetoothAddress = it } } val podIdLong = podState.podId ?.takeIf { podState.controllerId == controllerId } ?: podState.nextPodId - ?.takeIf { - O5IdRotation.controllerIdForPodId(it) == O5IdRotation.controllerIdForPodId(controllerId) - } + ?.takeIf { O5IdRotation.controllerIdForPodId(it) == O5IdRotation.controllerIdForPodId(controllerId) } ?: O5IdRotation.firstPodId(controllerId) podState.controllerId = controllerId podState.podId = podIdLong podState.nextPodId = null emitter.onNext(PodEvent.BluetoothConnecting) - val conn = bleConnectionFactory.createConnection(podAddress, controllerId) + val conn = bleConnectionFactory.createConnection(address, controllerId) connection = conn conn.connect(ConnectionWaitCondition(timeoutMs = BleConnection.DEFAULT_CONNECT_TIMEOUT_MS)) - emitter.onNext(PodEvent.BluetoothConnected(podAddress)) - + emitter.onNext(PodEvent.BluetoothConnected(address)) emitter.onNext(PodEvent.Pairing) - val mIO = conn.msgIO ?: throw ConnectException("Connection lost") - + val messageIO = conn.msgIO ?: throw ConnectException("Connection lost") val myId = Id.fromLong(certStore.controllerId) val podId = Id.fromLong(podIdLong) - - val ltkExchanger = O5LTKExchanger(aapsLogger, mIO, certStore, myId, podId) - val pairResult = ltkExchanger.o5NegotiateLTK() + val pairResult = O5LTKExchanger(aapsLogger, messageIO, certStore, myId, podId).o5NegotiateLTK() emitter.onNext(PodEvent.Paired(podId)) - podState.updateFromPairing(certStore.controllerId, podId.toLong(), pairResult) - if (config.DEBUG) { - aapsLogger.info(LTag.PUMPCOMM, "Got O5 LTK: ${pairResult.ltk.toHex()}") - } - + if (config.DEBUG) aapsLogger.info(LTag.PUMPCOMM, "Got O5 LTK: ${pairResult.ltk.toHex()}") emitter.onNext(PodEvent.EstablishingSession) establishSession(pairResult.msgSeq) emitter.onNext(PodEvent.Connected) } override fun sendAidSetupCommands(): Completable = Completable.fromAction { - if (!busy.compareAndSet(false, true)) { - throw BusyException() - } + acquireBusy() try { - val session = assertSessionEstablished() - O5AidSetupCommands.send(session) + O5AidSetupCommands.send(assertSessionEstablished()) } catch (ex: Exception) { disconnect(false) throw ex } finally { - busy.set(false) - } - } - - override fun disconnect(closeGatt: Boolean) { - connection?.disconnect(closeGatt) - ?: aapsLogger.info(LTag.PUMPBTCOMM, "Trying to disconnect a null O5 connection") - } - - override fun removeBond() { - val address = podState.bluetoothAddress - if (address == null) { - aapsLogger.error(LTag.PUMPBTCOMM, "removeBond (O5): MAC address not found") - return + releaseBusy() } - bleDeviceManager.removeBond(address) } } diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/legacy/session/O5Connection.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/legacy/session/O5Connection.kt index dd53781b6aa7..527d64662590 100644 --- a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/legacy/session/O5Connection.kt +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/legacy/session/O5Connection.kt @@ -1,187 +1,51 @@ package app.aaps.pump.omnipod.omnipod5.bledriver.comm.legacy.session -import app.aaps.pump.omnipod.common.bledriver.comm.legacy.session.Connection -import app.aaps.pump.omnipod.common.bledriver.comm.legacy.session.ServiceDiscoverer import android.bluetooth.BluetoothDevice import android.bluetooth.BluetoothGatt -import android.bluetooth.BluetoothManager -import android.bluetooth.BluetoothProfile import android.content.Context -import android.os.SystemClock -import app.aaps.core.data.configuration.Constants import app.aaps.core.interfaces.configuration.Config import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.LTag -import app.aaps.core.utils.toHex import app.aaps.pump.omnipod.common.bledriver.comm.Ids import app.aaps.pump.omnipod.common.bledriver.comm.endecrypt.EnDecrypt -import app.aaps.pump.omnipod.common.bledriver.comm.exceptions.ConnectException -import app.aaps.pump.omnipod.common.bledriver.comm.exceptions.FailedToConnectException -import app.aaps.pump.omnipod.common.bledriver.comm.interfaces.io.CharacteristicType -import app.aaps.pump.omnipod.common.bledriver.comm.interfaces.session.BleConnection -import app.aaps.pump.omnipod.common.bledriver.comm.legacy.callbacks.BleCommCallbacks import app.aaps.pump.omnipod.common.bledriver.comm.legacy.io.CmdBleIO -import app.aaps.pump.omnipod.common.bledriver.comm.legacy.io.DataBleIO -import app.aaps.pump.omnipod.common.bledriver.comm.legacy.io.IncomingPackets +import app.aaps.pump.omnipod.common.bledriver.comm.legacy.session.SharedBleConnection import app.aaps.pump.omnipod.common.bledriver.comm.message.MessageIO -import app.aaps.pump.omnipod.omnipod5.bledriver.comm.pair.O5CertificateStore -import app.aaps.pump.omnipod.common.bledriver.comm.session.Connected -import app.aaps.pump.omnipod.common.bledriver.comm.session.ConnectionState -import app.aaps.pump.omnipod.common.bledriver.comm.session.ConnectionWaitCondition -import app.aaps.pump.omnipod.common.bledriver.comm.session.DisconnectHandler -import app.aaps.pump.omnipod.common.bledriver.comm.session.EapSqn -import app.aaps.pump.omnipod.common.bledriver.comm.session.NotConnected -import app.aaps.pump.omnipod.common.bledriver.comm.session.STOP_CONNECTING_CHECK_INTERVAL_MS import app.aaps.pump.omnipod.common.bledriver.comm.session.Session -import app.aaps.pump.omnipod.common.bledriver.comm.session.SessionEstablisher import app.aaps.pump.omnipod.common.bledriver.comm.session.SessionKeys -import app.aaps.pump.omnipod.common.bledriver.comm.session.SessionNegotiationResynchronization import app.aaps.pump.omnipod.common.bledriver.pod.definition.PodType +import app.aaps.pump.omnipod.omnipod5.bledriver.comm.pair.O5CertificateStore import app.aaps.pump.omnipod.omnipod5.bledriver.pod.state.O5PodStateManager import app.aaps.pump.omnipod.omnipod5.bledriver.pod.util.P256KeyGenerator -/** - * BLE GATT connection lifecycle and session establishment for Omnipod 5, parallel to - * Dash's [Connection] rather than a modification of it - [Connection] is coupled - * throughout to the much larger [app.aaps.pump.omnipod.common.bledriver.pod.state - * .OmnipodDashPodStateManager] (full pod status surface: basal programs, alerts, - * delivery status, etc.), which doesn't fit O5's connection-only [O5PodStateManager]. - * - * Everything below the GATT-characteristic-selection level - [ServiceDiscoverer] (called - * here with [PodType.OMNIPOD_5]), [CmdBleIO], [DataBleIO], [MessageIO], - * [SessionEstablisher], [Session], [EnDecrypt] - is reused unmodified from the existing - * Dash connection path, since none of it is actually Dash-specific once given the right - * pod type and identity. - */ class O5Connection( - private val podDevice: BluetoothDevice, - private val aapsLogger: AAPSLogger, - private val config: Config, - private val context: Context, + podDevice: BluetoothDevice, + aapsLogger: AAPSLogger, + config: Config, + context: Context, private val podState: O5PodStateManager, private val p256KeyGenerator: P256KeyGenerator, private val pairingControllerId: Long? = null -) : BleConnection, DisconnectHandler { - - private val incomingPackets = IncomingPackets() - private val bleCommCallbacks = BleCommCallbacks(aapsLogger, incomingPackets, this) - private var gattConnection: BluetoothGatt? = null - - private val bluetoothManager: BluetoothManager? = - context.getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager? - - private var _connectionWaitCond: ConnectionWaitCondition? = null +) : SharedBleConnection(podDevice, aapsLogger, config, context) { - @Volatile - override var session: Session? = null + override val podType = PodType.OMNIPOD_5 - @Volatile - override var msgIO: MessageIO? = null - - @Synchronized - override fun connect(connectionWaitCond: ConnectionWaitCondition) { - aapsLogger.debug(LTag.PUMPBTCOMM, "Connecting (O5) connectionWaitCond=$connectionWaitCond") - _connectionWaitCond = connectionWaitCond + override fun recordConnectionAttempt() { podState.connectionAttempts++ - podState.bluetoothConnectionState = O5PodStateManager.BluetoothConnectionState.CONNECTING - val autoConnect = false - var gatt = gattConnection - if (gatt == null) { - gatt = podDevice.connectGatt(context, autoConnect, bleCommCallbacks, BluetoothDevice.TRANSPORT_LE) - if (gatt == null) { - Thread.sleep(SLEEP_WHEN_FAILING_TO_CONNECT_GATT) - throw FailedToConnectException("connectGatt() returned null") - } - gattConnection = gatt - } else if (!gatt.connect()) { - throw FailedToConnectException("connect() returned false") - } - val before = SystemClock.elapsedRealtime() - if (waitForConnection(connectionWaitCond) !is Connected) { - podState.bluetoothConnectionState = O5PodStateManager.BluetoothConnectionState.DISCONNECTED - _connectionWaitCond = null - throw FailedToConnectException(podDevice.address) - } - val waitedMs = SystemClock.elapsedRealtime() - before - val timeoutMs = connectionWaitCond.timeoutMs - if (timeoutMs != null) { - var newTimeout = timeoutMs - waitedMs - if (newTimeout < MIN_DISCOVERY_TIMEOUT_MS) { - newTimeout = MIN_DISCOVERY_TIMEOUT_MS - } - connectionWaitCond.timeoutMs = newTimeout - } - podState.bluetoothConnectionState = O5PodStateManager.BluetoothConnectionState.CONNECTED - aapsLogger.debug(LTag.PUMPBTCOMM, "GATT connected (O5) to ${podDevice.address}, discovering services") - - val discoverer = ServiceDiscoverer(aapsLogger, gatt, bleCommCallbacks, this) - val discovered = discoverer.discoverServices(connectionWaitCond, PodType.OMNIPOD_5) - aapsLogger.debug(LTag.PUMPBTCOMM, "Service discovery complete (O5): characteristics=${discovered.keys}") - - requestLargeMtu(gatt) - - val cmdBleIO = CmdBleIO( - aapsLogger, - discovered.getValue(CharacteristicType.CMD), - incomingPackets.cmdQueue, - gatt, - bleCommCallbacks - ) - val dataBleIO = DataBleIO( - aapsLogger, - discovered.getValue(CharacteristicType.DATA), - incomingPackets.dataQueue, - gatt, - bleCommCallbacks, - CharacteristicType.DATA_O5 - ) - msgIO = MessageIO(aapsLogger, cmdBleIO, dataBleIO, PodType.OMNIPOD_5) - val helloControllerId = pairingControllerId ?: podState.controllerId - if (helloControllerId != null) { - aapsLogger.debug( - LTag.PUMPBTCOMM, - "Performing O5 CMD 'hello' handshake (controllerId=0x%08x) and enabling reads".format(helloControllerId) - ) - cmdBleIO.hello(helloControllerId.toInt()) - } else { - aapsLogger.warn( - LTag.PUMPBTCOMM, - "O5 'hello' handshake has no controllerId available - falling back to default, pairing will likely fail" - ) - cmdBleIO.hello() - } - cmdBleIO.readyToRead() - dataBleIO.readyToRead() - aapsLogger.debug(LTag.PUMPBTCOMM, "O5 BLE connection ready (message IO established) for ${podDevice.address}") - _connectionWaitCond = null } - @Synchronized - override fun disconnect(closeGatt: Boolean) { - aapsLogger.debug(LTag.PUMPBTCOMM, "Disconnecting (O5) closeGatt=$closeGatt") - if (!closeGatt && gattConnection != null) { - gattConnection?.disconnect() - podState.bluetoothConnectionState = O5PodStateManager.BluetoothConnectionState.DISCONNECTED - } else { - gattConnection?.close() - bleCommCallbacks.resetConnection() - gattConnection = null - session = null - msgIO = null - podState.bluetoothConnectionState = O5PodStateManager.BluetoothConnectionState.DISCONNECTED + override fun updateConnectionState(state: LifecycleState) { + podState.bluetoothConnectionState = when (state) { + LifecycleState.CONNECTING -> O5PodStateManager.BluetoothConnectionState.CONNECTING + LifecycleState.CONNECTED -> O5PodStateManager.BluetoothConnectionState.CONNECTED + LifecycleState.DISCONNECTED -> O5PodStateManager.BluetoothConnectionState.DISCONNECTED } } - /** - * O5 messages are sent as single GATT writes up to [PodType.OMNIPOD_5]'s 244-byte - * packet payload (see BlePacketLayout.OMNIPOD_5), which needs an ATT MTU of at least - * [MIN_REQUIRED_MTU]. Android starts every connection at the 23-byte default and does - * NOT auto-negotiate a larger MTU (unlike iOS/CoreBluetooth, which is why OmnipodKit - * never has to ask). Without this, the first pairing message (SP1+SP2, ~51 bytes on - * the wire) is truncated to ~20 bytes and the pod replies ABORT. Dash is unaffected - * because its packets fit in the default MTU. - */ - private fun requestLargeMtu(gatt: BluetoothGatt) { + override fun connectGatt(): BluetoothGatt? = + podDevice.connectGatt(context, false, bleCommCallbacks, BluetoothDevice.TRANSPORT_LE) + + override fun prepareGatt(gatt: BluetoothGatt) { if (!gatt.requestMtu(REQUESTED_MTU)) { aapsLogger.warn(LTag.PUMPBTCOMM, "O5 requestMtu($REQUESTED_MTU) call returned false - continuing with default MTU") return @@ -194,112 +58,37 @@ class O5Connection( aapsLogger.debug(LTag.PUMPBTCOMM, "O5 MTU negotiated: $mtu") } if (mtu < MIN_REQUIRED_MTU) { - aapsLogger.warn( - LTag.PUMPBTCOMM, - "O5 negotiated MTU=$mtu is below the required $MIN_REQUIRED_MTU - large pairing messages may be truncated and rejected by the pod" - ) + aapsLogger.warn(LTag.PUMPBTCOMM, "O5 negotiated MTU=$mtu is below the required $MIN_REQUIRED_MTU") } } - private fun waitForConnection(connectionWaitCond: ConnectionWaitCondition): ConnectionState { - aapsLogger.debug(LTag.PUMPBTCOMM, "waitForConnection (O5) connectionWaitCond=$connectionWaitCond") - try { - connectionWaitCond.timeoutMs?.let { - bleCommCallbacks.waitForConnection(it) - } - val startWaiting = System.currentTimeMillis() - connectionWaitCond.stopConnection?.let { - while (!bleCommCallbacks.waitForConnection(STOP_CONNECTING_CHECK_INTERVAL_MS)) { - if (it.count == 0L) { - throw ConnectException("stopConnecting called") - } - val secondsElapsed = (System.currentTimeMillis() - startWaiting) / 1000 - if (secondsElapsed > MAX_WAIT_FOR_CONNECTION_SECONDS) { - throw ConnectException("connection timeout") - } - } - } - } catch (e: InterruptedException) { - aapsLogger.info(LTag.PUMPBTCOMM, "Interrupted while waiting for connection (O5)") + override fun hello(cmdBleIO: CmdBleIO) { + val controllerId = pairingControllerId ?: podState.controllerId + if (controllerId == null) { + aapsLogger.warn(LTag.PUMPBTCOMM, "O5 hello handshake has no controllerId; using the default") + cmdBleIO.hello() + } else { + cmdBleIO.hello(controllerId.toInt()) } - return connectionState() } - override fun connectionState(): ConnectionState { - val connectionState = bluetoothManager?.getConnectionState(podDevice, BluetoothProfile.GATT) - aapsLogger.debug(LTag.PUMPBTCOMM, "GATT connection state (O5): $connectionState") - if (connectionState != BluetoothProfile.STATE_CONNECTED) { - return NotConnected + override fun createSession(messageIO: MessageIO, ids: Ids, keys: SessionKeys, enDecrypt: EnDecrypt): Session { + val controllerId = requireNotNull(podState.controllerId) { + "Missing controllerId, cannot establish a signed O5 session" } - return Connected - } - - /** - * [ids] here must be built via [Ids.forController] using the pod's certificate-derived - * controller id and its own O5 pod id - O5 has no [Ids] constructor of its own since it - * has no Dash-style pod state manager to derive one from (see [Ids]'s class doc). - */ - override fun establishSession(ltk: ByteArray, msgSeq: Byte, ids: Ids, eapSqn: ByteArray): EapSqn? { - val mIO = msgIO ?: throw ConnectException("Connection lost") - aapsLogger.debug( - LTag.PUMPBTCOMM, - "Establishing O5 session (EAP-AKA): msgSeq=$msgSeq, ltk=${ltk.size} bytes, eapSqn=${eapSqn.toHex()}, ids=$ids" + return Session( + aapsLogger, + messageIO, + ids, + sessionKeys = keys, + enDecrypt = enDecrypt, + commandSigner = O5CertificateStore(aapsLogger, p256KeyGenerator, controllerId) ) - - val eapAkaExchanger = SessionEstablisher(aapsLogger, config, mIO, ltk, eapSqn, ids, msgSeq) - return when (val keys = eapAkaExchanger.negotiateSessionKeys()) { - is SessionNegotiationResynchronization -> { - aapsLogger.debug(LTag.PUMPBTCOMM, "O5 EAP-AKA requested SQN resynchronization: ${keys.synchronizedEapSqn}") - if (config.DEBUG) { - aapsLogger.info(LTag.PUMPCOMM, "EAP AKA resynchronization (O5): ${keys.synchronizedEapSqn}") - } - keys.synchronizedEapSqn - } - - is SessionKeys -> { - if (config.DEBUG) { - aapsLogger.info(LTag.PUMPCOMM, "CK (O5): ${keys.ck.toHex()}") - aapsLogger.info(LTag.PUMPCOMM, "msgSequenceNumber (O5): ${keys.msgSequenceNumber}") - aapsLogger.info(LTag.PUMPCOMM, "Nonce (O5): ${keys.nonce}") - } - val enDecrypt = EnDecrypt(aapsLogger, keys.nonce, keys.ck) - val controllerId = requireNotNull(podState.controllerId) { - "Missing controllerId, cannot establish a signed O5 session" - } - val certStore = O5CertificateStore(aapsLogger, p256KeyGenerator, controllerId) - session = Session(aapsLogger, mIO, ids, sessionKeys = keys, enDecrypt = enDecrypt, commandSigner = certStore) - aapsLogger.debug( - LTag.PUMPBTCOMM, - "O5 session established - encrypted channel ready (msgSeq=${keys.msgSequenceNumber})" - ) - null - } - } - } - - override fun onConnectionLost(status: Int) { - aapsLogger.info(LTag.PUMPBTCOMM, "Lost connection (O5) with status: $status") - _connectionWaitCond?.stopConnection?.let { - if (it.count > 0) { - it.countDown() - } - } - disconnect(true) } companion object { - const val MIN_DISCOVERY_TIMEOUT_MS = 10000L - const val MAX_WAIT_FOR_CONNECTION_SECONDS = Constants.PUMP_MAX_CONNECTION_TIME_IN_SECONDS + 10 - const val SLEEP_WHEN_FAILING_TO_CONNECT_GATT = 10000L - - /** MTU we ask the phone to negotiate. 512 lets the stack settle on the highest the - * phone and pod both support; O5 only needs [MIN_REQUIRED_MTU]. */ const val REQUESTED_MTU = 512 - - /** Minimum ATT MTU that fits a full 244-byte O5 packet payload (244 + 3-byte ATT - * header). Below this, large pairing writes get truncated and the pod aborts. */ const val MIN_REQUIRED_MTU = 247 - - const val MTU_NEGOTIATION_TIMEOUT_MS = 5000L + const val MTU_NEGOTIATION_TIMEOUT_MS = 5_000L } } diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/OmnipodO5ComposeContent.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/OmnipodO5ComposeContent.kt index e93a3960aad8..94ebafd7c079 100644 --- a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/OmnipodO5ComposeContent.kt +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/OmnipodO5ComposeContent.kt @@ -1,51 +1,26 @@ package app.aaps.pump.omnipod.omnipod5.ui.compose -import androidx.compose.foundation.layout.RowScope import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.filled.ArrowBack -import androidx.compose.material.icons.filled.Settings import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect -import androidx.compose.runtime.getValue -import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.remember -import androidx.compose.runtime.setValue -import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource -import androidx.lifecycle.compose.collectAsStateWithLifecycle import app.aaps.core.interfaces.protection.ProtectionCheck import app.aaps.core.interfaces.pump.BlePreCheck import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.ui.compose.ComposablePluginContent import app.aaps.core.ui.compose.ToolbarConfig -import app.aaps.core.ui.compose.dialogs.OkCancelDialog -import app.aaps.core.ui.compose.dialogs.OkDialog import app.aaps.core.ui.compose.metroViewModel -import app.aaps.core.ui.compose.pump.BlePreCheckHost -import app.aaps.core.ui.compose.pump.KeepScreenOnEffect -import app.aaps.core.ui.compose.pump.PumpOverviewScreen import app.aaps.pump.omnipod.common.R +import app.aaps.pump.omnipod.common.ui.compose.OmnipodComposeHost import app.aaps.pump.omnipod.omnipod5.bledriver.comm.pair.O5RegistrationData import app.aaps.pump.omnipod.omnipod5.ui.O5CredentialImportScreen import app.aaps.pump.omnipod.omnipod5.ui.O5CredentialImportViewModel -import app.aaps.pump.omnipod.common.ui.compose.PodImage -import app.aaps.pump.omnipod.common.ui.wizard.compose.ActivationType import app.aaps.pump.omnipod.omnipod5.ui.wizard.compose.O5OmnipodWizardViewModel -import app.aaps.pump.omnipod.common.ui.wizard.compose.OmnipodOverviewEvent -import app.aaps.pump.omnipod.common.ui.wizard.compose.OmnipodWizardScreen +import app.aaps.core.ui.R as CoreUiR -/** - * O5's plugin-settings entry composable - the `.composeContent {}` render target for - * [app.aaps.pump.omnipod.omnipod5.O5PumpPlugin]. Mirrors - * [app.aaps.pump.omnipod.dash.ui.compose.OmnipodDashComposeContent]'s overview/wizard - * toggle, but with a credentials screen in place of Dash's pod-history screen (O5 has no - * history feature) - the overview is always shown first; the settings gear opens the plugin - * preferences screen (which hosts the certificate store as a subpage), and "Activate Pod" - * routes to [O5CredentialImportScreen] first only if no registration credentials are installed - * yet (matches the confirmed UX choice - no auto-gating the whole screen). - */ class OmnipodO5ComposeContent( private val pluginName: String, private val protectionCheck: ProtectionCheck, @@ -60,135 +35,29 @@ class OmnipodO5ComposeContent( onSettings: (() -> Unit)? ) { val overviewViewModel: O5OverviewViewModel = metroViewModel() - val context = LocalContext.current - - var showWizard by remember { mutableStateOf(false) } - var showCredentials by remember { mutableStateOf(false) } - var wizardActivationType by remember { mutableStateOf(null) } - var isDeactivation by remember { mutableStateOf(false) } - - var showDialog by remember { mutableStateOf(false) } - var dialogTitle by remember { mutableStateOf("") } - var dialogMessage by remember { mutableStateOf("") } - var showDiscardConfirm by remember { mutableStateOf(false) } - var showErrorDialog by remember { mutableStateOf(false) } - var errorTitle by remember { mutableStateOf("") } - var errorMessage by remember { mutableStateOf("") } - - val overviewNavIcon: @Composable () -> Unit = { - IconButton(onClick = onNavigateBack) { - Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = stringResource(app.aaps.core.ui.R.string.back)) - } - } - val settingsAction: @Composable RowScope.() -> Unit = { - onSettings?.let { action -> - IconButton(onClick = action) { - Icon(Icons.Filled.Settings, contentDescription = stringResource(app.aaps.core.ui.R.string.settings)) - } - } - } - - LaunchedEffect(showWizard, showCredentials) { - if (!showWizard && !showCredentials) { - setToolbarConfig(ToolbarConfig(title = pluginName, navigationIcon = overviewNavIcon, actions = settingsAction)) - } - } - - LaunchedEffect(overviewViewModel) { - overviewViewModel.events.collect { event -> - when (event) { - is OmnipodOverviewEvent.StartActivation -> { - if (O5RegistrationData.pickControllerId == 0L) { - showCredentials = true - } else { - wizardActivationType = event.activationType - isDeactivation = false - showWizard = true - } - } - - is OmnipodOverviewEvent.StartDeactivation -> { - isDeactivation = true - showWizard = true - } - - is OmnipodOverviewEvent.ShowHistory -> Unit - - is OmnipodOverviewEvent.ShowDialog -> { - if (event.title == context.getString(R.string.omnipod_common_pod_management_button_discard_pod)) { - showDiscardConfirm = true - dialogTitle = event.title - dialogMessage = event.message - } else { - dialogTitle = event.title - dialogMessage = event.message - showDialog = true - } - } - - is OmnipodOverviewEvent.ShowErrorDialog -> { - errorTitle = event.title - errorMessage = event.message - showErrorDialog = true - } - - is OmnipodOverviewEvent.StartActivity -> context.startActivity(event.intent) - is OmnipodOverviewEvent.ShowRileyLinkPairWizard -> Unit - is OmnipodOverviewEvent.ShowRileyLinkStats -> Unit - is OmnipodOverviewEvent.ShowSnackbar -> Unit - } - } - } - - if (showDialog) { - OkDialog(title = dialogTitle, message = dialogMessage, onDismiss = { showDialog = false }) - } - if (showErrorDialog) { - OkDialog(title = errorTitle, message = errorMessage, onDismiss = { showErrorDialog = false }) - } - if (showDiscardConfirm) { - OkCancelDialog( - title = dialogTitle, - message = dialogMessage, - onConfirm = { - showDiscardConfirm = false - overviewViewModel.confirmDiscardPod() - }, - onDismiss = { showDiscardConfirm = false } - ) - } - - when { - showWizard -> { - KeepScreenOnEffect() - BlePreCheckHost(blePreCheck = blePreCheck, onFailed = { showWizard = false }) - - val wizardViewModel: O5OmnipodWizardViewModel = metroViewModel() - val wizardReady by wizardViewModel.ready.collectAsStateWithLifecycle() - LaunchedEffect(wizardReady, isDeactivation, wizardActivationType) { - if (!wizardReady) return@LaunchedEffect - if (isDeactivation) { - wizardViewModel.initializeDeactivation() - } else { - wizardActivationType?.let { wizardViewModel.initializeActivation(it) } - } - } - - OmnipodWizardScreen( - viewModel = wizardViewModel, - onFinish = { showWizard = false }, - setToolbarConfig = setToolbarConfig - ) - } - - showCredentials -> { - LaunchedEffect(Unit) { + OmnipodComposeHost( + pluginName = pluginName, + blePreCheck = blePreCheck, + setToolbarConfig = setToolbarConfig, + onNavigateBack = onNavigateBack, + onSettings = onSettings, + overviewState = overviewViewModel.uiState, + overviewEvents = overviewViewModel.events, + wizardViewModel = { + val viewModel: O5OmnipodWizardViewModel = metroViewModel() + viewModel + }, + onConfirmDiscardPod = overviewViewModel::confirmDiscardPod, + activationNeedsExtraContent = { O5RegistrationData.pickControllerId == 0L }, + extraContent = { onBack -> + val title = stringResource(R.string.omnipod_5_name) + LaunchedEffect(title) { setToolbarConfig( ToolbarConfig( - title = rh.gs(R.string.omnipod_5_name), + title = title, navigationIcon = { - IconButton(onClick = { showCredentials = false }) { - Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = stringResource(app.aaps.core.ui.R.string.back)) + IconButton(onClick = onBack) { + Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = stringResource(CoreUiR.string.back)) } }, actions = {} @@ -198,11 +67,6 @@ class OmnipodO5ComposeContent( val credentialViewModel: O5CredentialImportViewModel = metroViewModel() O5CredentialImportScreen(viewModel = credentialViewModel, rh = rh) } - - else -> { - val uiState by overviewViewModel.uiState.collectAsStateWithLifecycle() - PumpOverviewScreen(state = uiState, customContent = { PodImage() }) - } - } + ) } } diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/wizard/compose/O5OmnipodWizardViewModel.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/wizard/compose/O5OmnipodWizardViewModel.kt index 0cfe87953a14..9c2d5291f659 100644 --- a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/wizard/compose/O5OmnipodWizardViewModel.kt +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/wizard/compose/O5OmnipodWizardViewModel.kt @@ -6,10 +6,8 @@ import app.aaps.pump.omnipod.common.R import androidx.annotation.StringRes import androidx.compose.runtime.Stable import androidx.lifecycle.viewModelScope -import app.aaps.core.data.model.ICfg import app.aaps.core.data.model.TE import app.aaps.core.data.pump.defs.PumpType -import app.aaps.core.data.time.T import app.aaps.core.data.ue.Sources import app.aaps.core.interfaces.db.PersistenceLayer import app.aaps.core.interfaces.insulin.InsulinManager @@ -54,7 +52,7 @@ import app.aaps.pump.omnipod.omnipod5.bledriver.pod.util.buildO5ExpirationAlerts import app.aaps.pump.omnipod.common.keys.OmnipodBooleanPreferenceKey import app.aaps.pump.omnipod.common.keys.OmnipodIntPreferenceKey import app.aaps.pump.omnipod.common.queue.command.CommandDeactivatePod -import app.aaps.pump.omnipod.omnipod5.util.mapProfileToBasalProgram +import app.aaps.pump.omnipod.common.util.mapProfileToBasalProgram import androidx.lifecycle.ViewModel import dev.zacsweers.metro.AppScope import dev.zacsweers.metro.ContributesIntoMap @@ -63,7 +61,6 @@ import dev.zacsweers.metro.binding import dev.zacsweers.metrox.viewmodel.ViewModelKey import io.reactivex.rxjava3.core.Single import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.launch import kotlinx.coroutines.rx3.rxSingle import java.util.Date @@ -95,32 +92,29 @@ class O5OmnipodWizardViewModel @Inject constructor( private val commandQueue: CommandQueue, private val notificationManager: NotificationManager, private val pumpSync: PumpSync, - private val insulinManager: InsulinManager, - private val persistenceLayer: PersistenceLayer, + insulinManager: InsulinManager, + persistenceLayer: PersistenceLayer, profileFunction: ProfileFunction, profileRepository: ProfileRepository, pumpEnactResultProvider: () -> PumpEnactResult, logger: AAPSLogger, aapsSchedulers: AapsSchedulers -) : OmnipodWizardViewModel(logger, aapsSchedulers, pumpEnactResultProvider, profileFunction, profileRepository) { +) : OmnipodWizardViewModel( + logger, + aapsSchedulers, + pumpEnactResultProvider, + profileFunction, + profileRepository, + insulinManager, + persistenceLayer +) { - private val _siteRotationEntries = MutableStateFlow>(emptyList()) + public override val pumpSource: Sources = Sources.Omnipod5 init { - viewModelScope.launch { - val insulins = insulinManager.insulins.map { it.deepClone() } - val activeLabel = profileFunction.getProfile()?.iCfg?.insulinLabel - loadInsulins(insulins, activeLabel) - loadSiteRotationEntriesInternal() - resolveProfileGate() - _ready.value = true - } + initializeWizard() } - public override val pumpSource: Sources = Sources.Omnipod5 - - override fun fallbackICfg(): ICfg? = insulinManager.insulins.firstOrNull() - override val concentrationEnabled: Boolean get() = preferences.get(BooleanKey.GeneralInsulinConcentration) @@ -130,38 +124,6 @@ class O5OmnipodWizardViewModel @Inject constructor( override fun bodyType(): BodyType = BodyType.fromPref(preferences.get(IntKey.SiteRotationUserProfile)) - override fun siteRotationEntries(): List = _siteRotationEntries.value - - private suspend fun loadSiteRotationEntriesInternal() { - _siteRotationEntries.value = persistenceLayer.getTherapyEventDataFromTime( - System.currentTimeMillis() - T.days(45).msecs(), false - ).filter { it.type == TE.Type.CANNULA_CHANGE || it.type == TE.Type.SENSOR_CHANGE } - } - - override fun executeInsulinProfileSwitch() { - val selected = selectedInsulin.value ?: return - val activeLabel = activeInsulinLabel.value - if (selected.insulinLabel == activeLabel) return - viewModelScope.launch { - profileFunction.createProfileSwitchWithNewInsulin(selected, Sources.Omnipod5) - } - } - - override fun saveSiteLocation() { - val location = getSelectedSiteLocation().takeIf { it != TE.Location.NONE } ?: return - val arrow = getSelectedSiteArrow().takeIf { it != TE.Arrow.NONE } - viewModelScope.launch { - try { - val now = System.currentTimeMillis() - val entries = persistenceLayer.getTherapyEventDataFromToTime(now - 60_000, now) - .filter { it.type == TE.Type.CANNULA_CHANGE } - entries.firstOrNull()?.let { te -> - persistenceLayer.insertOrUpdateTherapyEvent(te.copy(location = location, arrow = arrow)) - } - } catch (_: Exception) { - } - } - } private fun requirePodId(): Int = podStateManager.podId?.toInt() ?: throw IllegalStateException("O5 pod not paired") diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/util/ProfileToBasalProgram.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/util/ProfileToBasalProgram.kt deleted file mode 100644 index 5352c351754b..000000000000 --- a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/util/ProfileToBasalProgram.kt +++ /dev/null @@ -1,69 +0,0 @@ -package app.aaps.pump.omnipod.omnipod5.util - -import app.aaps.core.data.pump.defs.PumpType -import app.aaps.core.interfaces.profile.Profile -import app.aaps.core.interfaces.pump.defs.determineCorrectBasalSize -import app.aaps.pump.omnipod.common.bledriver.pod.definition.BasalProgram -import kotlin.math.roundToInt - -/** - * Converts an AAPS basal schedule/profile into the pod's 30-minute-slot [BasalProgram] - * wire format. Duplicated from [app.aaps.pump.omnipod.dash.util.mapProfileToBasalProgram] - * (parametrized on [PumpType] instead of hardcoding [PumpType.OMNIPOD_DASH]) rather than - * shared, because `dash` depends on `common`, not the reverse - this module can't import - * from `dash`. - */ -fun mapProfileToBasalProgram(profile: Profile, pumpType: PumpType): BasalProgram { - val basalValues = profile.getBasalValues() - if (basalValues.isEmpty()) { - throw IllegalArgumentException("Basal values should contain values") - } - - val entries: MutableList = ArrayList() - - var previousBasalValue: Profile.ProfileValue? = null - - for (basalValue in basalValues) { - if (basalValue.timeAsSeconds >= 86_400) { - throw IllegalArgumentException("Basal segment start time can not be greater than 86400") - } - if (basalValue.timeAsSeconds < 0) { - throw IllegalArgumentException("Basal segment start time can not be less than 0") - } - if (basalValue.timeAsSeconds % 1_800 != 0) { - throw IllegalArgumentException("Basal segment time should be dividable by 30 minutes") - } - - val startSlotIndex = (basalValue.timeAsSeconds / 1800).toShort() - - if (previousBasalValue != null) { - entries.add( - BasalProgram.Segment( - (previousBasalValue.timeAsSeconds / 1800).toShort(), - startSlotIndex, - (pumpType.determineCorrectBasalSize(previousBasalValue.value) * 100).roundToInt() - ) - ) - } - - if (entries.isEmpty() && basalValue.timeAsSeconds != 0) { - throw IllegalArgumentException("First basal segment start time should be 0") - } - - if (entries.isNotEmpty() && entries[entries.size - 1].endSlotIndex != startSlotIndex) { - throw IllegalArgumentException("Illegal start time for basal segment: does not match previous previous segment's end time") - } - - previousBasalValue = basalValue - } - - entries.add( - BasalProgram.Segment( - (previousBasalValue!!.timeAsSeconds / 1800).toShort(), - 48, - (pumpType.determineCorrectBasalSize(previousBasalValue.value) * 100).roundToInt() - ) - ) - - return BasalProgram(entries) -} From 4bc030263705009db1a0e434cf2735c3868d8f74 Mon Sep 17 00:00:00 2001 From: Prem Nirmal Date: Wed, 23 Sep 2026 13:49:07 +0100 Subject: [PATCH 14/85] Add O5History and O5History viewer screen/viewmodel --- pump/omnipod/omnipod5/build.gradle.kts | 9 ++ .../pump/omnipod/omnipod5/O5PumpPlugin.kt | 142 +++++++++++++---- .../bledriver/pod/state/O5PodStateManager.kt | 3 +- .../omnipod/omnipod5/di/O5HistoryBindings.kt | 33 ++++ .../omnipod/omnipod5/history/HistoryMapper.kt | 19 +++ .../omnipod/omnipod5/history/O5History.kt | 122 +++++++++++++++ .../omnipod5/history/data/HistoryRecord.kt | 22 +++ .../omnipod/omnipod5/history/data/Record.kt | 28 ++++ .../omnipod5/history/data/ResultStates.kt | 9 ++ .../omnipod5/history/database/Converters.kt | 28 ++++ .../history/database/HistoryRecordDao.kt | 42 +++++ .../history/database/HistoryRecordEntity.kt | 27 ++++ .../history/database/O5HistoryDatabase.kt | 29 ++++ .../ui/compose/O5OverviewViewModel.kt | 10 +- .../omnipod5/ui/compose/O5PodHistoryScreen.kt | 146 ++++++++++++++++++ .../ui/compose/O5PodHistoryViewModel.kt | 41 +++++ .../ui/compose/OmnipodO5ComposeContent.kt | 24 ++- .../compose/O5OmnipodWizardViewModel.kt | 5 + .../omnipod5/src/main/res/values/strings.xml | 6 + 19 files changed, 712 insertions(+), 33 deletions(-) create mode 100644 pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/di/O5HistoryBindings.kt create mode 100644 pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/history/HistoryMapper.kt create mode 100644 pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/history/O5History.kt create mode 100644 pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/history/data/HistoryRecord.kt create mode 100644 pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/history/data/Record.kt create mode 100644 pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/history/data/ResultStates.kt create mode 100644 pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/history/database/Converters.kt create mode 100644 pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/history/database/HistoryRecordDao.kt create mode 100644 pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/history/database/HistoryRecordEntity.kt create mode 100644 pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/history/database/O5HistoryDatabase.kt create mode 100644 pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/O5PodHistoryScreen.kt create mode 100644 pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/O5PodHistoryViewModel.kt create mode 100644 pump/omnipod/omnipod5/src/main/res/values/strings.xml diff --git a/pump/omnipod/omnipod5/build.gradle.kts b/pump/omnipod/omnipod5/build.gradle.kts index 44e8e2e2757b..97dc0b95e792 100644 --- a/pump/omnipod/omnipod5/build.gradle.kts +++ b/pump/omnipod/omnipod5/build.gradle.kts @@ -12,18 +12,27 @@ android { namespace = "app.aaps.pump.omnipod.omnipod5" } +ksp { + arg("room.incremental", "true") + arg("room.schemaLocation", "$projectDir/schemas") +} + dependencies { implementation(project(":core:data")) implementation(project(":core:interfaces")) implementation(project(":core:keys")) implementation(project(":core:utils")) implementation(project(":core:ui")) + implementation(project(":pump:common")) implementation(project(":pump:omnipod:common")) + api(libs.androidx.room.runtime) + implementation(libs.androidx.room.rxjava3) implementation(libs.kotlinx.coroutines.rx3) implementation(libs.androidx.compose.ui.tooling.preview) debugImplementation(libs.androidx.compose.ui.tooling) testImplementation(project(":shared:tests")) + ksp(libs.androidx.room.compiler) } diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/O5PumpPlugin.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/O5PumpPlugin.kt index 0c85ab0b1e28..7c5026376e1a 100644 --- a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/O5PumpPlugin.kt +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/O5PumpPlugin.kt @@ -61,6 +61,7 @@ import app.aaps.pump.omnipod.common.bledriver.pod.definition.BeepType import app.aaps.pump.omnipod.omnipod5.bledriver.pod.definition.O5_FIXED_NONCE import app.aaps.pump.omnipod.common.bledriver.pod.definition.PodConstants import app.aaps.pump.omnipod.common.bledriver.pod.definition.ProgramReminder +import app.aaps.pump.omnipod.common.definition.OmnipodCommandType import app.aaps.pump.omnipod.common.bledriver.pod.response.AlarmStatusResponse import app.aaps.pump.omnipod.common.bledriver.pod.response.DefaultStatusResponse import app.aaps.pump.omnipod.common.bledriver.pod.response.PodInfoActivationTimeResponse @@ -70,6 +71,12 @@ import app.aaps.pump.omnipod.omnipod5.bledriver.pod.state.O5PodStateManager import app.aaps.pump.omnipod.omnipod5.bledriver.pod.state.basalDrift import app.aaps.pump.omnipod.omnipod5.bledriver.pod.state.basalDelivered import app.aaps.pump.omnipod.omnipod5.bledriver.pod.util.buildO5ExpirationAlerts +import app.aaps.pump.omnipod.omnipod5.history.O5History +import app.aaps.pump.omnipod.omnipod5.history.data.BasalValuesRecord +import app.aaps.pump.omnipod.omnipod5.history.data.BolusRecord +import app.aaps.pump.omnipod.omnipod5.history.data.BolusType +import app.aaps.pump.omnipod.omnipod5.history.data.InitialResult +import app.aaps.pump.omnipod.omnipod5.history.data.TempBasalRecord import app.aaps.pump.omnipod.common.keys.DashBooleanPreferenceKey import app.aaps.pump.omnipod.common.keys.OmnipodBooleanPreferenceKey import app.aaps.pump.omnipod.common.keys.OmnipodIntPreferenceKey @@ -146,6 +153,7 @@ class O5PumpPlugin @Inject constructor( commandQueue: CommandQueue, private val bleManager: O5BleManager, private val podStateManager: O5PodStateManager, + private val history: O5History, private val pumpSync: PumpSync, private val notificationManager: NotificationManager, private val pumpEnactResultProvider: () -> PumpEnactResult, @@ -484,11 +492,14 @@ class O5PumpPlugin @Inject constructor( timestamp = pending.startedAt, amount = PumpInsulin(0.0), type = pending.bolusType ?: BS.Type.NORMAL, - pumpId = pending.startedAt, + pumpId = pending.historyId ?: pending.startedAt, pumpType = PumpType.OMNIPOD_5, pumpSerial = serialNumber() ) } + pending.historyId?.let { + history.markSendingFailure(it).andThen(history.markFailure(it)).blockingAwait() + } podStateManager.pendingDoseCommand = null return } @@ -509,11 +520,13 @@ class O5PumpPlugin @Inject constructor( O5PodStateManager.PendingDoseType.TEMP_BASAL_START -> if (podStateManager.deliveryStatus?.tempBasalActive() == true) { + pending.historyId?.let { history.markSent(it).andThen(history.markSuccess(it)).blockingAwait() } podStateManager.pendingDoseCommand = null } O5PodStateManager.PendingDoseType.TEMP_BASAL_CANCEL -> if (podStateManager.deliveryStatus?.tempBasalActive() != true) { + pending.historyId?.let { history.markSent(it).andThen(history.markSuccess(it)).blockingAwait() } podStateManager.activeTempBasalStartTime = null podStateManager.activeTempBasalRate = null podStateManager.activeTempBasalDurationMinutes = null @@ -522,6 +535,7 @@ class O5PumpPlugin @Inject constructor( O5PodStateManager.PendingDoseType.BASAL_PROGRAM -> if (podStateManager.deliveryStatus?.basalActive() == true) { + pending.historyId?.let { history.markSent(it).andThen(history.markSuccess(it)).blockingAwait() } podStateManager.pendingDoseCommand = null } } @@ -590,12 +604,23 @@ class O5PumpPlugin @Inject constructor( podStateManager.podId?.toInt() ?: throw IllegalStateException("O5 pod not paired") - override suspend fun setNewBasalProfile(profile: PumpProfile): PumpEnactResult { + override suspend fun setNewBasalProfile(profile: PumpProfile): PumpEnactResult = + setNewBasalProfile(profile, OmnipodCommandType.SET_BASAL_PROFILE) + + private suspend fun setNewBasalProfile( + profile: PumpProfile, + historyType: OmnipodCommandType = OmnipodCommandType.SET_BASAL_PROFILE + ): PumpEnactResult { if (podStateManager.ltk == null) { return pumpEnactResultProvider.get().success(true).enacted(true) } if (!pendingDoseResolved()) return unresolvedDoseResult() val basalProgram = mapProfileToBasalProgram(profile, PumpType.OMNIPOD_5) + val historyId = history.createRecord( + commandType = historyType, + initialResult = InitialResult.NOT_SENT, + basalProfileRecord = BasalValuesRecord(profile.getBasalValues().toList()) + ).blockingGet() return try { if (podStateManager.deliveryStatus?.suspended() != true) { val basalBeeps = preferences.get(OmnipodBooleanPreferenceKey.BasalBeepsEnabled) @@ -612,7 +637,8 @@ class O5PumpPlugin @Inject constructor( podStateManager.pendingDoseCommand = O5PodStateManager.PendingDoseCommand( type = O5PodStateManager.PendingDoseType.BASAL_PROGRAM, startedAt = System.currentTimeMillis(), - sequenceNumber = podStateManager.msgSequenceNumber.toShort() + sequenceNumber = podStateManager.msgSequenceNumber.toShort(), + historyId = historyId ) armStatusChecker() val basalBeeps = preferences.get(OmnipodBooleanPreferenceKey.BasalBeepsEnabled) @@ -628,10 +654,12 @@ class O5PumpPlugin @Inject constructor( podStateManager.basalProgram = basalProgram podStateManager.deliverySuspended = false podStateManager.pendingDoseCommand = null + history.markSent(historyId).andThen(history.markSuccess(historyId)).blockingAwait() notificationManager.post(NotificationId.PROFILE_SET_OK, TextRef.AndroidRes(app.aaps.core.ui.R.string.profile_set_ok)) disableSuspendAlerts() pumpEnactResultProvider.get().success(true).enacted(true) } catch (e: Exception) { + history.markSendingFailure(historyId).andThen(history.markFailure(historyId)).blockingAwait() aapsLogger.error(LTag.PUMP, "Error in O5 setNewBasalProfile", e) notifyUncertain(NotificationId.FAILED_UPDATE_PROFILE, rh.gs(R.string.omnipod_5_error_setting_basal_profile_might_have_failed)) pumpEnactResultProvider.get().success(false).enacted(false) @@ -702,13 +730,23 @@ class O5PumpPlugin @Inject constructor( else OmnipodBooleanPreferenceKey.BolusBeepsEnabled val bolusBeeps = preferences.get(bolusBeepsKey) val startedAt = System.currentTimeMillis() + val historyId = history.createRecord( + commandType = OmnipodCommandType.SET_BOLUS, + date = startedAt, + initialResult = InitialResult.NOT_SENT, + bolusRecord = BolusRecord( + requestedUnits, + BolusType.fromBolusInfoBolusType(detailedBolusInfo.bolusType) + ) + ).blockingGet() val pendingDose = O5PodStateManager.PendingDoseCommand( type = O5PodStateManager.PendingDoseType.BOLUS, requestedUnits = requestedUnits, bolusType = detailedBolusInfo.bolusType, startedAt = startedAt, - sequenceNumber = podStateManager.msgSequenceNumber.toShort() + sequenceNumber = podStateManager.msgSequenceNumber.toShort(), + historyId = historyId ) podStateManager.pendingDoseCommand = pendingDose @@ -736,7 +774,7 @@ class O5PumpPlugin @Inject constructor( timestamp = startedAt, amount = PumpInsulin(requestedUnits), type = detailedBolusInfo.bolusType, - pumpId = startedAt, + pumpId = pendingDose.historyId ?: startedAt, pumpType = PumpType.OMNIPOD_5, pumpSerial = serialNumber() ) @@ -757,6 +795,9 @@ class O5PumpPlugin @Inject constructor( aapsLogger.error(LTag.PUMP, "O5 deliverTreatment error: $throwable") if (!commandMayHaveBeenSent) { podStateManager.pendingDoseCommand = null + pendingDose.historyId?.let { + history.markSendingFailure(it).andThen(history.markFailure(it)).blockingAwait() + } } else { armStatusChecker() } @@ -830,14 +871,22 @@ class O5PumpPlugin @Inject constructor( private suspend fun finalizeBolus(pending: O5PodStateManager.PendingDoseCommand, deliveredUnits: Double) { val finalUnits = deliveredUnits.coerceIn(0.0, pending.requestedUnits ?: deliveredUnits) - pumpSync.syncBolusWithPumpId( - timestamp = pending.startedAt, - amount = PumpInsulin(finalUnits), - type = pending.bolusType ?: BS.Type.NORMAL, - pumpId = pending.startedAt, - pumpType = PumpType.OMNIPOD_5, - pumpSerial = serialNumber() - ) + pending.historyId?.let { + history.markSent(it) + .andThen(history.setTotalAmountDelivered(it, finalUnits)) + .andThen(history.markSuccess(it)) + .blockingAwait() + } + if (!pending.isBasalCorrection) { + pumpSync.syncBolusWithPumpId( + timestamp = pending.startedAt, + amount = PumpInsulin(finalUnits), + type = pending.bolusType ?: BS.Type.NORMAL, + pumpId = pending.historyId ?: pending.startedAt, + pumpType = PumpType.OMNIPOD_5, + pumpSerial = serialNumber() + ) + } val deliveredPulses = if (pending.isBasalCorrection) { null } else { @@ -853,6 +902,10 @@ class O5PumpPlugin @Inject constructor( private fun cancelBolus(): Completable = ensureConnected().andThen(Completable.defer { val bolusBeeps = preferences.get(OmnipodBooleanPreferenceKey.BolusBeepsEnabled) + val historyId = history.createRecord( + commandType = OmnipodCommandType.CANCEL_BOLUS, + initialResult = InitialResult.NOT_SENT + ).blockingGet() val cmd = StopDeliveryCommand.Builder() .setUniqueId(requirePodId()) .setSequenceNumber(podStateManager.msgSequenceNumber.toShort()) @@ -861,6 +914,12 @@ class O5PumpPlugin @Inject constructor( .setBeepType(if (bolusBeeps) BeepType.LONG_SINGLE_BEEP else BeepType.SILENT) .build() bleManager.sendCommand(cmd, DefaultStatusResponse::class).ignoreElements() + .doOnComplete { + history.markSent(historyId).andThen(history.markSuccess(historyId)).blockingAwait() + } + .doOnError { + history.markSendingFailure(historyId).andThen(history.markFailure(historyId)).blockingAwait() + } }) override fun stopBolusDelivering() { @@ -879,18 +938,26 @@ class O5PumpPlugin @Inject constructor( ): PumpEnactResult { aapsLogger.info(LTag.PUMP, "O5 setTempBasalAbsolute: rate=$absoluteRate U/h duration=$durationInMinutes min enforce=$enforceNew type=$tbrType") if (!pendingDoseResolved()) return unresolvedDoseResult() + var historyId: Long? = null return try { if (podStateManager.deliveryStatus?.tempBasalActive() == true) { cancelActiveTempBasal() } val tempBasalBeeps = preferences.get(OmnipodBooleanPreferenceKey.TbrBeepsEnabled) val startedAt = System.currentTimeMillis() + historyId = history.createRecord( + commandType = OmnipodCommandType.SET_TEMPORARY_BASAL, + date = startedAt, + initialResult = InitialResult.NOT_SENT, + tempBasalRecord = TempBasalRecord(durationInMinutes, absoluteRate) + ).blockingGet() podStateManager.pendingDoseCommand = O5PodStateManager.PendingDoseCommand( type = O5PodStateManager.PendingDoseType.TEMP_BASAL_START, requestedRate = absoluteRate, requestedDurationMinutes = durationInMinutes.toShort(), startedAt = startedAt, - sequenceNumber = podStateManager.msgSequenceNumber.toShort() + sequenceNumber = podStateManager.msgSequenceNumber.toShort(), + historyId = historyId ) armStatusChecker() val cmd = ProgramTempBasalCommand.Builder() @@ -909,7 +976,7 @@ class O5PumpPlugin @Inject constructor( duration = T.mins(durationInMinutes.toLong()).msecs(), isAbsolute = true, type = tbrType, - pumpId = startedAt, + pumpId = historyId, pumpType = PumpType.OMNIPOD_5, pumpSerial = serialNumber() ) @@ -917,9 +984,11 @@ class O5PumpPlugin @Inject constructor( podStateManager.activeTempBasalRate = absoluteRate podStateManager.activeTempBasalDurationMinutes = durationInMinutes.toShort() podStateManager.pendingDoseCommand = null + history.markSent(historyId).andThen(history.markSuccess(historyId)).blockingAwait() if (needsBasalCorrection()) deliverBasalCorrection() pumpEnactResultProvider.get().success(true).enacted(true).isPercent(false).absolute(absoluteRate).duration(durationInMinutes) } catch (e: Exception) { + historyId?.let { history.markSendingFailure(it).andThen(history.markFailure(it)).blockingAwait() } aapsLogger.error(LTag.PUMP, "Error in O5 setTempBasalAbsolute", e) notifyUncertain(NotificationId.OMNIPOD_TBR_ALERTS, rh.gs(R.string.omnipod_5_error_setting_temp_basal_might_have_failed)) pumpEnactResultProvider.get().success(false).enacted(false) @@ -945,10 +1014,17 @@ class O5PumpPlugin @Inject constructor( } private fun cancelActiveTempBasal() { + val startedAt = System.currentTimeMillis() + val historyId = history.createRecord( + commandType = OmnipodCommandType.CANCEL_TEMPORARY_BASAL, + date = startedAt, + initialResult = InitialResult.NOT_SENT + ).blockingGet() podStateManager.pendingDoseCommand = O5PodStateManager.PendingDoseCommand( type = O5PodStateManager.PendingDoseType.TEMP_BASAL_CANCEL, - startedAt = System.currentTimeMillis(), - sequenceNumber = podStateManager.msgSequenceNumber.toShort() + startedAt = startedAt, + sequenceNumber = podStateManager.msgSequenceNumber.toShort(), + historyId = historyId ) armStatusChecker() val tempBasalBeeps = preferences.get(OmnipodBooleanPreferenceKey.TbrBeepsEnabled) @@ -960,6 +1036,7 @@ class O5PumpPlugin @Inject constructor( .setBeepType(if (tempBasalBeeps) BeepType.LONG_SINGLE_BEEP else BeepType.SILENT) .build() bleManager.sendCommand(cmd, DefaultStatusResponse::class).ignoreElements().blockingAwait() + history.markSent(historyId).andThen(history.markSuccess(historyId)).blockingAwait() podStateManager.activeTempBasalStartTime = null podStateManager.activeTempBasalRate = null podStateManager.activeTempBasalDurationMinutes = null @@ -1010,9 +1087,11 @@ class O5PumpPlugin @Inject constructor( private fun pairNewPod(): PumpEnactResult = try { bleManager.pairNewPod().ignoreElements().blockingAwait() + history.recordSuccess(OmnipodCommandType.INITIALIZE_POD) pumpEnactResultProvider.get().success(true).enacted(true) } catch (e: Exception) { aapsLogger.error(LTag.PUMP, "Error pairing new O5 pod", e) + history.recordFailure(OmnipodCommandType.INITIALIZE_POD) pumpEnactResultProvider.get().success(false).enacted(false) } @@ -1026,6 +1105,7 @@ class O5PumpPlugin @Inject constructor( bleManager.sendCommand(cmd, DefaultStatusResponse::class).ignoreElements().blockingAwait() bleManager.removeBond() podStateManager.reset() + history.recordSuccess(OmnipodCommandType.DEACTIVATE_POD) notificationManager.dismiss(NotificationId.OMNIPOD_POD_FAULT) pumpEnactResultProvider.get().success(true).enacted(true) } catch (e: Exception) { @@ -1043,6 +1123,7 @@ class O5PumpPlugin @Inject constructor( .setAlertTypes(alerts) .build() bleManager.sendCommand(cmd, DefaultStatusResponse::class).ignoreElements().blockingAwait() + history.recordSuccess(OmnipodCommandType.ACKNOWLEDGE_ALERTS) pumpEnactResultProvider.get().success(true).enacted(true) } catch (e: Exception) { aapsLogger.error(LTag.PUMP, "Error silencing O5 alerts", e) @@ -1062,6 +1143,7 @@ class O5PumpPlugin @Inject constructor( bleManager.sendCommand(cmd, DefaultStatusResponse::class).ignoreElements().blockingAwait() podStateManager.deliverySuspended = true podStateManager.suspendAlertsEnabled = true + history.recordSuccess(OmnipodCommandType.SUSPEND_DELIVERY) pumpEnactResultProvider.get().success(true).enacted(true) } catch (e: Exception) { aapsLogger.error(LTag.PUMP, "Error suspending O5 delivery", e) @@ -1080,6 +1162,7 @@ class O5PumpPlugin @Inject constructor( .setBolusReminder(silentReminder) .build() bleManager.sendCommand(cmd, DefaultStatusResponse::class).ignoreElements().blockingAwait() + history.recordSuccess(OmnipodCommandType.PLAY_TEST_BEEP) pumpEnactResultProvider.get().success(true).enacted(true) } catch (e: Exception) { aapsLogger.error(LTag.PUMP, "Error playing O5 test beep", e) @@ -1090,7 +1173,7 @@ class O5PumpPlugin @Inject constructor( * basal profile" - [ProgramBasalCommand] always sets the pod's current time and * implicitly resumes delivery, same as Dash's identical handling of both. */ private suspend fun resumeOrHandleTimeChange(): PumpEnactResult = - pumpSync.expectedPumpState().profile?.let { setNewBasalProfile(it) } + pumpSync.expectedPumpState().profile?.let { setNewBasalProfile(it, OmnipodCommandType.RESUME_DELIVERY) } ?: pumpEnactResultProvider.get().success(false).enacted(false).comment(rh.gs(R.string.omnipod_5_error_no_active_profile)) private fun notifyUncertain(id: NotificationId, message: String) { @@ -1143,6 +1226,7 @@ class O5PumpPlugin @Inject constructor( .build() bleManager.sendCommand(cmd, DefaultStatusResponse::class).ignoreElements().blockingAwait() podStateManager.syncedAlertSettings = current + history.recordSuccess(OmnipodCommandType.CONFIGURE_ALERTS) pumpEnactResultProvider.get().success(true).enacted(true) } catch (e: Exception) { aapsLogger.error(LTag.PUMP, "Error updating O5 alert configuration", e) @@ -1172,6 +1256,7 @@ class O5PumpPlugin @Inject constructor( .build() bleManager.sendCommand(cmd, DefaultStatusResponse::class).ignoreElements().blockingAwait() podStateManager.suspendAlertsEnabled = false + history.recordSuccess(OmnipodCommandType.CONFIGURE_ALERTS) pumpEnactResultProvider.get().success(true).enacted(true) } catch (e: Exception) { aapsLogger.error(LTag.PUMP, "Error disabling O5 suspend alerts", e) @@ -1240,19 +1325,27 @@ class O5PumpPlugin @Inject constructor( } var commandMayHaveBeenSent = false + var historyId: Long? = null return try { bolusDeliveryInProgress = true podStateManager.basalCorrectionInProgress = true aapsLogger.info(LTag.PUMP, "Delivering O5 basal correction") val startedAt = System.currentTimeMillis() + historyId = history.createRecord( + commandType = OmnipodCommandType.SET_BOLUS, + date = startedAt, + initialResult = InitialResult.NOT_SENT, + bolusRecord = BolusRecord(requestedInsulinAmount, BolusType.DEFAULT) + ).blockingGet() val pendingDose = O5PodStateManager.PendingDoseCommand( type = O5PodStateManager.PendingDoseType.BOLUS, requestedUnits = requestedInsulinAmount, bolusType = BS.Type.NORMAL, startedAt = startedAt, isBasalCorrection = true, - sequenceNumber = podStateManager.msgSequenceNumber.toShort() + sequenceNumber = podStateManager.msgSequenceNumber.toShort(), + historyId = historyId ) podStateManager.pendingDoseCommand = pendingDose @@ -1274,16 +1367,6 @@ class O5PumpPlugin @Inject constructor( .ignoreElements() .blockingAwait() armStatusChecker() - runBlocking { - pumpSync.syncBolusWithPumpId( - timestamp = startedAt, - amount = PumpInsulin(requestedInsulinAmount), - type = BS.Type.NORMAL, - pumpId = startedAt, - pumpType = PumpType.OMNIPOD_5, - pumpSerial = serialNumber() - ) - } val completion = waitForBolusDeliveryToComplete(requestedInsulinAmount).blockingGet() val deliveredUnits = completion.deliveredUnits if (deliveredUnits != null) { @@ -1298,6 +1381,7 @@ class O5PumpPlugin @Inject constructor( aapsLogger.error(LTag.PUMP, "O5 basal correction delivery failed", e) if (!commandMayHaveBeenSent) { podStateManager.pendingDoseCommand = null + historyId?.let { history.markSendingFailure(it).andThen(history.markFailure(it)).blockingAwait() } } else { armStatusChecker() } diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/state/O5PodStateManager.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/state/O5PodStateManager.kt index 68d71f2dad2c..b36f57965d2e 100644 --- a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/state/O5PodStateManager.kt +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/pod/state/O5PodStateManager.kt @@ -152,7 +152,8 @@ interface O5PodStateManager { * (the whole point of the correction is to true up basal drift). */ val isBasalCorrection: Boolean = false, val bolusRecordExpected: Boolean = false, - val confirmedByStatus: Boolean = false + val confirmedByStatus: Boolean = false, + val historyId: Long? = null ) : Serializable diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/di/O5HistoryBindings.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/di/O5HistoryBindings.kt new file mode 100644 index 000000000000..798b4ea4ffaa --- /dev/null +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/di/O5HistoryBindings.kt @@ -0,0 +1,33 @@ +package app.aaps.pump.omnipod.omnipod5.di + +import android.content.Context +import app.aaps.pump.omnipod.omnipod5.history.HistoryMapper +import app.aaps.pump.omnipod.omnipod5.history.O5History +import app.aaps.pump.omnipod.omnipod5.history.database.HistoryRecordDao +import app.aaps.pump.omnipod.omnipod5.history.database.O5HistoryDatabase +import dev.zacsweers.metro.AppScope +import dev.zacsweers.metro.BindingContainer +import dev.zacsweers.metro.ContributesTo +import dev.zacsweers.metro.Provides +import dev.zacsweers.metro.SingleIn + +@ContributesTo(AppScope::class) +@BindingContainer +object O5HistoryBindings { + + @Provides + @SingleIn(AppScope::class) + fun provideDatabase(context: Context): O5HistoryDatabase = O5HistoryDatabase.build(context) + + @Provides + @SingleIn(AppScope::class) + fun provideDao(database: O5HistoryDatabase): HistoryRecordDao = database.historyRecordDao() + + @Provides + @SingleIn(AppScope::class) + fun provideMapper(): HistoryMapper = HistoryMapper() + + @Provides + @SingleIn(AppScope::class) + fun provideHistory(dao: HistoryRecordDao, mapper: HistoryMapper): O5History = O5History(dao, mapper) +} diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/history/HistoryMapper.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/history/HistoryMapper.kt new file mode 100644 index 000000000000..9506d270f8de --- /dev/null +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/history/HistoryMapper.kt @@ -0,0 +1,19 @@ +package app.aaps.pump.omnipod.omnipod5.history + +import app.aaps.pump.omnipod.omnipod5.history.data.HistoryRecord +import app.aaps.pump.omnipod.omnipod5.history.database.HistoryRecordEntity + +class HistoryMapper { + + fun toDomain(entity: HistoryRecordEntity): HistoryRecord = HistoryRecord( + id = entity.id, + createdAt = entity.createdAt, + date = entity.date, + commandType = entity.commandType, + initialResult = entity.initialResult, + record = entity.bolusRecord ?: entity.tempBasalRecord ?: entity.basalProfileRecord, + totalAmountDelivered = entity.totalAmountDelivered, + resolvedResult = entity.resolvedResult, + resolvedAt = entity.resolvedAt + ) +} diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/history/O5History.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/history/O5History.kt new file mode 100644 index 000000000000..f3d1cf7daf48 --- /dev/null +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/history/O5History.kt @@ -0,0 +1,122 @@ +package app.aaps.pump.omnipod.omnipod5.history + +import app.aaps.pump.omnipod.common.definition.OmnipodCommandType +import app.aaps.pump.omnipod.omnipod5.history.data.BasalValuesRecord +import app.aaps.pump.omnipod.omnipod5.history.data.BolusRecord +import app.aaps.pump.omnipod.omnipod5.history.data.HistoryRecord +import app.aaps.pump.omnipod.omnipod5.history.data.InitialResult +import app.aaps.pump.omnipod.omnipod5.history.data.ResolvedResult +import app.aaps.pump.omnipod.omnipod5.history.data.TempBasalRecord +import app.aaps.pump.omnipod.omnipod5.history.database.HistoryRecordDao +import app.aaps.pump.omnipod.omnipod5.history.database.HistoryRecordEntity +import dev.zacsweers.metro.Inject +import io.reactivex.rxjava3.core.Single +import io.reactivex.rxjava3.core.Completable + +@Inject +class O5History( + private val dao: HistoryRecordDao, + private val mapper: HistoryMapper +) { + + fun recordSuccess( + commandType: OmnipodCommandType, + date: Long = System.currentTimeMillis(), + bolusRecord: BolusRecord? = null, + tempBasalRecord: TempBasalRecord? = null, + basalProfileRecord: BasalValuesRecord? = null, + totalAmountDelivered: Double? = null, + initialResult: InitialResult = InitialResult.SENT, + resolvedResult: ResolvedResult? = ResolvedResult.SUCCESS, + resolvedAt: Long? = System.currentTimeMillis() + ) { + createRecord( + commandType = commandType, + date = date, + bolusRecord = bolusRecord, + tempBasalRecord = tempBasalRecord, + basalProfileRecord = basalProfileRecord, + totalAmountDelivered = totalAmountDelivered, + initialResult = initialResult, + resolvedResult = resolvedResult, + resolvedAt = resolvedAt + ).blockingGet() + } + + fun recordFailure(commandType: OmnipodCommandType, date: Long = System.currentTimeMillis()) { + createRecord( + commandType = commandType, + date = date, + initialResult = InitialResult.FAILURE_SENDING, + resolvedResult = ResolvedResult.FAILURE, + resolvedAt = System.currentTimeMillis() + ).blockingGet() + } + + fun createRecord( + commandType: OmnipodCommandType, + date: Long = System.currentTimeMillis(), + initialResult: InitialResult = InitialResult.SENT, + bolusRecord: BolusRecord? = null, + tempBasalRecord: TempBasalRecord? = null, + basalProfileRecord: BasalValuesRecord? = null, + totalAmountDelivered: Double? = null, + resolvedResult: ResolvedResult? = null, + resolvedAt: Long? = null + ): Single = dao.save( + HistoryRecordEntity( + createdAt = System.currentTimeMillis(), + date = date, + commandType = commandType, + initialResult = initialResult, + tempBasalRecord = tempBasalRecord, + bolusRecord = bolusRecord, + basalProfileRecord = basalProfileRecord, + totalAmountDelivered = totalAmountDelivered, + resolvedResult = resolvedResult, + resolvedAt = resolvedAt + ) + ) + + fun getById(id: Long): HistoryRecord = + dao.byIdBlocking(id)?.let(mapper::toDomain) + ?: throw IllegalArgumentException("history entry [$id] not found") + + fun markSuccess(id: Long): Completable = + dao.markResolved(id, ResolvedResult.SUCCESS, System.currentTimeMillis()) + + fun markFailure(id: Long): Completable = + dao.markResolved(id, ResolvedResult.FAILURE, System.currentTimeMillis()) + + fun markSent(id: Long): Completable = + dao.setInitialResult(id, InitialResult.SENT) + + fun markSendingFailure(id: Long): Completable = + dao.setInitialResult(id, InitialResult.FAILURE_SENDING) + + fun setTotalAmountDelivered(id: Long, amount: Double?): Completable = + dao.setTotalAmountDelivered(id, amount) + + fun delete(record: HistoryRecord): Completable = + dao.delete( + HistoryRecordEntity( + id = record.id, + createdAt = record.createdAt, + date = record.date, + commandType = record.commandType, + initialResult = record.initialResult, + tempBasalRecord = record.record as? TempBasalRecord, + bolusRecord = record.record as? BolusRecord, + basalProfileRecord = record.record as? BasalValuesRecord, + totalAmountDelivered = record.totalAmountDelivered, + resolvedResult = record.resolvedResult, + resolvedAt = record.resolvedAt + ) + ) + + fun getRecords(): Single> = + dao.all().map { records -> records.map(mapper::toDomain) } + + fun getRecordsAfter(time: Long): Single> = + dao.allSince(time).map { records -> records.map(mapper::toDomain) } +} diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/history/data/HistoryRecord.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/history/data/HistoryRecord.kt new file mode 100644 index 000000000000..e6b25df8eb74 --- /dev/null +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/history/data/HistoryRecord.kt @@ -0,0 +1,22 @@ +package app.aaps.pump.omnipod.omnipod5.history.data + +import app.aaps.pump.omnipod.common.definition.OmnipodCommandType + +data class HistoryRecord( + val id: Long, + val createdAt: Long, + val date: Long, + val commandType: OmnipodCommandType, + val initialResult: InitialResult, + val record: Record?, + val totalAmountDelivered: Double?, + val resolvedResult: ResolvedResult?, + val resolvedAt: Long? +) { + + fun pumpId(): Long = id + + fun displayTimestamp(): Long = date + + fun isSuccess(): Boolean = initialResult == InitialResult.SENT && resolvedResult == ResolvedResult.SUCCESS +} diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/history/data/Record.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/history/data/Record.kt new file mode 100644 index 000000000000..f6e61a7d09cb --- /dev/null +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/history/data/Record.kt @@ -0,0 +1,28 @@ +package app.aaps.pump.omnipod.omnipod5.history.data + +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.data.model.BS + +sealed class Record + +data class BolusRecord(val amount: Double, val bolusType: BolusType) : Record() + +data class TempBasalRecord(val duration: Int, val rate: Double) : Record() + +data class BasalValuesRecord(val segments: List) : Record() + +enum class BolusType { + DEFAULT, SMB; + + fun toBolusInfoBolusType(): BS.Type = when (this) { + DEFAULT -> BS.Type.NORMAL + SMB -> BS.Type.SMB + } + + companion object { + fun fromBolusInfoBolusType(type: BS.Type): BolusType = when (type) { + BS.Type.SMB -> SMB + else -> DEFAULT + } + } +} diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/history/data/ResultStates.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/history/data/ResultStates.kt new file mode 100644 index 000000000000..6d443f81c3b8 --- /dev/null +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/history/data/ResultStates.kt @@ -0,0 +1,9 @@ +package app.aaps.pump.omnipod.omnipod5.history.data + +enum class InitialResult { + NOT_SENT, FAILURE_SENDING, SENT +} + +enum class ResolvedResult { + SUCCESS, FAILURE +} diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/history/database/Converters.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/history/database/Converters.kt new file mode 100644 index 000000000000..70430b769542 --- /dev/null +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/history/database/Converters.kt @@ -0,0 +1,28 @@ +package app.aaps.pump.omnipod.omnipod5.history.database + +import androidx.room.TypeConverter +import app.aaps.core.interfaces.profile.Profile +import app.aaps.pump.omnipod.common.definition.OmnipodCommandType +import app.aaps.pump.omnipod.omnipod5.history.data.InitialResult +import app.aaps.pump.omnipod.omnipod5.history.data.BolusType +import app.aaps.pump.omnipod.omnipod5.history.data.ResolvedResult +import com.google.gson.GsonBuilder + +class Converters { + + @TypeConverter fun toInitialResult(value: String) = enumValueOf(value) + @TypeConverter fun fromInitialResult(value: InitialResult) = value.name + @TypeConverter fun toResolvedResult(value: String?) = value?.let { enumValueOf(it) } + @TypeConverter fun fromResolvedResult(value: ResolvedResult?) = value?.name + @TypeConverter fun toBolusType(value: String?) = value?.let { enumValueOf(it) } + @TypeConverter fun fromBolusType(value: BolusType?) = value?.name + @TypeConverter fun toCommandType(value: String) = enumValueOf(value) + @TypeConverter fun fromCommandType(value: OmnipodCommandType) = value.name + + @TypeConverter + fun toSegments(value: String?): List = + value?.let { GsonBuilder().create().fromJson(it, Array::class.java).toList() } ?: emptyList() + + @TypeConverter + fun fromSegments(value: List): String = GsonBuilder().create().toJson(value) +} diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/history/database/HistoryRecordDao.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/history/database/HistoryRecordDao.kt new file mode 100644 index 000000000000..5877a46dbed0 --- /dev/null +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/history/database/HistoryRecordDao.kt @@ -0,0 +1,42 @@ +package app.aaps.pump.omnipod.omnipod5.history.database + +import androidx.room.Dao +import androidx.room.Insert +import androidx.room.OnConflictStrategy +import androidx.room.Query +import androidx.room.Delete +import app.aaps.pump.omnipod.omnipod5.history.data.InitialResult +import app.aaps.pump.omnipod.omnipod5.history.data.ResolvedResult +import io.reactivex.rxjava3.core.Completable +import io.reactivex.rxjava3.core.Single + +@Dao +abstract class HistoryRecordDao { + + @Query("SELECT * FROM historyrecords ORDER BY createdAt DESC") + abstract fun all(): Single> + + @Query("SELECT * FROM historyrecords WHERE createdAt >= :since ORDER BY createdAt DESC") + abstract fun allSince(since: Long): Single> + + @Query("SELECT * FROM historyrecords ORDER BY id LIMIT 1") + abstract fun first(): HistoryRecordEntity? + + @Query("SELECT * FROM historyrecords WHERE id = :id LIMIT 1") + abstract fun byIdBlocking(id: Long): HistoryRecordEntity? + + @Insert(onConflict = OnConflictStrategy.REPLACE) + abstract fun save(record: HistoryRecordEntity): Single + + @Delete + abstract fun delete(record: HistoryRecordEntity): Completable + + @Query("UPDATE historyrecords SET resolvedResult = :resolvedResult, resolvedAt = :resolvedAt WHERE id = :id") + abstract fun markResolved(id: Long, resolvedResult: ResolvedResult, resolvedAt: Long): Completable + + @Query("UPDATE historyrecords SET initialResult = :initialResult WHERE id = :id") + abstract fun setInitialResult(id: Long, initialResult: InitialResult): Completable + + @Query("UPDATE historyrecords SET totalAmountDelivered = :totalAmountDelivered WHERE id = :id") + abstract fun setTotalAmountDelivered(id: Long, totalAmountDelivered: Double?): Completable +} diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/history/database/HistoryRecordEntity.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/history/database/HistoryRecordEntity.kt new file mode 100644 index 000000000000..a5f9d9b9b90a --- /dev/null +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/history/database/HistoryRecordEntity.kt @@ -0,0 +1,27 @@ +package app.aaps.pump.omnipod.omnipod5.history.database + +import androidx.room.Embedded +import androidx.room.Entity +import androidx.room.Index +import androidx.room.PrimaryKey +import app.aaps.pump.omnipod.common.definition.OmnipodCommandType +import app.aaps.pump.omnipod.omnipod5.history.data.BasalValuesRecord +import app.aaps.pump.omnipod.omnipod5.history.data.BolusRecord +import app.aaps.pump.omnipod.omnipod5.history.data.InitialResult +import app.aaps.pump.omnipod.omnipod5.history.data.ResolvedResult +import app.aaps.pump.omnipod.omnipod5.history.data.TempBasalRecord + +@Entity(tableName = "historyrecords", indices = [Index("createdAt")]) +data class HistoryRecordEntity( + @PrimaryKey(autoGenerate = true) val id: Long = 0, + val createdAt: Long, + val date: Long, + val commandType: OmnipodCommandType, + val initialResult: InitialResult, + @Embedded(prefix = "tempBasal_") val tempBasalRecord: TempBasalRecord?, + @Embedded(prefix = "bolus_") val bolusRecord: BolusRecord?, + @Embedded(prefix = "basal_") val basalProfileRecord: BasalValuesRecord?, + val totalAmountDelivered: Double?, + val resolvedResult: ResolvedResult?, + val resolvedAt: Long? +) diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/history/database/O5HistoryDatabase.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/history/database/O5HistoryDatabase.kt new file mode 100644 index 000000000000..9d7ea5581b1b --- /dev/null +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/history/database/O5HistoryDatabase.kt @@ -0,0 +1,29 @@ +package app.aaps.pump.omnipod.omnipod5.history.database + +import android.content.Context +import androidx.room.Database +import androidx.room.Room +import androidx.room.RoomDatabase +import androidx.room.TypeConverters +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +@Database(entities = [HistoryRecordEntity::class], version = 2, exportSchema = false) +@TypeConverters(Converters::class) +abstract class O5HistoryDatabase : RoomDatabase() { + + abstract fun historyRecordDao(): HistoryRecordDao + + companion object { + fun build(context: Context): O5HistoryDatabase = Room.databaseBuilder( + context.applicationContext, + O5HistoryDatabase::class.java, + "omnipod_o5_history_database.db" + ).addMigrations(MIGRATION_1_2).build() + private val MIGRATION_1_2 = object : Migration(1, 2) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("ALTER TABLE historyrecords ADD COLUMN resolvedAt INTEGER") + } + } + } +} diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/O5OverviewViewModel.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/O5OverviewViewModel.kt index 3f13b442d145..739dfc46df58 100644 --- a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/O5OverviewViewModel.kt +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/O5OverviewViewModel.kt @@ -3,6 +3,7 @@ package app.aaps.pump.omnipod.omnipod5.ui.compose import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.filled.VolumeUp import androidx.compose.material.icons.filled.Delete +import androidx.compose.material.icons.filled.History import androidx.compose.material.icons.filled.NotificationsOff import androidx.compose.material.icons.filled.Pause import androidx.compose.material.icons.filled.PlayArrow @@ -73,8 +74,7 @@ import app.aaps.pump.omnipod.common.R as CommonR * connection-quality counters, no timezone-drift tracking) - those are approximated here * from O5's own flat fields ([O5PodStateManager.pendingDoseCommand] in place of Dash's * `activeCommand`, the [expiry] extension in place of Dash's `expiry` property, etc.) - * rather than adding matching complexity to the state manager. No pod-history feature - * exists for O5 (no `DashHistory` equivalent), so there is no History action/screen here. + * rather than adding matching complexity to the state manager. */ @Stable @ContributesIntoMap(AppScope::class, binding = binding()) @@ -301,6 +301,12 @@ class O5OverviewViewModel @Inject constructor( visible = podStateManager.activationProgress.isAtLeast(ActivationProgress.PHASE_1_COMPLETED), onClick = { runCustomCommandWithErrorDialog(CommandPlayTestBeep(), rh.gs(CommonR.string.omnipod_common_error_failed_to_play_test_beep)) } ), + PumpAction( + label = rh.gs(CommonR.string.omnipod_common_pod_management_button_pod_history), + icon = Icons.Filled.History, + category = ActionCategory.MANAGEMENT, + onClick = { _events.tryEmit(OmnipodOverviewEvent.ShowHistory) } + ), PumpAction( label = rh.gs(CommonR.string.omnipod_common_pod_management_button_discard_pod), icon = Icons.Filled.Delete, diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/O5PodHistoryScreen.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/O5PodHistoryScreen.kt new file mode 100644 index 000000000000..19001a1d884f --- /dev/null +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/O5PodHistoryScreen.kt @@ -0,0 +1,146 @@ +package app.aaps.pump.omnipod.omnipod5.ui.compose + +import androidx.compose.foundation.ExperimentalFoundationApi +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.ExperimentalLayoutApi +import androidx.compose.foundation.layout.FlowRow +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.CheckCircle +import androidx.compose.material.icons.filled.Error +import androidx.compose.material3.FilterChip +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp +import app.aaps.core.data.pump.defs.PumpType +import app.aaps.core.interfaces.profile.ProfileUtil +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.ui.compose.AapsCard +import app.aaps.core.ui.compose.AapsSpacing +import app.aaps.core.ui.compose.LocalDateUtil +import app.aaps.pump.common.defs.PumpHistoryEntryGroup +import app.aaps.pump.omnipod.common.definition.OmnipodCommandType +import app.aaps.pump.omnipod.omnipod5.R +import app.aaps.pump.omnipod.omnipod5.history.data.BasalValuesRecord +import app.aaps.pump.omnipod.omnipod5.history.data.BolusRecord +import app.aaps.pump.omnipod.omnipod5.history.data.HistoryRecord +import app.aaps.pump.omnipod.omnipod5.history.data.TempBasalRecord + +@OptIn(ExperimentalFoundationApi::class, ExperimentalLayoutApi::class) +@Composable +fun O5PodHistoryScreen(records: List, rh: ResourceHelper, profileUtil: ProfileUtil) { + val groups = remember { PumpHistoryEntryGroup.getTranslatedList(rh) } + var selectedGroup by remember { mutableStateOf(PumpHistoryEntryGroup.All) } + val dateUtil = LocalDateUtil.current + val filtered = if (selectedGroup == PumpHistoryEntryGroup.All) records else records.filter { + groupForCommandType(it.commandType) == selectedGroup + } + val grouped = filtered.groupBy { dateUtil.dateString(it.displayTimestamp()) } + + Column(Modifier.fillMaxSize()) { + FlowRow( + Modifier.fillMaxWidth().padding(horizontal = AapsSpacing.extraLarge, vertical = AapsSpacing.medium), + horizontalArrangement = Arrangement.spacedBy(AapsSpacing.medium) + ) { + groups.forEach { group -> + FilterChip( + selected = selectedGroup == group, + onClick = { selectedGroup = group }, + label = { Text(group.translated ?: "") } + ) + } + } + LazyColumn( + Modifier.fillMaxSize().padding(horizontal = AapsSpacing.extraLarge), + verticalArrangement = Arrangement.spacedBy(AapsSpacing.medium) + ) { + grouped.forEach { (date, dayRecords) -> + stickyHeader(key = date) { + Text( + text = dateUtil.dateStringRelative(dayRecords.first().displayTimestamp(), rh), + modifier = Modifier.fillMaxWidth().background(MaterialTheme.colorScheme.surface).padding(vertical = AapsSpacing.medium), + textAlign = TextAlign.Center, + style = MaterialTheme.typography.labelLarge, + fontWeight = FontWeight.Bold, + color = MaterialTheme.colorScheme.primary + ) + } + items(dayRecords, key = { it.id }) { record -> + O5HistoryCard(record, rh, profileUtil, dateUtil) + } + } + } + } +} + +@Composable +private fun O5HistoryCard(record: HistoryRecord, rh: ResourceHelper, profileUtil: ProfileUtil, dateUtil: DateUtil) { + AapsCard(Modifier.fillMaxWidth()) { + Row(Modifier.padding(AapsSpacing.large), verticalAlignment = Alignment.Top) { + Icon( + imageVector = if (record.isSuccess()) Icons.Filled.CheckCircle else Icons.Filled.Error, + contentDescription = null, + modifier = Modifier.size(20.dp).padding(top = 2.dp), + tint = if (record.isSuccess()) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.error + ) + Spacer(Modifier.width(AapsSpacing.large)) + Column(Modifier.weight(1f)) { + Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) { + Text( + text = rh.gs(record.commandType.resourceId), + fontWeight = FontWeight.SemiBold, + color = if (record.isSuccess()) MaterialTheme.colorScheme.onSurface else MaterialTheme.colorScheme.error + ) + Text(dateUtil.timeString(record.displayTimestamp()), style = MaterialTheme.typography.bodySmall) + } + formatValue(record, rh, profileUtil)?.takeIf { it.isNotEmpty() }?.let { + Text(it, style = MaterialTheme.typography.bodySmall, modifier = Modifier.padding(top = AapsSpacing.small)) + } + } + } + } +} + +private fun formatValue(record: HistoryRecord, rh: ResourceHelper, profileUtil: ProfileUtil): String? { + if (!record.isSuccess()) return rh.gs(R.string.omnipod_o5_history_command_failed) + return when (val value = record.record) { + is TempBasalRecord -> rh.gs(R.string.omnipod_o5_history_tbr_value, value.rate, value.duration) + is BolusRecord -> rh.gs(R.string.omnipod_o5_history_bolus_value, value.amount) + is BasalValuesRecord -> profileUtil.getBasalProfilesDisplayable(value.segments.toTypedArray(), PumpType.OMNIPOD_5) + null -> null + } +} + +private fun groupForCommandType(type: OmnipodCommandType): PumpHistoryEntryGroup = when (type) { + OmnipodCommandType.INITIALIZE_POD, OmnipodCommandType.INSERT_CANNULA, + OmnipodCommandType.DEACTIVATE_POD, OmnipodCommandType.DISCARD_POD -> PumpHistoryEntryGroup.Prime + OmnipodCommandType.CANCEL_TEMPORARY_BASAL, OmnipodCommandType.SET_BASAL_PROFILE, + OmnipodCommandType.SET_TEMPORARY_BASAL, OmnipodCommandType.RESUME_DELIVERY, + OmnipodCommandType.SUSPEND_DELIVERY -> PumpHistoryEntryGroup.Basal + OmnipodCommandType.SET_BOLUS, OmnipodCommandType.CANCEL_BOLUS -> PumpHistoryEntryGroup.Bolus + OmnipodCommandType.ACKNOWLEDGE_ALERTS, OmnipodCommandType.CONFIGURE_ALERTS, + OmnipodCommandType.PLAY_TEST_BEEP -> PumpHistoryEntryGroup.Alarm + OmnipodCommandType.GET_POD_STATUS, OmnipodCommandType.SET_TIME -> PumpHistoryEntryGroup.Configuration + OmnipodCommandType.READ_POD_PULSE_LOG -> PumpHistoryEntryGroup.Unknown +} diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/O5PodHistoryViewModel.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/O5PodHistoryViewModel.kt new file mode 100644 index 000000000000..090c6a29a95b --- /dev/null +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/O5PodHistoryViewModel.kt @@ -0,0 +1,41 @@ +package app.aaps.pump.omnipod.omnipod5.ui.compose + +import androidx.compose.runtime.Stable +import androidx.lifecycle.ViewModel +import app.aaps.core.interfaces.profile.ProfileUtil +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.pump.omnipod.omnipod5.history.O5History +import app.aaps.pump.omnipod.omnipod5.history.data.HistoryRecord +import dev.zacsweers.metro.AppScope +import dev.zacsweers.metro.ContributesIntoMap +import dev.zacsweers.metro.Inject +import dev.zacsweers.metro.binding +import dev.zacsweers.metrox.viewmodel.ViewModelKey +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import java.util.Calendar +import java.util.GregorianCalendar + +@Stable +@ContributesIntoMap(AppScope::class, binding = binding()) +@ViewModelKey +@Inject +class O5PodHistoryViewModel( + private val o5History: O5History, + private val aapsSchedulers: AapsSchedulers, + val rh: ResourceHelper, + val profileUtil: ProfileUtil +) : ViewModel() { + + private val _records = MutableStateFlow>(emptyList()) + val records: StateFlow> = _records + + init { + val calendar = GregorianCalendar() + calendar.add(Calendar.DAY_OF_MONTH, -5) + _records.value = o5History.getRecordsAfter(calendar.timeInMillis) + .subscribeOn(aapsSchedulers.io) + .blockingGet() + } +} diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/OmnipodO5ComposeContent.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/OmnipodO5ComposeContent.kt index 94ebafd7c079..511dafda496e 100644 --- a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/OmnipodO5ComposeContent.kt +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/OmnipodO5ComposeContent.kt @@ -1,12 +1,19 @@ package app.aaps.pump.omnipod.omnipod5.ui.compose +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.filled.ArrowBack import androidx.compose.material3.Icon import androidx.compose.material3.IconButton +import androidx.compose.material3.HorizontalDivider import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource +import androidx.lifecycle.compose.collectAsStateWithLifecycle import app.aaps.core.interfaces.protection.ProtectionCheck import app.aaps.core.interfaces.pump.BlePreCheck import app.aaps.core.interfaces.resources.ResourceHelper @@ -49,6 +56,7 @@ class OmnipodO5ComposeContent( }, onConfirmDiscardPod = overviewViewModel::confirmDiscardPod, activationNeedsExtraContent = { O5RegistrationData.pickControllerId == 0L }, + showExtraContentForHistory = true, extraContent = { onBack -> val title = stringResource(R.string.omnipod_5_name) LaunchedEffect(title) { @@ -65,7 +73,21 @@ class OmnipodO5ComposeContent( ) } val credentialViewModel: O5CredentialImportViewModel = metroViewModel() - O5CredentialImportScreen(viewModel = credentialViewModel, rh = rh) + val historyViewModel: O5PodHistoryViewModel = metroViewModel() + val records by historyViewModel.records.collectAsStateWithLifecycle() + Column(Modifier.fillMaxSize()) { + Box(Modifier.weight(1f)) { + O5CredentialImportScreen(viewModel = credentialViewModel, rh = rh) + } + HorizontalDivider() + Box(Modifier.weight(1f)) { + O5PodHistoryScreen( + records = records, + rh = historyViewModel.rh, + profileUtil = historyViewModel.profileUtil + ) + } + } } ) } diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/wizard/compose/O5OmnipodWizardViewModel.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/wizard/compose/O5OmnipodWizardViewModel.kt index 9c2d5291f659..873823ed1517 100644 --- a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/wizard/compose/O5OmnipodWizardViewModel.kt +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/wizard/compose/O5OmnipodWizardViewModel.kt @@ -53,6 +53,8 @@ import app.aaps.pump.omnipod.common.keys.OmnipodBooleanPreferenceKey import app.aaps.pump.omnipod.common.keys.OmnipodIntPreferenceKey import app.aaps.pump.omnipod.common.queue.command.CommandDeactivatePod import app.aaps.pump.omnipod.common.util.mapProfileToBasalProgram +import app.aaps.pump.omnipod.common.definition.OmnipodCommandType +import app.aaps.pump.omnipod.omnipod5.history.O5History import androidx.lifecycle.ViewModel import dev.zacsweers.metro.AppScope import dev.zacsweers.metro.ContributesIntoMap @@ -91,6 +93,7 @@ class O5OmnipodWizardViewModel @Inject constructor( private val rh: ResourceHelper, private val commandQueue: CommandQueue, private val notificationManager: NotificationManager, + private val history: O5History, private val pumpSync: PumpSync, insulinManager: InsulinManager, persistenceLayer: PersistenceLayer, @@ -247,6 +250,7 @@ class O5OmnipodWizardViewModel @Inject constructor( } podStateManager.activationProgress = ActivationProgress.PHASE_1_COMPLETED + history.recordSuccess(OmnipodCommandType.INITIALIZE_POD) pumpEnactResultProvider().success(true) } catch (throwable: Throwable) { logger.error(LTag.PUMP, "Error in O5 Pod activation part 1", throwable) @@ -338,6 +342,7 @@ class O5OmnipodWizardViewModel @Inject constructor( notificationManager.dismiss(NotificationId.OMNIPOD_POD_NOT_ATTACHED) podStateManager.activationProgress = ActivationProgress.COMPLETED podStateManager.cumulativeBolusPulsesDelivered = podStateManager.totalPulsesDelivered ?: 0 + history.recordSuccess(OmnipodCommandType.INSERT_CANNULA) viewModelScope.launch { commandQueue.readStatus(rh.gs(CommonR.string.omnipod_common_pod_activation_wizard_pod_activated_title)) } pumpEnactResultProvider().success(true) } catch (throwable: Throwable) { diff --git a/pump/omnipod/omnipod5/src/main/res/values/strings.xml b/pump/omnipod/omnipod5/src/main/res/values/strings.xml new file mode 100644 index 000000000000..20c04fa31333 --- /dev/null +++ b/pump/omnipod/omnipod5/src/main/res/values/strings.xml @@ -0,0 +1,6 @@ + + + Command failed + %1$.2f U/h, %2$d minutes + %1$.2f U + From 40e01572c30cd928de4cb9d8e8dbd85e0d35e6e1 Mon Sep 17 00:00:00 2001 From: Prem Nirmal Date: Wed, 23 Sep 2026 14:12:46 +0100 Subject: [PATCH 15/85] Show pod history entrypoint in 2 places --- .../pump/omnipod/omnipod5/O5PumpPlugin.kt | 25 ++++ .../pump/omnipod/omnipod5/keys/O5IntentKey.kt | 5 + .../omnipod5/ui/compose/O5PodHistoryScreen.kt | 109 +++++++++++++----- 3 files changed, 108 insertions(+), 31 deletions(-) diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/O5PumpPlugin.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/O5PumpPlugin.kt index 7c5026376e1a..d21dfcd9b594 100644 --- a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/O5PumpPlugin.kt +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/O5PumpPlugin.kt @@ -3,6 +3,15 @@ import app.aaps.pump.omnipod.common.R import android.os.Handler import android.os.Looper +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.ArrowBack +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Text +import androidx.compose.runtime.getValue +import androidx.compose.ui.res.stringResource +import androidx.lifecycle.compose.collectAsStateWithLifecycle import app.aaps.core.data.model.BS import app.aaps.core.data.plugin.PluginType import app.aaps.core.data.pump.defs.ManufacturerType @@ -38,8 +47,10 @@ import app.aaps.core.interfaces.rx.collectResilient import app.aaps.core.keys.interfaces.Preferences import app.aaps.core.keys.interfaces.TextRef import app.aaps.core.keys.interfaces.withCompose +import app.aaps.core.ui.compose.AapsTopAppBar import app.aaps.core.ui.compose.ComposeScreenContent import app.aaps.core.ui.compose.icons.IcPluginOmnipod +import app.aaps.core.ui.compose.metroViewModel import app.aaps.core.ui.compose.preference.PreferenceSubScreenDef import app.aaps.pump.omnipod.omnipod5.bledriver.comm.O5BleManager import app.aaps.pump.omnipod.common.bledriver.pod.command.DeactivateCommand @@ -94,6 +105,8 @@ import app.aaps.pump.omnipod.omnipod5.keys.O5IntentKey import app.aaps.pump.omnipod.omnipod5.ui.O5CertificateStoreScreen import app.aaps.pump.omnipod.omnipod5.ui.compose.OmnipodO5ComposeContent import app.aaps.pump.omnipod.common.util.mapProfileToBasalProgram +import app.aaps.pump.omnipod.omnipod5.ui.compose.O5PodHistoryScreen +import app.aaps.pump.omnipod.omnipod5.ui.compose.O5PodHistoryViewModel import io.reactivex.rxjava3.core.Completable import io.reactivex.rxjava3.core.Single import kotlinx.coroutines.CoroutineScope @@ -1432,6 +1445,18 @@ class O5PumpPlugin @Inject constructor( ComposeScreenContent { onBack -> O5CertificateStoreScreen(rh = rh, onBack = onBack) } + ), + O5IntentKey.PodHistory.withCompose( + ComposeScreenContent { onBack -> + val historyViewModel: O5PodHistoryViewModel = metroViewModel() + val records by historyViewModel.records.collectAsStateWithLifecycle() + O5PodHistoryScreen( + records = records, + rh = historyViewModel.rh, + profileUtil = historyViewModel.profileUtil, + onBack = onBack + ) + } ) ), icon = pluginDescription.icon diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/keys/O5IntentKey.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/keys/O5IntentKey.kt index 914093519120..1fded696e593 100644 --- a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/keys/O5IntentKey.kt +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/keys/O5IntentKey.kt @@ -25,5 +25,10 @@ enum class O5IntentKey( key = "omnipod_5_certificate_store", title = TextRef.AndroidRes(R.string.omnipod_5_certificate_store), summary = TextRef.AndroidRes(R.string.omnipod_5_certificate_store_summary) + ), + + PodHistory( + key = "omnipod_5_history", + title = TextRef.AndroidRes(R.string.omnipod_common_pod_management_button_pod_history), ) } diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/O5PodHistoryScreen.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/O5PodHistoryScreen.kt index 19001a1d884f..6f3471d19169 100644 --- a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/O5PodHistoryScreen.kt +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/O5PodHistoryScreen.kt @@ -6,6 +6,7 @@ import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.ExperimentalLayoutApi import androidx.compose.foundation.layout.FlowRow +import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxSize @@ -16,11 +17,14 @@ import androidx.compose.foundation.layout.width import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.ArrowBack import androidx.compose.material.icons.filled.CheckCircle import androidx.compose.material.icons.filled.Error import androidx.compose.material3.FilterChip import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Scaffold import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue @@ -29,6 +33,7 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp @@ -38,6 +43,7 @@ import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.ui.compose.AapsCard import app.aaps.core.ui.compose.AapsSpacing +import app.aaps.core.ui.compose.AapsTopAppBar import app.aaps.core.ui.compose.LocalDateUtil import app.aaps.pump.common.defs.PumpHistoryEntryGroup import app.aaps.pump.omnipod.common.definition.OmnipodCommandType @@ -49,7 +55,41 @@ import app.aaps.pump.omnipod.omnipod5.history.data.TempBasalRecord @OptIn(ExperimentalFoundationApi::class, ExperimentalLayoutApi::class) @Composable -fun O5PodHistoryScreen(records: List, rh: ResourceHelper, profileUtil: ProfileUtil) { +fun O5PodHistoryScreen( + records: List, + rh: ResourceHelper, profileUtil: ProfileUtil, + onBack: (() -> Unit)? = null, +) { + if (onBack != null) { + Scaffold( + topBar = { + AapsTopAppBar( + title = { Text(stringResource(app.aaps.pump.omnipod.common.R.string.omnipod_common_pod_management_button_pod_history)) }, + navigationIcon = { + IconButton(onClick = onBack) { + Icon( + imageVector = Icons.AutoMirrored.Filled.ArrowBack, + contentDescription = stringResource(app.aaps.core.ui.R.string.back) + ) + } + } + ) + } + ) { paddingValues -> + O5PodHistoryContent(rh, records, profileUtil, Modifier.padding(paddingValues)) + } + } else { + O5PodHistoryContent(rh, records, profileUtil, Modifier) + } +} + +@Composable +private fun O5PodHistoryContent( + rh: ResourceHelper, + records: List, + profileUtil: ProfileUtil, + modifier: Modifier = Modifier +) { val groups = remember { PumpHistoryEntryGroup.getTranslatedList(rh) } var selectedGroup by remember { mutableStateOf(PumpHistoryEntryGroup.All) } val dateUtil = LocalDateUtil.current @@ -58,37 +98,42 @@ fun O5PodHistoryScreen(records: List, rh: ResourceHelper, profile } val grouped = filtered.groupBy { dateUtil.dateString(it.displayTimestamp()) } - Column(Modifier.fillMaxSize()) { - FlowRow( - Modifier.fillMaxWidth().padding(horizontal = AapsSpacing.extraLarge, vertical = AapsSpacing.medium), - horizontalArrangement = Arrangement.spacedBy(AapsSpacing.medium) - ) { - groups.forEach { group -> - FilterChip( - selected = selectedGroup == group, - onClick = { selectedGroup = group }, - label = { Text(group.translated ?: "") } - ) - } - } - LazyColumn( - Modifier.fillMaxSize().padding(horizontal = AapsSpacing.extraLarge), - verticalArrangement = Arrangement.spacedBy(AapsSpacing.medium) - ) { - grouped.forEach { (date, dayRecords) -> - stickyHeader(key = date) { - Text( - text = dateUtil.dateStringRelative(dayRecords.first().displayTimestamp(), rh), - modifier = Modifier.fillMaxWidth().background(MaterialTheme.colorScheme.surface).padding(vertical = AapsSpacing.medium), - textAlign = TextAlign.Center, - style = MaterialTheme.typography.labelLarge, - fontWeight = FontWeight.Bold, - color = MaterialTheme.colorScheme.primary + LazyColumn( + modifier.fillMaxSize(), + verticalArrangement = Arrangement.spacedBy(AapsSpacing.medium) + ) { + item { + FlowRow( + Modifier + .fillMaxWidth() + .padding(horizontal = AapsSpacing.extraLarge, vertical = AapsSpacing.medium), + horizontalArrangement = Arrangement.spacedBy(AapsSpacing.medium) + ) { + groups.forEach { group -> + FilterChip( + selected = selectedGroup == group, + onClick = { selectedGroup = group }, + label = { Text(group.translated ?: "") } ) } - items(dayRecords, key = { it.id }) { record -> - O5HistoryCard(record, rh, profileUtil, dateUtil) - } + } + } + grouped.forEach { (date, dayRecords) -> + stickyHeader(key = date) { + Text( + text = dateUtil.dateStringRelative(dayRecords.first().displayTimestamp(), rh), + modifier = Modifier + .fillMaxWidth() + .background(MaterialTheme.colorScheme.surface) + .padding(vertical = AapsSpacing.medium), + textAlign = TextAlign.Center, + style = MaterialTheme.typography.labelLarge, + fontWeight = FontWeight.Bold, + color = MaterialTheme.colorScheme.primary + ) + } + items(dayRecords, key = { it.id }) { record -> + O5HistoryCard(record, rh, profileUtil, dateUtil) } } } @@ -101,7 +146,9 @@ private fun O5HistoryCard(record: HistoryRecord, rh: ResourceHelper, profileUtil Icon( imageVector = if (record.isSuccess()) Icons.Filled.CheckCircle else Icons.Filled.Error, contentDescription = null, - modifier = Modifier.size(20.dp).padding(top = 2.dp), + modifier = Modifier + .size(20.dp) + .padding(top = 2.dp), tint = if (record.isSuccess()) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.error ) Spacer(Modifier.width(AapsSpacing.large)) From d59041bcf49d03f0f1c436569151d99a1b697bee Mon Sep 17 00:00:00 2001 From: Prem Nirmal Date: Wed, 23 Sep 2026 16:03:35 +0100 Subject: [PATCH 16/85] Add ability to read cert from assets --- .gitignore | 3 + README.md | 9 +- .../bledriver/comm/pair/O5RegistrationData.kt | 2 +- .../omnipod5/ui/O5CredentialImportScreen.kt | 196 +++++++++++++++--- .../ui/O5CredentialImportViewModel.kt | 55 ++++- .../omnipod5/ui/compose/O5PodHistoryScreen.kt | 1 + .../comm/pair/O5CertificateStoreTest.kt | 5 +- .../bledriver/comm/pair/O5LTKExchangerTest.kt | 3 +- .../comm/session/SessionSigningTest.kt | 4 +- 9 files changed, 244 insertions(+), 34 deletions(-) diff --git a/.gitignore b/.gitignore index efad7f6f8bcf..55aba8b2231d 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,6 @@ ios/app/build*/ # Generated by :ios:shell:generateIosVersionXcconfig - the build number is a clock, never commit it. ios/app/Version.xcconfig + +# Certificates, never commit them +pump/omnipod/omnipod5/src/main/assets/certificates/ diff --git a/README.md b/README.md index cdecad9cfd04..302da136edcc 100644 --- a/README.md +++ b/README.md @@ -3,9 +3,16 @@ * Want to contribute? Please read [CONTRIBUTING.md](CONTRIBUTING.md) first — note that AI-generated pull requests are not welcome. * Everyone who’s been looping with AAPS needs to fill out the form after 3 days of looping https://docs.google.com/forms/d/14KcMjlINPMJHVt28MDRupa4sz4DDIooI4SrW0P3HSN8/viewform?c=0&w=1 +### Omnipod5 testing +1. Before building, request a test certificate granted to you by a Nightscout developer. You can reach out through the WeAreNotWaiting #omnipod5 thread, instructions on the discord thread in the wiki. +2. Place the credential file under the `pump/omnipod/omnipod5/main/assets/certificates/` folder. It **must** be placed in this folder prior to building, otherwise it will not successfully import. +3. Proceed to build the app with build instructions in the wiki. +4. Select Omnipod5 as your pump, and when prompted for a certificate, click the 'Import from assets' button to import the certificate. +5. Proceed with pod pairing. + [![Support Server](https://img.shields.io/discord/629952586895851530.svg?label=Discord&logo=Discord&colorB=7289da&style=for-the-badge)](https://discord.gg/4fQUWHZ4Mw) -[![CircleCI](https://circleci.com/gh/nightscout/AndroidAPS/tree/master.svg?style=svg)](https://circleci.com/gh/nightscout/AndroidAPS/tree/master) +[![CircleCI](https://circleci.com/gh/nightscout/AndroidAPS/tree/master.svg?style=svg)](https://circleci.com/gh/nightscout/AndroidAPS/tree/master)[danar](pump/danar) [![Crowdin](https://d322cqt584bo4o.cloudfront.net/androidaps/localized.svg)](https://translations.aaps.app/project/androidaps) [![Documentation Status](https://readthedocs.org/projects/androidaps/badge/?version=latest)](https://wiki.aaps.app/en/latest/?badge=latest) [![codecov](https://codecov.io/gh/nightscout/AndroidAPS/branch/master/graph/badge.svg?token=EmklfIV6bH)](https://codecov.io/gh/nightscout/AndroidAPS) diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/pair/O5RegistrationData.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/pair/O5RegistrationData.kt index 111f7a8c2357..6e01acbdaf11 100644 --- a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/pair/O5RegistrationData.kt +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/pair/O5RegistrationData.kt @@ -85,7 +85,7 @@ data class O5RegistrationData( @Volatile private var optionalDataLoaded = false - fun install(value: O5RegistrationData, source: O5RegistrationSource = O5RegistrationSource.DOWNLOADED) { + fun install(value: O5RegistrationData, source: O5RegistrationSource) { registry[value.controllerId] = value sources[value.controllerId] = source } diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/O5CredentialImportScreen.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/O5CredentialImportScreen.kt index 718be07be4e1..72e83b985c54 100644 --- a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/O5CredentialImportScreen.kt +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/O5CredentialImportScreen.kt @@ -19,6 +19,7 @@ import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue import androidx.compose.ui.Modifier import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.pump.omnipod.omnipod5.bledriver.comm.pair.O5RegistrationData @@ -41,7 +42,31 @@ fun O5CredentialImportScreen( val inputText by viewModel.inputText.collectAsState() val importResult by viewModel.importResult.collectAsState() val installedCredentials by viewModel.installedCredentials.collectAsState() + val showImportFromAssets by viewModel.allowImportFromAssets.collectAsState() + O5CredentialImportContent( + inputText = inputText, + inputChanged = viewModel::onInputChanged, + importInput = viewModel::importCurrentInput, + importFromAssets = viewModel::importCredentialFromAssets, + removeCredential = viewModel::removeCredential, + importResult = importResult, + installedCredentials = installedCredentials, + showImportFromAssets = showImportFromAssets, + ) +} + +@Composable +private fun O5CredentialImportContent( + inputText: String, + inputChanged: (String) -> Unit, + importInput: () -> Unit, + importFromAssets: () -> Unit, + removeCredential: (Long) -> Unit, + importResult: ImportResult, + installedCredentials: List, + showImportFromAssets: Boolean, +) { Column( modifier = Modifier .fillMaxWidth() @@ -54,45 +79,60 @@ fun O5CredentialImportScreen( style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold ) - Text( - text = "Paste a credential string obtained from a trusted source. This does not " + - "pair with a pod by itself - it only makes the credential available for pairing.", - style = MaterialTheme.typography.bodySmall - ) + if (installedCredentials.isEmpty()) { + if (showImportFromAssets) { + Text( + text = "Credential found in assets, click import to continue", + style = MaterialTheme.typography.bodySmall + ) + Button( + onClick = importFromAssets, + modifier = Modifier.fillMaxWidth() + ) { + Text("Import from assets") + } + } else { + Text( + text = "Paste a credential string obtained from a trusted source. This does not " + + "pair with a pod by itself - it only makes the credential available for pairing.", + style = MaterialTheme.typography.bodySmall + ) - OutlinedTextField( - value = inputText, - onValueChange = viewModel::onInputChanged, - label = { Text("Credential string") }, - modifier = Modifier - .fillMaxWidth() - .heightIn(max = 180.dp), - singleLine = false - ) + OutlinedTextField( + value = inputText, + onValueChange = inputChanged, + label = { Text("Credential string") }, + modifier = Modifier + .fillMaxWidth() + .heightIn(max = 180.dp), + singleLine = false + ) + + Button( + onClick = importInput, + modifier = Modifier.fillMaxWidth() + ) { + Text("Import") + } + } + } - when (val result = importResult) { + when (importResult) { is ImportResult.Success -> Text( - text = "Imported credential for controller 0x%08X".format(result.controllerId), + text = "Imported credential for controller 0x%08X".format(importResult.controllerId), color = MaterialTheme.colorScheme.primary, - style = MaterialTheme.typography.bodySmall + style = MaterialTheme.typography.labelLarge ) is ImportResult.Failure -> Text( - text = result.reason, + text = importResult.reason, color = MaterialTheme.colorScheme.error, - style = MaterialTheme.typography.bodySmall + style = MaterialTheme.typography.labelLarge ) ImportResult.None -> Unit } - Button( - onClick = viewModel::importCurrentInput, - modifier = Modifier.fillMaxWidth() - ) { - Text("Import") - } - if (installedCredentials.isNotEmpty()) { Text( text = "Installed credentials", @@ -118,7 +158,7 @@ fun O5CredentialImportScreen( style = MaterialTheme.typography.labelSmall ) } - TextButton(onClick = { viewModel.removeCredential(row.controllerId) }) { + TextButton(onClick = { removeCredential(row.controllerId) }) { Text("Remove") } } @@ -128,3 +168,105 @@ fun O5CredentialImportScreen( } } } + +@Preview(showBackground = true) +@Composable +private fun PreviewCredentialImportContent() { + MaterialTheme { + O5CredentialImportContent( + inputText = "", + inputChanged = {}, + importInput = {}, + importFromAssets = {}, + removeCredential = {}, + importResult = ImportResult.None, + installedCredentials = emptyList(), + showImportFromAssets = false, + ) + } +} + +@Preview(showBackground = true) +@Composable +private fun PreviewCredentialImportContentFromAssets() { + MaterialTheme { + O5CredentialImportContent( + inputText = "", + inputChanged = {}, + importInput = {}, + importFromAssets = {}, + removeCredential = {}, + importResult = ImportResult.None, + installedCredentials = emptyList(), + showImportFromAssets = true, + ) + } +} + +@Preview(showBackground = true) +@Composable +private fun PreviewCredentialImportedCredentialsContent() { + MaterialTheme { + O5CredentialImportContent( + inputText = "", + inputChanged = {}, + importInput = {}, + importFromAssets = {}, + removeCredential = {}, + importResult = ImportResult.None, + installedCredentials = listOf(InstalledCredentialRow(123, O5RegistrationData.O5RegistrationSource.IMPORTED)), + showImportFromAssets = false, + ) + } +} + +@Preview(showBackground = true) +@Composable +private fun PreviewCredentialImportAssetFailureContent() { + MaterialTheme { + O5CredentialImportContent( + inputText = "", + inputChanged = {}, + importInput = {}, + importFromAssets = {}, + removeCredential = {}, + importResult = ImportResult.Failure("Failed to import foobar"), + installedCredentials = emptyList(), + showImportFromAssets = true, + ) + } +} + +@Preview(showBackground = true) +@Composable +private fun PreviewCredentialImportFailureContent() { + MaterialTheme { + O5CredentialImportContent( + inputText = "", + inputChanged = {}, + importInput = {}, + importFromAssets = {}, + removeCredential = {}, + importResult = ImportResult.Failure("Failed to import cert"), + installedCredentials = emptyList(), + showImportFromAssets = false, + ) + } +} + +@Preview(showBackground = true) +@Composable +private fun PreviewCredentialImportSuccesssContent() { + MaterialTheme { + O5CredentialImportContent( + inputText = "", + inputChanged = {}, + importInput = {}, + importFromAssets = {}, + removeCredential = {}, + importResult = ImportResult.Success(123), + installedCredentials = listOf(InstalledCredentialRow(123, O5RegistrationData.O5RegistrationSource.IMPORTED)), + showImportFromAssets = false, + ) + } +} diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/O5CredentialImportViewModel.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/O5CredentialImportViewModel.kt index 80cadf0322b1..e31311dc1161 100644 --- a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/O5CredentialImportViewModel.kt +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/O5CredentialImportViewModel.kt @@ -1,7 +1,10 @@ package app.aaps.pump.omnipod.omnipod5.ui -import androidx.compose.runtime.Stable +import android.app.Application +import android.content.Context import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.pump.omnipod.omnipod5.bledriver.comm.pair.O5RegistrationData import app.aaps.pump.omnipod.omnipod5.bledriver.pod.security.SecureO5RegistrationStorage import dev.zacsweers.metro.AppScope @@ -9,10 +12,16 @@ import dev.zacsweers.metro.ContributesIntoMap import dev.zacsweers.metro.Inject import dev.zacsweers.metro.binding import dev.zacsweers.metrox.viewmodel.ViewModelKey +import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.launch import org.json.JSONException import org.json.JSONObject +import java.lang.ref.WeakReference +import kotlin.collections.filter +import kotlin.collections.isNotEmpty +import kotlin.collections.orEmpty /** One row of the "currently installed credentials" list shown in the import screen. */ data class InstalledCredentialRow( @@ -44,6 +53,8 @@ sealed class ImportResult { @ContributesIntoMap(AppScope::class, binding = binding()) @ViewModelKey class O5CredentialImportViewModel @Inject constructor( + context: Context, + private val aapsLogger: AAPSLogger, private val secureO5RegistrationStorage: SecureO5RegistrationStorage ) : ViewModel() { @@ -56,6 +67,11 @@ class O5CredentialImportViewModel @Inject constructor( private val _installedCredentials = MutableStateFlow>(emptyList()) val installedCredentials: StateFlow> = _installedCredentials + private val _allowImportFromAssets = MutableStateFlow(false) + val allowImportFromAssets: StateFlow = _allowImportFromAssets + + private val contextRef = WeakReference(context) + init { refreshInstalledCredentials() } @@ -80,6 +96,10 @@ class O5CredentialImportViewModel @Inject constructor( return } + importText(text) + } + + private fun importText(text: String) { val controllerId = if (text.startsWith("{")) importJsonCredential(text) else importPackedCredential(text) if (controllerId == null) { _importResult.value = ImportResult.Failure( @@ -135,12 +155,45 @@ class O5CredentialImportViewModel @Inject constructor( refreshInstalledCredentials() } + fun importCredentialFromAssets() { + viewModelScope.launch(Dispatchers.IO) { + val context = contextRef.get() ?: return@launch + val certificatesList = context.assets.list("certificates").orEmpty().filter { it.endsWith(".json") || it.endsWith(".o5keypair") } + certificatesList.first().let { certFile -> + try { + context.assets.open("certificates/$certFile").use { inputStream -> + val json = inputStream.bufferedReader().use { it.readText() } + importText(json) + } + } catch(e: Exception) { + aapsLogger.error("Failed to read certificate from assets", e) + _importResult.value = ImportResult.Failure("Import failed unexpectedly") + } + } + } + } + private fun refreshInstalledCredentials() { _installedCredentials.value = O5RegistrationData.allValues.mapNotNull { data -> O5RegistrationData.source(data.controllerId)?.let { source -> InstalledCredentialRow(data.controllerId, source) } } + checkAssets() + } + + private fun checkAssets() { + if (_installedCredentials.value.isNotEmpty()) { + _allowImportFromAssets.value = false + return + } + viewModelScope.launch(Dispatchers.IO) { + val context = contextRef.get() ?: return@launch + val certificatesList = context.assets.list("certificates").orEmpty().filter { it.endsWith(".json") || it.endsWith(".o5keypair") } + aapsLogger.debug("Certificates: " + certificatesList.joinToString(", ")) + val foundCertificate = certificatesList.isNotEmpty() + _allowImportFromAssets.value = foundCertificate + } } /** diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/O5PodHistoryScreen.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/O5PodHistoryScreen.kt index 6f3471d19169..90df308f5328 100644 --- a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/O5PodHistoryScreen.kt +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/O5PodHistoryScreen.kt @@ -90,6 +90,7 @@ private fun O5PodHistoryContent( profileUtil: ProfileUtil, modifier: Modifier = Modifier ) { + if (records.isEmpty()) return val groups = remember { PumpHistoryEntryGroup.getTranslatedList(rh) } var selectedGroup by remember { mutableStateOf(PumpHistoryEntryGroup.All) } val dateUtil = LocalDateUtil.current diff --git a/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/pair/O5CertificateStoreTest.kt b/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/pair/O5CertificateStoreTest.kt index c29eea9bcdd4..f12a2e76a970 100644 --- a/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/pair/O5CertificateStoreTest.kt +++ b/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/pair/O5CertificateStoreTest.kt @@ -42,7 +42,7 @@ class O5CertificateStoreTest { intermediateCABase64 = "", tlsCertificateBase64 = "" ) - O5RegistrationData.install(data) + O5RegistrationData.install(data, O5RegistrationData.O5RegistrationSource.DOWNLOADED) return data } @@ -89,7 +89,8 @@ class O5CertificateStoreTest { publicKeyHex = unrelatedPublicKey.toHex(), intermediateCABase64 = "", tlsCertificateBase64 = "" - ) + ), + source = O5RegistrationData.O5RegistrationSource.DOWNLOADED, ) assertThrows(PairingException::class.java) { diff --git a/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/pair/O5LTKExchangerTest.kt b/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/pair/O5LTKExchangerTest.kt index b7dda2f7f82f..1408591df4e0 100644 --- a/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/pair/O5LTKExchangerTest.kt +++ b/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/pair/O5LTKExchangerTest.kt @@ -97,7 +97,8 @@ class O5LTKExchangerTest { publicKeyHex = publicKey.joinToString("") { "%02x".format(it) }, intermediateCABase64 = if (withIntermediateCA) Base64.getEncoder().encodeToString(byteArrayOf(1, 2, 3, 4)) else "", tlsCertificateBase64 = if (withTlsCertificate) Base64.getEncoder().encodeToString(byteArrayOf(5, 6, 7, 8)) else "" - ) + ), + source = O5RegistrationData.O5RegistrationSource.DOWNLOADED, ) return O5CertificateStore(aapsLogger, p256KeyGenerator, controllerId) } diff --git a/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/session/SessionSigningTest.kt b/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/session/SessionSigningTest.kt index 69d46bd5f51a..637fe4d8eb32 100644 --- a/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/session/SessionSigningTest.kt +++ b/pump/omnipod/omnipod5/src/test/kotlin/app/aaps/pump/omnipod/omnipod5/bledriver/comm/session/SessionSigningTest.kt @@ -15,6 +15,7 @@ import app.aaps.pump.omnipod.omnipod5.bledriver.comm.pair.O5RegistrationData import app.aaps.pump.omnipod.common.bledriver.pod.command.DeactivateCommand import app.aaps.pump.omnipod.common.bledriver.pod.command.GetStatusCommand import app.aaps.pump.omnipod.common.bledriver.pod.response.ResponseType +import app.aaps.pump.omnipod.omnipod5.bledriver.comm.pair.O5RegistrationData import app.aaps.pump.omnipod.omnipod5.bledriver.pod.util.P256KeyGenerator import app.aaps.shared.tests.AAPSLoggerTest import com.google.common.truth.Truth.assertThat @@ -59,7 +60,8 @@ class SessionSigningTest { publicKeyHex = publicKey.toHex(), intermediateCABase64 = "", tlsCertificateBase64 = "" - ) + ), + source = O5RegistrationData.O5RegistrationSource.DOWNLOADED, ) } From 14399fc96d38413699af2f1a5c75b7c87f7a5868 Mon Sep 17 00:00:00 2001 From: Prem Nirmal Date: Wed, 23 Sep 2026 16:14:15 +0100 Subject: [PATCH 17/85] Show basal drift compensation bolus as compensation in pod history --- README.md | 9 +-------- .../app/aaps/pump/omnipod/omnipod5/O5PumpPlugin.kt | 2 +- .../aaps/pump/omnipod/omnipod5/history/data/Record.kt | 3 ++- .../omnipod/omnipod5/ui/compose/O5PodHistoryScreen.kt | 7 ++++++- pump/omnipod/omnipod5/src/main/res/values/strings.xml | 1 + 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 302da136edcc..cdecad9cfd04 100644 --- a/README.md +++ b/README.md @@ -3,16 +3,9 @@ * Want to contribute? Please read [CONTRIBUTING.md](CONTRIBUTING.md) first — note that AI-generated pull requests are not welcome. * Everyone who’s been looping with AAPS needs to fill out the form after 3 days of looping https://docs.google.com/forms/d/14KcMjlINPMJHVt28MDRupa4sz4DDIooI4SrW0P3HSN8/viewform?c=0&w=1 -### Omnipod5 testing -1. Before building, request a test certificate granted to you by a Nightscout developer. You can reach out through the WeAreNotWaiting #omnipod5 thread, instructions on the discord thread in the wiki. -2. Place the credential file under the `pump/omnipod/omnipod5/main/assets/certificates/` folder. It **must** be placed in this folder prior to building, otherwise it will not successfully import. -3. Proceed to build the app with build instructions in the wiki. -4. Select Omnipod5 as your pump, and when prompted for a certificate, click the 'Import from assets' button to import the certificate. -5. Proceed with pod pairing. - [![Support Server](https://img.shields.io/discord/629952586895851530.svg?label=Discord&logo=Discord&colorB=7289da&style=for-the-badge)](https://discord.gg/4fQUWHZ4Mw) -[![CircleCI](https://circleci.com/gh/nightscout/AndroidAPS/tree/master.svg?style=svg)](https://circleci.com/gh/nightscout/AndroidAPS/tree/master)[danar](pump/danar) +[![CircleCI](https://circleci.com/gh/nightscout/AndroidAPS/tree/master.svg?style=svg)](https://circleci.com/gh/nightscout/AndroidAPS/tree/master) [![Crowdin](https://d322cqt584bo4o.cloudfront.net/androidaps/localized.svg)](https://translations.aaps.app/project/androidaps) [![Documentation Status](https://readthedocs.org/projects/androidaps/badge/?version=latest)](https://wiki.aaps.app/en/latest/?badge=latest) [![codecov](https://codecov.io/gh/nightscout/AndroidAPS/branch/master/graph/badge.svg?token=EmklfIV6bH)](https://codecov.io/gh/nightscout/AndroidAPS) diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/O5PumpPlugin.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/O5PumpPlugin.kt index d21dfcd9b594..e2a5ade4557f 100644 --- a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/O5PumpPlugin.kt +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/O5PumpPlugin.kt @@ -1349,7 +1349,7 @@ class O5PumpPlugin @Inject constructor( commandType = OmnipodCommandType.SET_BOLUS, date = startedAt, initialResult = InitialResult.NOT_SENT, - bolusRecord = BolusRecord(requestedInsulinAmount, BolusType.DEFAULT) + bolusRecord = BolusRecord(requestedInsulinAmount, BolusType.BASAL_DRIFT_COMPENSATION) ).blockingGet() val pendingDose = O5PodStateManager.PendingDoseCommand( type = O5PodStateManager.PendingDoseType.BOLUS, diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/history/data/Record.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/history/data/Record.kt index f6e61a7d09cb..042c263c453b 100644 --- a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/history/data/Record.kt +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/history/data/Record.kt @@ -12,11 +12,12 @@ data class TempBasalRecord(val duration: Int, val rate: Double) : Record() data class BasalValuesRecord(val segments: List) : Record() enum class BolusType { - DEFAULT, SMB; + DEFAULT, SMB, BASAL_DRIFT_COMPENSATION; fun toBolusInfoBolusType(): BS.Type = when (this) { DEFAULT -> BS.Type.NORMAL SMB -> BS.Type.SMB + BASAL_DRIFT_COMPENSATION -> BS.Type.NORMAL } companion object { diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/O5PodHistoryScreen.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/O5PodHistoryScreen.kt index 90df308f5328..b8dac2de14fd 100644 --- a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/O5PodHistoryScreen.kt +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/O5PodHistoryScreen.kt @@ -50,6 +50,7 @@ import app.aaps.pump.omnipod.common.definition.OmnipodCommandType import app.aaps.pump.omnipod.omnipod5.R import app.aaps.pump.omnipod.omnipod5.history.data.BasalValuesRecord import app.aaps.pump.omnipod.omnipod5.history.data.BolusRecord +import app.aaps.pump.omnipod.omnipod5.history.data.BolusType import app.aaps.pump.omnipod.omnipod5.history.data.HistoryRecord import app.aaps.pump.omnipod.omnipod5.history.data.TempBasalRecord @@ -174,7 +175,11 @@ private fun formatValue(record: HistoryRecord, rh: ResourceHelper, profileUtil: if (!record.isSuccess()) return rh.gs(R.string.omnipod_o5_history_command_failed) return when (val value = record.record) { is TempBasalRecord -> rh.gs(R.string.omnipod_o5_history_tbr_value, value.rate, value.duration) - is BolusRecord -> rh.gs(R.string.omnipod_o5_history_bolus_value, value.amount) + is BolusRecord -> when (value.bolusType) { + BolusType.BASAL_DRIFT_COMPENSATION -> + rh.gs(R.string.omnipod_o5_history_basal_drift_compensation_bolus_value, value.amount) + else -> rh.gs(R.string.omnipod_o5_history_bolus_value, value.amount) + } is BasalValuesRecord -> profileUtil.getBasalProfilesDisplayable(value.segments.toTypedArray(), PumpType.OMNIPOD_5) null -> null } diff --git a/pump/omnipod/omnipod5/src/main/res/values/strings.xml b/pump/omnipod/omnipod5/src/main/res/values/strings.xml index 20c04fa31333..bf6487b4f593 100644 --- a/pump/omnipod/omnipod5/src/main/res/values/strings.xml +++ b/pump/omnipod/omnipod5/src/main/res/values/strings.xml @@ -3,4 +3,5 @@ Command failed %1$.2f U/h, %2$d minutes %1$.2f U + Basal drift compensation bolus: %1$.2f U From 7d7253bfe77daa2bdaac04ff99713760f8b67ab6 Mon Sep 17 00:00:00 2001 From: Prem Nirmal Date: Wed, 23 Sep 2026 18:19:23 +0100 Subject: [PATCH 18/85] content weight --- .../pump/omnipod/omnipod5/ui/compose/OmnipodO5ComposeContent.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/OmnipodO5ComposeContent.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/OmnipodO5ComposeContent.kt index 511dafda496e..43c286ee7f46 100644 --- a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/OmnipodO5ComposeContent.kt +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/OmnipodO5ComposeContent.kt @@ -76,7 +76,7 @@ class OmnipodO5ComposeContent( val historyViewModel: O5PodHistoryViewModel = metroViewModel() val records by historyViewModel.records.collectAsStateWithLifecycle() Column(Modifier.fillMaxSize()) { - Box(Modifier.weight(1f)) { + Box { O5CredentialImportScreen(viewModel = credentialViewModel, rh = rh) } HorizontalDivider() From eecc58beabab758a71af89b736b4577199f3f845 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 23 Sep 2026 19:21:41 +0000 Subject: [PATCH 19/85] Launch webview for O5 credential when none installed --- .gitignore | 3 - gradle/libs.versions.toml | 1 + .../common/ui/compose/OmnipodComposeHost.kt | 24 ++- .../common/src/main/res/values/strings.xml | 2 + pump/omnipod/omnipod5/build.gradle.kts | 2 + .../omnipod5/ui/O5CertificateStoreScreen.kt | 33 +++- .../ui/O5CredentialImportBottomSheet.kt | 107 +++++++++++++ .../omnipod5/ui/O5CredentialImportScreen.kt | 106 ------------- .../ui/O5CredentialImportViewModel.kt | 70 +++------ .../ui/O5CredentialManualImportScreen.kt | 142 ++++++++++++++++++ .../omnipod5/ui/O5CredentialWebViewScreen.kt | 86 +++++++++++ .../ui/compose/OmnipodO5ComposeContent.kt | 25 ++- 12 files changed, 431 insertions(+), 170 deletions(-) create mode 100644 pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/O5CredentialImportBottomSheet.kt create mode 100644 pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/O5CredentialManualImportScreen.kt create mode 100644 pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/O5CredentialWebViewScreen.kt diff --git a/.gitignore b/.gitignore index 55aba8b2231d..efad7f6f8bcf 100644 --- a/.gitignore +++ b/.gitignore @@ -45,6 +45,3 @@ ios/app/build*/ # Generated by :ios:shell:generateIosVersionXcconfig - the build number is a clock, never commit it. ios/app/Version.xcconfig - -# Certificates, never commit them -pump/omnipod/omnipod5/src/main/assets/certificates/ diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 273c0ef0896d..393a0b1719ae 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -117,6 +117,7 @@ androidx-legacy-support = { group = "androidx.legacy", name = "legacy-support-v1 androidx-lifecycle-process = { group = "androidx.lifecycle", name = "lifecycle-process", version.ref = "lifecycleRuntimeKtx" } androidx-documentfile = { group = "androidx.documentfile", name = "documentfile", version = "1.1.0" } androidx-preference = { group = "androidx.preference", name = "preference-ktx", version = "1.2.1" } +androidx-webkit = { group = "androidx.webkit", name = "webkit", version = "1.12.1" } androidx-room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "room" } androidx-room-runtime = { group = "androidx.room", name = "room-runtime", version.ref = "room" } androidx-room-rxjava3 = { group = "androidx.room", name = "room-rxjava3", version.ref = "room" } diff --git a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/ui/compose/OmnipodComposeHost.kt b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/ui/compose/OmnipodComposeHost.kt index d78d14e91bec..ffaffa8f459b 100644 --- a/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/ui/compose/OmnipodComposeHost.kt +++ b/pump/omnipod/common/src/main/kotlin/app/aaps/pump/omnipod/common/ui/compose/OmnipodComposeHost.kt @@ -45,11 +45,13 @@ fun OmnipodComposeHost( onConfirmDiscardPod: () -> Unit, activationNeedsExtraContent: () -> Boolean = { false }, showExtraContentForHistory: Boolean = false, - extraContent: (@Composable (onBack: () -> Unit) -> Unit)? = null + extraContent: (@Composable (onBack: () -> Unit) -> Unit)? = null, + credentialImportSheet: (@Composable (onImported: () -> Unit, onDismiss: () -> Unit) -> Unit)? = null ) { val context = LocalContext.current var showWizard by remember { mutableStateOf(false) } var showExtraContent by remember { mutableStateOf(false) } + var showCredentialSheet by remember { mutableStateOf(false) } var wizardActivationType by remember { mutableStateOf(null) } var isDeactivation by remember { mutableStateOf(false) } var showDialog by remember { mutableStateOf(false) } @@ -83,11 +85,13 @@ fun OmnipodComposeHost( overviewEvents.collect { event -> when (event) { is OmnipodOverviewEvent.StartActivation -> { - if (activationNeedsExtraContent()) { + wizardActivationType = event.activationType + isDeactivation = false + if (activationNeedsExtraContent() && credentialImportSheet != null) { + showCredentialSheet = true + } else if (activationNeedsExtraContent()) { showExtraContent = true } else { - wizardActivationType = event.activationType - isDeactivation = false showWizard = true } } @@ -143,6 +147,18 @@ fun OmnipodComposeHost( ) } + if (showCredentialSheet) { + credentialImportSheet?.invoke( + { + showCredentialSheet = false + showWizard = true + }, + { + showCredentialSheet = false + } + ) + } + when { showWizard -> { KeepScreenOnEffect() diff --git a/pump/omnipod/common/src/main/res/values/strings.xml b/pump/omnipod/common/src/main/res/values/strings.xml index 5ab574a68b2a..e3248d9f5065 100644 --- a/pump/omnipod/common/src/main/res/values/strings.xml +++ b/pump/omnipod/common/src/main/res/values/strings.xml @@ -184,12 +184,14 @@ + https://api.osaid-keymanager.org/o5/aaps/start Omnipod 5 O5 Unconfirmed command Omnipod 5 patch pump, running as a manual pod under AAPS\'s control. Certificate store Import and manage the Omnipod 5 pairing credential. + Import certificate Not enough insulin left in the reservoir for this bolus. A bolus is already in progress. Setting the new basal profile might have failed. Refresh pod status to confirm or deny this. diff --git a/pump/omnipod/omnipod5/build.gradle.kts b/pump/omnipod/omnipod5/build.gradle.kts index 97dc0b95e792..b127d3d76bf8 100644 --- a/pump/omnipod/omnipod5/build.gradle.kts +++ b/pump/omnipod/omnipod5/build.gradle.kts @@ -33,6 +33,8 @@ dependencies { implementation(libs.androidx.compose.ui.tooling.preview) debugImplementation(libs.androidx.compose.ui.tooling) + implementation(libs.androidx.webkit) + testImplementation(project(":shared:tests")) ksp(libs.androidx.room.compiler) } diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/O5CertificateStoreScreen.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/O5CertificateStoreScreen.kt index d5a2fe77e834..c4931801cdb7 100644 --- a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/O5CertificateStoreScreen.kt +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/O5CertificateStoreScreen.kt @@ -5,11 +5,17 @@ import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.padding import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.filled.ArrowBack +import androidx.compose.material.icons.filled.FileDownload import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.Scaffold import androidx.compose.material3.Text +import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import app.aaps.core.interfaces.resources.ResourceHelper @@ -23,17 +29,34 @@ fun O5CertificateStoreScreen( onBack: () -> Unit ) { val viewModel: O5CredentialImportViewModel = metroViewModel() + var showManualImport by remember { mutableStateOf(false) } Scaffold( topBar = { AapsTopAppBar( - title = { Text(stringResource(R.string.omnipod_5_certificate_store)) }, + title = { + Text( + stringResource( + if (showManualImport) R.string.omnipod_5_certificate_store_import + else R.string.omnipod_5_certificate_store + ) + ) + }, navigationIcon = { - IconButton(onClick = onBack) { + IconButton(onClick = { if (showManualImport) showManualImport = false else onBack() }) { Icon( imageVector = Icons.AutoMirrored.Filled.ArrowBack, contentDescription = stringResource(app.aaps.core.ui.R.string.back) ) } + }, + actions = { + if (!showManualImport) { + TextButton(onClick = { showManualImport = true }) { + Text( + text = stringResource(app.aaps.core.ui.R.string.import_btn) + ) + } + } } ) } @@ -43,7 +66,11 @@ fun O5CertificateStoreScreen( .fillMaxSize() .padding(paddingValues) ) { - O5CredentialImportScreen(viewModel = viewModel, rh = rh) + if (showManualImport) { + O5CredentialManualImportScreen(viewModel = viewModel, rh = rh) + } else { + O5CredentialImportScreen(viewModel = viewModel, rh = rh) + } } } } diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/O5CredentialImportBottomSheet.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/O5CredentialImportBottomSheet.kt new file mode 100644 index 000000000000..f62fd47d9b16 --- /dev/null +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/O5CredentialImportBottomSheet.kt @@ -0,0 +1,107 @@ +package app.aaps.pump.omnipod.omnipod5.ui + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxHeight +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.Button +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.ModalBottomSheet +import androidx.compose.material3.Text +import androidx.compose.material3.rememberModalBottomSheetState +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.key +import androidx.compose.runtime.mutableIntStateOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp + +/** + * Bottom sheet that hosts the Omnipod 5 credential import WebView (see + * [O5CredentialWebViewScreen]). The sheet loads [url], waits for the page to post the + * credential JSON back through the message bridge, and imports it via [onImportCredential]. + * + * - On a successful import the sheet is dismissed and [onImported] is called, which returns + * the user to the Omnipod 5 setup wizard. + * - On a failed import a "Try again" button is shown that re-launches the WebView (reloads + * [url] from scratch). + * + * [onDismiss] is called when the user swipes/taps the sheet away without importing a credential. + */ +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun O5CredentialImportBottomSheet( + url: String, + onImportCredential: (String) -> Boolean, + onImported: () -> Unit, + onFailed: (Throwable) -> Unit, + onDismiss: () -> Unit, +) { + val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true) + var attempt by remember { mutableIntStateOf(0) } + var failed by remember { mutableStateOf(false) } + + ModalBottomSheet( + onDismissRequest = onDismiss, + sheetState = sheetState, + containerColor = MaterialTheme.colorScheme.surface + ) { + Column( + modifier = Modifier + .fillMaxWidth() + .fillMaxHeight(0.9f) + .padding(horizontal = 16.dp), + verticalArrangement = Arrangement.spacedBy(12.dp) + ) { + Text( + text = "Login to import Omnipod5 certificate", + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.Bold + ) + + if (failed) { + Text( + text = "Could not import the credential. Please try again.", + color = MaterialTheme.colorScheme.error, + style = MaterialTheme.typography.bodyMedium + ) + Button( + onClick = { + failed = false + attempt++ + }, + modifier = Modifier.fillMaxWidth() + ) { + Text("Try again") + } + } else { + // key(attempt) recreates the WebView so "Try again" reloads the page. + key(attempt) { + O5CredentialWebViewScreen( + url = url, + onCredentialReceived = { json -> + if (onImportCredential(json)) { + onImported() + } else { + failed = true + } + }, + onCredentialError = { throwable -> + failed = true + onFailed(throwable) + }, + modifier = Modifier + .fillMaxWidth() + .weight(1f) + ) + } + } + } + } +} diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/O5CredentialImportScreen.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/O5CredentialImportScreen.kt index 72e83b985c54..0f4d9bfe6605 100644 --- a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/O5CredentialImportScreen.kt +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/O5CredentialImportScreen.kt @@ -4,14 +4,11 @@ import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.heightIn import androidx.compose.foundation.layout.padding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll -import androidx.compose.material3.Button import androidx.compose.material3.Card import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.Text import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable @@ -39,33 +36,21 @@ fun O5CredentialImportScreen( viewModel: O5CredentialImportViewModel, rh: ResourceHelper ) { - val inputText by viewModel.inputText.collectAsState() val importResult by viewModel.importResult.collectAsState() val installedCredentials by viewModel.installedCredentials.collectAsState() - val showImportFromAssets by viewModel.allowImportFromAssets.collectAsState() O5CredentialImportContent( - inputText = inputText, - inputChanged = viewModel::onInputChanged, - importInput = viewModel::importCurrentInput, - importFromAssets = viewModel::importCredentialFromAssets, removeCredential = viewModel::removeCredential, importResult = importResult, installedCredentials = installedCredentials, - showImportFromAssets = showImportFromAssets, ) } @Composable private fun O5CredentialImportContent( - inputText: String, - inputChanged: (String) -> Unit, - importInput: () -> Unit, - importFromAssets: () -> Unit, removeCredential: (Long) -> Unit, importResult: ImportResult, installedCredentials: List, - showImportFromAssets: Boolean, ) { Column( modifier = Modifier @@ -79,43 +64,6 @@ private fun O5CredentialImportContent( style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold ) - if (installedCredentials.isEmpty()) { - if (showImportFromAssets) { - Text( - text = "Credential found in assets, click import to continue", - style = MaterialTheme.typography.bodySmall - ) - Button( - onClick = importFromAssets, - modifier = Modifier.fillMaxWidth() - ) { - Text("Import from assets") - } - } else { - Text( - text = "Paste a credential string obtained from a trusted source. This does not " + - "pair with a pod by itself - it only makes the credential available for pairing.", - style = MaterialTheme.typography.bodySmall - ) - - OutlinedTextField( - value = inputText, - onValueChange = inputChanged, - label = { Text("Credential string") }, - modifier = Modifier - .fillMaxWidth() - .heightIn(max = 180.dp), - singleLine = false - ) - - Button( - onClick = importInput, - modifier = Modifier.fillMaxWidth() - ) { - Text("Import") - } - } - } when (importResult) { is ImportResult.Success -> Text( @@ -174,31 +122,9 @@ private fun O5CredentialImportContent( private fun PreviewCredentialImportContent() { MaterialTheme { O5CredentialImportContent( - inputText = "", - inputChanged = {}, - importInput = {}, - importFromAssets = {}, removeCredential = {}, importResult = ImportResult.None, installedCredentials = emptyList(), - showImportFromAssets = false, - ) - } -} - -@Preview(showBackground = true) -@Composable -private fun PreviewCredentialImportContentFromAssets() { - MaterialTheme { - O5CredentialImportContent( - inputText = "", - inputChanged = {}, - importInput = {}, - importFromAssets = {}, - removeCredential = {}, - importResult = ImportResult.None, - installedCredentials = emptyList(), - showImportFromAssets = true, ) } } @@ -208,31 +134,9 @@ private fun PreviewCredentialImportContentFromAssets() { private fun PreviewCredentialImportedCredentialsContent() { MaterialTheme { O5CredentialImportContent( - inputText = "", - inputChanged = {}, - importInput = {}, - importFromAssets = {}, removeCredential = {}, importResult = ImportResult.None, installedCredentials = listOf(InstalledCredentialRow(123, O5RegistrationData.O5RegistrationSource.IMPORTED)), - showImportFromAssets = false, - ) - } -} - -@Preview(showBackground = true) -@Composable -private fun PreviewCredentialImportAssetFailureContent() { - MaterialTheme { - O5CredentialImportContent( - inputText = "", - inputChanged = {}, - importInput = {}, - importFromAssets = {}, - removeCredential = {}, - importResult = ImportResult.Failure("Failed to import foobar"), - installedCredentials = emptyList(), - showImportFromAssets = true, ) } } @@ -242,14 +146,9 @@ private fun PreviewCredentialImportAssetFailureContent() { private fun PreviewCredentialImportFailureContent() { MaterialTheme { O5CredentialImportContent( - inputText = "", - inputChanged = {}, - importInput = {}, - importFromAssets = {}, removeCredential = {}, importResult = ImportResult.Failure("Failed to import cert"), installedCredentials = emptyList(), - showImportFromAssets = false, ) } } @@ -259,14 +158,9 @@ private fun PreviewCredentialImportFailureContent() { private fun PreviewCredentialImportSuccesssContent() { MaterialTheme { O5CredentialImportContent( - inputText = "", - inputChanged = {}, - importInput = {}, - importFromAssets = {}, removeCredential = {}, importResult = ImportResult.Success(123), installedCredentials = listOf(InstalledCredentialRow(123, O5RegistrationData.O5RegistrationSource.IMPORTED)), - showImportFromAssets = false, ) } } diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/O5CredentialImportViewModel.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/O5CredentialImportViewModel.kt index e31311dc1161..15759f61b1e4 100644 --- a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/O5CredentialImportViewModel.kt +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/O5CredentialImportViewModel.kt @@ -1,10 +1,6 @@ package app.aaps.pump.omnipod.omnipod5.ui -import android.app.Application -import android.content.Context import androidx.lifecycle.ViewModel -import androidx.lifecycle.viewModelScope -import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.pump.omnipod.omnipod5.bledriver.comm.pair.O5RegistrationData import app.aaps.pump.omnipod.omnipod5.bledriver.pod.security.SecureO5RegistrationStorage import dev.zacsweers.metro.AppScope @@ -12,16 +8,10 @@ import dev.zacsweers.metro.ContributesIntoMap import dev.zacsweers.metro.Inject import dev.zacsweers.metro.binding import dev.zacsweers.metrox.viewmodel.ViewModelKey -import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow -import kotlinx.coroutines.launch import org.json.JSONException import org.json.JSONObject -import java.lang.ref.WeakReference -import kotlin.collections.filter -import kotlin.collections.isNotEmpty -import kotlin.collections.orEmpty /** One row of the "currently installed credentials" list shown in the import screen. */ data class InstalledCredentialRow( @@ -53,8 +43,6 @@ sealed class ImportResult { @ContributesIntoMap(AppScope::class, binding = binding()) @ViewModelKey class O5CredentialImportViewModel @Inject constructor( - context: Context, - private val aapsLogger: AAPSLogger, private val secureO5RegistrationStorage: SecureO5RegistrationStorage ) : ViewModel() { @@ -67,11 +55,6 @@ class O5CredentialImportViewModel @Inject constructor( private val _installedCredentials = MutableStateFlow>(emptyList()) val installedCredentials: StateFlow> = _installedCredentials - private val _allowImportFromAssets = MutableStateFlow(false) - val allowImportFromAssets: StateFlow = _allowImportFromAssets - - private val contextRef = WeakReference(context) - init { refreshInstalledCredentials() } @@ -99,6 +82,26 @@ class O5CredentialImportViewModel @Inject constructor( importText(text) } + /** + * Imports a credential JSON/packed string received from the pairing web page (via the + * WebView message bridge). Runs the same parse/install path as a manual paste and + * returns whether a credential was successfully installed. + */ + fun importFromWebMessage(text: String): Boolean { + val trimmed = text.trim() + if (trimmed.isEmpty()) { + _importResult.value = ImportResult.Failure("Empty credential received") + return false + } + importText(trimmed) + return _importResult.value is ImportResult.Success + } + + fun importError(throwable: Throwable) { + _importResult.value = ImportResult.Failure(throwable.message ?: "Import failed unexpectedly") + return + } + private fun importText(text: String) { val controllerId = if (text.startsWith("{")) importJsonCredential(text) else importPackedCredential(text) if (controllerId == null) { @@ -155,45 +158,12 @@ class O5CredentialImportViewModel @Inject constructor( refreshInstalledCredentials() } - fun importCredentialFromAssets() { - viewModelScope.launch(Dispatchers.IO) { - val context = contextRef.get() ?: return@launch - val certificatesList = context.assets.list("certificates").orEmpty().filter { it.endsWith(".json") || it.endsWith(".o5keypair") } - certificatesList.first().let { certFile -> - try { - context.assets.open("certificates/$certFile").use { inputStream -> - val json = inputStream.bufferedReader().use { it.readText() } - importText(json) - } - } catch(e: Exception) { - aapsLogger.error("Failed to read certificate from assets", e) - _importResult.value = ImportResult.Failure("Import failed unexpectedly") - } - } - } - } - private fun refreshInstalledCredentials() { _installedCredentials.value = O5RegistrationData.allValues.mapNotNull { data -> O5RegistrationData.source(data.controllerId)?.let { source -> InstalledCredentialRow(data.controllerId, source) } } - checkAssets() - } - - private fun checkAssets() { - if (_installedCredentials.value.isNotEmpty()) { - _allowImportFromAssets.value = false - return - } - viewModelScope.launch(Dispatchers.IO) { - val context = contextRef.get() ?: return@launch - val certificatesList = context.assets.list("certificates").orEmpty().filter { it.endsWith(".json") || it.endsWith(".o5keypair") } - aapsLogger.debug("Certificates: " + certificatesList.joinToString(", ")) - val foundCertificate = certificatesList.isNotEmpty() - _allowImportFromAssets.value = foundCertificate - } } /** diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/O5CredentialManualImportScreen.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/O5CredentialManualImportScreen.kt new file mode 100644 index 000000000000..66fd55151a7f --- /dev/null +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/O5CredentialManualImportScreen.kt @@ -0,0 +1,142 @@ +package app.aaps.pump.omnipod.omnipod5.ui + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.heightIn +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.Button +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp +import app.aaps.core.interfaces.resources.ResourceHelper + +/** + * Manual credential import screen: lets the user paste a credential string and install it. + * Reached from the "import" action in the top app bar of + * [O5CredentialImportScreen]/[O5CertificateStoreScreen]. Purely credential management - no + * dosing/pairing actions. + */ +@Composable +fun O5CredentialManualImportScreen( + viewModel: O5CredentialImportViewModel, + rh: ResourceHelper +) { + val inputText by viewModel.inputText.collectAsState() + val importResult by viewModel.importResult.collectAsState() + + O5CredentialManualImportContent( + inputText = inputText, + inputChanged = viewModel::onInputChanged, + importInput = viewModel::importCurrentInput, + importResult = importResult, + ) +} + +@Composable +private fun O5CredentialManualImportContent( + inputText: String, + inputChanged: (String) -> Unit, + importInput: () -> Unit, + importResult: ImportResult, +) { + Column( + modifier = Modifier + .fillMaxWidth() + .verticalScroll(rememberScrollState()) + .padding(16.dp), + verticalArrangement = Arrangement.spacedBy(12.dp) + ) { + Text( + text = "Import Omnipod 5 Credential", + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.Bold + ) + Text( + text = "Paste a credential string obtained from a trusted source. This does not " + + "pair with a pod by itself - it only makes the credential available for pairing.", + style = MaterialTheme.typography.bodySmall + ) + + OutlinedTextField( + value = inputText, + onValueChange = inputChanged, + label = { Text("Credential string") }, + modifier = Modifier + .fillMaxWidth() + .heightIn(max = 180.dp), + singleLine = false + ) + + Button( + onClick = importInput, + modifier = Modifier.fillMaxWidth() + ) { + Text("Import") + } + + when (importResult) { + is ImportResult.Success -> Text( + text = "Imported credential for controller 0x%08X".format(importResult.controllerId), + color = MaterialTheme.colorScheme.primary, + style = MaterialTheme.typography.labelLarge + ) + + is ImportResult.Failure -> Text( + text = importResult.reason, + color = MaterialTheme.colorScheme.error, + style = MaterialTheme.typography.labelLarge + ) + + ImportResult.None -> Unit + } + } +} + +@Preview(showBackground = true) +@Composable +private fun PreviewManualImportContent() { + MaterialTheme { + O5CredentialManualImportContent( + inputText = "", + inputChanged = {}, + importInput = {}, + importResult = ImportResult.None, + ) + } +} + +@Preview(showBackground = true) +@Composable +private fun PreviewManualImportFailureContent() { + MaterialTheme { + O5CredentialManualImportContent( + inputText = "", + inputChanged = {}, + importInput = {}, + importResult = ImportResult.Failure("Failed to import cert"), + ) + } +} + +@Preview(showBackground = true) +@Composable +private fun PreviewManualImportSuccessContent() { + MaterialTheme { + O5CredentialManualImportContent( + inputText = "", + inputChanged = {}, + importInput = {}, + importResult = ImportResult.Success(123), + ) + } +} diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/O5CredentialWebViewScreen.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/O5CredentialWebViewScreen.kt new file mode 100644 index 000000000000..f0434d10d6d9 --- /dev/null +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/O5CredentialWebViewScreen.kt @@ -0,0 +1,86 @@ +package app.aaps.pump.omnipod.omnipod5.ui + +import android.annotation.SuppressLint +import android.webkit.WebView +import android.webkit.WebViewClient +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.rememberUpdatedState +import androidx.compose.runtime.getValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.viewinterop.AndroidView +import androidx.webkit.WebMessageCompat +import androidx.webkit.WebViewCompat +import androidx.webkit.WebViewFeature + +/** + * Name the web page uses to reach the app bridge: the page calls + * `bridge.postMessage(jsonString)` to hand back the Omnipod 5 credential. + */ +private const val BRIDGE_NAME = "aapsKeymanagerBridge" + +/** + * Origins the bridge accepts messages from. "*" allows every origin, which is fine for the + * stubbed URL; tighten this once the real credential page URL is known. + */ +private val ALLOWED_ORIGIN_RULES = setOf("*") + +/** + * Full-screen WebView shown instead of the manual credential import screen when no Omnipod 5 + * credential is installed yet. It loads [url] (a pairing/credential page) and listens for a + * single message posted through `bridge.postMessage(...)` using + * [WebViewCompat.addWebMessageListener]. The received message is expected to be the credential + * JSON string; it is handed back through [onCredentialReceived]. + */ +@SuppressLint("SetJavaScriptEnabled") +@Composable +fun O5CredentialWebViewScreen( + url: String, + onCredentialReceived: (String) -> Unit, + onCredentialError: (Throwable) -> Unit, + modifier: Modifier = Modifier +) { + val currentOnCredentialReceived by rememberUpdatedState(onCredentialReceived) + val currentOnCredentialError by rememberUpdatedState(onCredentialError) + + if (!WebViewFeature.isFeatureSupported(WebViewFeature.WEB_MESSAGE_LISTENER)) { + Box(modifier = modifier.fillMaxSize(), contentAlignment = Alignment.Center) { + Text( + text = "This device's WebView does not support the credential bridge. " + + "Please update Android System WebView and try again.", + style = MaterialTheme.typography.bodyMedium + ) + } + return + } + + AndroidView( + modifier = modifier.fillMaxSize(), + factory = { context -> + WebView(context).apply { + settings.javaScriptEnabled = true + settings.domStorageEnabled = true + // Keep navigation inside the WebView instead of opening an external browser. + webViewClient = WebViewClient() + try { + WebViewCompat.addWebMessageListener( + this, + BRIDGE_NAME, + ALLOWED_ORIGIN_RULES + ) { _, message, _, _, _ -> + if (message.type == WebMessageCompat.TYPE_STRING) { + message.data?.let { currentOnCredentialReceived(it) } + } + } + loadUrl(url) + } catch (e: UnsupportedOperationException) { + currentOnCredentialError(e) + } + } + } + ) +} diff --git a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/OmnipodO5ComposeContent.kt b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/OmnipodO5ComposeContent.kt index 43c286ee7f46..66442b954f4a 100644 --- a/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/OmnipodO5ComposeContent.kt +++ b/pump/omnipod/omnipod5/src/main/kotlin/app/aaps/pump/omnipod/omnipod5/ui/compose/OmnipodO5ComposeContent.kt @@ -1,5 +1,6 @@ package app.aaps.pump.omnipod.omnipod5.ui.compose +import android.widget.Toast import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxSize @@ -12,6 +13,7 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.lifecycle.compose.collectAsStateWithLifecycle import app.aaps.core.interfaces.protection.ProtectionCheck @@ -23,6 +25,7 @@ import app.aaps.core.ui.compose.metroViewModel import app.aaps.pump.omnipod.common.R import app.aaps.pump.omnipod.common.ui.compose.OmnipodComposeHost import app.aaps.pump.omnipod.omnipod5.bledriver.comm.pair.O5RegistrationData +import app.aaps.pump.omnipod.omnipod5.ui.O5CredentialImportBottomSheet import app.aaps.pump.omnipod.omnipod5.ui.O5CredentialImportScreen import app.aaps.pump.omnipod.omnipod5.ui.O5CredentialImportViewModel import app.aaps.pump.omnipod.omnipod5.ui.wizard.compose.O5OmnipodWizardViewModel @@ -42,6 +45,7 @@ class OmnipodO5ComposeContent( onSettings: (() -> Unit)? ) { val overviewViewModel: O5OverviewViewModel = metroViewModel() + val credentialViewModel: O5CredentialImportViewModel = metroViewModel() OmnipodComposeHost( pluginName = pluginName, blePreCheck = blePreCheck, @@ -57,6 +61,22 @@ class OmnipodO5ComposeContent( onConfirmDiscardPod = overviewViewModel::confirmDiscardPod, activationNeedsExtraContent = { O5RegistrationData.pickControllerId == 0L }, showExtraContentForHistory = true, + credentialImportSheet = { onImported, onDismiss -> + val context = LocalContext.current + O5CredentialImportBottomSheet( + url = stringResource(R.string.omnipod_5_login), + onImportCredential = credentialViewModel::importFromWebMessage, + onImported = { + Toast.makeText(context, "Omnipod 5 credential imported", Toast.LENGTH_LONG).show() + onImported() + }, + onFailed = { throwable -> + credentialViewModel.importError(throwable) + Toast.makeText(context, "Error importing certificate", Toast.LENGTH_LONG).show() + }, + onDismiss = onDismiss + ) + }, extraContent = { onBack -> val title = stringResource(R.string.omnipod_5_name) LaunchedEffect(title) { @@ -72,13 +92,10 @@ class OmnipodO5ComposeContent( ) ) } - val credentialViewModel: O5CredentialImportViewModel = metroViewModel() val historyViewModel: O5PodHistoryViewModel = metroViewModel() val records by historyViewModel.records.collectAsStateWithLifecycle() Column(Modifier.fillMaxSize()) { - Box { - O5CredentialImportScreen(viewModel = credentialViewModel, rh = rh) - } + O5CredentialImportScreen(viewModel = credentialViewModel, rh = rh) HorizontalDivider() Box(Modifier.weight(1f)) { O5PodHistoryScreen( From 7bd90b3b54346cf35adbddf6ab4ddc88847a0985 Mon Sep 17 00:00:00 2001 From: Prem Nirmal Date: Thu, 24 Sep 2026 10:50:54 +0100 Subject: [PATCH 20/85] Fix o5 insulin pump time expiration display --- .../project_constraints-objectives-move.md | 43 - .github/workflows/copilot-setup-steps.yml | 39 + README.md | 38 +- _docs/desktop_alignment.md | 2 - _docs/ios_blockers.md | 60 +- app/build.gradle.kts | 18 +- .../kotlin/app/aaps/CobExtendedCarbsTest.kt | 9 +- .../androidTest/kotlin/app/aaps/LoopTest.kt | 16 +- .../kotlin/app/aaps/e2e/SetupWizardE2ETest.kt | 14 +- app/src/main/AndroidManifest.xml | 7 +- .../kotlin/app/aaps/ComposeMainActivity.kt | 374 ++--- app/src/main/kotlin/app/aaps/MainApp.kt | 106 +- .../kotlin/app/aaps/di/PluginListMerge.kt | 2 +- .../app/aaps/di/metro/AppReceiversBindings.kt | 11 - .../kotlin/app/aaps/di/metro/AppRootGraph.kt | 17 +- .../app/aaps/di/metro/MainPluginsBindings.kt | 18 - .../kotlin/app/aaps/di/metro/MetroGraphs.kt | 12 +- .../app/aaps/implementations/ConfigImpl.kt | 8 +- .../DummyServiceHelper.kt | 1 - .../PersistentNotificationPlugin.kt | 194 ++- app/src/main/kotlin/app/aaps/trio/TrioUi.kt | 51 + .../ui/compose/main/TrioAddActionsSheet.kt | 88 ++ .../trio/ui/compose/main/TrioBottomBar.kt | 140 ++ .../trio/ui/compose/main/TrioTabScaffold.kt | 100 ++ .../aaps/trio/ui/compose/main/TrioTopBar.kt | 30 + .../aaps/trio/ui/compose/main/TrioUiImpl.kt | 87 ++ .../ui/compose/overview/TrioOverviewGraph.kt | 1042 +++++++++++++ .../ui/compose/overview/TrioOverviewScreen.kt | 1286 +++++++++++++++++ .../aaps/di/metro/ContributedBindingsTest.kt | 1 - .../aaps/di/metro/ContributedPluginsTest.kt | 11 +- .../di/metro/ContributedViewModelsTest.kt | 8 +- .../aaps/di/metro/ReceiverInjectorsTest.kt | 13 - .../compose/overview/TrioOverviewGraphTest.kt | 95 ++ .../aaps/di/metro/GraphScopeStabilityTest.kt | 2 - .../appshell/navigation/AppNavGraphTest.kt | 9 +- .../aaps/appshell/navigation/AppRouteTest.kt | 1 - .../navigation/ElementNavigatorTest.kt | 3 +- .../kotlin/app/aaps/appshell/AapsAppRoot.kt | 11 +- .../aaps/appshell/navigation/AppNavGraph.kt | 180 ++- .../app/aaps/appshell/navigation/AppRoute.kt | 7 +- .../appshell/navigation/ElementNavigation.kt | 37 +- buildSrc/src/main/kotlin/Versions.kt | 2 +- .../kotlin/app/aaps/core/data/ue/Sources.kt | 2 +- .../src/androidMain/res/values/strings.xml | 2 +- .../core/interfaces/alerts/LocalAlertUtils.kt | 4 +- .../core/interfaces/constraints/Objectives.kt | 24 - .../maintenance/BackupDatabaseConstants.kt | 10 + .../core/interfaces/navigation/ElementType.kt | 87 +- .../overview/graph/OverviewDataCache.kt | 1 + .../overview/graph/PredictionDataPoints.kt | 34 + .../core/interfaces/plugin/ActivePlugin.kt | 6 - .../core/interfaces/pump/PumpTimeRemaining.kt | 6 + .../interfaces/stats/DexcomTirCalculator.kt | 7 + .../notifications/IosNotificationDelegate.kt | 12 +- .../IosNotificationDelegateTest.kt | 8 +- .../src/androidMain/res/values/strings.xml | 1 + .../app/aaps/core/keys/BooleanNonKey.kt | 10 +- .../kotlin/app/aaps/core/keys/DoubleNonKey.kt | 2 + .../kotlin/app/aaps/core/keys/IntNonKey.kt | 4 +- .../kotlin/app/aaps/core/keys/LongNonKey.kt | 3 +- .../kotlin/app/aaps/core/keys/StringKey.kt | 12 +- .../kotlin/app/aaps/core/keys/StringNonKey.kt | 3 + core/ui/build.gradle.kts | 2 +- .../navigation/ElementTypeStyleTest.kt | 15 +- .../ui/compose/navigation/ElementTypeTest.kt | 41 - .../core/ui/compose/MetroAppCompatActivity.kt | 3 + .../core/ui/compose/PlatformTheme.android.kt | 11 + .../res/drawable-nodpi/trio_launcher_art.png | Bin 0 -> 464158 bytes .../androidMain/res/drawable/ic_launcher.xml | 6 + .../res/drawable/ic_launcher_background.xml | 5 + .../res/drawable/ic_launcher_foreground.xml | 13 + .../res/drawable/ic_launcher_monochrome.xml | 14 + .../res/drawable/ic_notif_aaps.xml | 47 +- .../androidMain/res/drawable/notif_icon.png | Bin 3123 -> 0 bytes .../androidMain/res/drawable/splash_logo.xml | 90 -- .../res/mipmap-hdpi/ic_launcher.png | Bin 6526 -> 10307 bytes .../res/mipmap-hdpi/ic_launcher_round.png | Bin 6526 -> 10307 bytes .../res/mipmap-mdpi/ic_launcher.png | Bin 3305 -> 5915 bytes .../res/mipmap-mdpi/ic_launcher_round.png | Bin 3305 -> 5915 bytes .../res/mipmap-xhdpi/ic_launcher.png | Bin 8597 -> 15459 bytes .../res/mipmap-xhdpi/ic_launcher_round.png | Bin 8597 -> 15459 bytes .../res/mipmap-xxhdpi/ic_launcher.png | Bin 14013 -> 28357 bytes .../res/mipmap-xxhdpi/ic_launcher_round.png | Bin 14013 -> 28357 bytes .../res/mipmap-xxxhdpi/ic_launcher.png | Bin 20439 -> 43935 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.png | Bin 20439 -> 43935 bytes .../androidMain/res/values-bg-rBG/strings.xml | 9 - .../androidMain/res/values-ca-rES/strings.xml | 1 - .../androidMain/res/values-cs-rCZ/strings.xml | 9 - .../androidMain/res/values-da-rDK/strings.xml | 1 - .../androidMain/res/values-de-rDE/strings.xml | 1 - .../androidMain/res/values-el-rGR/strings.xml | 1 - .../androidMain/res/values-es-rES/strings.xml | 9 - .../androidMain/res/values-fr-rFR/strings.xml | 9 - .../androidMain/res/values-hr-rHR/strings.xml | 1 - .../androidMain/res/values-it-rIT/strings.xml | 9 - .../androidMain/res/values-iw-rIL/strings.xml | 1 - .../androidMain/res/values-ko-rKR/strings.xml | 1 - .../androidMain/res/values-lt-rLT/strings.xml | 1 - .../androidMain/res/values-nb-rNO/strings.xml | 9 - .../androidMain/res/values-nl-rNL/strings.xml | 1 - .../androidMain/res/values-pl-rPL/strings.xml | 1 - .../androidMain/res/values-pt-rBR/strings.xml | 1 - .../androidMain/res/values-pt-rPT/strings.xml | 1 - .../androidMain/res/values-ro-rRO/strings.xml | 9 - .../androidMain/res/values-ru-rRU/strings.xml | 1 - .../androidMain/res/values-sk-rSK/strings.xml | 9 - .../androidMain/res/values-sv-rSE/strings.xml | 1 - .../androidMain/res/values-tr-rTR/strings.xml | 3 - .../androidMain/res/values-vi-rVN/strings.xml | 9 - .../androidMain/res/values-zh-rCN/strings.xml | 9 - .../androidMain/res/values-zh-rTW/strings.xml | 9 - core/ui/src/androidMain/res/values/colors.xml | 4 + .../src/androidMain/res/values/drawables.xml | 4 + .../ui/src/androidMain/res/values/strings.xml | 15 +- core/ui/src/androidMain/res/values/styles.xml | 15 + .../app/aaps/core/ui/compose/AapsSpacing.kt | 2 + .../app/aaps/core/ui/compose/AapsTheme.kt | 40 +- .../app/aaps/core/ui/compose/AapsTopAppBar.kt | 4 - .../aaps/core/ui/compose/AapsTypography.kt | 8 +- .../app/aaps/core/ui/compose/GeneralColors.kt | 36 + .../app/aaps/core/ui/compose/PlatformTheme.kt | 10 + .../ui/compose/icons/IcPluginObjectives.kt | 74 - .../icons/IcPluginObjectivesPreviews.kt | 43 - .../core/ui/compose/icons/IcSetupWizard.kt | 69 - .../ui/compose/icons/IcSetupWizardPreviews.kt | 20 - .../ui/compose/navigation/ElementTypeStyle.kt | 5 - .../compose/navigation/NavigationRequest.kt | 3 + .../ui/compose/preference/PreviewUtils.kt | 1 - .../ui/compose/pump/PumpActivityDialog.kt | 6 +- .../app/aaps/core/ui/extensions/Double.kt | 9 + .../app/aaps/core/ui/search/SearchableItem.kt | 138 +- .../aaps/core/ui/search/SearchableProvider.kt | 6 +- .../aaps/core/ui/compose/PlatformTheme.ios.kt | 4 + .../aaps/core/ui/compose/PlatformTheme.jvm.kt | 4 + .../app/aaps/database/entities/UserEntry.kt | 2 +- .../kotlin/app/aaps/desktop/shell/Main.kt | 74 +- .../aaps/desktop/shell/di/DesktopAppGraph.kt | 2 - .../platform/DesktopAbsentIntegrations.kt | 5 +- gradle/gradle-daemon-jvm.properties | 13 - gradle/libs.versions.toml | 7 +- .../AlarmNotificationManagerCancelTest.kt | 60 - .../bolus/WizardBolusExecutorImplTest.kt | 333 ++++- .../AndroidSystemNotificationPlatformTest.kt | 61 +- .../queue/CommandQueueImplementationTest.kt | 13 +- .../queue/commands/CommandBolusTest.kt | 17 + .../utils/HardLimitsImplTest.kt | 2 +- .../maintenance/ImportExportPrefsImpl.kt | 331 +++++ .../resources/IconsProviderImplementation.kt | 2 +- .../utils/fabric/FabricPrivacyImpl.kt | 18 +- .../alerts/LocalAlertUtilsImpl.kt | 5 +- .../SnackbarNotificationFallback.kt | 5 +- .../aaps/implementation/plugin/PluginStore.kt | 3 - .../queue/CommandQueueImplementation.kt | 6 +- .../queue/commands/CommandBolus.kt | 6 +- .../stats/DexcomTirCalculatorImpl.kt | 10 + .../UserEntryPresentationHelperImpl.kt | 3 +- .../implementation/utils/HardLimitsImpl.kt | 3 +- .../cloud/RecordingNotificationManager.kt | 6 +- .../CommonNotificationManagerTest.kt | 107 +- .../SnackbarNotificationFallbackTest.kt | 6 +- .../alerts/IosReminderScheduler.kt | 5 +- .../notifications/AlarmVolumeRamp.kt | 59 - .../notifications/AlarmVolumeRampTest.kt | 87 -- .../IosSystemNotificationPlatformTest.kt | 117 +- .../plugin/IosPluginPermissionsTest.kt | 2 - ios/app/AAPSClient.xcodeproj/project.pbxproj | 4 +- .../kotlin/app/aaps/ios/shell/ShellInfo.kt | 29 - .../app/aaps/ios/shell/di/IosAppGraph.kt | 6 +- .../aaps/ios/shell/di/IosPlatformBindings.kt | 7 +- .../app/aaps/ios/shell/di/IosProbeGraph.kt | 2 - .../ios/shell/missing/IosUiInteraction.kt | 20 +- .../app/aaps/ios/shell/ui/AapsAppHost.kt | 90 +- .../aaps/plugins/aps/loop/LoopPluginTest.kt | 18 +- .../loop/compose/LoopComposeContentTest.kt | 4 +- .../compose/LoopViewModelFormattingTest.kt | 15 +- .../aps/loop/compose/LoopViewModelTest.kt | 4 +- .../plugins/aps/loop/AndroidLoopNotifier.kt | 16 +- .../app/aaps/plugins/aps/loop/LoopPlugin.kt | 3 +- .../aps/loop/compose/LoopComposeContent.kt | 5 +- .../plugins/aps/loop/compose/LoopViewModel.kt | 4 - .../aaps/plugins/aps/loop/IosLoopNotifier.kt | 13 +- .../automation/TimerReminderReceiverTest.kt | 7 +- .../automation/TimerReminderReceiver.kt | 3 +- .../LinearCalibrationPluginTest.kt | 2 - .../androidMain/res/values-bg-rBG/strings.xml | 2 - .../androidMain/res/values-ca-rES/strings.xml | 1 - .../androidMain/res/values-cs-rCZ/strings.xml | 2 - .../androidMain/res/values-da-rDK/strings.xml | 1 - .../androidMain/res/values-de-rDE/strings.xml | 1 - .../androidMain/res/values-el-rGR/strings.xml | 1 - .../androidMain/res/values-es-rES/strings.xml | 2 - .../androidMain/res/values-fr-rFR/strings.xml | 2 - .../androidMain/res/values-it-rIT/strings.xml | 2 - .../androidMain/res/values-iw-rIL/strings.xml | 1 - .../androidMain/res/values-ko-rKR/strings.xml | 1 - .../androidMain/res/values-lt-rLT/strings.xml | 1 - .../androidMain/res/values-nb-rNO/strings.xml | 2 - .../androidMain/res/values-nl-rNL/strings.xml | 1 - .../androidMain/res/values-pl-rPL/strings.xml | 1 - .../androidMain/res/values-pt-rBR/strings.xml | 1 - .../androidMain/res/values-pt-rPT/strings.xml | 1 - .../androidMain/res/values-ro-rRO/strings.xml | 2 - .../androidMain/res/values-ru-rRU/strings.xml | 2 - .../androidMain/res/values-sk-rSK/strings.xml | 2 - .../androidMain/res/values-sv-rSE/strings.xml | 1 - .../androidMain/res/values-tr-rTR/strings.xml | 1 - .../androidMain/res/values-vi-rVN/strings.xml | 2 - .../androidMain/res/values-zh-rCN/strings.xml | 2 - .../androidMain/res/values-zh-rTW/strings.xml | 2 - .../src/androidMain/res/values/strings.xml | 2 - .../configuration/setupwizard/SWDefinition.kt | 12 - .../setupwizard/SetupWizardScreen.kt | 3 - plugins/constraints/build.gradle.kts | 15 +- .../constraints/ConstraintsCheckerImplTest.kt | 60 +- .../objectives/ObjectivesPluginTest.kt | 111 -- .../constraints/objectives/SntpClientTest.kt | 64 - .../constraints/objectives/SntpPacketTest.kt | 149 -- .../compose/ObjectivesScreenTest.kt | 521 ------- .../compose/ObjectivesViewModelTest.kt | 99 -- .../objectives/AndroidDurationText.kt | 36 - .../androidMain/res/values-ar-rSA/exam.xml | 2 - .../res/values-ar-rSA/objectives.xml | 2 - .../androidMain/res/values-ar-rSA/strings.xml | 1 - .../androidMain/res/values-bg-rBG/exam.xml | 214 --- .../res/values-bg-rBG/objectives.xml | 99 -- .../androidMain/res/values-bg-rBG/strings.xml | 14 - .../androidMain/res/values-ca-rES/exam.xml | 111 -- .../res/values-ca-rES/objectives.xml | 35 - .../androidMain/res/values-ca-rES/strings.xml | 10 - .../androidMain/res/values-cs-rCZ/exam.xml | 214 --- .../res/values-cs-rCZ/objectives.xml | 99 -- .../androidMain/res/values-cs-rCZ/strings.xml | 14 - .../androidMain/res/values-da-rDK/exam.xml | 166 --- .../res/values-da-rDK/objectives.xml | 72 - .../androidMain/res/values-da-rDK/strings.xml | 14 - .../androidMain/res/values-de-rDE/exam.xml | 166 --- .../res/values-de-rDE/objectives.xml | 73 - .../androidMain/res/values-de-rDE/strings.xml | 14 - .../androidMain/res/values-el-rGR/exam.xml | 166 --- .../res/values-el-rGR/objectives.xml | 72 - .../androidMain/res/values-el-rGR/strings.xml | 14 - .../androidMain/res/values-es-rES/exam.xml | 215 --- .../res/values-es-rES/objectives.xml | 100 -- .../androidMain/res/values-es-rES/strings.xml | 13 - .../androidMain/res/values-fr-rFR/exam.xml | 215 --- .../res/values-fr-rFR/objectives.xml | 99 -- .../androidMain/res/values-fr-rFR/strings.xml | 14 - .../androidMain/res/values-hr-rHR/exam.xml | 29 - .../res/values-hr-rHR/objectives.xml | 5 - .../androidMain/res/values-hr-rHR/strings.xml | 5 - .../androidMain/res/values-hu-rHU/exam.xml | 2 - .../res/values-hu-rHU/objectives.xml | 2 - .../androidMain/res/values-hu-rHU/strings.xml | 3 - .../androidMain/res/values-it-rIT/exam.xml | 215 --- .../res/values-it-rIT/objectives.xml | 100 -- .../androidMain/res/values-it-rIT/strings.xml | 14 - .../androidMain/res/values-iw-rIL/exam.xml | 169 --- .../res/values-iw-rIL/objectives.xml | 74 - .../androidMain/res/values-iw-rIL/strings.xml | 14 - .../androidMain/res/values-ko-rKR/exam.xml | 166 --- .../res/values-ko-rKR/objectives.xml | 72 - .../androidMain/res/values-ko-rKR/strings.xml | 14 - .../androidMain/res/values-lt-rLT/exam.xml | 194 --- .../res/values-lt-rLT/objectives.xml | 79 - .../androidMain/res/values-lt-rLT/strings.xml | 14 - .../androidMain/res/values-nb-rNO/exam.xml | 215 --- .../res/values-nb-rNO/objectives.xml | 100 -- .../androidMain/res/values-nb-rNO/strings.xml | 14 - .../androidMain/res/values-nl-rNL/exam.xml | 196 --- .../res/values-nl-rNL/objectives.xml | 83 -- .../androidMain/res/values-nl-rNL/strings.xml | 14 - .../androidMain/res/values-pl-rPL/exam.xml | 196 --- .../res/values-pl-rPL/objectives.xml | 82 -- .../androidMain/res/values-pl-rPL/strings.xml | 14 - .../androidMain/res/values-pt-rBR/exam.xml | 165 --- .../res/values-pt-rBR/objectives.xml | 72 - .../androidMain/res/values-pt-rBR/strings.xml | 14 - .../androidMain/res/values-pt-rPT/exam.xml | 165 --- .../res/values-pt-rPT/objectives.xml | 43 - .../androidMain/res/values-pt-rPT/strings.xml | 12 - .../androidMain/res/values-ro-rRO/exam.xml | 215 --- .../res/values-ro-rRO/objectives.xml | 99 -- .../androidMain/res/values-ro-rRO/strings.xml | 14 - .../androidMain/res/values-ru-rRU/exam.xml | 185 --- .../res/values-ru-rRU/objectives.xml | 95 -- .../androidMain/res/values-ru-rRU/strings.xml | 14 - .../androidMain/res/values-sk-rSK/exam.xml | 215 --- .../res/values-sk-rSK/objectives.xml | 99 -- .../androidMain/res/values-sk-rSK/strings.xml | 14 - .../androidMain/res/values-sr-rCS/exam.xml | 2 - .../res/values-sr-rCS/objectives.xml | 2 - .../androidMain/res/values-sr-rCS/strings.xml | 2 - .../androidMain/res/values-sv-rSE/exam.xml | 167 --- .../res/values-sv-rSE/objectives.xml | 72 - .../androidMain/res/values-sv-rSE/strings.xml | 14 - .../androidMain/res/values-tr-rTR/exam.xml | 194 --- .../res/values-tr-rTR/objectives.xml | 82 -- .../androidMain/res/values-tr-rTR/strings.xml | 14 - .../androidMain/res/values-uk-rUA/exam.xml | 2 - .../res/values-uk-rUA/objectives.xml | 2 - .../androidMain/res/values-uk-rUA/strings.xml | 1 - .../androidMain/res/values-vi-rVN/exam.xml | 215 --- .../res/values-vi-rVN/objectives.xml | 100 -- .../androidMain/res/values-vi-rVN/strings.xml | 14 - .../androidMain/res/values-zh-rCN/exam.xml | 216 --- .../res/values-zh-rCN/objectives.xml | 104 -- .../androidMain/res/values-zh-rCN/strings.xml | 14 - .../androidMain/res/values-zh-rTW/exam.xml | 215 --- .../res/values-zh-rTW/objectives.xml | 99 -- .../androidMain/res/values-zh-rTW/strings.xml | 14 - .../src/androidMain/res/values/exam.xml | 218 --- .../src/androidMain/res/values/objectives.xml | 101 -- .../src/androidMain/res/values/strings.xml | 14 - .../objectives/ObjectivesPlugin.kt | 152 -- .../constraints/objectives/SntpClient.kt | 43 - .../constraints/objectives/SntpPacket.kt | 117 -- .../objectives/compose/ExamBottomSheet.kt | 217 --- .../objectives/compose/LearnedBottomSheet.kt | 94 -- .../objectives/compose/NtpProgressDialog.kt | 41 - .../compose/ObjectivesComposeContent.kt | 90 -- .../objectives/compose/ObjectivesScreen.kt | 710 --------- .../objectives/compose/ObjectivesUiState.kt | 99 -- .../objectives/compose/ObjectivesViewModel.kt | 460 ------ .../events/EventObjectivesUpdateGui.kt | 5 - .../keys/ObjectivesBooleanComposedKey.kt | 13 - .../keys/ObjectivesLongComposedKey.kt | 14 - .../objectives/objectives/DurationText.kt | 20 - .../objectives/objectives/Objective.kt | 158 -- .../objectives/objectives/Objective0.kt | 108 -- .../objectives/objectives/Objective1.kt | 63 - .../objectives/objectives/Objective2.kt | 335 ----- .../objectives/objectives/Objective3.kt | 50 - .../objectives/objectives/Objective4.kt | 43 - .../objectives/objectives/Objective5.kt | 32 - .../objectives/objectives/Objective6.kt | 50 - .../objectives/objectives/Objective7.kt | 34 - .../objectives/objectives/Objective8.kt | 34 - .../objectives/objectives/Objective9.kt | 34 - .../objectives/PlainDurationText.kt | 28 - .../constraints/objectives/IosSntpClient.kt | 36 - .../constraints/objectives/JvmSntpClient.kt | 128 -- plugins/main/build.gradle.kts | 1 - .../src/androidMain/res/values/strings.xml | 3 + plugins/sync/build.gradle.kts | 1 - .../ClientControlRoundTripTest.kt | 3 +- .../clientcontrol/OrphanDetectorTest.kt | 18 +- .../data/NSDeviceStatusHandlerTest.kt | 4 +- .../extensions/DeviceStatusExtensionKtTest.kt | 4 +- .../sync/nsclientV3/ws/NsFrameHandlerTest.kt | 4 +- .../DataHandlerMobileWearBolusTest.kt | 2 +- .../nsclientV3/services/NSClientV3Service.kt | 1 - .../sync/openhumans/AllowedPreferenceKeys.kt | 1 - .../wear/wearintegration/DataHandlerMobile.kt | 2 +- .../sync/nsclientV3/NSClientV3Plugin.kt | 2 - .../nsclientV3/NsIncomingDataProcessor.kt | 6 - .../nsclientV3/data/NSDeviceStatusHandler.kt | 6 - .../sync/nsclientV3/ws/NsFrameHandler.kt | 3 - .../plugins/sync/di/SyncPluginsListModule.kt | 79 + .../aaps/pump/carelevo/CarelevoPumpPlugin.kt | 4 +- .../carelevo/common/CarelevoAlarmNotifier.kt | 24 +- .../pump/carelevo/domain/type/AlarmType.kt | 4 +- .../CarelevoPumpPluginLifecycleTest.kt | 19 +- .../common/CarelevoAlarmNotifierTest.kt | 18 +- .../services/DanaRv2ExecutionService.kt | 3 +- .../pump/danars/services/DanaRSService.kt | 3 +- .../pump/diaconn/service/BLECommonService.kt | 7 +- .../pump/diaconn/service/DiaconnG8Service.kt | 3 +- .../aaps/pump/eopatch/alarm/AlarmManager.kt | 6 +- .../app/aaps/pump/eopatch/ble/PatchManager.kt | 4 +- .../app/aaps/pump/equil/EquilPumpPlugin.kt | 18 +- .../aaps/pump/equil/manager/EquilManager.kt | 3 +- .../pump/medtronic/MedtronicPumpPlugin.kt | 3 +- .../pump/medtrum/services/MedtrumService.kt | 16 +- .../omnipod/dash/OmnipodDashPumpPlugin.kt | 63 +- .../omnipod/eros/OmnipodErosPumpPlugin.kt | 17 +- .../pump/omnipod/omnipod5/O5PumpPlugin.kt | 5 +- .../pod/security/AndroidKeystoreAesCipher.kt | 2 + .../pump/omnipod/omnipod5/O5PumpPluginTest.kt | 36 +- shared/clientbindings/build.gradle.kts | 4 +- .../clientbindings/ClientGraphBindings.kt | 36 +- .../aaps/shared/impl/di/SharedImplModule.kt | 57 + ui/build.gradle.kts | 20 - .../aaps/ui/compose/main/MainViewModelTest.kt | 91 +- .../MaintenanceBottomSheetContentTest.kt | 4 +- .../overview/OverviewScreenVariantsTest.kt | 250 ---- .../StatusLightsSettingsContentTest.kt | 59 - .../overview/chips/ChipsViewModelTest.kt | 11 +- .../RunningModeManagementViewModelTest.kt | 4 +- .../ui/compose/stats/TrioStatsDataTest.kt | 137 ++ .../compose/testing/FakeOverviewDataCache.kt | 1 + .../testing/OverviewViewModelFixture.kt | 234 --- .../app/aaps/ui/search/SearchViewModelTest.kt | 171 --- .../aaps/ui/activities/ErrorScreenPreviews.kt | 5 +- ui/src/androidMain/res/values/strings.xml | 96 ++ .../compose/carbsDialog/CarbsDialogScreen.kt | 18 +- .../carbsDialog/CarbsDialogScreenPreviews.kt | 1 - .../compose/carbsDialog/CarbsDialogUiState.kt | 1 - .../carbsDialog/CarbsDialogViewModel.kt | 1 - .../ui/compose/careDialog/CareDialogScreen.kt | 18 +- .../careDialog/CareDialogScreenPreviews.kt | 3 +- .../compose/careDialog/CareDialogUiState.kt | 10 - .../compose/careDialog/CareDialogViewModel.kt | 2 - .../configuration/ConfigurationScreen.kt | 84 +- .../ui/compose/fillDialog/FillDialogScreen.kt | 18 +- .../fillDialog/FillDialogScreenPreviews.kt | 3 +- .../compose/fillDialog/FillDialogUiState.kt | 1 - .../compose/fillDialog/FillDialogViewModel.kt | 1 - .../aaps/ui/compose/history/HistoryScreen.kt | 26 +- .../insulinDialog/InsulinDialogScreen.kt | 30 +- .../InsulinDialogScreenPreviews.kt | 3 +- .../insulinDialog/InsulinDialogUiState.kt | 1 - .../insulinDialog/InsulinDialogViewModel.kt | 1 - .../app/aaps/ui/compose/main/MainDrawer.kt | 151 -- .../aaps/ui/compose/main/MainNavigationBar.kt | 282 ---- .../app/aaps/ui/compose/main/MainScreen.kt | 433 +----- .../app/aaps/ui/compose/main/MainTopBar.kt | 91 -- .../app/aaps/ui/compose/main/MainUiState.kt | 23 +- .../app/aaps/ui/compose/main/MainViewModel.kt | 313 +++- .../aaps/ui/compose/main/OverviewScreen.kt | 124 +- .../app/aaps/ui/compose/main/TrioNavTab.kt | 5 + .../maintenance/MaintenanceBottomSheet.kt | 9 +- .../MaintenanceBottomSheetPreviews.kt | 2 +- .../compose/maintenance/MaintenanceDialogs.kt | 63 + .../compose/maintenance/MaintenanceScreen.kt | 34 + .../aaps/ui/compose/overview/BgInfoSection.kt | 81 +- .../aaps/ui/compose/overview/LargeClock.kt | 72 - .../ui/compose/overview/LargeClockPreviews.kt | 21 - .../compose/overview/OverviewDataCacheImpl.kt | 66 +- .../ui/compose/overview/OverviewScreen.kt | 259 +--- .../compose/overview/OverviewScreenSplit.kt | 202 --- .../compose/overview/OverviewScreenStacked.kt | 171 --- .../compose/overview/OverviewScreenTablet.kt | 213 --- .../compose/overview/OverviewStatusSection.kt | 261 ---- .../overview/OverviewStatusSectionPreviews.kt | 90 -- .../ui/compose/overview/TrioOverviewModel.kt | 57 + .../ui/compose/overview/chips/ChipsUiState.kt | 1 + .../compose/overview/chips/ChipsViewModel.kt | 45 +- .../ui/compose/overview/chips/SceneBadge.kt | 2 +- .../compose/overview/graphs/GraphViewModel.kt | 2 - .../compose/overview/graphs/GraphsSection.kt | 35 +- .../preferences/AllPreferencesScreen.kt | 91 +- .../ProfileActivationScreen.kt | 20 +- .../viewmodels/ProfileManagementViewModel.kt | 6 +- .../RunningModeManagementViewModel.kt | 17 +- .../app/aaps/ui/compose/stats/StatsScreen.kt | 28 +- .../ui/compose/stats/TrioInsulinStatsData.kt | 77 + .../aaps/ui/compose/stats/TrioStatsData.kt | 178 +++ .../aaps/ui/compose/stats/TrioStatsScreen.kt | 925 ++++++++++++ .../stats/viewmodels/StatsViewModel.kt | 102 ++ .../ui/compose/tempTarget/TempTargetEditor.kt | 24 +- .../tempTarget/TempTargetManagementScreen.kt | 5 +- .../tempTarget/TempTargetManagementUiState.kt | 3 - .../TempTargetManagementViewModel.kt | 15 +- .../ui/compose/treatments/TreatmentsScreen.kt | 20 +- .../wizardDialog/WizardDialogScreen.kt | 18 +- .../wizardDialog/WizardDialogUiState.kt | 1 - .../wizardDialog/WizardDialogViewModel.kt | 2 - .../app/aaps/ui/search/BuiltInSearchables.kt | 10 +- .../kotlin/app/aaps/ui/search/Diacritics.kt | 10 - .../app/aaps/ui/search/DialogSearchables.kt | 32 - .../kotlin/app/aaps/ui/search/SearchBar.kt | 163 --- .../kotlin/app/aaps/ui/search/SearchIndex.kt | 35 - .../app/aaps/ui/search/SearchIndexBuilder.kt | 343 ----- .../app/aaps/ui/search/SearchResults.kt | 341 ----- .../app/aaps/ui/search/SearchViewModel.kt | 236 --- .../aaps/ui/search/WikiSearchRepository.kt | 172 --- .../app/aaps/ui/search/DiacriticsTest.kt | 49 - .../app/aaps/ui/search/Diacritics.ios.kt | 16 - .../aaps/ui/search/Diacritics.jvmShared.kt | 7 - .../app/aaps/wear/comm/DataHandlerWear.kt | 2 + .../wear/comm/DataLayerListenerServiceWear.kt | 6 +- .../workflow/PostCalculationRunnerTest.kt | 1 + .../aaps/workflow/PostCalculationRunner.kt | 34 +- 473 files changed, 7703 insertions(+), 19059 deletions(-) delete mode 100644 .claude/agent-memory/ui-to-common/project_constraints-objectives-move.md create mode 100644 .github/workflows/copilot-setup-steps.yml create mode 100644 app/src/main/kotlin/app/aaps/trio/TrioUi.kt create mode 100644 app/src/main/kotlin/app/aaps/trio/ui/compose/main/TrioAddActionsSheet.kt create mode 100644 app/src/main/kotlin/app/aaps/trio/ui/compose/main/TrioBottomBar.kt create mode 100644 app/src/main/kotlin/app/aaps/trio/ui/compose/main/TrioTabScaffold.kt create mode 100644 app/src/main/kotlin/app/aaps/trio/ui/compose/main/TrioTopBar.kt create mode 100644 app/src/main/kotlin/app/aaps/trio/ui/compose/main/TrioUiImpl.kt create mode 100644 app/src/main/kotlin/app/aaps/trio/ui/compose/overview/TrioOverviewGraph.kt create mode 100644 app/src/main/kotlin/app/aaps/trio/ui/compose/overview/TrioOverviewScreen.kt create mode 100644 app/src/test/kotlin/app/aaps/trio/ui/compose/overview/TrioOverviewGraphTest.kt delete mode 100644 core/interfaces/src/commonMain/kotlin/app/aaps/core/interfaces/constraints/Objectives.kt create mode 100644 core/interfaces/src/commonMain/kotlin/app/aaps/core/interfaces/maintenance/BackupDatabaseConstants.kt create mode 100644 core/interfaces/src/commonMain/kotlin/app/aaps/core/interfaces/overview/graph/PredictionDataPoints.kt create mode 100644 core/interfaces/src/commonMain/kotlin/app/aaps/core/interfaces/pump/PumpTimeRemaining.kt create mode 100644 core/ui/src/androidMain/res/drawable-nodpi/trio_launcher_art.png create mode 100644 core/ui/src/androidMain/res/drawable/ic_launcher.xml create mode 100644 core/ui/src/androidMain/res/drawable/ic_launcher_background.xml create mode 100644 core/ui/src/androidMain/res/drawable/ic_launcher_foreground.xml create mode 100644 core/ui/src/androidMain/res/drawable/ic_launcher_monochrome.xml delete mode 100644 core/ui/src/androidMain/res/drawable/notif_icon.png delete mode 100644 core/ui/src/androidMain/res/drawable/splash_logo.xml create mode 100644 core/ui/src/androidMain/res/values/drawables.xml delete mode 100644 core/ui/src/commonMain/kotlin/app/aaps/core/ui/compose/icons/IcPluginObjectives.kt delete mode 100644 core/ui/src/commonMain/kotlin/app/aaps/core/ui/compose/icons/IcPluginObjectivesPreviews.kt delete mode 100644 core/ui/src/commonMain/kotlin/app/aaps/core/ui/compose/icons/IcSetupWizard.kt delete mode 100644 core/ui/src/commonMain/kotlin/app/aaps/core/ui/compose/icons/IcSetupWizardPreviews.kt create mode 100644 core/ui/src/commonMain/kotlin/app/aaps/core/ui/extensions/Double.kt delete mode 100644 gradle/gradle-daemon-jvm.properties delete mode 100644 implementation/src/androidHostTest/kotlin/app/aaps/implementation/androidNotification/AlarmNotificationManagerCancelTest.kt delete mode 100644 implementation/src/iosMain/kotlin/app/aaps/implementation/notifications/AlarmVolumeRamp.kt delete mode 100644 implementation/src/iosTest/kotlin/app/aaps/implementation/notifications/AlarmVolumeRampTest.kt delete mode 100644 plugins/constraints/src/androidHostTest/kotlin/app/aaps/plugins/constraints/objectives/ObjectivesPluginTest.kt delete mode 100644 plugins/constraints/src/androidHostTest/kotlin/app/aaps/plugins/constraints/objectives/SntpClientTest.kt delete mode 100644 plugins/constraints/src/androidHostTest/kotlin/app/aaps/plugins/constraints/objectives/SntpPacketTest.kt delete mode 100644 plugins/constraints/src/androidHostTest/kotlin/app/aaps/plugins/constraints/objectives/compose/ObjectivesScreenTest.kt delete mode 100644 plugins/constraints/src/androidHostTest/kotlin/app/aaps/plugins/constraints/objectives/compose/ObjectivesViewModelTest.kt delete mode 100644 plugins/constraints/src/androidMain/kotlin/app/aaps/plugins/constraints/objectives/objectives/AndroidDurationText.kt delete mode 100644 plugins/constraints/src/androidMain/res/values-ar-rSA/exam.xml delete mode 100644 plugins/constraints/src/androidMain/res/values-ar-rSA/objectives.xml delete mode 100644 plugins/constraints/src/androidMain/res/values-bg-rBG/exam.xml delete mode 100644 plugins/constraints/src/androidMain/res/values-bg-rBG/objectives.xml delete mode 100644 plugins/constraints/src/androidMain/res/values-ca-rES/exam.xml delete mode 100644 plugins/constraints/src/androidMain/res/values-ca-rES/objectives.xml delete mode 100644 plugins/constraints/src/androidMain/res/values-cs-rCZ/exam.xml delete mode 100644 plugins/constraints/src/androidMain/res/values-cs-rCZ/objectives.xml delete mode 100644 plugins/constraints/src/androidMain/res/values-da-rDK/exam.xml delete mode 100644 plugins/constraints/src/androidMain/res/values-da-rDK/objectives.xml delete mode 100644 plugins/constraints/src/androidMain/res/values-de-rDE/exam.xml delete mode 100644 plugins/constraints/src/androidMain/res/values-de-rDE/objectives.xml delete mode 100644 plugins/constraints/src/androidMain/res/values-el-rGR/exam.xml delete mode 100644 plugins/constraints/src/androidMain/res/values-el-rGR/objectives.xml delete mode 100644 plugins/constraints/src/androidMain/res/values-es-rES/exam.xml delete mode 100644 plugins/constraints/src/androidMain/res/values-es-rES/objectives.xml delete mode 100644 plugins/constraints/src/androidMain/res/values-fr-rFR/exam.xml delete mode 100644 plugins/constraints/src/androidMain/res/values-fr-rFR/objectives.xml delete mode 100644 plugins/constraints/src/androidMain/res/values-hr-rHR/exam.xml delete mode 100644 plugins/constraints/src/androidMain/res/values-hr-rHR/objectives.xml delete mode 100644 plugins/constraints/src/androidMain/res/values-hu-rHU/exam.xml delete mode 100644 plugins/constraints/src/androidMain/res/values-hu-rHU/objectives.xml delete mode 100644 plugins/constraints/src/androidMain/res/values-it-rIT/exam.xml delete mode 100644 plugins/constraints/src/androidMain/res/values-it-rIT/objectives.xml delete mode 100644 plugins/constraints/src/androidMain/res/values-iw-rIL/exam.xml delete mode 100644 plugins/constraints/src/androidMain/res/values-iw-rIL/objectives.xml delete mode 100644 plugins/constraints/src/androidMain/res/values-ko-rKR/exam.xml delete mode 100644 plugins/constraints/src/androidMain/res/values-ko-rKR/objectives.xml delete mode 100644 plugins/constraints/src/androidMain/res/values-lt-rLT/exam.xml delete mode 100644 plugins/constraints/src/androidMain/res/values-lt-rLT/objectives.xml delete mode 100644 plugins/constraints/src/androidMain/res/values-nb-rNO/exam.xml delete mode 100644 plugins/constraints/src/androidMain/res/values-nb-rNO/objectives.xml delete mode 100644 plugins/constraints/src/androidMain/res/values-nl-rNL/exam.xml delete mode 100644 plugins/constraints/src/androidMain/res/values-nl-rNL/objectives.xml delete mode 100644 plugins/constraints/src/androidMain/res/values-pl-rPL/exam.xml delete mode 100644 plugins/constraints/src/androidMain/res/values-pl-rPL/objectives.xml delete mode 100644 plugins/constraints/src/androidMain/res/values-pt-rBR/exam.xml delete mode 100644 plugins/constraints/src/androidMain/res/values-pt-rBR/objectives.xml delete mode 100644 plugins/constraints/src/androidMain/res/values-pt-rPT/exam.xml delete mode 100644 plugins/constraints/src/androidMain/res/values-pt-rPT/objectives.xml delete mode 100644 plugins/constraints/src/androidMain/res/values-ro-rRO/exam.xml delete mode 100644 plugins/constraints/src/androidMain/res/values-ro-rRO/objectives.xml delete mode 100644 plugins/constraints/src/androidMain/res/values-ru-rRU/exam.xml delete mode 100644 plugins/constraints/src/androidMain/res/values-ru-rRU/objectives.xml delete mode 100644 plugins/constraints/src/androidMain/res/values-sk-rSK/exam.xml delete mode 100644 plugins/constraints/src/androidMain/res/values-sk-rSK/objectives.xml delete mode 100644 plugins/constraints/src/androidMain/res/values-sr-rCS/exam.xml delete mode 100644 plugins/constraints/src/androidMain/res/values-sr-rCS/objectives.xml delete mode 100644 plugins/constraints/src/androidMain/res/values-sv-rSE/exam.xml delete mode 100644 plugins/constraints/src/androidMain/res/values-sv-rSE/objectives.xml delete mode 100644 plugins/constraints/src/androidMain/res/values-tr-rTR/exam.xml delete mode 100644 plugins/constraints/src/androidMain/res/values-tr-rTR/objectives.xml delete mode 100644 plugins/constraints/src/androidMain/res/values-uk-rUA/exam.xml delete mode 100644 plugins/constraints/src/androidMain/res/values-uk-rUA/objectives.xml delete mode 100644 plugins/constraints/src/androidMain/res/values-vi-rVN/exam.xml delete mode 100644 plugins/constraints/src/androidMain/res/values-vi-rVN/objectives.xml delete mode 100644 plugins/constraints/src/androidMain/res/values-zh-rCN/exam.xml delete mode 100644 plugins/constraints/src/androidMain/res/values-zh-rCN/objectives.xml delete mode 100644 plugins/constraints/src/androidMain/res/values-zh-rTW/exam.xml delete mode 100644 plugins/constraints/src/androidMain/res/values-zh-rTW/objectives.xml delete mode 100644 plugins/constraints/src/androidMain/res/values/exam.xml delete mode 100644 plugins/constraints/src/androidMain/res/values/objectives.xml delete mode 100644 plugins/constraints/src/commonMain/kotlin/app/aaps/plugins/constraints/objectives/ObjectivesPlugin.kt delete mode 100644 plugins/constraints/src/commonMain/kotlin/app/aaps/plugins/constraints/objectives/SntpClient.kt delete mode 100644 plugins/constraints/src/commonMain/kotlin/app/aaps/plugins/constraints/objectives/SntpPacket.kt delete mode 100644 plugins/constraints/src/commonMain/kotlin/app/aaps/plugins/constraints/objectives/compose/ExamBottomSheet.kt delete mode 100644 plugins/constraints/src/commonMain/kotlin/app/aaps/plugins/constraints/objectives/compose/LearnedBottomSheet.kt delete mode 100644 plugins/constraints/src/commonMain/kotlin/app/aaps/plugins/constraints/objectives/compose/NtpProgressDialog.kt delete mode 100644 plugins/constraints/src/commonMain/kotlin/app/aaps/plugins/constraints/objectives/compose/ObjectivesComposeContent.kt delete mode 100644 plugins/constraints/src/commonMain/kotlin/app/aaps/plugins/constraints/objectives/compose/ObjectivesScreen.kt delete mode 100644 plugins/constraints/src/commonMain/kotlin/app/aaps/plugins/constraints/objectives/compose/ObjectivesUiState.kt delete mode 100644 plugins/constraints/src/commonMain/kotlin/app/aaps/plugins/constraints/objectives/compose/ObjectivesViewModel.kt delete mode 100644 plugins/constraints/src/commonMain/kotlin/app/aaps/plugins/constraints/objectives/events/EventObjectivesUpdateGui.kt delete mode 100644 plugins/constraints/src/commonMain/kotlin/app/aaps/plugins/constraints/objectives/keys/ObjectivesBooleanComposedKey.kt delete mode 100644 plugins/constraints/src/commonMain/kotlin/app/aaps/plugins/constraints/objectives/keys/ObjectivesLongComposedKey.kt delete mode 100644 plugins/constraints/src/commonMain/kotlin/app/aaps/plugins/constraints/objectives/objectives/DurationText.kt delete mode 100644 plugins/constraints/src/commonMain/kotlin/app/aaps/plugins/constraints/objectives/objectives/Objective.kt delete mode 100644 plugins/constraints/src/commonMain/kotlin/app/aaps/plugins/constraints/objectives/objectives/Objective0.kt delete mode 100644 plugins/constraints/src/commonMain/kotlin/app/aaps/plugins/constraints/objectives/objectives/Objective1.kt delete mode 100644 plugins/constraints/src/commonMain/kotlin/app/aaps/plugins/constraints/objectives/objectives/Objective2.kt delete mode 100644 plugins/constraints/src/commonMain/kotlin/app/aaps/plugins/constraints/objectives/objectives/Objective3.kt delete mode 100644 plugins/constraints/src/commonMain/kotlin/app/aaps/plugins/constraints/objectives/objectives/Objective4.kt delete mode 100644 plugins/constraints/src/commonMain/kotlin/app/aaps/plugins/constraints/objectives/objectives/Objective5.kt delete mode 100644 plugins/constraints/src/commonMain/kotlin/app/aaps/plugins/constraints/objectives/objectives/Objective6.kt delete mode 100644 plugins/constraints/src/commonMain/kotlin/app/aaps/plugins/constraints/objectives/objectives/Objective7.kt delete mode 100644 plugins/constraints/src/commonMain/kotlin/app/aaps/plugins/constraints/objectives/objectives/Objective8.kt delete mode 100644 plugins/constraints/src/commonMain/kotlin/app/aaps/plugins/constraints/objectives/objectives/Objective9.kt delete mode 100644 plugins/constraints/src/commonMain/kotlin/app/aaps/plugins/constraints/objectives/objectives/PlainDurationText.kt delete mode 100644 plugins/constraints/src/iosMain/kotlin/app/aaps/plugins/constraints/objectives/IosSntpClient.kt delete mode 100644 plugins/constraints/src/jvmSharedMain/kotlin/app/aaps/plugins/constraints/objectives/JvmSntpClient.kt create mode 100644 plugins/sync/src/main/kotlin/app/aaps/plugins/sync/di/SyncPluginsListModule.kt create mode 100644 shared/impl/src/main/kotlin/app/aaps/shared/impl/di/SharedImplModule.kt delete mode 100644 ui/src/androidHostTest/kotlin/app/aaps/ui/compose/overview/OverviewScreenVariantsTest.kt delete mode 100644 ui/src/androidHostTest/kotlin/app/aaps/ui/compose/overview/StatusLightsSettingsContentTest.kt create mode 100644 ui/src/androidHostTest/kotlin/app/aaps/ui/compose/stats/TrioStatsDataTest.kt delete mode 100644 ui/src/androidHostTest/kotlin/app/aaps/ui/compose/testing/OverviewViewModelFixture.kt delete mode 100644 ui/src/androidHostTest/kotlin/app/aaps/ui/search/SearchViewModelTest.kt delete mode 100644 ui/src/commonMain/kotlin/app/aaps/ui/compose/main/MainDrawer.kt delete mode 100644 ui/src/commonMain/kotlin/app/aaps/ui/compose/main/MainNavigationBar.kt delete mode 100644 ui/src/commonMain/kotlin/app/aaps/ui/compose/main/MainTopBar.kt create mode 100644 ui/src/commonMain/kotlin/app/aaps/ui/compose/main/TrioNavTab.kt create mode 100644 ui/src/commonMain/kotlin/app/aaps/ui/compose/maintenance/MaintenanceScreen.kt delete mode 100644 ui/src/commonMain/kotlin/app/aaps/ui/compose/overview/LargeClock.kt delete mode 100644 ui/src/commonMain/kotlin/app/aaps/ui/compose/overview/LargeClockPreviews.kt delete mode 100644 ui/src/commonMain/kotlin/app/aaps/ui/compose/overview/OverviewScreenSplit.kt delete mode 100644 ui/src/commonMain/kotlin/app/aaps/ui/compose/overview/OverviewScreenStacked.kt delete mode 100644 ui/src/commonMain/kotlin/app/aaps/ui/compose/overview/OverviewScreenTablet.kt delete mode 100644 ui/src/commonMain/kotlin/app/aaps/ui/compose/overview/OverviewStatusSection.kt delete mode 100644 ui/src/commonMain/kotlin/app/aaps/ui/compose/overview/OverviewStatusSectionPreviews.kt create mode 100644 ui/src/commonMain/kotlin/app/aaps/ui/compose/overview/TrioOverviewModel.kt create mode 100644 ui/src/commonMain/kotlin/app/aaps/ui/compose/stats/TrioInsulinStatsData.kt create mode 100644 ui/src/commonMain/kotlin/app/aaps/ui/compose/stats/TrioStatsData.kt create mode 100644 ui/src/commonMain/kotlin/app/aaps/ui/compose/stats/TrioStatsScreen.kt delete mode 100644 ui/src/commonMain/kotlin/app/aaps/ui/search/Diacritics.kt delete mode 100644 ui/src/commonMain/kotlin/app/aaps/ui/search/DialogSearchables.kt delete mode 100644 ui/src/commonMain/kotlin/app/aaps/ui/search/SearchBar.kt delete mode 100644 ui/src/commonMain/kotlin/app/aaps/ui/search/SearchIndex.kt delete mode 100644 ui/src/commonMain/kotlin/app/aaps/ui/search/SearchIndexBuilder.kt delete mode 100644 ui/src/commonMain/kotlin/app/aaps/ui/search/SearchResults.kt delete mode 100644 ui/src/commonMain/kotlin/app/aaps/ui/search/SearchViewModel.kt delete mode 100644 ui/src/commonMain/kotlin/app/aaps/ui/search/WikiSearchRepository.kt delete mode 100644 ui/src/commonTest/kotlin/app/aaps/ui/search/DiacriticsTest.kt delete mode 100644 ui/src/iosMain/kotlin/app/aaps/ui/search/Diacritics.ios.kt delete mode 100644 ui/src/jvmSharedMain/kotlin/app/aaps/ui/search/Diacritics.jvmShared.kt diff --git a/.claude/agent-memory/ui-to-common/project_constraints-objectives-move.md b/.claude/agent-memory/ui-to-common/project_constraints-objectives-move.md deleted file mode 100644 index 624943f3682a..000000000000 --- a/.claude/agent-memory/ui-to-common/project_constraints-objectives-move.md +++ /dev/null @@ -1,43 +0,0 @@ ---- -name: constraints-objectives-move -description: State of the :plugins:constraints androidMain -> commonMain Compose move, and the three exact root causes that pin the remaining 14 objectives files -metadata: - type: project ---- - -`ObjectivesScreen.kt`, `ExamBottomSheet`, `LearnedBottomSheet`, `NtpProgressDialog`, -`ObjectivesUiState`, the events and the keys are already in commonMain and compile for iosArm64. -104 androidHostTest tests, 0 failures (2026-08-30). - -Still in androidMain: `ObjectivesComposeContent`, `ObjectivesViewModel`, `ObjectivesPlugin`, -`SntpClient`, `Objective` + `Objective0..9`. - -**Why:** measured with three probe moves in Aug 2026 (moved, compiled `:plugins:constraints: -compileKotlinIosArm64`, reverted). A raw move of the whole cluster gives 88 errors; applying only the -mechanical fixes leaves **exactly 25, and they are three root causes, one per file**: - -1. `Objective.kt` - `rh.gq(app.aaps.core.ui.R.plurals.days/hours/minutes, ...)` in - `MinimumDurationTask.getDurationText`. See [[no-plural-api-in-commonmain]]. -2. `ObjectivesPlugin.kt` - the `@APS` multibinding qualifier is in - `core/interfaces/src/androidMain/.../di/APS.kt` and carries `javax.inject.Qualifier`. -3. `SntpClient.kt` - `java.net.DatagramSocket`, `SecureRandom`, `android.os.SystemClock`. - iOS *can* do SNTP (it is plain UDP), so this is a work-sizing question, not a capability gap. - `ktor-network` (UDP on JVM+Native) is not in the version catalog; only the ktor *client* is. - -Everything else in the cluster is cascade. `ObjectivesComposeContent` and `Objective0..9` produced -**zero** errors of their own - they are pinned only by transitive references, so they cannot move -before 1-3 are settled. There is **no safe movable subset**; a run that tries one will move nothing. - -**How to apply:** do not reopen this as "a screen move". It is three separate decisions, and 2 and 3 -are `:core:*` / new-library questions. Verified mechanical, if the cluster ever does move: -`ResourceHelper` -> `TextResolver` everywhere (`PluginBase.rh` is already `TextResolver`, so -`ObjectivesPlugin`'s `override val rh: ResourceHelper` is a narrowing accident); -`import kotlin.jvm.JvmSuppressWildcards` added explicitly; the unused -`import app.aaps.plugins.constraints.R` in `Objective.kt` deleted; `System.currentTimeMillis()` -> -`dateUtil.now()` (a behaviour change under a faked clock - name it). - -Superseded: an earlier note here claimed `ObjectivesComposeContent` was blocked by -`MetroViewModelFactoryOwner`. It is not - see [[metroviewmodel-is-not-a-blocker]]. - -Related: [[cmp-what-crosses-unchanged]], [[feedback-mutation-restore-proof]], -[[move-breaks-two-test-harnesses]] diff --git a/.github/workflows/copilot-setup-steps.yml b/.github/workflows/copilot-setup-steps.yml new file mode 100644 index 000000000000..0574fba808ce --- /dev/null +++ b/.github/workflows/copilot-setup-steps.yml @@ -0,0 +1,39 @@ +name: Copilot Setup Steps + +on: + workflow_dispatch: + push: + paths: + - .github/workflows/copilot-setup-steps.yml + pull_request: + paths: + - .github/workflows/copilot-setup-steps.yml + +jobs: + copilot-setup-steps: + runs-on: ubuntu-latest + permissions: + contents: read + timeout-minutes: 59 + steps: + - name: Checkout code + uses: actions/checkout@v5 + + - name: Set up Java 21 + uses: actions/setup-java@v5 + with: + distribution: temurin + java-version: "21" + cache: gradle + + - name: Configure Gradle Java toolchains + run: | + mkdir -p ~/.gradle + { + echo "org.gradle.java.installations.auto-download=false" + echo "org.gradle.java.installations.auto-detect=false" + echo "org.gradle.java.installations.paths=${JAVA_HOME}" + } >> ~/.gradle/gradle.properties + + - name: Warm Gradle + run: ./gradlew :app:compileFullDebugKotlin --no-daemon diff --git a/README.md b/README.md index cdecad9cfd04..f06f02c0b29c 100644 --- a/README.md +++ b/README.md @@ -1,19 +1,29 @@ -# AAPS -* Check the wiki: https://wiki.aaps.app -* Want to contribute? Please read [CONTRIBUTING.md](CONTRIBUTING.md) first — note that AI-generated pull requests are not welcome. -* Everyone who’s been looping with AAPS needs to fill out the form after 3 days of looping https://docs.google.com/forms/d/14KcMjlINPMJHVt28MDRupa4sz4DDIooI4SrW0P3HSN8/viewform?c=0&w=1 +# Trio for Android + +### This is a fork of AAPS with a Trio inspired UI +- AAPS: https://github.com/nightscout/AndroidAPS +- Trio: https://github.com/nightscout/Trio +- JugglucoNG: https://github.com/ctqvva/JugglucoNG/ -[![Support Server](https://img.shields.io/discord/629952586895851530.svg?label=Discord&logo=Discord&colorB=7289da&style=for-the-badge)](https://discord.gg/4fQUWHZ4Mw) +### Changes +1. Live updates to show your BG +2. Trio style home navigation and home screen +3. Updated statistics screen inspired by JugglucoNG +4. Material theme -[![CircleCI](https://circleci.com/gh/nightscout/AndroidAPS/tree/master.svg?style=svg)](https://circleci.com/gh/nightscout/AndroidAPS/tree/master) -[![Crowdin](https://d322cqt584bo4o.cloudfront.net/androidaps/localized.svg)](https://translations.aaps.app/project/androidaps) -[![Documentation Status](https://readthedocs.org/projects/androidaps/badge/?version=latest)](https://wiki.aaps.app/en/latest/?badge=latest) -[![codecov](https://codecov.io/gh/nightscout/AndroidAPS/branch/master/graph/badge.svg?token=EmklfIV6bH)](https://codecov.io/gh/nightscout/AndroidAPS) +### Screenshots -DEV: -[![CircleCI](https://circleci.com/gh/nightscout/AndroidAPS/tree/dev.svg?style=svg)](https://circleci.com/gh/nightscout/AndroidAPS/tree/dev) -[![codecov](https://codecov.io/gh/nightscout/AndroidAPS/branch/dev/graph/badge.svg?token=EmklfIV6bH)](https://codecov.io/gh/nightscout/AndroidAPS/tree/dev) +|Light|Dark| +|---|---| +||| +|Staticstics|Graph gestures| +||| +|Status bar pill|Live updates| +||| -Bitcoin Icon +### Note +This app should only be used for research and development purposes, and not as a medical instrument. -3KawK8aQe48478s6fxJ8Ms6VTWkwjgr9f2 +* Check the wiki: https://wiki.aaps.app +* Want to contribute? Please read [CONTRIBUTING.md](CONTRIBUTING.md) first — note that AI-generated pull requests are not welcome. +* Everyone who’s been looping with AAPS needs to fill out the form after 3 days of looping https://docs.google.com/forms/d/14KcMjlINPMJHVt28MDRupa4sz4DDIooI4SrW0P3HSN8/viewform?c=0&w=1 diff --git a/_docs/desktop_alignment.md b/_docs/desktop_alignment.md index 2e028edca276..0b344fbcd077 100644 --- a/_docs/desktop_alignment.md +++ b/_docs/desktop_alignment.md @@ -173,8 +173,6 @@ save dialog, a folder it opens - is a product question rather than a porting one Not everything should be chased. Some of these are real platform limits and the honest answer is to say so rather than fake it: -- **`AlertOverrideDoNotDisturb`** - AWT offers one system beep and no notion of silent mode, so - desktop honours neither half of that setting. Recorded in `AlarmSoundPlayer`'s KDoc. - **Paired Bluetooth devices** - there is no list to read, which is why `DesktopPairedBtDevices` returns an empty list rather than null. Null means "ask the user for a permission" and there is no permission to ask for. diff --git a/_docs/ios_blockers.md b/_docs/ios_blockers.md index 2f35099c059d..7c57315ff09f 100644 --- a/_docs/ios_blockers.md +++ b/_docs/ios_blockers.md @@ -564,20 +564,6 @@ Not blockers, and not for the Windows session to fix. Listed so nobody is surpri `socket.io-client-java` Android uses, which is what keeps both platforms speaking to Nightscout identically. The graph has to take it as a factory parameter from the app at start up. -- `IosSystemNotificationPlatform.setAudibleAlarm` only logs, so **an urgent alarm makes no sound on - iOS today**. There are two separate paths and they are easy to confuse: - - *While the app is alive* - an `AVAudioPlayer` on an `AVAudioSession` with category `.playback`, - which ignores the hardware mute switch. **No entitlement needed.** This is the counterpart of - `AlarmSoundPlayerImpl`, and it is the missing piece: writing an iOS `AlarmSoundPlayer` and - driving it from `setAudibleAlarm` would make alarms work whenever AAPS is running. The four - sounds live in `core/ui/res/raw` as Android resources, so they would first have to reach the iOS - bundle. - - *While the app is not running* - only a Critical Alerts entitlement lets a notification break - through silent and Focus. Apple grants it to medical apps on application. This is a project - decision, not code. - - Earlier notes here said the entitlement was the only route. That was wrong: it is the only route - for a notification-delivered alarm, not for one the app plays itself. - `IosSystemNotificationPlatform.onDismissed` **is** wired now. Two things were needed and either one missing makes it silently never fire: a delegate on the shared centre, held in a property because that slot is weak, and a `UNNotificationCategory` carrying `customDismissAction`, without @@ -836,43 +822,6 @@ Checked the rest of the tree while there: the only other `kotlin.random.Random` pump serial number and a date helper, neither of which is security. -## Before anyone writes `IosUiInteraction`: the alarm owner tag is a trap - -Not a live bug - nothing on iOS plays with `OWNER_FULLSCREEN` today - but the next person to write -`UiInteraction.runAlarm` for iOS will walk into it, so it is written down before that happens. - -`AlarmSoundPlayer` records who started a sound. Two owners exist: `OWNER_INTERNAL`, used by the -notification registry through `setAudibleAlarm`, and `OWNER_FULLSCREEN`, used by Android's -`AlarmNotificationManager` for the full screen alarm that `runAlarm` posts. - -`stopAlarm` is `notificationManager.muteAllAlarms()` on both platforms, and that ends in -`refreshAlarmSound()` plus `platform.cancelAll()`. The difference is what `cancelAll` does: - -- `AndroidSystemNotificationPlatform.cancelAll()` calls `alarmNotificationManager().cancelAlarm()`, - which stops the **`OWNER_FULLSCREEN`** audio and cancels the notification. -- `IosSystemNotificationPlatform.cancelAll()` removes only the delivered notifications it posted - itself, matched by the instance-key parse. Nothing on the iOS side stops `OWNER_FULLSCREEN`, - because nothing starts it. (It used to call `removeAllPendingNotificationRequests()` as well, - which deleted the scheduled automation reminders - they share the `aaps-` prefix. Whatever - `runAlarm` ends up doing, it must not widen this back out.) - -So an iOS `runAlarm` that plays with `OWNER_FULLSCREEN` would produce a **ramping alarm that -`stopAlarm` cannot silence**. In a medical app that is the worse of the two failure directions, and -it would not show up in a build or in any test that does not actually let the sound run. - -Two ways out, and the choice is a design decision rather than a porting one: - -1. play with `OWNER_INTERNAL` and let the registry own the sound, accepting that - `setAudibleAlarm`'s `soundingKey` bookkeeping may silence it when the notification list changes; -2. give iOS its own counterpart of `cancelAlarm()` so `cancelAll()` stops the full screen owner too, - which is the shape Android already has. - -Related, and part of the same decision: `runAlarm` takes a `title`, and the shared registry does not -carry one - `CommonNotificationManager` derives the title from the level ("Urgent alarm" / "Info"). -Posting an alarm through the registry therefore loses the caller's title, while posting outside it -is what raises the owner tag question above. Android sidesteps both by not using the registry for -`runAlarm` at all. - Worth knowing while deciding: `UiInteraction` is injected on iOS but never called. `LoopPlugin` and `TreatmentsViewModel` hold it without using it in commonMain, and every reader of `mainActivity` and `errorHelperActivity` is androidMain - checked, not assumed. So the iOS implementation is needed to @@ -1308,8 +1257,7 @@ code rather than written twice. It should be deleted from both the day the Main - **The notification cluster - done.** There is one registry now. `AndroidSystemNotificationPlatform` (`implementation/src/androidMain/.../notifications/`) holds the Android half - channel, dismiss `BroadcastReceiver`, `NotificationCompat`, `PendingIntent` - and - makes the three way decision the old class made inline: URGENT **with a sound** is posted silently, - because `AlarmSoundPlayer` owns the ramping audio; anything else is shown only when + shows URGENT notifications as silent visual/vibration alerts; anything else is shown only when `AlertUrgentAsAndroidNotification` is set **and** there are no actions; otherwise nothing. `NotificationManagerImpl` is deleted and `CommonNotificationManager` is bound on both platforms. Notes for whoever reads this next: @@ -1318,13 +1266,13 @@ code rather than written twice. It should be deleted from both the day the Main - it is a `@Provides` in `ImplementationBindings`, not annotations on the class: building the registry registers the receiver and creates the channel, and that must not happen while the graph is being assembled. - - `AlarmNotificationManager`, `AlarmSoundPlayer` and `NotificationHolder` are injected as + - `AlarmNotificationManager` and `NotificationHolder` are injected as `Provider`s for the same reason. `AlarmNotificationManager` calls `createChannels()` in its own constructor, so injecting it directly makes the plain-JVM graph tests fail on `getSystemService`. - the channel is created on the first `show()` rather than at start up, so its entry in the system notification settings appears only after the first notification. - - `AlarmSoundPlayerImpl` and `NotificationHolderImpl` are on Metro now. `AlarmNotificationManager` - is the last one still on javax. + - `NotificationHolderImpl` is on Metro now. `AlarmNotificationManager` is the last one still on + javax. - 9 Robolectric tests pin the gating in `AndroidSystemNotificationPlatformTest`. The paths that need a real alarm are not covered on device yet. diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 2ed16dd47a19..dc6b6ee03787 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -125,6 +125,7 @@ android { buildConfigField("String", "REMOTE", "\"${generateGitRemote()}\"") buildConfigField("String", "HEAD", "\"${generateGitBuild()}\"") buildConfigField("String", "COMMITTED", "\"${allCommitted()}\"") + buildConfigField("boolean", "FIREBASE_ENABLED", "true") // Runner for instrumentation tests in this module. testInstrumentationRunner = "app.aaps.runners.AapsTestRunner" @@ -136,10 +137,10 @@ android { isDefault = true applicationId = "info.nightscout.androidaps" dimension = "standard" - resValue("string", "app_name", "AAPS") + resValue("string", "app_name", "Trio") versionName = Versions.appVersion - manifestPlaceholders["appIcon"] = "@mipmap/ic_launcher" - manifestPlaceholders["appIconRound"] = "@mipmap/ic_launcher_round" + manifestPlaceholders["appIcon"] = "@drawable/ic_launcher" + manifestPlaceholders["appIconRound"] = "@drawable/ic_launcher" } create("pumpcontrol") { applicationId = "info.nightscout.aapspumpcontrol" @@ -185,8 +186,12 @@ android { sourceSets { - getByName("aapsclient2") { kotlin.directories.add("src/aapsclient/kotlin") } - getByName("aapsclient3") { kotlin.directories.add("src/aapsclient/kotlin") } + getByName("main") { kotlin.directories.add("src/androidaps/kotlin") } + getByName("full") { kotlin.directories.addAll(listOf("src/aaps/kotlin", "src/withPumps/kotlin")) } + getByName("pumpcontrol") { kotlin.directories.addAll(listOf("src/aaps/kotlin", "src/withPumps/kotlin")) } + getByName("aapsclient") { kotlin.directories.add("src/aaps/kotlin") } + getByName("aapsclient2") { kotlin.directories.addAll(listOf("src/aaps/kotlin", "src/aapsclient/kotlin")) } + getByName("aapsclient3") { kotlin.directories.addAll(listOf("src/aaps/kotlin", "src/aapsclient/kotlin")) } // Instrumented tests that drive one pump, added only where that pump is in the build. An e2e // test for a Dana emulator has nothing to test without :pump:dana:danar, so it should not compile @@ -237,6 +242,8 @@ dependencies { implementation(project(":database:persistence")) implementation(project(":pump:virtual")) implementation(project(":workflow")) + implementation(libs.androidx.car.app) + implementation(libs.androidx.core) // Pump drivers — only for full + pumpcontrol flavors. Derived from the :pump:* modules included // in settings.gradle (single source of truth) minus one exception: @@ -260,7 +267,6 @@ dependencies { "fullImplementation"(project(it.path)) "pumpcontrolImplementation"(project(it.path)) } - implementation(libs.androidx.lifecycle.process) testImplementation(project(":shared:tests")) diff --git a/app/src/androidTest/kotlin/app/aaps/CobExtendedCarbsTest.kt b/app/src/androidTest/kotlin/app/aaps/CobExtendedCarbsTest.kt index a72758de8e75..d53d5a52de9c 100644 --- a/app/src/androidTest/kotlin/app/aaps/CobExtendedCarbsTest.kt +++ b/app/src/androidTest/kotlin/app/aaps/CobExtendedCarbsTest.kt @@ -49,7 +49,6 @@ class CobExtendedCarbsTest : AapsInstrumentedTest() { private val l get() = testGraphs.l private val config get() = testGraphs.config private val loop get() = testGraphs.loop - private val objectivesPlugin get() = testGraphs.objectivesPlugin private val commandQueue get() = testGraphs.commandQueue private val profileData = "{\"_id\":\"653f90bc89f99714b4635b33\",\"defaultProfile\":\"U200_32\",\"date\":1695655201449,\"created_at\":\"2023-09-25T15:20:01.449Z\"," + @@ -59,7 +58,6 @@ class CobExtendedCarbsTest : AapsInstrumentedTest() { fun tearDown() { rxHelper.clear() loop.lastRun = null - objectivesPlugin.objectives.forEach { it.startedOn = 0 } (profileFunction as ProfileFunctionImpl).cache.clear() // Leave the command queue empty for whatever runs next in this process. This class is @ShardB, // which it shares with six Dana tests that drive pumps through the same queue, and work left in @@ -79,10 +77,10 @@ class CobExtendedCarbsTest : AapsInstrumentedTest() { l.findByName(LTag.EVENTS.name).enabled = true assertThat(config.APS).isTrue() - setupProfileAndObjectives() + setupProfile() } - private suspend fun setupProfileAndObjectives() { + private suspend fun setupProfile() { persistenceLayer.clearDatabases() @SuppressLint("CheckResult") persistenceLayer.insertOrUpdateRunningMode( @@ -97,9 +95,6 @@ class CobExtendedCarbsTest : AapsInstrumentedTest() { listValues = listOf(ValueWithUnit.SimpleString("Test")) ) - objectivesPlugin.onStart() - objectivesPlugin.objectives[0].startedOn = 1 - (profileFunction as ProfileFunctionImpl).cache.clear() nsIncomingDataProcessor.processProfile(Json.parseToJsonElement(profileData).jsonObject, true) assertThat(profileRepository.profile.value).isNotNull() diff --git a/app/src/androidTest/kotlin/app/aaps/LoopTest.kt b/app/src/androidTest/kotlin/app/aaps/LoopTest.kt index d62b185bc90a..ea0bdc996ee2 100644 --- a/app/src/androidTest/kotlin/app/aaps/LoopTest.kt +++ b/app/src/androidTest/kotlin/app/aaps/LoopTest.kt @@ -45,7 +45,6 @@ class LoopTest : AapsInstrumentedTest() { private val rxHelper by lazy { newRxHelper() } private val l get() = testGraphs.l private val config get() = testGraphs.config - private val objectivesPlugin get() = testGraphs.objectivesPlugin private val persistenceLayer get() = testGraphs.persistenceLayer private val pumpSync get() = testGraphs.pumpSync private val iobCobCalculator get() = testGraphs.iobCobCalculator @@ -68,7 +67,6 @@ class LoopTest : AapsInstrumentedTest() { fun tearDown() { rxHelper.clear() loop.lastRun = null - objectivesPlugin.objectives.forEach { it.startedOn = 0 } (profileFunction as ProfileFunctionImpl).cache.clear() runBlocking { persistenceLayer.clearDatabases() } } @@ -91,7 +89,6 @@ class LoopTest : AapsInstrumentedTest() { rxHelper.listen(EventResetOpenAPSGui::class) rxHelper.listen(EventOpenAPSUpdateGui::class) rxHelper.listen(EventAPSCalculationFinished::class) - objectivesPlugin.onStart() // Enable event logging l.findByName(LTag.EVENTS.name).enabled = true @@ -99,19 +96,10 @@ class LoopTest : AapsInstrumentedTest() { // Are we running full flavor? assertThat(config.APS).isTrue() - // Loop should be limited by unfinished objectives - loop.invoke("test1", allowNotification = false) - var loopStatusEvent = rxHelper.waitFor(EventLoopSetLastRunGui::class, comment = "step1") - assertThat(loopStatusEvent.first).isTrue() - assertThat((loopStatusEvent.second as EventLoopSetLastRunGui).text).contains("Loop disabled by user") - - // So start objectives - objectivesPlugin.objectives[0].startedOn = 1 - - // Now there should be missing profile + // There should be missing profile (profileFunction as ProfileFunctionImpl).cache.clear() loop.invoke("test2", allowNotification = false) - loopStatusEvent = rxHelper.waitFor(EventLoopSetLastRunGui::class, comment = "step2") + val loopStatusEvent = rxHelper.waitFor(EventLoopSetLastRunGui::class, comment = "step2") assertThat(loopStatusEvent.first).isTrue() assertThat((loopStatusEvent.second as EventLoopSetLastRunGui).text).contains("NO PROFILE SET") diff --git a/app/src/androidTest/kotlin/app/aaps/e2e/SetupWizardE2ETest.kt b/app/src/androidTest/kotlin/app/aaps/e2e/SetupWizardE2ETest.kt index ce66404c8cc9..20ca82ba036a 100644 --- a/app/src/androidTest/kotlin/app/aaps/e2e/SetupWizardE2ETest.kt +++ b/app/src/androidTest/kotlin/app/aaps/e2e/SetupWizardE2ETest.kt @@ -31,8 +31,7 @@ import java.util.regex.Pattern * open-loop app and exercises the core treatments: * * fresh start → EULA → master password → units → patient safety → BG source (default) → - * create + activate a profile → Virtual Pump → OpenAPS SMB → Sensitivity Oref1 → start objective 1 → - * FINISH → manual bolus (assert IOB + DB) → carbs (assert DB) → temp target (assert chip + DB) → + * create + activate a profile → Virtual Pump → OpenAPS SMB → Sensitivity Oref1 → FINISH → manual bolus (assert IOB + DB) → carbs (assert DB) → temp target (assert chip + DB) → * enable Open Loop (assert mode + DB). * * ## Why this lives in `:app/androidTest` (vs the standalone `:e2e` module) @@ -66,7 +65,6 @@ class SetupWizardE2ETest { private val configBuilder get() = testGraphs.configBuilder private val config get() = testGraphs.config private val preferences get() = testGraphs.preferences - private val objectivesPlugin get() = testGraphs.objectivesPlugin private val instrumentation get() = InstrumentationRegistry.getInstrumentation() private val device: UiDevice get() = UiDevice.getInstance(instrumentation) @@ -83,10 +81,6 @@ class SetupWizardE2ETest { pluginStore.plugins = pluginList configBuilder.initialize() config.initCompleted() // flip splash gate → AppContent renders - // Pre-seed objective 1 as started: the wizard gates its FINISH button on - // objectives[FIRST].isStarted, and the UI "Start" runs an NTP network-time check that can't - // complete under the test app (no connectivity wiring from MainApp.onCreate). - objectivesPlugin.objectives.firstOrNull()?.startedOn = System.currentTimeMillis() // Heads-up banners (e.g. the profile-switch "loop disabled" toast) must not cover the UI. device.executeShellCommand("settings put global heads_up_notifications_enabled 0") // Start logcat fresh so the DB-insert assertions only match THIS run's records. @@ -248,11 +242,7 @@ class SetupWizardE2ETest { // 15. APS — OpenAPS SMB is the default selection tapNext("Sensitivity detection") - // 16. Sensitivity — Sensitivity Oref1 is the default selection - tapNext("Objectives") - - // 17. Objectives — objective 1 was pre-seeded as started in setUp(), so the wizard's final - // step offers FINISH directly (the UI "Start" needs an NTP check that can't run in-process). + // 16. Sensitivity — Sensitivity Oref1 is the default selection, and it is the last step openVia("FINISH", expect = "LocalProfile1") // wizard → overview (active profile chip) } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index da65b6972a5b..40e812a14270 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -18,7 +18,7 @@ - + @@ -72,11 +72,6 @@ android:name="app.aaps.implementation.androidNotification.AlarmScreenWakeReceiver" android:exported="false" /> - - - Image(painterResource(iconsProvider.getIcon()), null, modifier) }, - splashLogo = { modifier -> Image(painterResource(CoreUiR.drawable.splash_logo), null, modifier) }, + splashLogo = { modifier -> Image(painterResource(CoreUiR.mipmap.ic_launcher_round), null, modifier) }, // The Activity keeps a reference so an incoming intent can route without the composition. onNavControllerReady = { navController = it }, onClose = { finish() }, @@ -331,23 +317,14 @@ class ComposeMainActivity : MetroAppCompatActivity() { // Track last navigated route as a Crashlytics custom key for crash reports DisposableEffect(navController) { val listener = NavController.OnDestinationChangedListener { _, dest, _ -> - FirebaseCrashlytics.getInstance().setCustomKey("last_route", dest.route ?: "unknown") + if (BuildConfig.FIREBASE_ENABLED) { + FirebaseCrashlytics.getInstance().setCustomKey("last_route", dest.route ?: "unknown") + } } navController.addOnDestinationChangedListener(listener) onDispose { navController.removeOnDestinationChangedListener(listener) } } - // Auto-launch setup wizard on first run - LaunchedEffect(Unit) { - if (!preferences.get(BooleanNonKey.GeneralSetupWizardProcessed) && !isRunningRealPumpTest()) { - protectionCheck.requestProtection(ProtectionCheck.Protection.PREFERENCES) { result -> - if (result == ProtectionResult.GRANTED) { - navController.navigate(AppRoute.SetupWizard.route) - } - } - } - } - // Permissions bottom sheet val permState by permissionsViewModel.uiState.collectAsStateWithLifecycle() @@ -444,15 +421,128 @@ class ComposeMainActivity : MetroAppCompatActivity() { ) } - val state by mainViewModel.uiState.collectAsStateWithLifecycle() - val bolusState by bolusProgressData.state.collectAsStateWithLifecycle() - val pumpStatusBanner by pumpCommunicationStatus.statusBannerFlow.collectAsStateWithLifecycle() - val pumpQueueStatus by pumpCommunicationStatus.queueStatusFlow.collectAsStateWithLifecycle() + val cobUiState by chipsViewModel.cobUiState.collectAsStateWithLifecycle() + val appSnackbarHostState = LocalSnackbarHostState.current NavHost( navController = navController, startDestination = AppRoute.Main.route ) { + composable(AppRoute.Main.route) { + val state by mainViewModel.uiState.collectAsStateWithLifecycle() + val currentBackStackEntry by navController.currentBackStackEntryAsState() + val currentRoute = currentBackStackEntry?.destination?.route + + // Pump setup button in bottom bar + val pumpPlugin = activePlugin.activePumpInternal as PluginBase + val showPumpSetup = (!activePlugin.activePump.isInitialized() || activePlugin.activePump.isSuspended()) && + pumpPlugin.hasComposeContent() + val pumpSetupPlugin = if (showPumpSetup) pumpPlugin else null + + // Authorization failed dialog + if (state.showAuthFailedDialog) { + OkDialog( + title = "", + message = stringResource(R.string.authorizationfailed), + onDismiss = { + mainViewModel.setShowAuthFailedDialog(false) + finish() + } + ) + } + + + MainScreen( + mainViewModel = mainViewModel, + uiState = state, + aboutDialogData = if (state.showAboutDialog) { + mainViewModel.buildAboutDialogData(getString(R.string.app_name)) + } else null, + maintenanceViewModel = maintenanceViewModel, + onNavigate = { request -> handleNavigationRequest(request, navController) }, + onTrioTabSelected = { tab -> navigateToTrioTab(tab, navController) }, + trioSelectedTab = trioTabForRoute(currentRoute), + trioBottomBar = { selectedTab, carbsRequired, onTabSelected, onAddClick, modifier -> + trioUi.bottomBar( + selectedTab = selectedTab, + carbsRequired = carbsRequired, + onTabSelected = onTabSelected, + onAddClick = onAddClick, + modifier = modifier + ) + }, + trioAddActionsSheet = { onDismiss, onBolusClick, onCarbsClick, onWizardClick -> + trioUi.addActionsSheet( + onDismiss = onDismiss, + onBolusClick = onBolusClick, + onCarbsClick = onCarbsClick, + onWizardClick = onWizardClick + ) + }, + trioOverview = trioUi::overview, + onAboutDialogDismiss = { mainViewModel.setShowAboutDialog(false) }, + onOpenBatteryHelp = if (mainViewModel.showBatteryHelp) { + { mainViewModel.openBatteryHelp() } + } else { + null + }, + onMaintenanceSheetDismiss = { mainViewModel.setShowMaintenanceSheet(false) }, + onDirectoryClick = { + try { + accessTree?.launch(null) + } catch (_: Exception) { + maintenanceViewModel.emitError("Unable to launch activity. This is an Android issue") + } + }, + onLaunchBrowser = { url -> + try { + val customTabsIntent = CustomTabsIntent.Builder() + .setShowTitle(true) + .build() + customTabsIntent.launchUrl(this@ComposeMainActivity, url.toUri()) + } catch (_: Exception) { + maintenanceViewModel.emitError("Unable to open browser") + } + }, + onBringToForeground = { + val intent = Intent(this@ComposeMainActivity, ComposeMainActivity::class.java) + .addFlags( + Intent.FLAG_ACTIVITY_REORDER_TO_FRONT + or Intent.FLAG_ACTIVITY_SINGLE_TOP + or Intent.FLAG_ACTIVITY_CLEAR_TOP + or Intent.FLAG_ACTIVITY_NO_ANIMATION + ) + startActivity(intent) + }, + onImportSettingsNavigate = { source -> + navController.navigate(AppRoute.ImportSettings.createRoute(source.name)) + }, + onRecreateActivity = { recreate() }, + // Notifications + notificationsFlow = notificationManager.notifications, + onDismissNotification = { notification -> + notificationManager.dismiss(NotificationHandle(notification.instanceKey)) + }, + onNotificationActionClick = { notification -> + handleNotificationAction(notification.id, navController) + }, + autoShowNotificationSheet = _autoShowNotifications.value, + onAutoShowConsumed = { _autoShowNotifications.value = false }, + pumpSetupPlugin = pumpSetupPlugin, + graphViewModel = graphViewModel, + chipsViewModel = chipsViewModel, + bolusStateFlow = bolusProgressData.state, + onStopBolus = { + if (config.AAPSCLIENT) { + clientControlActionDispatcher.stopBolus() + bolusProgressData.stopPressed() + } else { + commandQueue.cancelAllBoluses(null) + } + } + ) + } + appNavGraph( navController = navController, insulinManagementViewModel = insulinManagementViewModel, @@ -469,10 +559,8 @@ class ComposeMainActivity : MetroAppCompatActivity() { siteRotationManagementViewModel = siteRotationManagementViewModel, graphViewModel = graphViewModel, chipsViewModel = chipsViewModel, - swDefinition = swDefinition, rxBus = rxBus, activePlugin = activePlugin, - pluginPermissions = pluginPermissions, automationRuntime = automationRuntime, preferences = preferences, rh = rh, @@ -483,7 +571,7 @@ class ComposeMainActivity : MetroAppCompatActivity() { visibilityContext = visibilityContext, onNavigationRequest = { request, nc -> handleNavigationRequest(request, nc) }, onShowDeliveryError = { comment, title -> - uiInteraction.runAlarm(comment, rh.gs(title), AlarmSound.BOLUS_ERROR) + uiInteraction.runAlarm(comment, rh.gs(title)) }, withProtection = { protection, action -> navigator(navController).guarded(protection, action) }, requestEditModeAuthorization = { onGranted -> @@ -493,115 +581,58 @@ class ComposeMainActivity : MetroAppCompatActivity() { }, onRefreshPermissions = { permissionsViewModel.refresh() }, onExecuteQuickWizard = { guid -> mainViewModel.executeQuickWizard(guid) }, - onRequestDirectoryAccess = { + onNavigateToTrioTab = { tab -> navigateToTrioTab(tab, navController) }, + trioTabScaffold = { selectedTab, title, showTopBar, topBarActions, content -> + trioUi.tabScaffold( + selectedTab = selectedTab, + title = title, + carbsRequired = cobUiState.carbsReq, + onTabSelected = { tab -> navigateToTrioTab(tab, navController) }, + onBolusClick = { handleNavigationRequest(NavigationRequest.Element(ElementType.INSULIN), navController) }, + onCarbsClick = { handleNavigationRequest(NavigationRequest.Element(ElementType.CARBS), navController) }, + onWizardClick = { handleNavigationRequest(NavigationRequest.Element(ElementType.BOLUS_WIZARD), navController) }, + showTopBar = showTopBar, + topBarActions = topBarActions, + content = content + ) + }, + maintenanceViewModel = maintenanceViewModel, + onMaintenanceDirectoryClick = { try { accessTree?.launch(null) } catch (_: Exception) { + maintenanceViewModel.emitError("Unable to launch activity. This is an Android issue") } }, - onRequestPermission = { group -> permissionsViewModel.requestPermission(group) }, - overview = { - OverviewScreen( - mainViewModel = mainViewModel, - manageViewModel = manageViewModel, - maintenanceViewModel = maintenanceViewModel, - statusViewModel = statusViewModel, - treatmentViewModel = treatmentViewModel, - scenesViewModel = scenesViewModel, - loopActionViewModel = loopActionViewModel, - searchViewModel = searchViewModel, - permissionsViewModel = permissionsViewModel, - graphViewModel = graphViewModel, - chipsViewModel = chipsViewModel, - activePlugin = activePlugin, - config = config, - objectives = objectives, - bgQualityCheck = bgQualityCheck, - notificationManager = notificationManager, - uiInteraction = uiInteraction, - builtInSearchables = builtInSearchables, - bolusProgressData = bolusProgressData, - clientControlActionDispatcher = clientControlActionDispatcher, - commandQueue = commandQueue, - pumpCommunicationStatus = pumpCommunicationStatus, - appName = getString(R.string.app_name), - authorizationFailedMessage = getString(R.string.authorizationfailed), - onNavigate = { request -> handleNavigationRequest(request, navController) }, - onSearchResultClick = { entry -> handleSearchResultClick(entry, navController) }, - onNotificationActionClick = { notification -> handleNotificationAction(notification.id, navController) }, - onQuickLaunchActionClick = { action -> handleQuickLaunchAction(action, navController) }, - onImportSettingsNavigate = { source -> navController.navigate(AppRoute.ImportSettings.createRoute(source.name)) }, - onDirectoryClick = { - try { - accessTree?.launch(null) - } catch (_: Exception) { - maintenanceViewModel.emitError("Unable to launch activity. This is an Android issue") - } - }, - onLaunchBrowser = { url -> - try { - val customTabsIntent = CustomTabsIntent.Builder() - .setShowTitle(true) - .build() - customTabsIntent.launchUrl(this@ComposeMainActivity, url.toUri()) - } catch (_: Exception) { - maintenanceViewModel.emitError("Unable to open browser") - } - }, - onBringToForeground = { - val intent = Intent(this@ComposeMainActivity, ComposeMainActivity::class.java) - .addFlags( - Intent.FLAG_ACTIVITY_REORDER_TO_FRONT - or Intent.FLAG_ACTIVITY_SINGLE_TOP - or Intent.FLAG_ACTIVITY_CLEAR_TOP - or Intent.FLAG_ACTIVITY_NO_ANIMATION - ) - startActivity(intent) - }, - onRecreateActivity = { recreate() }, - onAuthorizationFailed = { finish() }, - autoShowNotificationSheet = _autoShowNotifications.value, - onAutoShowConsumed = { _autoShowNotifications.value = false } + onMaintenanceRecreateActivity = { recreate() }, + onMaintenanceLaunchBrowser = { url -> + try { + CustomTabsIntent.Builder().setShowTitle(true).build() + .launchUrl(this@ComposeMainActivity, url.toUri()) + } catch (_: Exception) { + maintenanceViewModel.emitError("Unable to open browser") + } + }, + onMaintenanceBringToForeground = { + startActivity( + Intent(this@ComposeMainActivity, ComposeMainActivity::class.java).addFlags( + Intent.FLAG_ACTIVITY_REORDER_TO_FRONT or + Intent.FLAG_ACTIVITY_SINGLE_TOP or + Intent.FLAG_ACTIVITY_CLEAR_TOP or + Intent.FLAG_ACTIVITY_NO_ANIMATION + ) ) }, + onMaintenanceSnackbar = { message -> appSnackbarHostState.showSnackbar(message) }, ) } - // Modal bolus progress overlay — shown above everything for standard bolus - bolusState?.let { state -> - if (!state.isSMB) { - val pumpStatus = pumpStatusBanner?.text ?: "" - val queueStatus = pumpQueueStatus - PumpActivityDialog( - bolusState = state, - pumpStatus = pumpStatus, - queueStatus = queueStatus, - isModal = true, - onStop = { - if (config.AAPSCLIENT) { - clientControlActionDispatcher.stopBolus() - bolusProgressData.stopPressed() - } else { - commandQueue.cancelAllBoluses(null) - } - }, - // Only reachable via the stalled-state Dismiss button (client/follower): hides the - // local mirror dialog. Delivery belongs to the master — this does not touch the pump. - onDismiss = { bolusProgressData.clear() } - ) - } - } } - private var isProtectionCheckActive = false private fun refreshOnResume() { - manageViewModel.refreshState() permissionsViewModel.refresh() - if (notificationManager.notifications.value.any { it.level.priority <= NotificationLevel.IMPORTANT.priority }) { - _autoShowNotifications.value = true - } if (!isProtectionCheckActive) { isProtectionCheckActive = true protectionCheck.requestProtection(ProtectionCheck.Protection.APPLICATION) { result -> @@ -683,24 +714,39 @@ class ComposeMainActivity : MetroAppCompatActivity() { accessTree?.launch(null) } catch (_: Exception) { } - }, - onOpenUrl = { url -> startActivity(Intent(Intent.ACTION_VIEW, url.toUri())) } + } ) private fun handleNavigationRequest(request: NavigationRequest, navController: NavController) { navigator(navController).handleNavigationRequest(request) } - private fun handleQuickLaunchAction(action: QuickLaunchAction, navController: NavController) { - navigator(navController).handleQuickLaunchAction(action) - } - private fun handleNotificationAction(notificationId: NotificationId, navController: NavController) { navigator(navController).handleNotificationAction(notificationId) } - private fun handleSearchResultClick(entry: SearchIndexEntry, navController: NavController) { - navigator(navController).handleSearchResultClick(entry) + private fun navigateToTrioTab(tab: TrioNavTab, navController: NavController) { + val route = when (tab) { + TrioNavTab.Overview -> AppRoute.Main.route + TrioNavTab.Adjustments -> AppRoute.TrioTreatments.route + TrioNavTab.Treatments -> AppRoute.TrioTreatmentList.route + TrioNavTab.Settings -> AppRoute.TrioSettings.route + } + navController.navigate(route) { + launchSingleTop = true + restoreState = true + popUpTo(AppRoute.Main.route) { + saveState = true + } + } + } + + private fun trioTabForRoute(route: String?): TrioNavTab = when (route) { + AppRoute.TrioTreatmentList.route -> TrioNavTab.Treatments + AppRoute.TrioTreatments.route -> TrioNavTab.Adjustments + AppRoute.TrioHistory.route -> TrioNavTab.Adjustments + AppRoute.TrioSettings.route -> TrioNavTab.Settings + else -> TrioNavTab.Overview } private fun openCgmApp(packageName: String) { @@ -712,22 +758,4 @@ class ComposeMainActivity : MetroAppCompatActivity() { aapsLogger.debug("Error opening CGM app: $packageName") } } - - /** - * Navigate to [elementType] using hierarchical authorization. - * For management screens, the granted level determines the screen mode - * (PLAY for BOLUS, EDIT for PREFERENCES or higher). - */ - - /** - * Execute [action] after verifying protection level. - * Protection level is defined once in [ElementType] — no manual lookup needed at call sites. - */ - - /** - * Navigate to an [ElementType] destination. Protection is handled by the caller. - * No `else` — compiler catches missing enum values. - */ - } - diff --git a/app/src/main/kotlin/app/aaps/MainApp.kt b/app/src/main/kotlin/app/aaps/MainApp.kt index 11f50ff6023b..26fdb80a09d2 100644 --- a/app/src/main/kotlin/app/aaps/MainApp.kt +++ b/app/src/main/kotlin/app/aaps/MainApp.kt @@ -28,6 +28,7 @@ import app.aaps.core.interfaces.configuration.ExternalOptions import app.aaps.core.interfaces.di.MetroMemberInjector import app.aaps.core.interfaces.insulin.InsulinType import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.maintenance.BackupDatabaseConstants import app.aaps.core.interfaces.notifications.NotificationAction import app.aaps.core.interfaces.notifications.NotificationId import app.aaps.core.interfaces.notifications.NotificationLevel @@ -51,6 +52,7 @@ import app.aaps.core.keys.StringNonKey import app.aaps.core.keys.UnitDoubleKey import app.aaps.core.keys.interfaces.TextRef import app.aaps.core.objects.profile.ProfileSealed +import app.aaps.core.ui.UiMode import app.aaps.core.ui.compose.MetroViewModelFactoryOwner import app.aaps.core.ui.locale.LocaleHelper import app.aaps.di.metro.MetroGraphs @@ -62,7 +64,6 @@ import app.aaps.implementation.receivers.ChargingStateReceiver import app.aaps.implementation.receivers.KeepAliveWorker import app.aaps.implementation.receivers.NetworkChangeReceiver import app.aaps.implementation.receivers.TimeDateOrTZChangeReceiver -import app.aaps.plugins.constraints.objectives.keys.ObjectivesLongComposedKey import app.aaps.ui.activityMonitor.ActivityMonitor import app.aaps.utils.configureLeakCanary import com.google.firebase.Firebase @@ -79,15 +80,17 @@ import kotlinx.coroutines.SupervisorJob import kotlinx.coroutines.delay import kotlinx.coroutines.launch import kotlinx.coroutines.withTimeoutOrNull +import java.io.File import kotlinx.serialization.json.Json import kotlinx.serialization.json.JsonObject import kotlinx.serialization.json.jsonObject -import rxdogtag2.RxDogTag import java.io.IOException import java.util.Locale import kotlin.reflect.KMutableProperty import kotlin.reflect.full.declaredMemberProperties import kotlin.time.Duration.Companion.milliseconds +import org.json.JSONObject +import rxdogtag2.RxDogTag class MainApp : Application(), MetroMemberInjector, MetroViewModelFactoryOwner, Configuration.Provider { @@ -171,6 +174,7 @@ class MainApp : Application(), MetroMemberInjector, MetroViewModelFactoryOwner, private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob()) override fun onCreate() { + applyPendingDatabaseRestorePreInitIfNeeded() super.onCreate() GeneratedStringOwners.registerAll() @@ -326,7 +330,7 @@ class MainApp : Application(), MetroMemberInjector, MetroViewModelFactoryOwner, aapsLogger.debug("Remote: " + config.REMOTE) aapsLogger.debug("Phone: " + Build.MANUFACTURER + " " + Build.MODEL) registerLocalBroadcastReceiver() - setupRemoteConfig() + if (BuildConfig.FIREBASE_ENABLED) setupRemoteConfig() // trigger here to see the new version on app start after an update handler.postDelayed({ versionCheckersUtils.triggerCheckVersion() }, 30000) @@ -512,11 +516,13 @@ class MainApp : Application(), MetroMemberInjector, MetroViewModelFactoryOwner, // 3.3 if (preferences.get(UnitDoubleKey.OverviewLowMark) == 0.0) preferences.remove(UnitDoubleKey.OverviewLowMark) if (preferences.get(UnitDoubleKey.OverviewHighMark) == 0.0) preferences.remove(UnitDoubleKey.OverviewHighMark) - // These three migrate bidirectionally-synced keys. Skip on a client: it adopts the value from - // the master via sync, and a local put here would now trigger a client→master round-trip (modal) - // at startup. The master migrates and publishes; the client follows. - if (!config.AAPSCLIENT && preferences.getIfExists(BooleanKey.GeneralSimpleMode) == null) - preferences.put(BooleanKey.GeneralSimpleMode, !preferences.get(BooleanNonKey.GeneralSetupWizardProcessed)) + // Trio does not use the setup wizard and starts in simple mode. + if (preferences.getIfExists(BooleanNonKey.GeneralSetupWizardProcessed) == null) { + preferences.put(BooleanNonKey.GeneralSetupWizardProcessed, true) + } + if (preferences.getIfExists(BooleanKey.GeneralSimpleMode) == null) { + preferences.put(BooleanKey.GeneralSimpleMode, true) + } // Migrate from OpenAPSSMBDynamicISFPlugin if (sp.getBoolean("ConfigBuilder_APS_OpenAPSSMBDynamicISFPlugin_Enabled", false)) { sp.remove("ConfigBuilder_APS_OpenAPSSMBDynamicISFPlugin_Enabled") @@ -562,25 +568,6 @@ class MainApp : Application(), MetroMemberInjector, MetroViewModelFactoryOwner, sp.remove(key) } } - // Migrate Objectives - for ((key, value) in keys) { - if (key.startsWith("Objectives_") && key.endsWith("_started")) { - val objective = key.split("_")[1] - if (value is String) - preferences.put(ObjectivesLongComposedKey.Started, objective, value = SafeParse.stringToLong(value)) - else - preferences.put(ObjectivesLongComposedKey.Started, objective, value = value as Long) - sp.remove(key) - } - if (key.startsWith("Objectives_") && key.endsWith("_accomplished")) { - val objective = key.split("_")[1] - if (value is String) - preferences.put(ObjectivesLongComposedKey.Accomplished, objective, value = SafeParse.stringToLong(value)) - else - preferences.put(ObjectivesLongComposedKey.Accomplished, objective, value = value as Long) - sp.remove(key) - } - } // Migrate ConfigBuilder for ((key, value) in keys) { if (key.startsWith("ConfigBuilder_") && key.endsWith("_Enabled")) { @@ -903,6 +890,71 @@ class MainApp : Application(), MetroMemberInjector, MetroViewModelFactoryOwner, ) } + private fun copyPendingDatabaseFilePreInit( + pendingDir: File, + databaseDir: File, + fileName: String, + required: Boolean + ): Boolean { + val pendingFile = File(pendingDir, fileName) + val targetFile = File(databaseDir, fileName) + + if (!pendingFile.exists()) { + if (!required && targetFile.exists()) { + targetFile.delete() + } + return !required + } + + return try { + pendingFile.inputStream().use { input -> + targetFile.outputStream().use { output -> + input.copyTo(output) + output.flush() + } + } + true + } catch (_: Exception) { + false + } + } + + private fun applyPendingDatabaseRestorePreInitIfNeeded() { + val sharedPreferences = getSharedPreferences("${packageName}${BackupDatabaseConstants.SHARED_PREFERENCES_SUFFIX}", MODE_PRIVATE) + if (!sharedPreferences.getBoolean(BackupDatabaseConstants.PENDING_DB_RESTORE_FLAG, false)) return + + val pendingDir = getDir(BackupDatabaseConstants.PENDING_DB_RESTORE_DIR, MODE_PRIVATE) + val databaseDir = getDatabasePath(BackupDatabaseConstants.DATABASE_MAIN_FILE).parentFile ?: return + databaseDir.mkdirs() + + val mainCopied = copyPendingDatabaseFilePreInit( + pendingDir = pendingDir, + databaseDir = databaseDir, + fileName = BackupDatabaseConstants.DATABASE_MAIN_FILE, + required = true + ) + if (!mainCopied) { + sharedPreferences.edit().putBoolean(BackupDatabaseConstants.PENDING_DB_RESTORE_FLAG, false).apply() + return + } + + copyPendingDatabaseFilePreInit( + pendingDir = pendingDir, + databaseDir = databaseDir, + fileName = BackupDatabaseConstants.DATABASE_WAL_FILE, + required = false + ) + copyPendingDatabaseFilePreInit( + pendingDir = pendingDir, + databaseDir = databaseDir, + fileName = BackupDatabaseConstants.DATABASE_SHM_FILE, + required = false + ) + + pendingDir.listFiles()?.forEach { it.delete() } + sharedPreferences.edit().putBoolean(BackupDatabaseConstants.PENDING_DB_RESTORE_FLAG, false).apply() + } + private val timeDateReceiver = TimeDateOrTZChangeReceiver() private val networkReceiver = NetworkChangeReceiver() private val chargingReceiver = ChargingStateReceiver() diff --git a/app/src/main/kotlin/app/aaps/di/PluginListMerge.kt b/app/src/main/kotlin/app/aaps/di/PluginListMerge.kt index ec48a6626d8e..4da9919b089c 100644 --- a/app/src/main/kotlin/app/aaps/di/PluginListMerge.kt +++ b/app/src/main/kotlin/app/aaps/di/PluginListMerge.kt @@ -20,7 +20,7 @@ data class PluginSource(val name: String, val plugins: Map) * 400-550 bg sources :plugins:source * 600-630 smoothing :plugins:smoothing * 700-710 calibration :plugins:calibration - * 800-860 constraints (safety, objectives, …) :plugins:constraints + * 800-860 constraints (safety, …) :plugins:constraints * 1000 VirtualPump (all configs) :pump:virtual * 1010+ real pump drivers (@PumpDriver, step 10) :pump:* modules * ``` diff --git a/app/src/main/kotlin/app/aaps/di/metro/AppReceiversBindings.kt b/app/src/main/kotlin/app/aaps/di/metro/AppReceiversBindings.kt index 88866330ffab..4bd8dcf0f0d7 100644 --- a/app/src/main/kotlin/app/aaps/di/metro/AppReceiversBindings.kt +++ b/app/src/main/kotlin/app/aaps/di/metro/AppReceiversBindings.kt @@ -1,6 +1,5 @@ package app.aaps.di.metro -import app.aaps.implementation.androidNotification.AlarmMuteReceiver import app.aaps.implementation.receivers.BTReceiver import app.aaps.implementation.receivers.ChargingStateReceiver import app.aaps.implementation.receivers.NetworkChangeReceiver @@ -33,16 +32,6 @@ import dev.zacsweers.metro.Provides @BindingContainer object AppReceiversBindings { - // Android builds this one from a notification action, so it must be in the map like the rest. - // It was converted to MetroBroadcastReceiver without an entry here, and tapping Mute or Dismiss - // on the background alarm notification then died with "No Metro binding for AlarmMuteReceiver" - // (issue #5124). - @Provides - @FeatureMemberInjectors - @IntoMap - @ClassKey(AlarmMuteReceiver::class) - fun bindAlarmMuteReceiver(injector: MembersInjector): MembersInjector<*> = injector - @Provides @FeatureMemberInjectors @IntoMap diff --git a/app/src/main/kotlin/app/aaps/di/metro/AppRootGraph.kt b/app/src/main/kotlin/app/aaps/di/metro/AppRootGraph.kt index 8a385e8a9222..9b013c6c2a26 100644 --- a/app/src/main/kotlin/app/aaps/di/metro/AppRootGraph.kt +++ b/app/src/main/kotlin/app/aaps/di/metro/AppRootGraph.kt @@ -41,7 +41,6 @@ import app.aaps.core.interfaces.maintenance.CloudStorageProvider import app.aaps.core.interfaces.maintenance.FileListProvider import app.aaps.core.interfaces.maintenance.ImportExportPrefs import app.aaps.core.interfaces.maintenance.Maintenance -import app.aaps.core.interfaces.notifications.AlarmSoundPlayer import app.aaps.core.interfaces.notifications.NotificationHolder import app.aaps.core.interfaces.notifications.NotificationManager import app.aaps.core.interfaces.nsclient.NSClientRepository @@ -142,8 +141,6 @@ import app.aaps.plugins.automation.AutomationRuntime import app.aaps.plugins.automation.services.LastLocationDataContainer import app.aaps.plugins.constraints.bgQualityCheck.BgQualityCheckPlugin import app.aaps.plugins.constraints.dstHelper.DstHelperPlugin -import app.aaps.plugins.constraints.objectives.ObjectivesPlugin -import app.aaps.plugins.constraints.objectives.objectives.Objective import app.aaps.plugins.constraints.signatureVerifier.SignatureVerifierPlugin import app.aaps.plugins.source.DexcomPlugin import app.aaps.plugins.source.NSClientSourcePlugin @@ -245,8 +242,8 @@ interface AppRootGraph : MetroViewModelMultibindings { /** * Contributed plugins that only belong in a build that runs the loop. * - * The qualifier is the whole point: `:app` merges this bucket only when `config.APS`. Objectives, - * the signature verifier and the storage constraint have no meaning in a build that never makes a + * The qualifier is the whole point: `:app` merges this bucket only when `config.APS`. The signature + * verifier and the storage constraint have no meaning in a build that never makes a * decision, and a plugin in the wrong bucket fails silently - a plugin list is just a list. */ @APS @@ -285,14 +282,6 @@ interface AppRootGraph : MetroViewModelMultibindings { @FeatureMemberInjectors val contributedMemberInjectors: Map, MembersInjector<*>> - /** - * The ten objectives, in order. `ObjectivesPlugin` takes this list and is built here, so the - * objectives are contributed to this graph too. - */ - @Provides - fun objectivesList(objectives: Map): List = - objectives.toList().sortedBy { it.first }.map { it.second } - /** * Constraint plugins that are also bound to an interface, or injected directly. * to these instances rather than building their own. @@ -382,7 +371,6 @@ interface AppRootGraph : MetroViewModelMultibindings { val notificationHolder: NotificationHolder val userEntryPresentationHelper: UserEntryPresentationHelper val profiler: Profiler - val alarmSoundPlayer: AlarmSoundPlayer val wizardExecutor: WizardExecutor val configBuilder: ConfigBuilder @@ -451,7 +439,6 @@ interface AppRootGraph : MetroViewModelMultibindings { val bgQualityCheckPlugin: BgQualityCheckPlugin val dstHelperPlugin: DstHelperPlugin val dstHelper: DstHelper - val objectivesPlugin: ObjectivesPlugin /** * Automation, and the permission providers it is the only contributor to. diff --git a/app/src/main/kotlin/app/aaps/di/metro/MainPluginsBindings.kt b/app/src/main/kotlin/app/aaps/di/metro/MainPluginsBindings.kt index e3e0247a4508..93e62c5d7244 100644 --- a/app/src/main/kotlin/app/aaps/di/metro/MainPluginsBindings.kt +++ b/app/src/main/kotlin/app/aaps/di/metro/MainPluginsBindings.kt @@ -1,6 +1,5 @@ package app.aaps.di.metro -import app.aaps.core.interfaces.constraints.Objectives import app.aaps.core.interfaces.db.PersistenceLayer import app.aaps.core.interfaces.db.ProcessedTbrEbData import app.aaps.core.interfaces.iob.IobCobCalculator @@ -17,7 +16,6 @@ import app.aaps.core.interfaces.utils.DecimalFormatter import app.aaps.core.interfaces.workflow.CalculationSignalsEmitter import app.aaps.core.interfaces.workflow.CalculationWorkflow import app.aaps.core.keys.interfaces.Preferences -import app.aaps.plugins.constraints.objectives.ObjectivesPlugin import app.aaps.plugins.main.iob.iobCobCalculator.IobCobCalculatorPlugin import dev.zacsweers.metro.AppScope import dev.zacsweers.metro.BindingContainer @@ -77,20 +75,4 @@ object MainPluginsBindings { @IntoMap @IntKey(10) fun iobCobCalculatorEntry(plugin: IobCobCalculatorPlugin): PluginBase = plugin - - /** - * The `Objectives` interface, unqualified. - * - * `ObjectivesPlugin` carries `@APS` on the class for the plugin-list multibinding, and a second - * `@ContributesBinding` there would inherit it - the interface would then only be readable as - * `@APS Objectives`, which is not what a reader asks for. - * - * Metro documents the way out: put the qualifier on the bound type instead, `binding<@APS - * PluginBase>()`. The version pinned here rejects that form outright - - * `Inapplicable candidate(s): constructor(scope: KClass<*>, binding: binding<*> = ...)` - which is - * the same wall `SyncPluginsBindings` hits for its qualified entry. So this stays stated, and - * hands out the same scoped instance either way. Retry both when Metro leaves the snapshot. - */ - @Provides - fun objectives(plugin: ObjectivesPlugin): Objectives = plugin } diff --git a/app/src/main/kotlin/app/aaps/di/metro/MetroGraphs.kt b/app/src/main/kotlin/app/aaps/di/metro/MetroGraphs.kt index a55a7da405fe..ba6b8c767099 100644 --- a/app/src/main/kotlin/app/aaps/di/metro/MetroGraphs.kt +++ b/app/src/main/kotlin/app/aaps/di/metro/MetroGraphs.kt @@ -11,7 +11,6 @@ import app.aaps.core.interfaces.bgQualityCheck.BgQualityCheck import app.aaps.core.interfaces.configuration.Config import app.aaps.core.interfaces.configuration.ConfigBuilder import app.aaps.core.interfaces.constraints.ConstraintsChecker -import app.aaps.core.interfaces.constraints.Objectives import app.aaps.core.interfaces.db.PersistenceLayer import app.aaps.core.interfaces.db.ProcessedTbrEbData import app.aaps.core.interfaces.insulin.ConcentrationHelper @@ -67,7 +66,6 @@ import app.aaps.plugins.aps.openAPSAMA.DetermineBasalAMA import app.aaps.plugins.aps.openAPSAutoISF.DetermineBasalAutoISF import app.aaps.plugins.aps.openAPSSMB.DetermineBasalSMB import app.aaps.plugins.automation.AutomationRuntime -import app.aaps.plugins.constraints.objectives.ObjectivesPlugin import app.aaps.plugins.constraints.signatureVerifier.SignatureVerifierPlugin import app.aaps.plugins.source.di.SourceMetroGraph import app.aaps.plugins.sync.di.OpenHumansMetroBridge @@ -186,7 +184,7 @@ class MetroGraphs( * * The qualified buckets are merged **only** under the condition that build should have them. * Keeping them apart is what stops a plugin appearing in a build that never had it - a follower - * showing Objectives, say. `mergePlugins` names which bucket a clashing plugin came from, which is + * showing the signature verifier, say. `mergePlugins` names which bucket a clashing plugin came from, which is * why the sources are listed rather than merged directly. */ fun allPlugins(aapsLogger: AAPSLogger): List { @@ -219,8 +217,8 @@ class MetroGraphs( /** * Plugins that only belong in a build that runs the loop. * - * Same reasoning as [notNsClientPlugins], for the `@APS` qualifier. Objectives, the signature - * verifier and the storage constraint have no meaning in a build that never makes a decision. + * Same reasoning as [notNsClientPlugins], for the `@APS` qualifier. The signature verifier and the + * storage constraint have no meaning in a build that never makes a decision. */ fun apsPlugins(): Map = root.contributedApsPlugins @@ -240,7 +238,6 @@ class MetroGraphs( val xDripSource: XDripSource get() = root.xdripSourcePlugin val dexcomBoyda: DexcomBoyda get() = root.dexcomPlugin val bgQualityCheck: BgQualityCheck get() = root.bgQualityCheckPlugin - val objectives: Objectives get() = root.objectivesPlugin val profileFunction: ProfileFunction get() = root.profileFunction val versionCheckerUtils: VersionCheckerUtils get() = root.versionCheckerUtils @@ -248,9 +245,6 @@ class MetroGraphs( val automation: Automation get() = root.automation val automationRuntime: AutomationRuntime get() = root.automationRuntime - /** Same plugin as [objectives], by class. The instrumented tests ask for the concrete type. */ - val objectivesPlugin: ObjectivesPlugin get() = root.objectivesPlugin - /** The live loop's calculator - not the history browser's. */ val iobCobCalculator: IobCobCalculator get() = root.iobCobCalculator diff --git a/app/src/main/kotlin/app/aaps/implementations/ConfigImpl.kt b/app/src/main/kotlin/app/aaps/implementations/ConfigImpl.kt index ceaa90d3369d..45e1588eca48 100644 --- a/app/src/main/kotlin/app/aaps/implementations/ConfigImpl.kt +++ b/app/src/main/kotlin/app/aaps/implementations/ConfigImpl.kt @@ -1,10 +1,10 @@ package app.aaps.implementations -import app.aaps.core.keys.interfaces.AppPlatform -import app.aaps.core.keys.interfaces.TextRef import android.os.Build import app.aaps.BuildConfig import app.aaps.R +import app.aaps.core.keys.interfaces.AppPlatform +import app.aaps.core.keys.interfaces.TextRef import app.aaps.core.interfaces.configuration.Config import app.aaps.core.interfaces.configuration.ExternalOptions import app.aaps.core.interfaces.configuration.InitProgress @@ -12,6 +12,7 @@ import app.aaps.core.interfaces.maintenance.FileListProvider import app.aaps.di.ExternalOptionsOverride import dev.zacsweers.metro.AppScope import dev.zacsweers.metro.ContributesBinding +import dev.zacsweers.metro.Inject import dev.zacsweers.metro.SingleIn import dev.zacsweers.metro.binding import kotlinx.coroutines.flow.MutableSharedFlow @@ -20,7 +21,6 @@ import kotlinx.coroutines.flow.SharedFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asSharedFlow import kotlinx.coroutines.flow.asStateFlow -import dev.zacsweers.metro.Inject // @Singleton (not @Reusable): Config owns the single app-global init-progress flow that // ComposeMainActivity's splash gate observes; a guaranteed single instance keeps that flow shared @@ -42,7 +42,7 @@ class ConfigImpl( override val AAPSCLIENT3 = BuildConfig.FLAVOR == "aapsclient3" override val PUMPCONTROL = BuildConfig.FLAVOR == "pumpcontrol" override val PUMPDRIVERS = BuildConfig.FLAVOR == "full" || BuildConfig.FLAVOR == "pumpcontrol" - override val FLAVOR = BuildConfig.FLAVOR + override val FLAVOR = "trio" override val VERSION_NAME = BuildConfig.VERSION_NAME override val HEAD = BuildConfig.HEAD override val COMMITTED = BuildConfig.COMMITTED.toBoolean() diff --git a/app/src/main/kotlin/app/aaps/persistentNotification/DummyServiceHelper.kt b/app/src/main/kotlin/app/aaps/persistentNotification/DummyServiceHelper.kt index 3365e9e1d9a1..4d0e7d6c23d3 100644 --- a/app/src/main/kotlin/app/aaps/persistentNotification/DummyServiceHelper.kt +++ b/app/src/main/kotlin/app/aaps/persistentNotification/DummyServiceHelper.kt @@ -13,7 +13,6 @@ import dev.zacsweers.metro.SingleIn /* This code replaces following val alarm = Intent(context, DummyService::class.java) - alarm.putExtra("soundId", n.soundId) if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) context.startForegroundService(alarm) else context.startService(alarm) it fails randomly with error diff --git a/app/src/main/kotlin/app/aaps/persistentNotification/PersistentNotificationPlugin.kt b/app/src/main/kotlin/app/aaps/persistentNotification/PersistentNotificationPlugin.kt index 64bdd46f7057..ae0c3f37ccb9 100644 --- a/app/src/main/kotlin/app/aaps/persistentNotification/PersistentNotificationPlugin.kt +++ b/app/src/main/kotlin/app/aaps/persistentNotification/PersistentNotificationPlugin.kt @@ -5,8 +5,16 @@ import android.app.PendingIntent import android.content.Context import android.content.Intent import android.graphics.BitmapFactory +import android.os.Build +import androidx.car.app.connection.CarConnection import androidx.core.app.NotificationCompat +import androidx.core.app.NotificationCompat.Metric +import androidx.core.app.NotificationCompat.Metric.FixedFloat +import androidx.core.app.NotificationCompat.Metric.FixedInt +import androidx.core.app.NotificationCompat.MetricStyle +import androidx.core.app.Person import androidx.core.app.RemoteInput +import androidx.lifecycle.Observer import app.aaps.core.data.model.GlucoseUnit import app.aaps.core.data.model.TrendArrow import app.aaps.core.data.plugin.PluginType @@ -41,11 +49,13 @@ import app.aaps.core.keys.interfaces.TextRef import app.aaps.core.objects.extensions.apsAdjustedTargetMgdl import app.aaps.core.objects.extensions.round import app.aaps.core.ui.extensions.generateCOBString +import app.aaps.core.ui.extensions.round import app.aaps.core.ui.extensions.toStringShort import app.aaps.core.utils.DeferredForegroundStart import app.aaps.plugins.main.R import dev.zacsweers.metro.AppScope import dev.zacsweers.metro.ContributesIntoMap +import dev.zacsweers.metro.Inject import dev.zacsweers.metro.IntKey import dev.zacsweers.metro.SingleIn import dev.zacsweers.metro.binding @@ -59,9 +69,10 @@ import kotlinx.coroutines.flow.debounce import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.merge import kotlinx.coroutines.runBlocking -import dev.zacsweers.metro.Inject +import kotlinx.coroutines.withContext +import kotlin.math.round -@Suppress("PrivatePropertyName", "DEPRECATION") +@Suppress("PrivatePropertyName") // Registers itself into the every-build plugin bucket at order 0, replacing the @Binds @IntKey(0) in // PersistentNotificationModule. @ContributesIntoMap(AppScope::class, binding = binding()) @@ -104,7 +115,6 @@ class PersistentNotificationPlugin( // For Android Auto // Intents are not declared in manifest and not consumed, this is intentionally because actually we can't do anything with - private val PACKAGE = "info.nightscout" private val READ_ACTION = "info.nightscout.androidaps.ACTION_MESSAGE_READ" private val REPLY_ACTION = "info.nightscout.androidaps.ACTION_MESSAGE_REPLY" private val CONVERSATION_ID = "conversation_id" @@ -114,11 +124,26 @@ class PersistentNotificationPlugin( private var scope: CoroutineScope? = null private val deferredStart = DeferredForegroundStart() private var lastAutoNotificationContent: String = "" + private val carConnection by lazy { CarConnection(context) } + private val carConnectionObserver = Observer { connectionType -> + val connected = connectionType == CarConnection.CONNECTION_TYPE_PROJECTION + if (connected != isAndroidAutoConnected) { + isAndroidAutoConnected = connected + lastAutoNotificationContent = "" + triggerNotificationUpdate(includeAuto = connected) + } + } + + @Volatile + private var isAndroidAutoConnected = false @OptIn(FlowPreview::class) override suspend fun onStart() { super.onStart() notificationHolder.createNotificationChannel() + withContext(Dispatchers.Main.immediate) { + carConnection.type.observeForever(carConnectionObserver) + } val newScope = CoroutineScope(Dispatchers.IO + SupervisorJob()) scope = newScope rxBus.toFlow(EventRefreshOverview::class) @@ -138,7 +163,7 @@ class PersistentNotificationPlugin( rxBus.toFlow(EventAutosensCalculationFinished::class).map { } ) .debounce(10_000L) - .collectResilient(newScope, aapsLogger, LTag.CORE) { triggerNotificationUpdate(includeAuto = true) } + .collectResilient(newScope, aapsLogger, LTag.CORE) { triggerNotificationUpdate(includeAuto = isAndroidAutoConnected) } /// End Android Auto // The missing half of this plugin's own onStop, which stops DummyService. Until now the service // came back only when the next rxBus event reached triggerNotificationUpdate, so after a stop and @@ -150,6 +175,10 @@ class PersistentNotificationPlugin( } override suspend fun onStop() { + withContext(Dispatchers.Main.immediate) { + carConnection.type.removeObserver(carConnectionObserver) + } + isAndroidAutoConnected = false scope?.cancel() scope = null deferredStart.cancel() @@ -168,14 +197,33 @@ class PersistentNotificationPlugin( var line1: String? var line2: String? = null var line3: String? = null - var unreadConversationBuilder: NotificationCompat.CarExtender.UnreadConversation.Builder? = null + var bgStatusChipText: String? = null + var bgMetric: Metric? = null + var metricValue: Metric.MetricValue? = null + var androidAutoReplyAction: NotificationCompat.Action? = null + var androidAutoReadAction: NotificationCompat.Action? = null if (profileFunction.isProfileValid("Notification")) { val lastBG = iobCobCalculator.ads.lastBg() val glucoseStatus = glucoseStatusProvider.glucoseStatusData + val units = profileFunction.getUnits() if (lastBG != null) { + val bgValueText = profileUtil.fromMgdlToStringInUnits(lastBG.recalculated) + val fromMgdlToUnits = profileUtil.fromMgdlToUnits(lastBG.recalculated) + metricValue = if (units == GlucoseUnit.MMOL) { + FixedFloat( + fromMgdlToUnits.round(1).toFloat(), + units.displayLabel + ) + } else { + FixedInt( + fromMgdlToUnits.toInt(), + units.displayLabel + ) + } val trendSymbol = (trendCalculator.getTrendArrow(iobCobCalculator.ads) ?.takeIf { it != TrendArrow.NONE } ?: TrendArrow.FLAT).symbol - line1 = profileUtil.fromMgdlToStringInUnits(lastBG.recalculated) + " " + trendSymbol + bgStatusChipText = "$bgValueText$trendSymbol" + line1 = "$bgValueText $trendSymbol" if (glucoseStatus != null) { line1 += " " + profileUtil.fromMgdlToSignedStringInUnits(glucoseStatus.delta) } else { @@ -197,13 +245,41 @@ class PersistentNotificationPlugin( val cobInfo = iobCobCalculator.getCobInfo("PersistentNotificationPlugin") line2 = rh.gs(app.aaps.core.ui.R.string.treatments_iob_label_string) + " " + rh.gs(R.string.notification_iob_short, bolusIob.iob + basalIob.basaliob) + " • " + rh.gs(app.aaps.core.ui.R.string.cob) + ": " + cobInfo.generateCOBString(decimalFormatter) + metricValue?.let { + bgMetric = Metric( + it, + line2, + ) + } line3 = profileName - /// For Android Auto + } else { + line1 = rh.gs(app.aaps.core.ui.R.string.no_profile_set) + } + val content = "$line1|$line2|$line3" + if (includeAuto && content == lastAutoNotificationContent) return + if (includeAuto) lastAutoNotificationContent = content + val builder = NotificationCompat.Builder(context, notificationHolder.channelID) + builder.setOngoing(true) + if (!includeAuto) { + applyLiveUpdate( + builder = builder, + bgStatusChipText = bgStatusChipText, + bgMetric = bgMetric, + ) + } + builder.setOnlyAlertOnce(true) + builder.setCategory(if (includeAuto) NotificationCompat.CATEGORY_MESSAGE else NotificationCompat.CATEGORY_STATUS) + builder.setSmallIcon(iconsProvider.getNotificationIcon()) + builder.setContentTitle(line1) + if (line2 != null) builder.setContentText(line2) + if (line3 != null) builder.setSubText(line3) + /// Android Auto + if (includeAuto) { val msgReadIntent = Intent() .addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES) .setAction(READ_ACTION) .putExtra(CONVERSATION_ID, notificationHolder.notificationID) - .setPackage(PACKAGE) + .setPackage(context.packageName) val msgReadPendingIntent = PendingIntent.getBroadcast( context, notificationHolder.notificationID, @@ -214,63 +290,48 @@ class PersistentNotificationPlugin( .addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES) .setAction(REPLY_ACTION) .putExtra(CONVERSATION_ID, notificationHolder.notificationID) - .setPackage(PACKAGE) + .setPackage(context.packageName) val msgReplyPendingIntent = PendingIntent.getBroadcast( context, notificationHolder.notificationID, msgReplyIntent, - PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT + PendingIntent.FLAG_MUTABLE or PendingIntent.FLAG_UPDATE_CURRENT ) // Build a RemoteInput for receiving voice input from devices val remoteInput = RemoteInput.Builder(EXTRA_VOICE_REPLY).build() - // Build Android Auto message: IOB • COB • Target • Profile - val units = profileFunction.getUnits() - var aaTarget = "" - val tempTarget = persistenceLayer.getTemporaryTargetActiveAt(dateUtil.now()) - if (tempTarget != null) { - aaTarget = profileUtil.toTargetRangeString(tempTarget.lowTarget, tempTarget.highTarget, GlucoseUnit.MGDL, units) + - " " + dateUtil.untilString(tempTarget.end, rh) - } else { - profileFunction.getProfile()?.let { profile -> - val adjustedTarget = profile.apsAdjustedTargetMgdl(loop, config, processedDeviceStatusData) - aaTarget = if (adjustedTarget != null) { - profileUtil.toTargetRangeString(adjustedTarget, adjustedTarget, GlucoseUnit.MGDL, units) - } else { - profileUtil.toTargetRangeString(profile.getTargetLowMgdl(), profile.getTargetHighMgdl(), GlucoseUnit.MGDL, units) - } - } - } - val aaMsg = decimalFormatter.to2Decimal(bolusIob.iob + basalIob.basaliob) + rh.gs(app.aaps.core.ui.R.string.insulin_unit_shortname) + - " • " + cobInfo.generateCOBString(decimalFormatter) + - " • " + aaTarget + - " • " + profileName - unreadConversationBuilder = NotificationCompat.CarExtender.UnreadConversation.Builder(rh.gs(config.appName)) - .setLatestTimestamp(System.currentTimeMillis()) - .setReadPendingIntent(msgReadPendingIntent) - .setReplyAction(msgReplyPendingIntent, remoteInput) - unreadConversationBuilder.addMessage(aaMsg) - /// End Android Auto - } else { - line1 = rh.gs(app.aaps.core.ui.R.string.no_profile_set) - } - val content = "$line1|$line2|$line3" - if (includeAuto && content == lastAutoNotificationContent) return - if (includeAuto) lastAutoNotificationContent = content - val builder = NotificationCompat.Builder(context, notificationHolder.channelID) - builder.setOngoing(true) - builder.setOnlyAlertOnce(true) - builder.setCategory(NotificationCompat.CATEGORY_STATUS) - builder.setSmallIcon(iconsProvider.getNotificationIcon()) - builder.setContentTitle(line1) - if (line2 != null) builder.setContentText(line2) - if (line3 != null) builder.setSubText(line3) - /// Android Auto - if (includeAuto && unreadConversationBuilder != null) { - builder.extend( - NotificationCompat.CarExtender() - .setLargeIcon(BitmapFactory.decodeResource(context.resources, iconsProvider.getIcon())) - .setUnreadConversation(unreadConversationBuilder.build()) + val appPerson = Person.Builder() + .setName(bgStatusChipText ?: line1) + .setKey(context.packageName) + .build() + val devicePerson = Person.Builder() + .setName(bgStatusChipText ?: line1) + .setKey("$CONVERSATION_ID-device-user") + .build() + val androidAutoMessagingStyle = NotificationCompat.MessagingStyle(devicePerson) + .setConversationTitle(bgStatusChipText) + .setGroupConversation(false) + .addMessage((line1), System.currentTimeMillis(), appPerson) + androidAutoReplyAction = NotificationCompat.Action.Builder( + iconsProvider.getNotificationIcon(), + rh.gs(R.string.android_auto_reply), + msgReplyPendingIntent ) + .setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_REPLY) + .setShowsUserInterface(false) + .addRemoteInput(remoteInput) + .build() + androidAutoReadAction = NotificationCompat.Action.Builder( + iconsProvider.getNotificationIcon(), + rh.gs(R.string.android_auto_mark_as_read), + msgReadPendingIntent + ) + .setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_MARK_AS_READ) + .setShowsUserInterface(false) + .build() + builder.setLargeIcon(BitmapFactory.decodeResource(context.resources, iconsProvider.getIcon())) + builder.setStyle(androidAutoMessagingStyle) + builder.addInvisibleAction(androidAutoReplyAction) + builder.addInvisibleAction(androidAutoReadAction) } /// End Android Auto builder.setContentIntent(notificationHolder.openAppIntent()) @@ -279,4 +340,23 @@ class PersistentNotificationPlugin( mNotificationManager.notify(notificationHolder.notificationID, notification) notificationHolder.notification = notification } + + private fun applyLiveUpdate( + builder: NotificationCompat.Builder, + bgStatusChipText: String?, + bgMetric: Metric? + ) { + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.BAKLAVA) return + builder.setRequestPromotedOngoing(true) + if (!bgStatusChipText.isNullOrBlank()) { + builder.setShortCriticalText(bgStatusChipText) + } + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.CINNAMON_BUN && bgMetric != null) { + builder.setStyle( + MetricStyle() + .addMetric(bgMetric) + .setCriticalMetric(0) + ) + } + } } diff --git a/app/src/main/kotlin/app/aaps/trio/TrioUi.kt b/app/src/main/kotlin/app/aaps/trio/TrioUi.kt new file mode 100644 index 000000000000..a88a39e8b452 --- /dev/null +++ b/app/src/main/kotlin/app/aaps/trio/TrioUi.kt @@ -0,0 +1,51 @@ +package app.aaps.trio + +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.RowScope +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import app.aaps.ui.compose.main.TrioNavTab +import app.aaps.ui.compose.overview.TrioOverviewModel + +interface TrioUi { + + @Composable + fun topBar( + title: String, + modifier: Modifier + ) + + @Composable + fun bottomBar( + selectedTab: TrioNavTab, + carbsRequired: Int, + onTabSelected: (TrioNavTab) -> Unit, + onAddClick: () -> Unit, + modifier: Modifier + ) + + @Composable + fun addActionsSheet( + onDismiss: () -> Unit, + onBolusClick: () -> Unit, + onCarbsClick: () -> Unit, + onWizardClick: () -> Unit + ) + + @Composable + fun overview(model: TrioOverviewModel) + + @Composable + fun tabScaffold( + selectedTab: TrioNavTab, + title: String, + carbsRequired: Int, + onTabSelected: (TrioNavTab) -> Unit, + onBolusClick: () -> Unit, + onCarbsClick: () -> Unit, + onWizardClick: () -> Unit, + showTopBar: Boolean, + topBarActions: @Composable RowScope.() -> Unit, + content: @Composable (PaddingValues) -> Unit + ) +} diff --git a/app/src/main/kotlin/app/aaps/trio/ui/compose/main/TrioAddActionsSheet.kt b/app/src/main/kotlin/app/aaps/trio/ui/compose/main/TrioAddActionsSheet.kt new file mode 100644 index 000000000000..71914581bc69 --- /dev/null +++ b/app/src/main/kotlin/app/aaps/trio/ui/compose/main/TrioAddActionsSheet.kt @@ -0,0 +1,88 @@ +package app.aaps.trio.ui.compose.main + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Bloodtype +import androidx.compose.material.icons.filled.Calculate +import androidx.compose.material.icons.filled.Restaurant +import androidx.compose.material3.Button +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon +import androidx.compose.material3.ModalBottomSheet +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.tooling.preview.Preview +import app.aaps.core.ui.compose.AapsSpacing +import app.aaps.core.ui.compose.AapsTheme +import app.aaps.core.interfaces.R as CoreInterfacesR +import app.aaps.core.ui.R as CoreUiR + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun TrioAddActionsSheet( + onDismiss: () -> Unit, + onBolusClick: () -> Unit, + onCarbsClick: () -> Unit, + onWizardClick: () -> Unit +) { + ModalBottomSheet(onDismissRequest = onDismiss) { + Column( + modifier = Modifier + .fillMaxWidth() + .padding( + horizontal = AapsSpacing.extraLarge + AapsSpacing.small, + vertical = AapsSpacing.large + ), + verticalArrangement = Arrangement.spacedBy(AapsSpacing.large) + ) { + Button( + onClick = onWizardClick, + modifier = Modifier.fillMaxWidth() + ) { + Icon(imageVector = Icons.Default.Calculate, contentDescription = null) + Text( + text = stringResource(CoreUiR.string.boluswizard), + modifier = Modifier.padding(start = AapsSpacing.medium) + ) + } + Button( + onClick = onBolusClick, + modifier = Modifier.fillMaxWidth() + ) { + Icon(imageVector = Icons.Default.Bloodtype, contentDescription = null) + Text( + text = stringResource(CoreInterfacesR.string.bolus), + modifier = Modifier.padding(start = AapsSpacing.medium) + ) + } + Button( + onClick = onCarbsClick, + modifier = Modifier.fillMaxWidth() + ) { + Icon(imageVector = Icons.Default.Restaurant, contentDescription = null) + Text( + text = stringResource(CoreInterfacesR.string.carbs), + modifier = Modifier.padding(start = AapsSpacing.medium) + ) + } + } + } +} + +@Preview(showBackground = true) +@Composable +private fun TrioAddActionsSheetPreview() { + AapsTheme { + TrioAddActionsSheet( + onDismiss = {}, + onBolusClick = {}, + onCarbsClick = {}, + onWizardClick = {} + ) + } +} diff --git a/app/src/main/kotlin/app/aaps/trio/ui/compose/main/TrioBottomBar.kt b/app/src/main/kotlin/app/aaps/trio/ui/compose/main/TrioBottomBar.kt new file mode 100644 index 000000000000..664e7895dd5b --- /dev/null +++ b/app/src/main/kotlin/app/aaps/trio/ui/compose/main/TrioBottomBar.kt @@ -0,0 +1,140 @@ +package app.aaps.trio.ui.compose.main + +import androidx.compose.foundation.layout.RowScope +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Add +import androidx.compose.material.icons.filled.AreaChart +import androidx.compose.material.icons.filled.Medication +import androidx.compose.material.icons.filled.Settings +import androidx.compose.material.icons.filled.Tune +import androidx.compose.material3.Badge +import androidx.compose.material3.BadgedBox +import androidx.compose.material3.FloatingActionButton +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.NavigationBar +import androidx.compose.material3.NavigationBarItem +import androidx.compose.material3.NavigationBarItemColors +import androidx.compose.material3.NavigationBarItemDefaults +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp +import app.aaps.core.ui.compose.AapsSpacing +import app.aaps.ui.compose.main.TrioNavTab +import app.aaps.ui.R +import app.aaps.core.ui.R as CoreUiR + +@Composable +fun TrioBottomBar( + selectedTab: TrioNavTab, + carbsRequired: Int, + onTabSelected: (TrioNavTab) -> Unit, + onAddClick: () -> Unit, + modifier: Modifier = Modifier +) { + val colors = NavigationBarItemDefaults.colors() + NavigationBar( + modifier = modifier, + containerColor = MaterialTheme.colorScheme.surface, + contentColor = MaterialTheme.colorScheme.onSurface, + tonalElevation = 4.dp + ) { + TrioTabItem( + selected = selectedTab == TrioNavTab.Overview, + onClick = { onTabSelected(TrioNavTab.Overview) }, + label = stringResource(R.string.trio_tab_home), + icon = { + val label = stringResource(R.string.trio_tab_home) + BadgedBox( + badge = { + if (carbsRequired > 0) { + Badge { + Text( + text = stringResource(R.string.trio_carbs_required_badge, carbsRequired), + modifier = Modifier.padding(horizontal = AapsSpacing.small) + ) + } + } + } + ) { + Icon( + imageVector = Icons.Default.AreaChart, + contentDescription = if (carbsRequired > 0) { + stringResource(R.string.trio_tab_carbs_required, label, carbsRequired) + } else { + label + } + ) + } + }, + colors = colors + ) + TrioTabItem( + selected = selectedTab == TrioNavTab.Treatments, + onClick = { onTabSelected(TrioNavTab.Treatments) }, + label = stringResource(CoreUiR.string.treatments), + icon = { Icon(imageVector = Icons.Default.Medication, contentDescription = null) }, + colors = colors + ) + FloatingActionButton( + onClick = onAddClick, + containerColor = MaterialTheme.colorScheme.primary, + contentColor = MaterialTheme.colorScheme.onPrimary, + shape = CircleShape, + ) { + Icon( + imageVector = Icons.Default.Add, + contentDescription = stringResource(R.string.trio_add_action) + ) + } + TrioTabItem( + selected = selectedTab == TrioNavTab.Adjustments, + onClick = { onTabSelected(TrioNavTab.Adjustments) }, + label = stringResource(R.string.trio_tab_adjustments), + icon = { Icon(imageVector = Icons.Default.Tune, contentDescription = null) }, + colors = colors + ) + TrioTabItem( + selected = selectedTab == TrioNavTab.Settings, + onClick = { onTabSelected(TrioNavTab.Settings) }, + label = stringResource(CoreUiR.string.settings), + icon = { Icon(imageVector = Icons.Default.Settings, contentDescription = null) }, + colors = colors + ) + } +} + +@Composable +private fun RowScope.TrioTabItem( + selected: Boolean, + onClick: () -> Unit, + label: String, + icon: @Composable () -> Unit, + colors: NavigationBarItemColors +) { + NavigationBarItem( + selected = selected, + onClick = onClick, + label = null, + icon = icon, + colors = colors + ) +} + +@Preview(showBackground = true) +@Composable +private fun TrioBottomBarPreview() { + MaterialTheme { + TrioBottomBar( + selectedTab = TrioNavTab.Overview, + carbsRequired = 23, + onTabSelected = {}, + onAddClick = {} + ) + } +} diff --git a/app/src/main/kotlin/app/aaps/trio/ui/compose/main/TrioTabScaffold.kt b/app/src/main/kotlin/app/aaps/trio/ui/compose/main/TrioTabScaffold.kt new file mode 100644 index 000000000000..433e2eddacde --- /dev/null +++ b/app/src/main/kotlin/app/aaps/trio/ui/compose/main/TrioTabScaffold.kt @@ -0,0 +1,100 @@ +package app.aaps.trio.ui.compose.main + +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.RowScope +import androidx.compose.foundation.layout.WindowInsets +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.saveable.rememberSaveable +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.tooling.preview.Preview +import app.aaps.core.ui.compose.AapsSystemBarStyleEffect +import app.aaps.core.ui.compose.AapsTheme +import app.aaps.ui.compose.main.TrioNavTab + +@Composable +fun TrioTabScaffold( + selectedTab: TrioNavTab, + title: String, + carbsRequired: Int, + onTabSelected: (TrioNavTab) -> Unit, + onBolusClick: () -> Unit, + onCarbsClick: () -> Unit, + onWizardClick: () -> Unit, + modifier: Modifier = Modifier, + showTopBar: Boolean = true, + topBarActions: @Composable RowScope.() -> Unit = {}, + content: @Composable (PaddingValues) -> Unit +) { + var showAddSheet by rememberSaveable { mutableStateOf(false) } + AapsSystemBarStyleEffect() + + Scaffold( + modifier = modifier.fillMaxSize(), + contentWindowInsets = WindowInsets(0), + topBar = { + if (showTopBar) { + TrioTopBar( + title = title, + actions = topBarActions + ) + } + }, + bottomBar = { + TrioBottomBar( + selectedTab = selectedTab, + carbsRequired = carbsRequired, + onTabSelected = onTabSelected, + onAddClick = { showAddSheet = true } + ) + } + ) { paddingValues -> + content(paddingValues) + } + + if (showAddSheet) { + TrioAddActionsSheet( + onDismiss = { showAddSheet = false }, + onBolusClick = { + showAddSheet = false + onBolusClick() + }, + onCarbsClick = { + showAddSheet = false + onCarbsClick() + }, + onWizardClick = { + showAddSheet = false + onWizardClick() + } + ) + } +} + +@Preview(showBackground = true) +@Composable +private fun TrioTabScaffoldPreview() { + MaterialTheme { + TrioTabScaffold( + selectedTab = TrioNavTab.Adjustments, + title = "Adjustments", + carbsRequired = 23, + onTabSelected = {}, + onBolusClick = {}, + onCarbsClick = {}, + onWizardClick = {} + ) { padding -> + Text( + text = "Trio Tab Content", + modifier = Modifier.padding(padding) + ) + } + } +} diff --git a/app/src/main/kotlin/app/aaps/trio/ui/compose/main/TrioTopBar.kt b/app/src/main/kotlin/app/aaps/trio/ui/compose/main/TrioTopBar.kt new file mode 100644 index 000000000000..3933da955aa6 --- /dev/null +++ b/app/src/main/kotlin/app/aaps/trio/ui/compose/main/TrioTopBar.kt @@ -0,0 +1,30 @@ +package app.aaps.trio.ui.compose.main + +import androidx.compose.foundation.layout.RowScope +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.tooling.preview.Preview +import app.aaps.core.ui.compose.AapsTheme +import app.aaps.core.ui.compose.AapsTopAppBar + +@Composable +fun TrioTopBar( + title: String, + modifier: Modifier = Modifier, + actions: @Composable RowScope.() -> Unit = {} +) { + AapsTopAppBar( + title = { Text(title) }, + modifier = modifier, + actions = actions + ) +} + +@Preview(showBackground = true) +@Composable +private fun TrioTopBarPreview() { + AapsTheme { + TrioTopBar(title = "Trio") + } +} diff --git a/app/src/main/kotlin/app/aaps/trio/ui/compose/main/TrioUiImpl.kt b/app/src/main/kotlin/app/aaps/trio/ui/compose/main/TrioUiImpl.kt new file mode 100644 index 000000000000..656826d63aa4 --- /dev/null +++ b/app/src/main/kotlin/app/aaps/trio/ui/compose/main/TrioUiImpl.kt @@ -0,0 +1,87 @@ +package app.aaps.trio.ui.compose.main + +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.RowScope +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import app.aaps.trio.TrioUi +import app.aaps.trio.ui.compose.overview.TrioOverviewScreen +import app.aaps.ui.compose.main.TrioNavTab +import app.aaps.ui.compose.overview.TrioOverviewModel +import dev.zacsweers.metro.AppScope +import dev.zacsweers.metro.ContributesBinding +import dev.zacsweers.metro.Inject +import dev.zacsweers.metro.binding + +@ContributesBinding(AppScope::class, binding = binding()) +class TrioUiImpl @Inject constructor() : TrioUi { + + @Composable + override fun topBar(title: String, modifier: Modifier) { + TrioTopBar(title = title, modifier = modifier) + } + + @Composable + override fun bottomBar( + selectedTab: TrioNavTab, + carbsRequired: Int, + onTabSelected: (TrioNavTab) -> Unit, + onAddClick: () -> Unit, + modifier: Modifier + ) { + TrioBottomBar( + selectedTab = selectedTab, + carbsRequired = carbsRequired, + onTabSelected = onTabSelected, + onAddClick = onAddClick, + modifier = modifier + ) + } + + @Composable + override fun addActionsSheet( + onDismiss: () -> Unit, + onBolusClick: () -> Unit, + onCarbsClick: () -> Unit, + onWizardClick: () -> Unit + ) { + TrioAddActionsSheet( + onDismiss = onDismiss, + onBolusClick = onBolusClick, + onCarbsClick = onCarbsClick, + onWizardClick = onWizardClick + ) + } + + @Composable + override fun overview(model: TrioOverviewModel) { + TrioOverviewScreen(model) + } + + @Composable + override fun tabScaffold( + selectedTab: TrioNavTab, + title: String, + carbsRequired: Int, + onTabSelected: (TrioNavTab) -> Unit, + onBolusClick: () -> Unit, + onCarbsClick: () -> Unit, + onWizardClick: () -> Unit, + showTopBar: Boolean, + topBarActions: @Composable RowScope.() -> Unit, + content: @Composable (PaddingValues) -> Unit + ) { + TrioTabScaffold( + selectedTab = selectedTab, + title = title, + carbsRequired = carbsRequired, + onTabSelected = onTabSelected, + onBolusClick = onBolusClick, + onCarbsClick = onCarbsClick, + onWizardClick = onWizardClick, + showTopBar = showTopBar, + topBarActions = topBarActions, + content = content + ) + } +} diff --git a/app/src/main/kotlin/app/aaps/trio/ui/compose/overview/TrioOverviewGraph.kt b/app/src/main/kotlin/app/aaps/trio/ui/compose/overview/TrioOverviewGraph.kt new file mode 100644 index 000000000000..7be3400f4dd4 --- /dev/null +++ b/app/src/main/kotlin/app/aaps/trio/ui/compose/overview/TrioOverviewGraph.kt @@ -0,0 +1,1042 @@ +package app.aaps.trio.ui.compose.overview + +import androidx.compose.animation.AnimatedVisibility as AnimatedVisibilityComposable +import androidx.compose.animation.fadeIn +import androidx.compose.animation.fadeOut +import androidx.compose.animation.core.Animatable +import androidx.compose.animation.core.Spring +import androidx.compose.animation.core.animateFloatAsState +import androidx.compose.animation.core.exponentialDecay +import androidx.compose.animation.core.spring +import androidx.compose.foundation.Canvas +import androidx.compose.foundation.gestures.awaitEachGesture +import androidx.compose.foundation.gestures.awaitFirstDown +import androidx.compose.foundation.gestures.calculateZoom +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.outlined.Info +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.FilterChip +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.ModalBottomSheet +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableIntStateOf +import androidx.compose.runtime.mutableLongStateOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.saveable.rememberSaveable +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.geometry.Size +import androidx.compose.ui.graphics.Brush +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.Path +import androidx.compose.ui.graphics.PathEffect +import androidx.compose.ui.graphics.StrokeCap +import androidx.compose.ui.graphics.StrokeJoin +import androidx.compose.ui.graphics.drawscope.DrawScope +import androidx.compose.ui.graphics.drawscope.Stroke +import androidx.compose.ui.input.pointer.changedToUp +import androidx.compose.ui.input.pointer.pointerInput +import androidx.compose.ui.input.pointer.util.VelocityTracker +import androidx.compose.ui.input.pointer.util.addPointerInputChange +import androidx.compose.ui.res.stringResource as androidStringResource +import androidx.compose.ui.text.drawText +import androidx.compose.ui.text.rememberTextMeasurer +import androidx.compose.ui.unit.Dp +import androidx.compose.ui.unit.dp +import androidx.lifecycle.compose.collectAsStateWithLifecycle +import app.aaps.core.interfaces.InterfacesStrings +import app.aaps.core.interfaces.overview.graph.BgDataPoint +import app.aaps.core.interfaces.overview.graph.BgRange +import app.aaps.core.interfaces.overview.graph.BgType +import app.aaps.core.interfaces.overview.graph.BolusGraphPoint +import app.aaps.core.interfaces.overview.graph.BolusType +import app.aaps.core.interfaces.overview.graph.SeriesType +import app.aaps.core.ui.CoreUiStrings +import app.aaps.core.ui.compose.AapsSpacing +import app.aaps.core.ui.compose.AapsTheme +import app.aaps.core.ui.compose.LocalDateUtil +import app.aaps.core.ui.compose.stringResource +import app.aaps.ui.R +import app.aaps.ui.compose.overview.graphs.GraphViewModel +import kotlinx.coroutines.launch +import kotlinx.coroutines.delay +import java.text.NumberFormat +import kotlin.math.abs +import kotlin.math.ceil +import kotlin.math.floor +import kotlin.time.Duration.Companion.milliseconds + +private const val DEFAULT_WINDOW_MS = 6L * 60L * 60L * 1000L +private const val MIN_WINDOW_MS = 10L * 60L * 1000L +private const val MAX_WINDOW_MS = 72L * 60L * 60L * 1000L +private const val LIVE_EDGE_TOLERANCE_MS = 10L * 60L * 1000L +private const val NOW_POSITION_FRACTION = 0.6 +private const val FUTURE_POSITION_FRACTION = 1.0 - NOW_POSITION_FRACTION +private const val DATA_GAP_MS = 17L * 60L * 1000L +private const val DOUBLE_TAP_TIMEOUT_MS = 300L +private const val INFO_BUTTON_SHOW_DELAY = 1500L +internal const val BOLUS_VALUE_THRESHOLD_UNITS = 0.5 +internal val GRAPH_RANGE_HRS = intArrayOf(4, 6, 12, 24) + +private val GRID_INTERVALS_MS = longArrayOf( + 5L * 60L * 1000L, + 15L * 60L * 1000L, + 30L * 60L * 1000L, + 60L * 60L * 1000L, + 2L * 60L * 60L * 1000L, + 4L * 60L * 60L * 1000L, + 8L * 60L * 60L * 1000L, + 12L * 60L * 60L * 1000L, + 24L * 60L * 60L * 1000L +) + +internal data class TrioGraphRange( + val min: Double, + val max: Double +) + +internal data class BolusMarkerPosition( + val bolus: BolusGraphPoint, + val x: Float, + val y: Float +) + +@Composable +fun TrioOverviewGraph( + graphViewModel: GraphViewModel, + height: Dp, + modifier: Modifier = Modifier +) { + val readings by graphViewModel.bgReadingsFlow.collectAsStateWithLifecycle() + val bucketedReadings by graphViewModel.bucketedDataFlow.collectAsStateWithLifecycle() + val predictions by graphViewModel.predictionsFlow.collectAsStateWithLifecycle() + val chartConfig by graphViewModel.chartConfigFlow.collectAsStateWithLifecycle() + val graphConfig by graphViewModel.graphConfigFlow.collectAsStateWithLifecycle() + val derivedTimeRange by graphViewModel.derivedTimeRange.collectAsStateWithLifecycle() + val nowTimestamp by graphViewModel.nowTimestamp.collectAsStateWithLifecycle() + val treatments by graphViewModel.treatmentGraphFlow.collectAsStateWithLifecycle() + + val history = remember(readings, bucketedReadings) { + (readings + bucketedReadings) + .sortedBy(BgDataPoint::timestamp) + .distinctBy(BgDataPoint::timestamp) + } + val visiblePredictions = remember(predictions, graphConfig) { + if (SeriesType.PREDICTIONS in graphConfig.bgOverlays) { + predictions.sortedBy(BgDataPoint::timestamp) + } else { + emptyList() + } + } + + val liveEnd = maxOf( + nowTimestamp, + history.lastOrNull()?.timestamp ?: nowTimestamp, + visiblePredictions.lastOrNull()?.timestamp ?: nowTimestamp, + nowTimestamp + (DEFAULT_WINDOW_MS * FUTURE_POSITION_FRACTION).toLong() + ) + val range = derivedTimeRange?.first?.let { it to liveEnd } + ?: (liveEnd - 24L * 60L * 60L * 1000L to liveEnd) + var selectedRangeHours by rememberSaveable { mutableStateOf(6) } + var showPredictionInfo by rememberSaveable { mutableStateOf(false) } + var isInteracting by remember { mutableStateOf(false) } + var showInfoButton by remember { mutableStateOf(true) } + var infoButtonHideRequest by remember { mutableIntStateOf(0) } + + LaunchedEffect(isInteracting) { + if (isInteracting) { + if (isInteracting) showInfoButton = false + } else { + delay(INFO_BUTTON_SHOW_DELAY.milliseconds) + if (!isInteracting) showInfoButton = true + } + } + LaunchedEffect(infoButtonHideRequest) { + if (infoButtonHideRequest == 0) return@LaunchedEffect + showInfoButton = false + } + + Column( + modifier = modifier + .fillMaxWidth() + .height(height) + ) { + Surface( + modifier = Modifier.fillMaxWidth().weight(1f), + shape = RoundedCornerShape(AapsSpacing.chipCornerRadius), + color = Color.Transparent, + shadowElevation = 0.dp + ) { + InteractiveTrioGlucoseChart( + history = history, + predictions = visiblePredictions, + boluses = treatments.boluses, + fullRange = range, + nowTimestamp = nowTimestamp, + lowMark = chartConfig.lowMark, + highMark = chartConfig.highMark, + selectedRangeHours = selectedRangeHours, + onRangeSelected = { selectedRangeHours = it }, + onInteraction = { + graphViewModel.onGraphInteraction() + infoButtonHideRequest++ + }, + onInteractingChanged = { isInteracting = it }, + modifier = Modifier.fillMaxSize() + ) + } + + Box(Modifier.fillMaxWidth()) { + Row(Modifier.align(Alignment.Center)) { + GRAPH_RANGE_HRS.forEach { hours -> + FilterChip( + selected = hours == selectedRangeHours, + onClick = { selectedRangeHours = hours }, + label = { + Text( + text = stringResource(CoreUiStrings.units_format_hours, hours), + style = MaterialTheme.typography.labelSmall + ) + }, + border = null, + ) + } + } + GraphInfoButton( + visible = showInfoButton, + onClick = { showPredictionInfo = true }, + modifier = Modifier.align(Alignment.CenterEnd) + ) + } + } + + if (showPredictionInfo) { + PredictionLegendBottomSheet(onDismiss = { showPredictionInfo = false }) + } +} + +@Composable +private fun GraphInfoButton( + visible: Boolean, + onClick: () -> Unit, + modifier: Modifier = Modifier +) { + AnimatedVisibilityComposable( + visible = visible, + modifier = modifier, + enter = fadeIn(), + exit = fadeOut() + ) { + IconButton(onClick = onClick) { + Icon( + imageVector = Icons.Outlined.Info, + contentDescription = androidStringResource(R.string.trio_graph_prediction_info), + tint = MaterialTheme.colorScheme.onSurface + ) + } + } +} + +@Composable +@OptIn(ExperimentalMaterial3Api::class) +private fun PredictionLegendBottomSheet(onDismiss: () -> Unit) { + ModalBottomSheet(onDismissRequest = onDismiss) { + Column( + modifier = Modifier + .fillMaxWidth() + .padding(AapsSpacing.extraLarge), + verticalArrangement = Arrangement.spacedBy(AapsSpacing.medium) + ) { + Text( + text = androidStringResource(R.string.trio_graph_prediction_info), + style = MaterialTheme.typography.titleLarge + ) + PredictionLegendItem( + title = androidStringResource(R.string.trio_graph_prediction_iob_title), + description = androidStringResource(R.string.trio_graph_prediction_iob_description), + color = AapsTheme.generalColors.iobPrediction + ) + PredictionLegendItem( + title = androidStringResource(R.string.trio_graph_prediction_cob_title), + description = androidStringResource(R.string.trio_graph_prediction_cob_description), + color = AapsTheme.generalColors.cobPrediction + ) + PredictionLegendItem( + title = androidStringResource(R.string.trio_graph_prediction_acob_title), + description = androidStringResource(R.string.trio_graph_prediction_acob_description), + color = AapsTheme.generalColors.aCobPrediction + ) + PredictionLegendItem( + title = androidStringResource(R.string.trio_graph_prediction_uam_title), + description = androidStringResource(R.string.trio_graph_prediction_uam_description), + color = AapsTheme.generalColors.uamPrediction + ) + PredictionLegendItem( + title = androidStringResource(R.string.trio_graph_prediction_zt_title), + description = androidStringResource(R.string.trio_graph_prediction_zt_description), + color = AapsTheme.generalColors.ztPrediction + ) + Text( + text = androidStringResource(R.string.trio_graph_gesture_help_title), + style = MaterialTheme.typography.titleLarge + ) + GestureHelpItem(text = androidStringResource(R.string.trio_graph_gesture_pinch)) + GestureHelpItem(text = androidStringResource(R.string.trio_graph_gesture_double_tap)) + GestureHelpItem(text = androidStringResource(R.string.trio_graph_gesture_scroll)) + } + } +} + +@Composable +private fun GestureHelpItem(text: String) { + Row( + horizontalArrangement = Arrangement.spacedBy(AapsSpacing.medium), + verticalAlignment = Alignment.CenterVertically + ) { + val bulletColor = MaterialTheme.colorScheme.onSurfaceVariant + Canvas( + modifier = Modifier + .padding(top = AapsSpacing.small) + .size(AapsSpacing.small) + ) { + drawCircle(color = bulletColor) + } + Text( + text = text, + style = MaterialTheme.typography.bodyMedium, + modifier = Modifier.weight(1f) + ) + } +} + +@Composable +private fun PredictionLegendItem( + title: String, + description: String, + color: Color +) { + Row( + horizontalArrangement = Arrangement.spacedBy(AapsSpacing.medium), + verticalAlignment = Alignment.CenterVertically + ) { + Canvas( + modifier = Modifier + .padding(top = AapsSpacing.medium) + .size(AapsSpacing.xxLarge) + ) { + drawLine( + color = color, + start = Offset.Zero, + end = Offset(size.width, 0f), + strokeWidth = 2.dp.toPx(), + pathEffect = PathEffect.dashPathEffect(floatArrayOf(10.dp.toPx(), 8.dp.toPx())) + ) + } + Column(modifier = Modifier.weight(1f)) { + Text(text = title, style = MaterialTheme.typography.titleSmall) + Text( + text = description, + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + } + } +} + +@Composable +private fun InteractiveTrioGlucoseChart( + history: List, + predictions: List, + boluses: List, + fullRange: Pair, + nowTimestamp: Long, + lowMark: Double, + highMark: Double, + selectedRangeHours: Int?, + onRangeSelected: (Int?) -> Unit, + onInteraction: () -> Unit, + onInteractingChanged: (Boolean) -> Unit = {}, + modifier: Modifier = Modifier +) { + val colors = AapsTheme.generalColors + val dateUtil = LocalDateUtil.current + val textMeasurer = rememberTextMeasurer() + val coroutineScope = rememberCoroutineScope() + val numberFormat = remember { + NumberFormat.getNumberInstance().apply { + minimumFractionDigits = 0 + maximumFractionDigits = 1 + } + } + val bolusTitle = stringResource(InterfacesStrings.bolus) + val smbTitle = stringResource(CoreUiStrings.smb_shortname) + + val fullStart = fullRange.first + val fullEnd = maxOf(fullRange.second, fullStart + MIN_WINDOW_MS) + val fullSpan = (fullEnd - fullStart).coerceAtLeast(MIN_WINDOW_MS) + val maxDuration = fullSpan.coerceAtMost(MAX_WINDOW_MS).coerceAtLeast(MIN_WINDOW_MS) + var visibleDuration by rememberSaveable { + mutableLongStateOf(DEFAULT_WINDOW_MS.coerceAtMost(maxDuration)) + } + var centerTime by rememberSaveable { + mutableLongStateOf(nowCenteredViewport(nowTimestamp, visibleDuration)) + } + var selectedPoint by remember { mutableStateOf(null) } + var selectedBolus by remember { mutableStateOf(null) } + var lastTapTime by remember { mutableLongStateOf(0L) } + val inertia = remember { Animatable(0f) } + + fun clampCenter(value: Long, duration: Long = visibleDuration): Long { + val half = duration / 2L + val minCenter = fullStart + half + val maxCenter = (fullEnd - half).coerceAtLeast(minCenter) + return value.coerceIn(minCenter, maxCenter) + } + + LaunchedEffect(selectedRangeHours, maxDuration) { + val hours = selectedRangeHours ?: return@LaunchedEffect + val duration = (hours * 60L * 60L * 1000L) + .coerceIn(MIN_WINDOW_MS, maxDuration) + visibleDuration = duration + centerTime = clampCenter(nowCenteredViewport(nowTimestamp, duration), duration) + selectedPoint = null + selectedBolus = null + } + + LaunchedEffect(maxDuration) { + if (visibleDuration > maxDuration) { + visibleDuration = maxDuration + centerTime = clampCenter(centerTime, maxDuration) + } + } + + LaunchedEffect(fullEnd, nowTimestamp) { + val liveCenter = nowCenteredViewport(nowTimestamp, visibleDuration) + if (abs(centerTime - liveCenter) <= LIVE_EDGE_TOLERANCE_MS) { + centerTime = clampCenter(liveCenter) + } + } + + LaunchedEffect(centerTime, visibleDuration, selectedPoint, selectedBolus) { + val start = centerTime - visibleDuration / 2L + val end = centerTime + visibleDuration / 2L + selectedPoint?.let { + if (it.timestamp !in start..end) selectedPoint = null + } + selectedBolus?.let { + if (it.timestamp !in start..end) selectedBolus = null + } + } + + val surfaceColor = MaterialTheme.colorScheme.surfaceContainerHigh + val gridColor = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.12f) + val labelColor = MaterialTheme.colorScheme.onSurfaceVariant + val selectionColor = MaterialTheme.colorScheme.onSurface + val targetColor = colors.bgTargetRangeArea + val insulinColor = AapsTheme.elementColors.insulin + val lineColors = listOf( + colors.bgVeryHigh, + colors.bgHigh, + colors.bgInRange, + colors.bgLow, + colors.bgVeryLow + ) + val predictionColors = mapOf( + BgType.IOB_PREDICTION to colors.iobPrediction, + BgType.COB_PREDICTION to colors.cobPrediction, + BgType.A_COB_PREDICTION to colors.aCobPrediction, + BgType.UAM_PREDICTION to colors.uamPrediction, + BgType.ZT_PREDICTION to colors.ztPrediction + ) + val labelStyle = MaterialTheme.typography.labelSmall.copy(color = labelColor) + + Box( + modifier = modifier + .pointerInput(history, predictions, boluses, fullStart, fullEnd, maxDuration) { + awaitEachGesture { + val down = awaitFirstDown(requireUnconsumed = false) + coroutineScope.launch { inertia.stop() } + val velocityTracker = VelocityTracker() + velocityTracker.addPointerInputChange(down) + val downTime = down.uptimeMillis + val isSecondTap = downTime - lastTapTime <= DOUBLE_TAP_TIMEOUT_MS + var previous = down + var totalX = 0f + var totalY = 0f + var horizontalGesture = false + var zoomGesture = false + var interactionStarted = false + var pointerCount = 1 + + while (true) { + val event = awaitPointerEvent() + val pressed = event.changes.filter { it.pressed } + val change = pressed.firstOrNull() ?: event.changes.firstOrNull() ?: break + if (pressed.isEmpty() || change.changedToUp()) break + if (pressed.size != pointerCount) { + pointerCount = pressed.size + previous = change + totalX = 0f + totalY = 0f + velocityTracker.resetTracking() + continue + } + + if (pressed.size > 1) { + val zoom = event.calculateZoom() + if (zoom.isFinite() && zoom != 1f) { + val effectiveZoom = 1f + (zoom - 1f) * 2f + val newDuration = (visibleDuration / effectiveZoom) + .toLong() + .coerceIn(MIN_WINDOW_MS, maxDuration) + visibleDuration = newDuration + centerTime = clampCenter(centerTime, newDuration) + onRangeSelected(null) + zoomGesture = true + if (!interactionStarted) { + interactionStarted = true + onInteractingChanged(true) + } + event.changes.forEach { it.consume() } + } + } else { + velocityTracker.addPointerInputChange(change) + val deltaX = change.position.x - previous.position.x + val deltaY = change.position.y - previous.position.y + totalX += deltaX + totalY += deltaY + + if (!horizontalGesture && abs(totalX) > viewConfiguration.touchSlop) { + horizontalGesture = abs(totalX) > abs(totalY) + if (horizontalGesture) { + interactionStarted = true + onInteractingChanged(true) + } + } + if (horizontalGesture) { + val timePerPixel = visibleDuration.toDouble() / size.width.coerceAtLeast(1) + centerTime = clampCenter(centerTime - (deltaX * timePerPixel).toLong()) + change.consume() + } + } + previous = change + } + + val wasTap = !horizontalGesture && !zoomGesture && + abs(totalX) < viewConfiguration.touchSlop && + abs(totalY) < viewConfiguration.touchSlop + + when { + wasTap && isSecondTap -> { + interactionStarted = true + onInteractingChanged(true) + val targetDuration = if (visibleDuration <= DEFAULT_WINDOW_MS / 2L) { + DEFAULT_WINDOW_MS.coerceAtMost(maxDuration) + } else { + (visibleDuration / 2L).coerceAtLeast(MIN_WINDOW_MS) + } + visibleDuration = targetDuration + centerTime = clampCenter(centerTime, targetDuration) + onRangeSelected(null) + selectedPoint = null + selectedBolus = null + lastTapTime = 0L + onRangeSelected(null) + onInteraction() + } + + wasTap -> { + lastTapTime = downTime + val viewportStart = centerTime - visibleDuration / 2L + val viewportEnd = centerTime + visibleDuration / 2L + val visibleHistory = history.withRangePadding(viewportStart, viewportEnd) + val visiblePredictionPoints = predictions.withRangePadding(viewportStart, viewportEnd) + val yRange = calculateYRange( + points = visibleHistory + visiblePredictionPoints, + lowMark = lowMark, + highMark = highMark + ) + val plotHeight = (size.height - 32.dp.toPx()).coerceAtLeast(1f) + val markers = calculateBolusMarkerPositions( + boluses = boluses, + history = history, + viewportStart = viewportStart, + viewportDuration = visibleDuration, + width = size.width.toFloat(), + plotHeight = plotHeight, + yRange = yRange, + markerOffset = 12.dp.toPx() + ) + val tappedBolus = findTappedBolus( + markers = markers, + tapX = down.position.x, + tapY = down.position.y, + hitRadius = 20.dp.toPx() + ) + val tappedTime = viewportStart + + (down.position.x / size.width.coerceAtLeast(1)) * visibleDuration + selectedBolus = tappedBolus + selectedPoint = if (tappedBolus == null) { + nearestPoint(history, tappedTime.toLong()) + } else { + null + } + } + + horizontalGesture -> { + lastTapTime = 0L + onRangeSelected(null) + onInteraction() + val velocityX = velocityTracker.calculateVelocity().x + if (abs(velocityX) > 1_000f) { + coroutineScope.launch { + var previousValue = 0f + inertia.snapTo(0f) + inertia.animateDecay( + initialVelocity = -velocityX, + animationSpec = exponentialDecay(frictionMultiplier = 2f) + ) { + val delta = value - previousValue + val timePerPixel = visibleDuration.toDouble() / size.width.coerceAtLeast(1) + centerTime = clampCenter(centerTime + (delta * timePerPixel).toLong()) + previousValue = value + } + } + } + } + + zoomGesture -> { + lastTapTime = 0L + onInteraction() + } + } + if (interactionStarted) onInteractingChanged(false) + } + } + ) { + val animatedVisibleDuration by animateFloatAsState( + targetValue = visibleDuration.toFloat(), + animationSpec = spring(stiffness = Spring.StiffnessMedium), + label = "TrioGraphZoom" + ) + + Canvas(modifier = Modifier.fillMaxSize()) { + val bottomAxisHeight = 32.dp.toPx() + val plotHeight = (size.height - bottomAxisHeight).coerceAtLeast(1f) + val renderedDuration = animatedVisibleDuration.toLong().coerceAtLeast(MIN_WINDOW_MS) + val viewportStart = centerTime - renderedDuration / 2L + val viewportEnd = centerTime + renderedDuration / 2L + val visibleHistory = history.withRangePadding(viewportStart, viewportEnd) + val visiblePredictionPoints = predictions.withRangePadding(viewportStart, viewportEnd) + val yRange = calculateYRange( + points = visibleHistory + visiblePredictionPoints, + lowMark = lowMark, + highMark = highMark + ) + val ySpan = (yRange.max - yRange.min).coerceAtLeast(0.1) + + fun timeToX(timestamp: Long): Float = + ((timestamp - viewportStart).toDouble() / renderedDuration * size.width).toFloat() + + fun valueToY(value: Double): Float = + (plotHeight - ((value - yRange.min) / ySpan * plotHeight)).toFloat() + + val targetTop = valueToY(highMark).coerceIn(0f, plotHeight) + val targetBottom = valueToY(lowMark).coerceIn(0f, plotHeight) + drawRect( + color = targetColor, + topLeft = Offset(0f, minOf(targetTop, targetBottom)), + size = Size(size.width, abs(targetBottom - targetTop)) + ) + + val yStep = chooseYGridStep(ySpan) + var yValue = ceil(yRange.min / yStep) * yStep + while (yValue < yRange.max) { + val y = valueToY(yValue) + drawLine(gridColor, Offset(0f, y), Offset(size.width, y), 1.dp.toPx()) + val label = numberFormat.format(yValue) + drawText( + textMeasurer = textMeasurer, + text = label, + topLeft = Offset(AapsSpacing.small.toPx(), (y - 8.dp.toPx()).coerceAtLeast(0f)), + style = labelStyle + ) + yValue += yStep + } + + val gridInterval = chooseTimeGridInterval(renderedDuration, size.width) + var gridTime = floor(viewportStart.toDouble() / gridInterval).toLong() * gridInterval + if (gridTime < viewportStart) gridTime += gridInterval + while (gridTime <= viewportEnd) { + val x = timeToX(gridTime) + drawLine(gridColor, Offset(x, 0f), Offset(x, plotHeight), 1.dp.toPx()) + val label = dateUtil.timeString(gridTime) + val layout = textMeasurer.measure(label, labelStyle) + drawText( + textMeasurer = textMeasurer, + text = label, + topLeft = Offset( + (x - layout.size.width / 2f).coerceIn(0f, size.width - layout.size.width), + plotHeight + AapsSpacing.small.toPx() + ), + style = labelStyle + ) + gridTime += gridInterval + } + + val highPosition = ((yRange.max - highMark) / ySpan).toFloat().coerceIn(0f, 1f) + val lowPosition = ((yRange.max - lowMark) / ySpan).toFloat().coerceIn(0f, 1f) + val lineBrush = Brush.verticalGradient( + colorStops = arrayOf( + 0f to lineColors[0], + highPosition to lineColors[1], + ((highPosition + lowPosition) / 2f) to lineColors[2], + lowPosition to lineColors[3], + 1f to lineColors[4] + ), + endY = plotHeight + ) + + drawGlucosePath( + points = visibleHistory, + x = ::timeToX, + y = ::valueToY, + brush = lineBrush, + pointColor = { point -> + when (point.range) { + BgRange.HIGH -> colors.bgHigh + BgRange.IN_RANGE -> colors.bgInRange + BgRange.LOW -> colors.bgLow + } + } + ) + + predictions.groupBy(BgDataPoint::type).forEach { (type, points) -> + val color = predictionColors[type] ?: return@forEach + val path = points.withRangePadding(viewportStart, viewportEnd).toPath(::timeToX, ::valueToY) + drawPath( + path = path, + color = color.copy(alpha = 0.7f), + style = Stroke( + width = 2.dp.toPx(), + cap = StrokeCap.Round, + join = StrokeJoin.Round, + pathEffect = PathEffect.dashPathEffect(floatArrayOf(10.dp.toPx(), 8.dp.toPx())) + ) + ) + } + + val bolusMarkers = calculateBolusMarkerPositions( + boluses = boluses, + history = history, + viewportStart = viewportStart, + viewportDuration = renderedDuration, + width = size.width, + plotHeight = plotHeight, + yRange = yRange, + markerOffset = 12.dp.toPx() + ) + val markerHalfWidth = 5.dp.toPx() + val markerHalfHeight = 5.dp.toPx() + bolusMarkers.forEach { marker -> + val markerPath = Path().apply { + moveTo(marker.x - markerHalfWidth, marker.y - markerHalfHeight) + lineTo(marker.x + markerHalfWidth, marker.y - markerHalfHeight) + lineTo(marker.x, marker.y + markerHalfHeight) + close() + } + drawPath( + path = markerPath, + color = insulinColor + ) + if (shouldShowBolusValue(marker.bolus.amount)) { + val labelLayout = textMeasurer.measure(marker.bolus.label, labelStyle) + drawText( + textMeasurer = textMeasurer, + text = marker.bolus.label, + topLeft = Offset( + x = (marker.x - labelLayout.size.width / 2f) + .coerceIn(0f, size.width - labelLayout.size.width), + y = (marker.y - markerHalfHeight - labelLayout.size.height) + .coerceAtLeast(0f) + ), + style = labelStyle + ) + } + } + + if (nowTimestampInRange(viewportStart, viewportEnd, nowTimestamp)) { + val x = timeToX(nowTimestamp) + drawLine( + color = selectionColor.copy(alpha = 0.45f), + start = Offset(x, 0f), + end = Offset(x, plotHeight), + strokeWidth = 1.dp.toPx() + ) + } + + selectedPoint?.let { point -> + val x = timeToX(point.timestamp) + val y = valueToY(point.value) + drawLine( + color = selectionColor.copy(alpha = 0.65f), + start = Offset(x, 0f), + end = Offset(x, plotHeight), + strokeWidth = 1.dp.toPx() + ) + drawCircle( + color = surfaceColor, + radius = 7.dp.toPx(), + center = Offset(x, y) + ) + drawCircle( + color = selectionColor, + radius = 5.dp.toPx(), + center = Offset(x, y) + ) + } + } + + selectedBolus?.let { bolus -> + Surface( + modifier = Modifier + .align(Alignment.TopCenter) + .padding(top = AapsSpacing.medium), + shape = RoundedCornerShape(AapsSpacing.chipCornerRadius), + color = MaterialTheme.colorScheme.surface.copy(alpha = 0.94f), + shadowElevation = AapsSpacing.extraSmall + ) { + Row( + modifier = Modifier.padding( + horizontal = AapsSpacing.large, + vertical = AapsSpacing.medium + ), + horizontalArrangement = Arrangement.spacedBy(AapsSpacing.large) + ) { + Text( + text = bolusTitle, + color = insulinColor, + style = MaterialTheme.typography.labelLarge + ) + Text( + text = stringResource(InterfacesStrings.format_insulin_units, bolus.amount), + style = MaterialTheme.typography.labelLarge + ) + if (bolus.bolusType == BolusType.SMB) { + Text( + text = smbTitle, + style = MaterialTheme.typography.labelLarge + ) + } + Text( + text = dateUtil.timeString(bolus.timestamp), + style = MaterialTheme.typography.labelLarge + ) + } + } + } ?: selectedPoint?.let { point -> + Surface( + modifier = Modifier + .align(Alignment.TopCenter) + .padding(top = AapsSpacing.medium), + shape = RoundedCornerShape(AapsSpacing.chipCornerRadius), + color = MaterialTheme.colorScheme.surface.copy(alpha = 0.94f), + shadowElevation = AapsSpacing.extraSmall + ) { + Row( + modifier = Modifier.padding( + horizontal = AapsSpacing.large, + vertical = AapsSpacing.medium + ), + horizontalArrangement = Arrangement.spacedBy(AapsSpacing.large) + ) { + Text( + text = numberFormat.format(point.value), + style = MaterialTheme.typography.labelLarge + ) + Text( + text = dateUtil.timeString(point.timestamp), + style = MaterialTheme.typography.labelLarge + ) + } + } + } + } +} + +private fun List.withRangePadding(start: Long, end: Long): List { + if (isEmpty()) return emptyList() + val first = binarySearchBy(start) { it.timestamp } + .let { if (it >= 0) it else -it - 1 } + .minus(1) + .coerceAtLeast(0) + val last = binarySearchBy(end) { it.timestamp } + .let { if (it >= 0) it + 1 else -it - 1 } + .plus(1) + .coerceAtMost(size) + return if (first < last) subList(first, last) else emptyList() +} + +private fun nearestPoint(points: List, timestamp: Long): BgDataPoint? { + if (points.isEmpty()) return null + val index = points.binarySearchBy(timestamp) { it.timestamp } + if (index >= 0) return points[index] + val insertionPoint = -index - 1 + if (insertionPoint == 0) return points.first() + if (insertionPoint == points.size) return points.last() + val before = points[insertionPoint - 1] + val after = points[insertionPoint] + return if (timestamp - before.timestamp <= after.timestamp - timestamp) before else after +} + +internal fun shouldShowBolusValue(amount: Double): Boolean = + amount > BOLUS_VALUE_THRESHOLD_UNITS + +internal fun calculateBolusMarkerPositions( + boluses: List, + history: List, + viewportStart: Long, + viewportDuration: Long, + width: Float, + plotHeight: Float, + yRange: TrioGraphRange, + markerOffset: Float +): List { + if (history.isEmpty() || viewportDuration <= 0L || width <= 0f || plotHeight <= 0f) return emptyList() + val viewportEnd = viewportStart + viewportDuration + val ySpan = (yRange.max - yRange.min).coerceAtLeast(0.1) + val maxMarkerY = (plotHeight - markerOffset).coerceAtLeast(markerOffset) + return boluses + .asSequence() + .filter { it.isValid && it.amount > 0.0 && it.timestamp in viewportStart..viewportEnd } + .mapNotNull { bolus -> + val glucose = nearestPoint(history, bolus.timestamp) ?: return@mapNotNull null + val x = ((bolus.timestamp - viewportStart).toDouble() / viewportDuration * width).toFloat() + val glucoseY = (plotHeight - ((glucose.value - yRange.min) / ySpan * plotHeight)).toFloat() + BolusMarkerPosition( + bolus = bolus, + x = x, + y = (glucoseY - markerOffset).coerceIn(markerOffset, maxMarkerY) + ) + } + .toList() +} + +internal fun findTappedBolus( + markers: List, + tapX: Float, + tapY: Float, + hitRadius: Float +): BolusGraphPoint? { + val maxDistanceSquared = hitRadius * hitRadius + return markers + .map { marker -> + val dx = marker.x - tapX + val dy = marker.y - tapY + marker to dx * dx + dy * dy + } + .filter { (_, distanceSquared) -> distanceSquared <= maxDistanceSquared } + .minByOrNull { (_, distanceSquared) -> distanceSquared } + ?.first + ?.bolus +} + +private fun calculateYRange( + points: List, + lowMark: Double, + highMark: Double +): TrioGraphRange { + val values = points.map(BgDataPoint::value).filter(Double::isFinite) + val baseMin = minOf(lowMark, values.minOrNull() ?: lowMark) + val baseMax = maxOf(highMark, values.maxOrNull() ?: highMark) + val span = (baseMax - baseMin).coerceAtLeast(if (highMark < 20.0) 6.0 else 108.0) + val padding = span * 0.08 + val step = if (highMark < 20.0) 1.0 else 18.0 + return TrioGraphRange( + min = (floor((baseMin - padding) / step) * step).coerceAtLeast(0.0), + max = ceil((baseMax + padding) / step) * step + ) +} + +private fun chooseYGridStep(span: Double): Double = when { + span <= 8.0 -> 1.0 + span <= 20.0 -> 2.0 + span <= 120.0 -> 20.0 + else -> 50.0 +} + +private fun chooseTimeGridInterval(duration: Long, width: Float): Long { + val minimumInterval = (duration * (120f / width.coerceAtLeast(1f))).toLong() + return GRID_INTERVALS_MS.firstOrNull { it >= minimumInterval } ?: GRID_INTERVALS_MS.last() +} + +private fun List.toPath( + x: (Long) -> Float, + y: (Double) -> Float +): Path { + val path = Path() + var previousTimestamp: Long? = null + forEach { point -> + val pointX = x(point.timestamp) + val pointY = y(point.value) + if (previousTimestamp == null || point.timestamp - previousTimestamp!! > DATA_GAP_MS) { + path.moveTo(pointX, pointY) + } else { + path.lineTo(pointX, pointY) + } + previousTimestamp = point.timestamp + } + return path +} + +private fun DrawScope.drawGlucosePath( + points: List, + x: (Long) -> Float, + y: (Double) -> Float, + brush: Brush, + pointColor: (BgDataPoint) -> Color +) { + if (points.isEmpty()) return + drawPath( + path = points.toPath(x, y), + brush = brush, + style = Stroke( + width = 3.dp.toPx(), + cap = StrokeCap.Round, + join = StrokeJoin.Round + ) + ) + points.forEach { point -> + drawCircle( + color = pointColor(point), + radius = 2.5.dp.toPx(), + center = Offset(x(point.timestamp), y(point.value)) + ) + } +} + +private fun nowTimestampInRange(start: Long, end: Long, timestamp: Long): Boolean = + timestamp in start..end + +private fun nowCenteredViewport(nowTimestamp: Long, duration: Long): Long = + nowTimestamp - (duration * (NOW_POSITION_FRACTION - 0.5)).toLong() diff --git a/app/src/main/kotlin/app/aaps/trio/ui/compose/overview/TrioOverviewScreen.kt b/app/src/main/kotlin/app/aaps/trio/ui/compose/overview/TrioOverviewScreen.kt new file mode 100644 index 000000000000..c8ac00fba969 --- /dev/null +++ b/app/src/main/kotlin/app/aaps/trio/ui/compose/overview/TrioOverviewScreen.kt @@ -0,0 +1,1286 @@ +package app.aaps.trio.ui.compose.overview + +import androidx.compose.animation.core.Animatable +import androidx.compose.animation.core.FastOutSlowInEasing +import androidx.compose.animation.core.RepeatMode +import androidx.compose.animation.core.animateFloat +import androidx.compose.animation.core.infiniteRepeatable +import androidx.compose.animation.core.rememberInfiniteTransition +import androidx.compose.animation.core.tween +import androidx.compose.foundation.BorderStroke +import androidx.compose.foundation.Canvas +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.BoxWithConstraints +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.RowScope +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.heightIn +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.statusBarsPadding +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.foundation.verticalScroll +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Close +import androidx.compose.material.icons.filled.Notifications +import androidx.compose.material.icons.filled.Vaccines +import androidx.compose.material.icons.filled.Warning +import androidx.compose.material.icons.outlined.ArrowCircleRight +import androidx.compose.material3.Badge +import androidx.compose.material3.BadgedBox +import androidx.compose.material3.CardDefaults +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.LinearProgressIndicator +import androidx.compose.material3.LocalMinimumInteractiveComponentSize +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.ModalBottomSheet +import androidx.compose.material3.OutlinedCard +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.Composable +import androidx.compose.runtime.CompositionLocalProvider +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.alpha +import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.graphics.Brush +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.layout.onGloballyPositioned +import androidx.compose.ui.layout.positionInRoot +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.Dp +import androidx.compose.ui.unit.dp +import androidx.lifecycle.compose.collectAsStateWithLifecycle +import app.aaps.core.data.model.ActiveSceneState +import app.aaps.core.data.model.RM +import app.aaps.core.data.model.TT +import app.aaps.core.data.model.TrendArrow +import app.aaps.core.interfaces.navigation.ElementType +import app.aaps.core.interfaces.notifications.NotificationLevel +import app.aaps.core.interfaces.overview.graph.BgInfoData +import app.aaps.core.interfaces.overview.graph.BgRange +import app.aaps.core.interfaces.overview.graph.TbrState +import app.aaps.core.interfaces.pump.BolusProgressState +import app.aaps.core.interfaces.pump.PumpInsulin +import app.aaps.core.keys.interfaces.TextRef +import app.aaps.core.ui.UiMode +import app.aaps.core.ui.compose.AapsSpacing +import app.aaps.core.ui.compose.AapsTheme +import app.aaps.core.ui.compose.LocalAapsScale +import app.aaps.core.ui.compose.icons.IcLoopClosed +import app.aaps.core.ui.compose.icons.IcLoopDisabled +import app.aaps.core.ui.compose.icons.IcLoopDisconnected +import app.aaps.core.ui.compose.icons.IcLoopLgs +import app.aaps.core.ui.compose.icons.IcLoopOpen +import app.aaps.core.ui.compose.icons.IcLoopPaused +import app.aaps.core.ui.compose.icons.IcLoopPausedDst +import app.aaps.core.ui.compose.icons.IcLoopPausedPump +import app.aaps.core.ui.compose.icons.IcLoopSuperbolus +import app.aaps.core.ui.compose.icons.IcPumpCartridge +import app.aaps.core.ui.compose.loopColor +import app.aaps.core.ui.compose.navigation.NavigationRequest +import app.aaps.core.ui.compose.navigation.icon +import app.aaps.core.ui.compose.pump.PumpActivityDialog +import app.aaps.ui.compose.notificationsSheet.toColor +import app.aaps.ui.R +import app.aaps.ui.compose.main.TempTargetChipState +import app.aaps.ui.compose.main.TempTargetUiState +import app.aaps.ui.compose.notificationsSheet.NotificationBottomSheet +import app.aaps.ui.compose.overview.BgInfoSection +import app.aaps.ui.compose.overview.OverviewChipsColumn +import app.aaps.ui.compose.overview.TrioOverviewModel +import app.aaps.ui.compose.overview.chips.CobUiState +import app.aaps.ui.compose.overview.chips.IobUiState +import app.aaps.ui.compose.overview.chips.SceneBadge +import app.aaps.ui.compose.overview.chips.SensitivityUiState +import app.aaps.ui.compose.scenes.ActiveSceneBanner +import java.util.Locale +import kotlin.math.roundToInt +import kotlin.time.Duration.Companion.milliseconds + +@Composable +fun TrioOverviewScreen( + model: TrioOverviewModel, + modifier: Modifier = Modifier +) = with(model) { + val bgInfoState by graphViewModel.bgInfoState.collectAsStateWithLifecycle() + val predictions by graphViewModel.predictionsFlow.collectAsStateWithLifecycle() + val sensitivityUiState by chipsViewModel.sensitivityUiState.collectAsStateWithLifecycle() + val iobUiState by chipsViewModel.iobUiState.collectAsStateWithLifecycle() + val cobUiState by chipsViewModel.cobUiState.collectAsStateWithLifecycle() + val now by graphViewModel.nowTimestamp.collectAsStateWithLifecycle() + val notifications by notificationsFlow.collectAsStateWithLifecycle() + val bolusState by bolusStateFlow.collectAsStateWithLifecycle() + val timeInRangeTodayPercent by timeInRangeTodayPercentFlow.collectAsStateWithLifecycle() + val calcProgress by calcProgressFlow.collectAsStateWithLifecycle() + val profileCardTempTargetState by profileCardTempTargetStateFlow.collectAsStateWithLifecycle() + var dismissedNotifications by remember { mutableStateOf(emptySet>()) } + var showNotificationSheet by remember { mutableStateOf(false) } + var showBolusDialog by remember { mutableStateOf(false) } + val visibleNotifications = notifications.filterNot { + it.instanceKey to it.date in dismissedNotifications + } + + LaunchedEffect(notifications) { + val activeNotifications = notifications.mapTo(mutableSetOf()) { it.instanceKey to it.date } + dismissedNotifications = dismissedNotifications.intersect(activeNotifications) + } + LaunchedEffect(autoShowNotificationSheet) { + if (autoShowNotificationSheet) { + showNotificationSheet = true + onAutoShowConsumed() + } + } + LaunchedEffect(bolusState) { + if (bolusState == null) showBolusDialog = false + } + val pumpTimeRemainingText = pumpEndTimeMillis?.let { endTime -> + val totalHours = ((endTime - now).coerceAtLeast(0L) / 3_600_000L).toInt() + val days = totalHours / 24 + val hours = totalHours % 24 + if (days >= 1) stringResource(R.string.trio_pump_time_days_hours, days, hours) + else stringResource(R.string.trio_pump_time_hours, hours) + } + val predictedText = predictions.lastOrNull()?.value?.let { value -> + if (value >= 40.0) value.roundToInt().toString() + else String.format(Locale.getDefault(), "%.1f", value) + } ?: stringResource(app.aaps.core.ui.R.string.value_unavailable_short) + + TrioOverviewContent( + profileName = profileName, + isProfileModified = isProfileModified, + profileProgress = profileProgress, + profileSceneManaged = profileSceneManaged, + profilePercentage = profilePercentage, + profileTargetRangeText = profileTargetRangeText, + profileCardTempTargetState = profileCardTempTargetState, + runningMode = runningMode, + runningModeText = runningModeText, + runningModeRemaining = runningModeRemaining, + runningModeProgress = runningModeProgress, + runningModeSceneManaged = runningModeSceneManaged, + lastLoopAgeMillis = lastLoopAgeMillis, + smbEnabled = smbEnabled, + tbrState = tbrState, + calcProgress = calcProgress, + bgInfo = bgInfoState.bgInfo, + bgTimeAgoText = bgInfoState.timeAgoText, + sensitivityUiState = sensitivityUiState, + iobUiState = iobUiState, + cobUiState = cobUiState, + predictedText = predictedText, + onNavigate = onNavigate, + onTbrChipClick = onTbrChipClick, + onIobChipClick = onIobChipClick, + onBgSourceClick = onBgSourceClick, + paddingValues = paddingValues, + activeSceneState = activeSceneState, + sceneExpired = sceneExpired, + onEndScene = onEndScene, + onDismissScene = onDismissScene, + endSceneEnabled = endSceneEnabled, + commandsAllowed = commandsAllowed, + pumpNeedsSetup = pumpNeedsSetup, + pumpTimeRemainingText = pumpTimeRemainingText, + reservoirUnits = reservoirUnits, + notificationCount = visibleNotifications.size, + highestNotificationLevel = visibleNotifications.minByOrNull { it.level.ordinal }?.level, + onNotificationClick = { showNotificationSheet = true }, + bolusState = bolusState, + onBolusClick = { showBolusDialog = true }, + timeInRangeTodayPercent = timeInRangeTodayPercent, + formatDuration = formatDuration, + modifier = modifier, + graphContent = { chartHeight -> + TrioOverviewGraph( + graphViewModel = graphViewModel, + height = chartHeight, + modifier = Modifier.fillMaxWidth() + ) + } + ) + + if (showNotificationSheet && visibleNotifications.isNotEmpty()) { + NotificationBottomSheet( + notifications = visibleNotifications, + onDismissSheet = { showNotificationSheet = false }, + onDismissNotification = { notification -> + dismissedNotifications = dismissedNotifications + (notification.instanceKey to notification.date) + onDismissNotification(notification) + }, + onNotificationActionClick = onNotificationActionClick + ) + } + + bolusState?.takeIf { showBolusDialog }?.let { state -> + PumpActivityDialog( + bolusState = state, + pumpStatus = null, + queueStatus = null, + isModal = false, + onStop = onStopBolus, + onDismiss = { showBolusDialog = false } + ) + } +} + +@Composable +private fun TrioOverviewContent( + profileName: String, + isProfileModified: Boolean, + profileProgress: Float, + profileSceneManaged: Boolean, + profilePercentage: Int, + profileTargetRangeText: String, + profileCardTempTargetState: TempTargetUiState, + runningMode: RM.Mode, + runningModeText: String, + runningModeRemaining: String, + runningModeProgress: Float, + runningModeSceneManaged: Boolean, + lastLoopAgeMillis: Long?, + smbEnabled: Boolean, + tbrState: TbrState, + calcProgress: Int, + bgInfo: BgInfoData?, + bgTimeAgoText: String, + sensitivityUiState: SensitivityUiState, + iobUiState: IobUiState, + cobUiState: CobUiState, + predictedText: String, + onNavigate: (NavigationRequest) -> Unit, + onTbrChipClick: () -> Unit, + onIobChipClick: () -> Unit, + onBgSourceClick: () -> Unit, + paddingValues: PaddingValues, + activeSceneState: ActiveSceneState?, + sceneExpired: Boolean, + onEndScene: () -> Unit, + onDismissScene: () -> Unit, + endSceneEnabled: Boolean, + commandsAllowed: Boolean, + pumpNeedsSetup: Boolean, + pumpTimeRemainingText: String?, + reservoirUnits: Double?, + notificationCount: Int, + highestNotificationLevel: NotificationLevel?, + onNotificationClick: () -> Unit, + bolusState: BolusProgressState?, + onBolusClick: () -> Unit, + timeInRangeTodayPercent: Int?, + formatDuration: (Long) -> String, + graphContent: @Composable (Dp) -> Unit, + modifier: Modifier = Modifier +) { + var showPredictionInfo by remember { mutableStateOf(false) } + var bgGlowCenter by remember { mutableStateOf(null) } + val animatedCalcProgress = remember { Animatable(calcProgress.coerceIn(0, 100) / 100f) } + val tempTargetSceneManaged = activeSceneState?.scopedRecords?.ttId + ?.let { it == profileCardTempTargetState.recordId && it > 0 } == true + + LaunchedEffect(calcProgress) { + val targetProgress = calcProgress.coerceIn(0, 100) / 100f + if (targetProgress < animatedCalcProgress.value) { + animatedCalcProgress.snapTo(targetProgress) + } else { + animatedCalcProgress.animateTo( + targetValue = targetProgress, + animationSpec = tween(durationMillis = 250) + ) + } + } + BoxWithConstraints( + modifier = modifier + .fillMaxSize() + .padding(paddingValues) + ) { + val chartHeight = maxHeight * 0.47f + val bgGlowSize = (AapsSpacing.bgCircleSize.value * LocalAapsScale.current * 1.5).dp + + TrioBgGlow( + visible = bgInfo != null, + center = bgGlowCenter, + modifier = Modifier.size(bgGlowSize) + ) + + Column( + modifier = Modifier + .fillMaxSize() + .statusBarsPadding() + .verticalScroll(rememberScrollState()) + .padding(AapsSpacing.medium), + verticalArrangement = Arrangement.spacedBy(AapsSpacing.medium) + ) { + ActiveSceneBanner( + activeState = activeSceneState, + expired = sceneExpired, + onEndClick = onEndScene, + onDismiss = onDismissScene, + endEnabled = endSceneEnabled, + formatDuration = formatDuration + ) + + Box(modifier = Modifier.fillMaxWidth()) { + Column( + verticalArrangement = Arrangement.spacedBy(AapsSpacing.medium) + ) { + Column( + verticalArrangement = Arrangement.spacedBy(AapsSpacing.small) + ) { + Row( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = AapsSpacing.small), + horizontalArrangement = Arrangement.spacedBy(AapsSpacing.small), + verticalAlignment = Alignment.CenterVertically, + ) { + PumpEntryPoint( + needsSetup = pumpNeedsSetup, + timeRemainingText = pumpTimeRemainingText, + reservoirUnits = reservoirUnits, + modifier = Modifier + .weight(1f) + .clickable { + onNavigate(NavigationRequest.Element(ElementType.PUMP)) + } + ) + val circleSize = AapsSpacing.bgCircleSize * LocalAapsScale.current + AapsSpacing.medium + Box( + contentAlignment = Alignment.Center, + modifier = Modifier + .size(circleSize) + .onGloballyPositioned { coordinates -> + val position = coordinates.positionInRoot() + bgGlowCenter = Offset( + x = position.x + coordinates.size.width / 2f, + y = position.y + coordinates.size.height / 2f + ) + } + ) { + if (calcProgress < 100) { + CircularProgressIndicator( + progress = { animatedCalcProgress.value }, + modifier = Modifier.size( + circleSize + ), + color = MaterialTheme.colorScheme.primary, + trackColor = MaterialTheme.colorScheme.surfaceVariant + ) + } + val bgInfoSize = AapsSpacing.bgCircleSize * LocalAapsScale.current + BgInfoSection( + bgInfo = bgInfo, + timeAgoText = bgTimeAgoText, + size = bgInfoSize, + modifier = Modifier.clickable(onClick = onBgSourceClick), + useGradientRing = true, + elevation = AapsSpacing.medium + ) + } + LoopStatusAndPrediction( + runningMode = runningMode, + runningModeText = runningModeText, + lastLoopAgeMillis = lastLoopAgeMillis, + predictedText = predictedText, + onClick = { showPredictionInfo = true }, + modifier = Modifier.weight(1f), + ) + } + } + + Row( + modifier = Modifier + .fillMaxWidth() + .heightIn(min = AapsSpacing.chipHeight), + horizontalArrangement = Arrangement.spacedBy(AapsSpacing.medium), + verticalAlignment = Alignment.CenterVertically + ) { + MetricRow( + label = stringResource(app.aaps.core.ui.R.string.iob), + value = iobUiState.text, + onClick = onIobChipClick, + modifier = Modifier.weight(1f) + ) + MetricRow( + label = stringResource(app.aaps.core.ui.R.string.cob), + value = cobUiState.baseText.ifEmpty { cobUiState.text }, + modifier = Modifier.weight(1f), + trailingContent = { + if (cobUiState.carbsReq > 0) { + Badge( + modifier = Modifier.clickable { + onNavigate(NavigationRequest.Element(ElementType.BOLUS_WIZARD)) + }, + containerColor = MaterialTheme.colorScheme.error, + contentColor = MaterialTheme.colorScheme.onError + ) { + Text( + text = stringResource( + R.string.trio_carbs_required_badge, + cobUiState.carbsReq + ), + style = MaterialTheme.typography.labelSmall, + modifier = Modifier.padding(horizontal = AapsSpacing.small) + ) + } + } + } + ) + Box( + contentAlignment = Alignment.CenterEnd, + modifier = Modifier + .weight(1f) + .heightIn(min = AapsSpacing.xxLarge) + ) { + TrioNotificationButton( + notificationCount = notificationCount, + highestLevel = highestNotificationLevel, + onClick = onNotificationClick + ) + } + } + } + } + + graphContent(chartHeight) + + if (bolusState != null) { + TrioBolusingCard( + state = bolusState, + onClick = onBolusClick + ) + } + + val profileCardTarget = if (profileCardTempTargetState.state == TempTargetChipState.Active) { + ElementType.TEMP_TARGET_MANAGEMENT + } else { + ElementType.PROFILE_MANAGEMENT + } + TrioProfileCard( + profileName = profileName, + profilePercentage = profilePercentage, + profileTargetRangeText = profileTargetRangeText, + tempTargetRangeText = profileCardTempTargetState.rangeText, + tempTargetRemainingText = profileCardTempTargetState.remainingText, + tempTargetState = profileCardTempTargetState.state, + tempTargetReason = profileCardTempTargetState.reason, + tempTargetProgress = profileCardTempTargetState.progress, + progress = profileProgress, + sceneManaged = profileSceneManaged, + onClick = { onNavigate(NavigationRequest.Element(profileCardTarget)) } + ) + + TimeInRangeTodayCard( + timeInRangeTodayPercent = timeInRangeTodayPercent, + onClick = { onNavigate(NavigationRequest.TrioStatistics) } + ) + + Spacer(modifier = Modifier + .fillMaxWidth() + .height(height = 8.dp)) + } + } + + if (showPredictionInfo) { + PredictionInfoBottomSheet( + profileName = profileName, + isProfileModified = isProfileModified, + profileProgress = profileProgress, + profileSceneManaged = profileSceneManaged, + tempTargetText = profileCardTempTargetState.text, + tempTargetState = profileCardTempTargetState.state, + tempTargetProgress = profileCardTempTargetState.progress, + tempTargetReason = profileCardTempTargetState.reason, + tempTargetSceneManaged = tempTargetSceneManaged, + runningMode = runningMode, + runningModeText = runningModeText, + runningModeRemaining = runningModeRemaining, + runningModeProgress = runningModeProgress, + runningModeSceneManaged = runningModeSceneManaged, + smbEnabled = smbEnabled, + tbrState = tbrState, + iobUiState = iobUiState, + cobUiState = cobUiState, + sensitivityUiState = sensitivityUiState, + commandsAllowed = commandsAllowed, + onNavigate = { request -> + showPredictionInfo = false + onNavigate(request) + }, + onTbrChipClick = { + showPredictionInfo = false + onTbrChipClick() + }, + onIobChipClick = { + showPredictionInfo = false + onIobChipClick() + }, + onDismiss = { showPredictionInfo = false } + ) + } +} + +@Composable +private fun TrioBgGlow( + visible: Boolean, + center: Offset?, + modifier: Modifier = Modifier +) { + if (!visible || center == null) return + + val transition = rememberInfiniteTransition(label = "trioBgGlow") + val glowScale by transition.animateFloat( + initialValue = 0.92f, + targetValue = 1.06f, + animationSpec = infiniteRepeatable( + animation = tween(durationMillis = 2_800, easing = FastOutSlowInEasing), + repeatMode = RepeatMode.Reverse + ), + label = "trioBgGlowScale" + ) + val glowOffset by transition.animateFloat( + initialValue = -0.1f, + targetValue = 0.1f, + animationSpec = infiniteRepeatable( + animation = tween(durationMillis = 4_600, easing = FastOutSlowInEasing), + repeatMode = RepeatMode.Reverse + ), + label = "trioBgGlowOffset" + ) + val glowColor = AapsTheme.generalColors.trioBgGlow + + Canvas(modifier = modifier) { + val animatedCenter = Offset( + x = center.x + size.width * glowOffset, + y = center.y + ) + val radius = size.width * 0.72f * glowScale + drawCircle( + brush = Brush.radialGradient( + colors = listOf( + glowColor, + glowColor.copy(alpha = glowColor.alpha * 0.55f), + Color.Transparent + ), + center = animatedCenter, + radius = radius + ), + radius = radius, + center = animatedCenter + ) + } +} + +@Preview(showBackground = true, widthDp = 400, heightDp = 750) +@Composable +private fun TrioOverviewScreenPreview() { + AapsTheme( + uiMode = UiMode.SYSTEM, + ) { + TrioOverviewContent( + profileName = "Standard", + isProfileModified = true, + profileProgress = 0.65f, + profileSceneManaged = false, + profilePercentage = 100, + profileTargetRangeText = "90–110 mg/dL", + profileCardTempTargetState = TempTargetUiState( + text = "110 mg/dL", + rangeText = "110 mg/dL", + remainingText = "(30 min)", + state = TempTargetChipState.Active, + progress = 0.5f, + reason = TT.Reason.ACTIVITY + ), + runningMode = RM.Mode.CLOSED_LOOP, + runningModeText = "Closed loop", + runningModeRemaining = "", + runningModeProgress = 0f, + runningModeSceneManaged = false, + lastLoopAgeMillis = 45_000L, + smbEnabled = true, + tbrState = TbrState.HIGH, + calcProgress = 65, + bgInfo = BgInfoData( + bgValue = 118.0, + bgText = "118", + bgRange = BgRange.IN_RANGE, + isOutdated = false, + timestamp = 1_780_000_000_000L, + trendArrow = TrendArrow.FLAT, + trendDescription = "Flat", + delta = 2.0, + deltaText = "+2", + shortAvgDelta = 1.5, + shortAvgDeltaText = "+1.5", + longAvgDelta = 1.0, + longAvgDeltaText = "+1.0" + ), + bgTimeAgoText = "2 min", + sensitivityUiState = SensitivityUiState( + asText = "105%", + isfFrom = "45", + isfTo = "47", + ratio = 1.05, + hasData = true + ), + iobUiState = IobUiState(text = "1.25 U", iobTotal = 1.25), + cobUiState = CobUiState(text = "18g", cobValue = 18.0), + predictedText = "132", + onNavigate = {}, + onTbrChipClick = {}, + onIobChipClick = {}, + onBgSourceClick = {}, + paddingValues = PaddingValues(), + activeSceneState = null, + sceneExpired = false, + onEndScene = {}, + onDismissScene = {}, + endSceneEnabled = true, + commandsAllowed = true, + pumpNeedsSetup = false, + pumpTimeRemainingText = "2d 6h", + reservoirUnits = 50.0, + notificationCount = 2, + highestNotificationLevel = NotificationLevel.NORMAL, + onNotificationClick = {}, + bolusState = null, + onBolusClick = {}, + timeInRangeTodayPercent = 82, + formatDuration = { "30 min" }, + graphContent = { chartHeight -> + Surface( + color = MaterialTheme.colorScheme.surface, + shape = RoundedCornerShape(AapsSpacing.chipCornerRadius), + modifier = Modifier + .fillMaxWidth() + .height(chartHeight) + ) { + Box(contentAlignment = Alignment.Center) { + Text( + text = "Glucose graph", + style = MaterialTheme.typography.titleMedium + ) + } + + } + } + ) + } +} + +@Composable +private fun TrioProfileCard( + profileName: String, + profilePercentage: Int, + profileTargetRangeText: String, + tempTargetRangeText: String, + tempTargetRemainingText: String, + tempTargetState: TempTargetChipState, + tempTargetReason: TT.Reason?, + tempTargetProgress: Float, + progress: Float, + sceneManaged: Boolean, + onClick: () -> Unit, + modifier: Modifier = Modifier +) { + val contentColor = if (profileName.isEmpty()) { + MaterialTheme.colorScheme.error + } else { + MaterialTheme.colorScheme.onSurfaceVariant + } + val hasActiveAdjustment = tempTargetState == TempTargetChipState.Active + val subtitle = if (profileName.isEmpty()) { + stringResource(app.aaps.core.ui.R.string.no_profile_set) + } else if (hasActiveAdjustment && tempTargetRemainingText.isNotEmpty()) { + tempTargetRemainingText + } else { + stringResource( + R.string.trio_profile_summary, + profilePercentage, + profileTargetRangeText + ) + } + val title = if (hasActiveAdjustment) { + stringResource( + R.string.trio_active_adjustment, + tempTargetReason?.text ?: stringResource(app.aaps.core.ui.R.string.temporary_target), + tempTargetRangeText + ) + } else { + profileName + } + + OutlinedCard( + onClick = onClick, + colors = CardDefaults.elevatedCardColors().copy(containerColor = MaterialTheme.colorScheme.surfaceVariant), + modifier = modifier.fillMaxWidth(), + elevation = CardDefaults.elevatedCardElevation(), + ) { + Column( + modifier = Modifier.padding( + horizontal = AapsSpacing.large, + vertical = AapsSpacing.medium + ), + verticalArrangement = Arrangement.spacedBy(AapsSpacing.small) + ) { + Row( + horizontalArrangement = Arrangement.spacedBy(AapsSpacing.large), + verticalAlignment = Alignment.CenterVertically + ) { + Surface( + shape = RoundedCornerShape(AapsSpacing.chipHeight), + color = contentColor.copy(alpha = 0.12f), + modifier = Modifier.size(AapsSpacing.chipHeight) + ) { + Icon( + imageVector = ElementType.PROFILE_MANAGEMENT.icon(), + contentDescription = null, + tint = contentColor, + modifier = Modifier.padding(AapsSpacing.medium) + ) + } + Column( + modifier = Modifier.weight(1f) + ) { + Text( + text = title, + style = MaterialTheme.typography.titleSmall, + color = contentColor + ) + Text( + text = subtitle, + style = MaterialTheme.typography.labelSmall, + color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.7f) + ) + } + if (sceneManaged) { + SceneBadge() + } + } + // tempTargetProgress is elapsed time; the card shows the time still remaining. + val displayProgress = if (hasActiveAdjustment) { + (1f - tempTargetProgress).coerceIn(0f, 1f) + } else { + progress + } + if (displayProgress > 0f) { + LinearProgressIndicator( + progress = { displayProgress }, + modifier = Modifier + .fillMaxWidth() + .height(AapsSpacing.small), + trackColor = MaterialTheme.colorScheme.surface, + ) + } + } + } +} + +@Composable +private fun TrioBolusingCard( + state: BolusProgressState, + onClick: () -> Unit, + modifier: Modifier = Modifier +) { + OutlinedCard( + colors = CardDefaults.elevatedCardColors().copy(containerColor = MaterialTheme.colorScheme.primaryContainer), + modifier = modifier + .fillMaxWidth() + .clickable( + onClickLabel = stringResource(R.string.trio_open_bolus_progress), + onClick = onClick + ), + elevation = CardDefaults.elevatedCardElevation(), + ) { + Column( + modifier = Modifier.fillMaxWidth().padding( + horizontal = AapsSpacing.large, + vertical = AapsSpacing.medium + ), + verticalArrangement = Arrangement.spacedBy(AapsSpacing.small) + ) { + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(AapsSpacing.medium), + verticalAlignment = Alignment.CenterVertically + ) { + if (state.percent == 0 && state.delivered.cU == 0.0) { + CircularProgressIndicator( + modifier = Modifier.size(AapsSpacing.xxLarge), + ) + } else { + Icon( + imageVector = Icons.Default.Vaccines, + contentDescription = null, + tint = MaterialTheme.colorScheme.onPrimaryContainer, + modifier = Modifier.size(AapsSpacing.xxLarge) + ) + } + Column(modifier = Modifier.weight(1.0f)) { + Text( + text = stringResource( + if (state.isSMB) R.string.trio_bolusing_title_smb + else R.string.trio_bolusing_title + ), + style = MaterialTheme.typography.titleSmall, + color = MaterialTheme.colorScheme.onPrimaryContainer + ) + Text( + text = stringResource( + R.string.trio_bolusing_progress, + state.delivered.cU, + state.insulin + ), + style = MaterialTheme.typography.labelSmall, + color = MaterialTheme.colorScheme.onPrimaryContainer + ) + } + if (state.stopDeliveryEnabled && !state.stopPressed && state.percent < 100) { + Icon( + imageVector = Icons.Default.Close, + contentDescription = stringResource(app.aaps.core.ui.R.string.cancel), + tint = MaterialTheme.colorScheme.primary, + ) + } + } + Box( + modifier = Modifier + .fillMaxWidth() + .height(AapsSpacing.small) + ) { + if (state.percent > 0) { + LinearProgressIndicator( + progress = { state.percent.coerceIn(0, 100) / 100f }, + modifier = Modifier + .fillMaxWidth() + .height(AapsSpacing.small), + trackColor = MaterialTheme.colorScheme.surfaceVariant, + ) + } + } + } + } +} + +@Composable +private fun TimeInRangeTodayCard( + timeInRangeTodayPercent: Int?, + onClick: () -> Unit, + modifier: Modifier = Modifier +) { + OutlinedCard( + onClick = onClick, + colors = CardDefaults.elevatedCardColors().copy(containerColor = MaterialTheme.colorScheme.surfaceVariant), + modifier = modifier.fillMaxWidth(), + elevation = CardDefaults.elevatedCardElevation(), + ) { + Column( + modifier = Modifier.padding( + horizontal = AapsSpacing.large, + vertical = AapsSpacing.medium + ), + verticalArrangement = Arrangement.spacedBy(AapsSpacing.small) + ) { + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(AapsSpacing.small), + verticalAlignment = Alignment.CenterVertically + ) { + Text( + text = timeInRangeTodayPercent?.let { + stringResource(R.string.trio_time_in_range_percent, it) + } ?: stringResource(app.aaps.core.ui.R.string.value_unavailable_short), + style = MaterialTheme.typography.headlineSmall, + color = MaterialTheme.colorScheme.onSurface, + ) + Text( + text = stringResource(R.string.trio_time_in_range_today), + style = MaterialTheme.typography.titleMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + modifier = Modifier.weight(1f) + ) + } + LinearProgressIndicator( + progress = { (timeInRangeTodayPercent ?: 0).coerceIn(0, 100) / 100f }, + modifier = Modifier + .fillMaxWidth() + .height(AapsSpacing.small), + trackColor = MaterialTheme.colorScheme.surface, + ) + } + } +} + +@Composable +private fun LoopStatusAndPrediction( + runningMode: RM.Mode, + runningModeText: String, + lastLoopAgeMillis: Long?, + predictedText: String, + onClick: () -> Unit, + modifier: Modifier = Modifier +) { + Column( + modifier = modifier.clickable( + onClick = onClick + ), + horizontalAlignment = Alignment.End, + verticalArrangement = Arrangement.spacedBy(AapsSpacing.small) + ) { + TrioLoopStatusPill( + mode = runningMode, + modeDescription = runningModeText, + lastLoopAgeMillis = lastLoopAgeMillis, + ) + PredictionText( + predictedText = predictedText, + ) + } +} + +@Composable +private fun TrioLoopStatusPill( + mode: RM.Mode, + modeDescription: String, + lastLoopAgeMillis: Long?, + modifier: Modifier = Modifier +) { + val colors = AapsTheme.generalColors + val ageMinutes = lastLoopAgeMillis?.milliseconds?.inWholeMinutes + val color = when { + !mode.isClosedLoopOrLgs() && mode != RM.Mode.RESUME -> mode.loopColor(colors) + ageMinutes == null -> MaterialTheme.colorScheme.onSurfaceVariant + ageMinutes < 5L -> colors.statusNormal + ageMinutes < 10L -> colors.statusWarning + else -> colors.statusCritical + } + val ageText = when { + ageMinutes == null || ageMinutes > 1_440L -> "--" + ageMinutes < 1L -> stringResource(R.string.trio_loop_less_than_one_minute) + else -> stringResource(R.string.trio_loop_minutes, ageMinutes) + } + + CompositionLocalProvider(LocalMinimumInteractiveComponentSize provides Dp.Unspecified) { + Surface( + modifier = modifier.height(AapsSpacing.chipHeight), + shape = RoundedCornerShape(AapsSpacing.chipHeight), + color = Color.Transparent, + border = BorderStroke( + width = AapsSpacing.extraSmall, + color = color.copy(alpha = 0.4f) + ) + ) { + Row( + modifier = Modifier.padding(horizontal = AapsSpacing.large), + horizontalArrangement = Arrangement.spacedBy(AapsSpacing.medium), + verticalAlignment = Alignment.CenterVertically + ) { + Icon( + imageVector = mode.toLoopStatusIcon(), + contentDescription = modeDescription, + tint = color, + modifier = Modifier.size(AapsSpacing.chipIconSize) + ) + Text( + text = ageText, + color = color, + style = MaterialTheme.typography.labelLarge + ) + } + } + } +} + +private fun RM.Mode.toLoopStatusIcon() = when (this) { + RM.Mode.CLOSED_LOOP -> IcLoopClosed + RM.Mode.CLOSED_LOOP_LGS -> IcLoopLgs + RM.Mode.OPEN_LOOP -> IcLoopOpen + RM.Mode.DISABLED_LOOP -> IcLoopDisabled + RM.Mode.SUPER_BOLUS -> IcLoopSuperbolus + RM.Mode.DISCONNECTED_PUMP -> IcLoopDisconnected + RM.Mode.SUSPENDED_BY_PUMP -> IcLoopPausedPump + RM.Mode.SUSPENDED_BY_DST -> IcLoopPausedDst + RM.Mode.SUSPENDED_BY_USER -> IcLoopPaused + RM.Mode.RESUME -> IcLoopClosed +} + +@Composable +private fun PumpEntryPoint( + needsSetup: Boolean, + timeRemainingText: String?, + reservoirUnits: Double?, + modifier: Modifier = Modifier +) { + val reservoirColor = when { + reservoirUnits == null || needsSetup -> MaterialTheme.colorScheme.onSurfaceVariant + reservoirUnits <= 10.0 -> AapsTheme.generalColors.statusCritical + reservoirUnits <= 30.0 -> AapsTheme.generalColors.statusWarning + else -> AapsTheme.generalColors.activeInsulinText + } + val reservoirText = when { + needsSetup || reservoirUnits == null -> "--" + reservoirUnits >= 50.0 -> stringResource(R.string.trio_reservoir_over_50) + else -> stringResource( + R.string.trio_reservoir_units, + reservoirUnits.roundToInt() + ) + } + Column( + modifier = modifier, + horizontalAlignment = Alignment.Start, + verticalArrangement = Arrangement.spacedBy(AapsSpacing.small) + ) { + Surface( + modifier = Modifier.height(AapsSpacing.chipHeight), + shape = RoundedCornerShape(AapsSpacing.chipHeight), + color = Color.Transparent, + border = BorderStroke( + width = AapsSpacing.extraSmall, + color = reservoirColor.copy(alpha = 0.4f) + ) + ) { + Row( + modifier = Modifier.padding(horizontal = AapsSpacing.large), + horizontalArrangement = Arrangement.spacedBy(AapsSpacing.medium), + verticalAlignment = Alignment.CenterVertically + ) { + Icon( + imageVector = if (needsSetup) Icons.Default.Warning else IcPumpCartridge, + contentDescription = null, + tint = if (needsSetup) MaterialTheme.colorScheme.error else reservoirColor, + modifier = Modifier.size(AapsSpacing.chipIconSize) + ) + Text( + text = reservoirText, + style = MaterialTheme.typography.labelLarge, + color = if (needsSetup) MaterialTheme.colorScheme.error else reservoirColor + ) + } + } + Row( + modifier = Modifier + .height(AapsSpacing.chipHeight) + .padding(horizontal = AapsSpacing.large), + verticalAlignment = Alignment.CenterVertically + ) { + Text( + text = when { + needsSetup -> stringResource(R.string.trio_no_pump) + timeRemainingText != null -> timeRemainingText + else -> "--" + }, + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurface + ) + } + } +} + +@Composable +private fun PredictionText( + predictedText: String, + modifier: Modifier = Modifier +) { + Row( + modifier = modifier + .height(AapsSpacing.chipHeight) + .padding(horizontal = AapsSpacing.large), + horizontalArrangement = Arrangement.spacedBy(AapsSpacing.medium), + verticalAlignment = Alignment.CenterVertically + ) { + Icon( + imageVector = Icons.Outlined.ArrowCircleRight, + contentDescription = null, + tint = MaterialTheme.colorScheme.onSurface, + modifier = Modifier.size(AapsSpacing.chipIconSize) + ) + Text( + text = predictedText, + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurface + ) + } +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +private fun PredictionInfoBottomSheet( + profileName: String, + isProfileModified: Boolean, + profileProgress: Float, + profileSceneManaged: Boolean, + tempTargetText: String, + tempTargetState: TempTargetChipState, + tempTargetProgress: Float, + tempTargetReason: TT.Reason?, + tempTargetSceneManaged: Boolean, + runningMode: RM.Mode, + runningModeText: String, + runningModeRemaining: String, + runningModeProgress: Float, + runningModeSceneManaged: Boolean, + smbEnabled: Boolean, + tbrState: TbrState, + iobUiState: IobUiState, + cobUiState: CobUiState, + sensitivityUiState: SensitivityUiState, + commandsAllowed: Boolean, + onNavigate: (NavigationRequest) -> Unit, + onTbrChipClick: () -> Unit, + onIobChipClick: () -> Unit, + onDismiss: () -> Unit +) { + ModalBottomSheet(onDismissRequest = onDismiss) { + Column( + modifier = Modifier + .fillMaxWidth() + .padding(AapsSpacing.extraLarge), + verticalArrangement = Arrangement.spacedBy(AapsSpacing.medium) + ) { + OverviewChipsColumn( + runningMode = runningMode, + runningModeText = runningModeText, + runningModeRemaining = runningModeRemaining, + runningModeProgress = runningModeProgress, + runningModeSceneManaged = runningModeSceneManaged, + smbEnabled = smbEnabled, + profileName = profileName, + isProfileModified = isProfileModified, + profileProgress = profileProgress, + profileSceneManaged = profileSceneManaged, + tempTargetText = tempTargetText, + tempTargetState = tempTargetState, + tempTargetProgress = tempTargetProgress, + tempTargetReason = tempTargetReason, + tempTargetSceneManaged = tempTargetSceneManaged, + tbrState = tbrState, + iobUiState = iobUiState, + cobUiState = cobUiState, + sensitivityUiState = sensitivityUiState, + onNavigate = onNavigate, + onTbrChipClick = onTbrChipClick, + onIobChipClick = onIobChipClick, + commandsAllowed = commandsAllowed, + modifier = Modifier.fillMaxWidth() + ) + } + } +} + +@Composable +private fun TrioNotificationButton( + notificationCount: Int, + highestLevel: NotificationLevel?, + onClick: () -> Unit, + modifier: Modifier = Modifier +) { + val visible = notificationCount > 0 + Surface( + onClick = onClick, + enabled = visible, + shape = RoundedCornerShape(AapsSpacing.chipCornerRadius), + color = highestLevel?.toColor() ?: MaterialTheme.colorScheme.primary, + modifier = modifier.alpha(if (visible) 1f else 0f) + ) { + BadgedBox( + badge = { + Badge { + Text(text = notificationCount.toString()) + } + }, + modifier = Modifier.padding(AapsSpacing.small) + ) { + IconButton( + onClick = onClick, + enabled = visible, + modifier = Modifier.size(AapsSpacing.xxLarge) + ) { + Icon( + imageVector = Icons.Default.Notifications, + contentDescription = null, + tint = AapsTheme.generalColors.onNotification + ) + } + } + } +} + +@Composable +private fun MetricRow( + label: String, + value: String, + modifier: Modifier = Modifier, + onClick: (() -> Unit)? = null, + trailingContent: @Composable RowScope.() -> Unit = {} +) { + Box( + modifier = modifier.clickable(enabled = onClick != null, onClick = onClick ?: {}), + contentAlignment = Alignment.Center, + ) { + Row( + modifier = Modifier.padding(horizontal = AapsSpacing.medium, vertical = AapsSpacing.small), + horizontalArrangement = Arrangement.spacedBy(AapsSpacing.small), + verticalAlignment = Alignment.CenterVertically + ) { + Text( + text = label, + style = MaterialTheme.typography.labelSmall, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + Text( + text = value, + style = MaterialTheme.typography.bodyMedium.copy( + lineHeight = MaterialTheme.typography.bodySmall.lineHeight + ), + color = MaterialTheme.colorScheme.onSurface, + textAlign = TextAlign.Center, + maxLines = 2 + ) + trailingContent() + } + } +} + +@Preview(showBackground = true, widthDp = 400) +@Composable +private fun TrioBolusingCardPreview() { + AapsTheme( + uiMode = UiMode.SYSTEM, + ) { + Column { + TrioBolusingCard( + state = BolusProgressState( + 2.0, false, false, 20, TextRef.Literal(""), TextRef.Literal(""), + PumpInsulin(0.5), false, true, false, + ), + onClick = {}, + ) + TrioBolusingCard( + state = BolusProgressState( + 2.0, false, false, 0, TextRef.Literal(""), TextRef.Literal(""), + PumpInsulin(0.0), false, true, false, + ), + onClick = {}, + ) + } + } +} diff --git a/app/src/test/kotlin/app/aaps/di/metro/ContributedBindingsTest.kt b/app/src/test/kotlin/app/aaps/di/metro/ContributedBindingsTest.kt index c77eefcd1d7e..acb6a0a3f55c 100644 --- a/app/src/test/kotlin/app/aaps/di/metro/ContributedBindingsTest.kt +++ b/app/src/test/kotlin/app/aaps/di/metro/ContributedBindingsTest.kt @@ -46,7 +46,6 @@ class ContributedBindingsTest { assertThat(root.insulinManager).isSameInstanceAs(root.insulinManager) assertThat(root.wizardBolusExecutor).isSameInstanceAs(root.wizardBolusExecutor) assertThat(root.loggerUtils).isSameInstanceAs(root.loggerUtils) - assertThat(root.alarmSoundPlayer).isSameInstanceAs(root.alarmSoundPlayer) assertThat(root.notificationHolder).isSameInstanceAs(root.notificationHolder) assertThat(root.userEntryPresentationHelper).isSameInstanceAs(root.userEntryPresentationHelper) assertThat(root.profiler).isSameInstanceAs(root.profiler) diff --git a/app/src/test/kotlin/app/aaps/di/metro/ContributedPluginsTest.kt b/app/src/test/kotlin/app/aaps/di/metro/ContributedPluginsTest.kt index 5d8d78c7e132..8ece502f4c05 100644 --- a/app/src/test/kotlin/app/aaps/di/metro/ContributedPluginsTest.kt +++ b/app/src/test/kotlin/app/aaps/di/metro/ContributedPluginsTest.kt @@ -107,8 +107,8 @@ class ContributedPluginsTest { } @Test - fun `only a looping build gets storage, signature verifier and objectives`() { - assertThat(testRoot().contributedApsPlugins.keys).containsExactly(820, 830, 840) + fun `only a looping build gets storage and the signature verifier`() { + assertThat(testRoot().contributedApsPlugins.keys).containsExactly(820, 830) } @Test @@ -130,13 +130,6 @@ class ContributedPluginsTest { assertThat(total).isEqualTo(all.size) } - @Test - fun `the ten objectives are contributed in order`() { - // ObjectivesPlugin takes List and the order is the objective number, so a lost or - // reordered entry would change which objective the user is asked to complete next. - assertThat(testRoot().objectivesPlugin.objectives).hasSize(10) - } - @Test fun `each order key holds the plugin it is meant to`() { assertThat(plugins[100]).isInstanceOf(SensitivityAAPSPlugin::class.java) diff --git a/app/src/test/kotlin/app/aaps/di/metro/ContributedViewModelsTest.kt b/app/src/test/kotlin/app/aaps/di/metro/ContributedViewModelsTest.kt index 5f3f30e233b6..ea44f3510b84 100644 --- a/app/src/test/kotlin/app/aaps/di/metro/ContributedViewModelsTest.kt +++ b/app/src/test/kotlin/app/aaps/di/metro/ContributedViewModelsTest.kt @@ -1,6 +1,5 @@ package app.aaps.di.metro -import app.aaps.plugins.constraints.objectives.compose.ObjectivesViewModel import app.aaps.plugins.sync.nsclientV3.clientcontrol.compose.AuthorizedClientsViewModel import app.aaps.plugins.sync.nsclientV3.clientcontrol.compose.PairWithMasterViewModel import app.aaps.plugins.sync.nsclientV3.compose.NSClientViewModel @@ -24,11 +23,6 @@ import org.junit.jupiter.api.Test */ class ContributedViewModelsTest { - @Test - fun `the objectives view model is contributed to the root graph`() { - assertThat(testRoot().viewModelProviders.keys).contains(ObjectivesViewModel::class) - } - @Test fun `every sync view model reaches the factory`() { val registered = testRoot().viewModelProviders.keys @@ -71,7 +65,7 @@ class ContributedViewModelsTest { // A view model holds one screen's state. Scoping it would hand the next screen the previous // screen's state, and the annotation that does that is a single word. val root = testRoot() - val provider = root.viewModelProviders.getValue(ObjectivesViewModel::class) + val provider = root.viewModelProviders.getValue(NSClientViewModel::class) assertThat(provider()).isNotSameInstanceAs(provider()) } } diff --git a/app/src/test/kotlin/app/aaps/di/metro/ReceiverInjectorsTest.kt b/app/src/test/kotlin/app/aaps/di/metro/ReceiverInjectorsTest.kt index 9968a4c1223e..13d5c3e230a4 100644 --- a/app/src/test/kotlin/app/aaps/di/metro/ReceiverInjectorsTest.kt +++ b/app/src/test/kotlin/app/aaps/di/metro/ReceiverInjectorsTest.kt @@ -1,6 +1,5 @@ package app.aaps.di.metro -import app.aaps.implementation.androidNotification.AlarmMuteReceiver import app.aaps.persistentNotification.DummyService import app.aaps.plugins.automation.TimerReminderReceiver import app.aaps.plugins.automation.services.LocationService @@ -35,18 +34,6 @@ class ReceiverInjectorsTest { ) } - /** - * Android builds this one from a notification action button, so it needs an entry like the rest. - * It was converted to `MetroBroadcastReceiver` without one, and tapping Mute or Dismiss on the - * background alarm notification crashed with "No Metro binding for AlarmMuteReceiver" - issue - * #5124. Nothing failed at build time, and no test covered it, because this file names the - * classes it checks by hand. - */ - @Test - fun `the alarm notification receiver has an injector`() { - assertThat(injectors.keys).contains(AlarmMuteReceiver::class) - } - @Test fun `the persistent notification service and receiver have injectors`() { // DummyService is a Service, not a receiver. It reaches the same class-keyed map through diff --git a/app/src/test/kotlin/app/aaps/trio/ui/compose/overview/TrioOverviewGraphTest.kt b/app/src/test/kotlin/app/aaps/trio/ui/compose/overview/TrioOverviewGraphTest.kt new file mode 100644 index 000000000000..cb6d4b4e8d43 --- /dev/null +++ b/app/src/test/kotlin/app/aaps/trio/ui/compose/overview/TrioOverviewGraphTest.kt @@ -0,0 +1,95 @@ +package app.aaps.trio.ui.compose.overview + +import app.aaps.core.interfaces.overview.graph.BgDataPoint +import app.aaps.core.interfaces.overview.graph.BgRange +import app.aaps.core.interfaces.overview.graph.BgType +import app.aaps.core.interfaces.overview.graph.BolusGraphPoint +import app.aaps.core.interfaces.overview.graph.BolusType +import com.google.common.truth.Truth.assertThat +import org.junit.jupiter.api.Test + +class TrioOverviewGraphTest { + + @Test + fun `bolus value is shown only above half a unit`() { + assertThat(shouldShowBolusValue(0.5)).isFalse() + assertThat(shouldShowBolusValue(0.5001)).isTrue() + } + + @Test + fun `bolus marker uses its time and nearest glucose height`() { + val bolus = bolus(timestamp = 800L) + val markers = calculateBolusMarkerPositions( + boluses = listOf(bolus), + history = listOf( + glucose(timestamp = 0L, value = 100.0), + glucose(timestamp = 1_000L, value = 200.0) + ), + viewportStart = 0L, + viewportDuration = 1_000L, + width = 1_000f, + plotHeight = 500f, + yRange = TrioGraphRange(min = 0.0, max = 250.0), + markerOffset = 10f + ) + + assertThat(markers).hasSize(1) + assertThat(markers.single().x).isWithin(0.001f).of(800f) + assertThat(markers.single().y).isWithin(0.001f).of(90f) + } + + @Test + fun `invalid and zero boluses have no marker`() { + val markers = calculateBolusMarkerPositions( + boluses = listOf( + bolus(timestamp = 500L, amount = 0.0), + bolus(timestamp = 600L, isValid = false) + ), + history = listOf(glucose(timestamp = 500L, value = 100.0)), + viewportStart = 0L, + viewportDuration = 1_000L, + width = 1_000f, + plotHeight = 500f, + yRange = TrioGraphRange(min = 0.0, max = 250.0), + markerOffset = 10f + ) + + assertThat(markers).isEmpty() + } + + @Test + fun `tap selects the closest bolus marker within the hit area`() { + val first = bolus(timestamp = 100L) + val second = bolus(timestamp = 200L) + val selected = findTappedBolus( + markers = listOf( + BolusMarkerPosition(first, x = 100f, y = 100f), + BolusMarkerPosition(second, x = 120f, y = 100f) + ), + tapX = 116f, + tapY = 102f, + hitRadius = 20f + ) + + assertThat(selected).isEqualTo(second) + } + + private fun bolus( + timestamp: Long, + amount: Double = 1.0, + isValid: Boolean = true + ) = BolusGraphPoint( + timestamp = timestamp, + amount = amount, + bolusType = BolusType.NORMAL, + isValid = isValid, + label = amount.toString() + ) + + private fun glucose(timestamp: Long, value: Double) = BgDataPoint( + timestamp = timestamp, + value = value, + type = BgType.REGULAR, + range = BgRange.IN_RANGE + ) +} diff --git a/app/src/testFull/kotlin/app/aaps/di/metro/GraphScopeStabilityTest.kt b/app/src/testFull/kotlin/app/aaps/di/metro/GraphScopeStabilityTest.kt index 4fcbe2b112ee..fa2bd79a15d9 100644 --- a/app/src/testFull/kotlin/app/aaps/di/metro/GraphScopeStabilityTest.kt +++ b/app/src/testFull/kotlin/app/aaps/di/metro/GraphScopeStabilityTest.kt @@ -93,7 +93,6 @@ class GraphScopeStabilityTest { "activeSceneManager", "activeSceneSync", "activityMonitor", - "alarmSoundPlayer", "appRepository", "appScope", "authFlowOut", @@ -165,7 +164,6 @@ class GraphScopeStabilityTest { "nsClientSourcePlugin", "nsClientV3Plugin", "nsIncomingDataProcessor", - "objectivesPlugin", "openHumansMetroBridge", "overviewData", "overviewDataCache", diff --git a/appshell/src/androidHostTest/kotlin/app/aaps/appshell/navigation/AppNavGraphTest.kt b/appshell/src/androidHostTest/kotlin/app/aaps/appshell/navigation/AppNavGraphTest.kt index 524f0b70a8cd..2e2dba61fa39 100644 --- a/appshell/src/androidHostTest/kotlin/app/aaps/appshell/navigation/AppNavGraphTest.kt +++ b/appshell/src/androidHostTest/kotlin/app/aaps/appshell/navigation/AppNavGraphTest.kt @@ -56,10 +56,8 @@ class AppNavGraphTest { siteRotationManagementViewModel = mock(), graphViewModel = mock(), chipsViewModel = mock(), - swDefinition = mock(), rxBus = mock(), activePlugin = activePlugin, - pluginPermissions = mock(), automationRuntime = mock(), preferences = mock(), rh = mock(), @@ -74,8 +72,9 @@ class AppNavGraphTest { requestEditModeAuthorization = { onGranted -> onGranted() }, onRefreshPermissions = {}, onExecuteQuickWizard = {}, - onRequestDirectoryAccess = {}, - onRequestPermission = {}, + onNavigateToTrioTab = {}, + trioTabScaffold = { _, _, _, _, _ -> }, + overview = if (withOverview) ({ }) else null ) } @@ -94,7 +93,7 @@ class AppNavGraphTest { AppRoute.Preferences.route, AppRoute.RunningMode.route, AppRoute.Configuration.route, - AppRoute.SetupWizard.route + AppRoute.TrioSettings.route ) } diff --git a/appshell/src/androidHostTest/kotlin/app/aaps/appshell/navigation/AppRouteTest.kt b/appshell/src/androidHostTest/kotlin/app/aaps/appshell/navigation/AppRouteTest.kt index ace1237e6c02..cfdffb534799 100644 --- a/appshell/src/androidHostTest/kotlin/app/aaps/appshell/navigation/AppRouteTest.kt +++ b/appshell/src/androidHostTest/kotlin/app/aaps/appshell/navigation/AppRouteTest.kt @@ -32,7 +32,6 @@ class AppRouteTest { assertThat(AppRoute.Configuration.route).isEqualTo("configuration") assertThat(AppRoute.FoodManagement.route).isEqualTo("food_management") assertThat(AppRoute.SiteRotationManagement.route).isEqualTo("siteRotationManagement") - assertThat(AppRoute.SetupWizard.route).isEqualTo("setup_wizard") } @Test diff --git a/appshell/src/androidHostTest/kotlin/app/aaps/appshell/navigation/ElementNavigatorTest.kt b/appshell/src/androidHostTest/kotlin/app/aaps/appshell/navigation/ElementNavigatorTest.kt index 38ab4c7840fa..216356476dcf 100644 --- a/appshell/src/androidHostTest/kotlin/app/aaps/appshell/navigation/ElementNavigatorTest.kt +++ b/appshell/src/androidHostTest/kotlin/app/aaps/appshell/navigation/ElementNavigatorTest.kt @@ -62,8 +62,7 @@ class ElementNavigatorTest { dexcomBoyda = dexcomBoyda, onOpenCgmApp = { openedCgmApps += it }, onExit = { exited = true }, - onRequestDirectoryAccess = {}, - onOpenUrl = {} + onRequestDirectoryAccess = {} ) } diff --git a/appshell/src/commonMain/kotlin/app/aaps/appshell/AapsAppRoot.kt b/appshell/src/commonMain/kotlin/app/aaps/appshell/AapsAppRoot.kt index deb4c81bf73a..d25f5eff7945 100644 --- a/appshell/src/commonMain/kotlin/app/aaps/appshell/AapsAppRoot.kt +++ b/appshell/src/commonMain/kotlin/app/aaps/appshell/AapsAppRoot.kt @@ -48,6 +48,7 @@ import app.aaps.core.interfaces.utils.DecimalFormatter import app.aaps.core.keys.interfaces.Preferences import app.aaps.core.keys.interfaces.VisibilityContext import app.aaps.core.ui.CoreUiStrings +import app.aaps.core.ui.compose.AapsSpacing import app.aaps.core.ui.compose.AapsTheme import app.aaps.core.ui.compose.LocalAppIcon import app.aaps.core.ui.compose.LocalConfig @@ -181,7 +182,15 @@ fun AapsAppRoot( rxBus = rxBus, snackbarHostPresence = snackbarHostPresence, hostState = rootSnackbarHostState, - modifier = Modifier.align(Alignment.BottomCenter) + modifier = Modifier + .align(Alignment.BottomCenter) + .padding( + bottom = if (initProgress.done) { + AapsSpacing.xxLarge * 3 + AapsSpacing.medium + } else { + 0.dp + } + ) ) // Root-level dialog host — subscribes to EventShowDialog and diff --git a/appshell/src/commonMain/kotlin/app/aaps/appshell/navigation/AppNavGraph.kt b/appshell/src/commonMain/kotlin/app/aaps/appshell/navigation/AppNavGraph.kt index a537c1e3c517..10e4f389818f 100644 --- a/appshell/src/commonMain/kotlin/app/aaps/appshell/navigation/AppNavGraph.kt +++ b/appshell/src/commonMain/kotlin/app/aaps/appshell/navigation/AppNavGraph.kt @@ -3,7 +3,9 @@ package app.aaps.appshell.navigation import androidx.navigation.NavBackStackEntry import androidx.savedstate.read import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.RowScope +import androidx.compose.foundation.layout.consumeWindowInsets import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.padding import androidx.compose.material.icons.Icons @@ -39,20 +41,15 @@ import app.aaps.core.ui.CoreUiStrings import app.aaps.core.data.model.TE import app.aaps.core.data.time.T import app.aaps.core.interfaces.configuration.ConfigBuilder -import app.aaps.core.interfaces.constraints.Objectives import app.aaps.core.interfaces.db.PersistenceLayer import app.aaps.core.interfaces.maintenance.PrefsFileInfo import app.aaps.core.interfaces.navigation.ElementType import app.aaps.core.interfaces.plugin.ActivePlugin -import app.aaps.core.interfaces.plugin.PermissionGroup import app.aaps.core.interfaces.plugin.PluginBase -import app.aaps.core.interfaces.plugin.PluginPermissions import app.aaps.core.interfaces.protection.ProtectionCheck import app.aaps.core.interfaces.resources.TextResolver import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.rx.events.EventShowSnackbar -import app.aaps.core.keys.BooleanKey -import app.aaps.core.keys.BooleanNonKey import app.aaps.core.keys.IntKey import app.aaps.core.keys.StringKey import app.aaps.core.keys.interfaces.Preferences @@ -70,8 +67,6 @@ import app.aaps.core.ui.search.SearchableItem import app.aaps.core.ui.search.SearchableProvider import app.aaps.core.ui.compose.siteRotation.SiteLocationPickerScreen import app.aaps.plugins.automation.AutomationRuntime -import app.aaps.plugins.configuration.setupwizard.SWDefinition -import app.aaps.plugins.configuration.setupwizard.SetupWizardScreen import app.aaps.plugins.sync.nsclientV3.clientcontrol.compose.AuthorizedClientsScreen import app.aaps.plugins.sync.nsclientV3.clientcontrol.compose.PairWithMasterScreen import app.aaps.ui.compose.calibrationDialog.CalibrationDialogScreen @@ -86,9 +81,13 @@ import app.aaps.ui.compose.history.HistoryScreen import app.aaps.ui.compose.insulinDialog.InsulinDialogScreen import app.aaps.ui.compose.insulinManagement.InsulinManagementScreen import app.aaps.ui.compose.insulinManagement.InsulinManagementViewModel +import app.aaps.ui.compose.main.VersionOverlay +import app.aaps.ui.compose.main.TrioNavTab import app.aaps.ui.compose.maintenance.ImportSettingsScreen import app.aaps.ui.compose.maintenance.ImportSource import app.aaps.ui.compose.maintenance.ImportViewModel +import app.aaps.ui.compose.maintenance.MaintenanceScreen +import app.aaps.ui.compose.maintenance.MaintenanceViewModel import app.aaps.ui.compose.overview.chips.ChipsViewModel import app.aaps.ui.compose.preferences.AllPreferencesScreen import app.aaps.ui.compose.preferences.PreferenceScreenView @@ -110,6 +109,7 @@ import app.aaps.ui.compose.scenes.wizard.SceneWizardScreen import app.aaps.ui.compose.siteRotationDialog.SiteRotationManagementScreen import app.aaps.ui.compose.siteRotationDialog.viewModels.SiteRotationManagementViewModel import app.aaps.ui.compose.stats.StatsScreen +import app.aaps.ui.compose.stats.TrioStatsScreen import app.aaps.ui.compose.stats.viewmodels.StatsViewModel import app.aaps.ui.compose.tempBasalDialog.TempBasalDialogScreen import app.aaps.ui.compose.tempTarget.TempTargetManagementScreen @@ -118,6 +118,7 @@ import app.aaps.ui.compose.treatmentDialog.TreatmentDialogScreen import app.aaps.ui.compose.treatments.TreatmentsScreen import app.aaps.ui.compose.treatments.viewmodels.TreatmentsViewModel import app.aaps.ui.compose.wizardDialog.WizardDialogScreen +import app.aaps.ui.UiStrings import app.aaps.ui.search.BuiltInSearchables import kotlinx.coroutines.launch @@ -154,10 +155,8 @@ fun NavGraphBuilder.appNavGraph( graphViewModel: app.aaps.ui.compose.overview.graphs.GraphViewModel, chipsViewModel: ChipsViewModel, // Dependencies - swDefinition: SWDefinition, rxBus: RxBus, activePlugin: ActivePlugin, - pluginPermissions: PluginPermissions, automationRuntime: AutomationRuntime, preferences: Preferences, rh: TextResolver, @@ -173,8 +172,20 @@ fun NavGraphBuilder.appNavGraph( requestEditModeAuthorization: (onGranted: () -> Unit) -> Unit, onRefreshPermissions: () -> Unit, onExecuteQuickWizard: (guid: String) -> Unit, - onRequestDirectoryAccess: () -> Unit, - onRequestPermission: (PermissionGroup) -> Unit, + onNavigateToTrioTab: (TrioNavTab) -> Unit, + trioTabScaffold: @Composable ( + selectedTab: TrioNavTab, + title: String, + showTopBar: Boolean, + topBarActions: @Composable RowScope.() -> Unit, + content: @Composable (PaddingValues) -> Unit + ) -> Unit, + maintenanceViewModel: MaintenanceViewModel? = null, + onMaintenanceDirectoryClick: () -> Unit = {}, + onMaintenanceRecreateActivity: () -> Unit = {}, + onMaintenanceLaunchBrowser: (String) -> Unit = {}, + onMaintenanceBringToForeground: () -> Unit = {}, + onMaintenanceSnackbar: suspend (String) -> Unit = {}, /** * The overview, which is the app home screen. * @@ -440,7 +451,6 @@ fun NavGraphBuilder.appNavGraph( currentPercentage = reuseValues?.first ?: 100, currentTimeshiftHours = reuseValues?.second ?: 0, hasReuseValues = reuseValues != null, - showNotesField = preferences.get(BooleanKey.OverviewShowNotesInDialogs), initialTimestamp = profileManagementViewModel.dateUtil.nowWithoutMilliseconds(), rh = rh, onNavigateBack = { navController.safePopBackStack() }, @@ -514,6 +524,44 @@ fun NavGraphBuilder.appNavGraph( ) } + composable(AppRoute.TrioTreatmentList.route) { + trioTabScaffold( + TrioNavTab.Treatments, + stringResource(CoreUiStrings.treatments), + false, + {} + ) { paddingValues -> + TreatmentsScreen( + viewModel = treatmentsViewModel, + onNavigateBack = { onNavigateToTrioTab(TrioNavTab.Overview) }, + modifier = Modifier + .padding(paddingValues) + .consumeWindowInsets(paddingValues) + ) + } + } + + composable(AppRoute.TrioTreatments.route) { + trioTabScaffold( + TrioNavTab.Adjustments, + stringResource(UiStrings.trio_tab_adjustments), + false, + {} + ) { paddingValues -> + TempTargetManagementScreen( + viewModel = tempTargetManagementViewModel, + initialMode = ScreenMode.EDIT, + onNavigateBack = { onNavigateToTrioTab(TrioNavTab.Overview) }, + onRequestEditMode = { + requestEditModeAuthorization { tempTargetManagementViewModel.setScreenMode(ScreenMode.EDIT) } + }, + modifier = Modifier + .padding(paddingValues) + .consumeWindowInsets(paddingValues) + ) + } + } + composable(AppRoute.Stats.route) { StatsScreen( viewModel = statsViewModel, @@ -521,6 +569,13 @@ fun NavGraphBuilder.appNavGraph( ) } + composable(AppRoute.TrioStats.route) { + TrioStatsScreen( + viewModel = statsViewModel, + onNavigateBack = { navController.safePopBackStack() } + ) + } + composable(AppRoute.ProfileHelper.route) { ProfileHelperScreen( viewModel = profileHelperViewModel, @@ -535,16 +590,52 @@ fun NavGraphBuilder.appNavGraph( ) } + composable(AppRoute.TrioHistory.route) { + trioTabScaffold( + TrioNavTab.Adjustments, + stringResource(MainStrings.nav_history_browser), + true, + {} + ) { paddingValues -> + HistoryScreen( + title = stringResource(MainStrings.nav_history_browser), + onNavigateBack = { onNavigateToTrioTab(TrioNavTab.Overview) }, + modifier = Modifier + .padding(paddingValues) + .consumeWindowInsets(paddingValues), + showTopBar = false + ) + } + } + composable(AppRoute.Preferences.route) { AllPreferencesScreen( activePlugin = activePlugin, rh = rh, builtInSearchables = builtInSearchables, configBuilder = configBuilder, - onBackClick = { navController.safePopBackStack() } + onBackClick = { navController.safePopBackStack() }, + onMaintenanceClick = maintenanceViewModel?.let { { navController.navigate(AppRoute.Maintenance.route) } } ) } + maintenanceViewModel?.let { viewModel -> + composable(AppRoute.Maintenance.route) { + MaintenanceScreen( + maintenanceViewModel = viewModel, + onDirectoryClick = onMaintenanceDirectoryClick, + onImportSettingsNavigate = { source -> + navController.navigate(AppRoute.ImportSettings.createRoute(source.name)) + }, + onRecreateActivity = onMaintenanceRecreateActivity, + onLaunchBrowser = onMaintenanceLaunchBrowser, + onBringToForeground = onMaintenanceBringToForeground, + onSnackbar = onMaintenanceSnackbar, + onNavigateBack = { navController.safePopBackStack() } + ) + } + } + composable( route = AppRoute.PluginContent.route, arguments = listOf(navArgument("pluginIndex") { type = NavType.IntType }) @@ -622,6 +713,7 @@ fun NavGraphBuilder.appNavGraph( val configState by configurationViewModel.uiState.collectAsStateWithLifecycle() ConfigurationScreen( categories = configState.categories, + visibleTypes = null, hardwarePumpConfirmation = configState.hardwarePumpConfirmation, onNavigateBack = { navController.safePopBackStack() }, onNavigateToCategory = { type -> @@ -635,6 +727,34 @@ fun NavGraphBuilder.appNavGraph( ) } + composable(AppRoute.TrioSettings.route) { + trioTabScaffold( + TrioNavTab.Settings, + stringResource(CoreUiStrings.settings), + true, + { + VersionOverlay() + } + ) { paddingValues -> + AllPreferencesScreen( + activePlugin = activePlugin, + rh = rh, + builtInSearchables = builtInSearchables, + configBuilder = configBuilder, + onBackClick = { onNavigateToTrioTab(TrioNavTab.Overview) }, + modifier = Modifier + .padding(paddingValues) + .consumeWindowInsets(paddingValues), + showTopBar = false, + showSimpleModeHiddenPreferences = true, + onConfigurationClick = { + navController.navigate(AppRoute.Configuration.route) + }, + onMaintenanceClick = maintenanceViewModel?.let { { navController.navigate(AppRoute.Maintenance.route) } } + ) + } + } + composable( AppRoute.PluginCategory.route, arguments = listOf(navArgument("typeOrdinal") { type = NavType.IntType }) @@ -753,40 +873,6 @@ fun NavGraphBuilder.appNavGraph( ) } - composable(AppRoute.SetupWizard.route) { - SetupWizardScreen( - swDefinition = swDefinition, - onFinish = { - preferences.put(BooleanNonKey.GeneralSetupWizardProcessed, true) - navController.safePopBackStack() - }, - onBack = { navController.safePopBackStack() }, - onImportSettings = { navController.navigate(AppRoute.ImportSettings.createRoute("LOCAL")) }, - onPluginPreferences = { pluginId -> navController.navigate(AppRoute.PluginPreferences.createRoute(pluginId)) }, - onPluginOpen = { pluginId -> onNavigationRequest(NavigationRequest.Plugin(pluginId), navController) }, - onSetMasterPassword = { navController.navigate(AppRoute.PreferenceScreen.createRoute("protection", StringKey.ProtectionMasterPassword.key)) }, - onManageInsulin = { navController.navigate(AppRoute.InsulinManagement.createRoute()) }, - onManageProfile = { navController.navigate(AppRoute.Profile.createRoute()) }, - onProfileSwitch = { navController.navigate(AppRoute.ProfileActivation.createRoute(0)) }, - onOpenAuthorizedClients = { navController.navigate(AppRoute.AuthorizedClients.route) }, - onPairWithMaster = { navController.navigate(AppRoute.PairWithMaster.route) }, - onOpenNsReceiveSettings = { navController.navigate(AppRoute.PreferenceScreen.createRoute("ns_client_synchronization")) }, - onRunObjectives = { - val index = activePlugin.getPluginsList().indexOfFirst { it is Objectives } - if (index >= 0) navController.navigate(AppRoute.PluginContent.createRoute(index)) - }, - onRequestDirectoryAccess = onRequestDirectoryAccess, - onRequestPermission = onRequestPermission, - permissionItems = { - val allGroups = pluginPermissions.collectAllPermissions() - val missingGroups = pluginPermissions.collectMissingPermissions() - val missingSets = missingGroups.map { it.permissions.toSet() }.toSet() - allGroups.map { group -> group to (group.permissions.toSet() !in missingSets) } - }, - isDirectoryAccessGranted = { prefFileList.isDirectoryAccessGranted() }, - rxBus = rxBus - ) - } } @Composable diff --git a/appshell/src/commonMain/kotlin/app/aaps/appshell/navigation/AppRoute.kt b/appshell/src/commonMain/kotlin/app/aaps/appshell/navigation/AppRoute.kt index 151c6ab16c8f..aaa8070751a2 100644 --- a/appshell/src/commonMain/kotlin/app/aaps/appshell/navigation/AppRoute.kt +++ b/appshell/src/commonMain/kotlin/app/aaps/appshell/navigation/AppRoute.kt @@ -46,6 +46,7 @@ sealed class AppRoute(val route: String) { data object ProfileHelper : AppRoute("profile_helper") data object HistoryBrowser : AppRoute("history_browser") data object Preferences : AppRoute("preferences") + data object Maintenance : AppRoute("maintenance") data object PluginPreferences : AppRoute("plugin_preferences/{pluginKey}") { fun createRoute(pluginKey: String) = "plugin_preferences/$pluginKey" @@ -123,7 +124,11 @@ sealed class AppRoute(val route: String) { data object FoodManagement : AppRoute("food_management") data object SiteRotationManagement : AppRoute("siteRotationManagement") - data object SetupWizard : AppRoute("setup_wizard") data object AuthorizedClients : AppRoute("authorized_clients") data object PairWithMaster : AppRoute("pair_with_master") + data object TrioTreatments : AppRoute("trio_treatments") + data object TrioTreatmentList : AppRoute("trio_treatment_list") + data object TrioHistory : AppRoute("trio_history") + data object TrioStats : AppRoute("trio_stats") + data object TrioSettings : AppRoute("trio_settings") } diff --git a/appshell/src/commonMain/kotlin/app/aaps/appshell/navigation/ElementNavigation.kt b/appshell/src/commonMain/kotlin/app/aaps/appshell/navigation/ElementNavigation.kt index d1c1cc4d8503..b3c21ef4a4e1 100644 --- a/appshell/src/commonMain/kotlin/app/aaps/appshell/navigation/ElementNavigation.kt +++ b/appshell/src/commonMain/kotlin/app/aaps/appshell/navigation/ElementNavigation.kt @@ -12,9 +12,7 @@ import app.aaps.ui.compose.careDialog.CareportalEventType import app.aaps.core.interfaces.navigation.ElementType import app.aaps.core.interfaces.notifications.NotificationId import app.aaps.core.keys.StringKey -import app.aaps.core.ui.search.SearchableItem import app.aaps.ui.compose.quickLaunch.QuickLaunchAction -import app.aaps.ui.search.SearchIndexEntry import app.aaps.core.ui.compose.ScreenMode import app.aaps.core.ui.compose.navigation.NavigationRequest import app.aaps.ui.compose.main.MainViewModel @@ -46,11 +44,10 @@ class ElementNavigator( private val dexcomBoyda: DexcomBoyda, private val onOpenCgmApp: (packageName: String) -> Unit, private val onExit: () -> Unit, - val onRequestDirectoryAccess: () -> Unit, - val onOpenUrl: (url: String) -> Unit + val onRequestDirectoryAccess: () -> Unit ) { - /** Where a tap in the drawer, a search result or a quick launch tile goes. */ + /** Where a tap in the drawer or a quick launch tile goes. */ fun handleNavigationRequest(request: NavigationRequest) { when (request) { is NavigationRequest.Element -> navigateProtected(request.type) @@ -65,9 +62,15 @@ class ElementNavigator( openPlugin(plugin, navController, activePlugin) } + is NavigationRequest.PluginCategory -> guarded(ElementType.CONFIGURATION.protection) { + navController.navigate(AppRoute.PluginCategory.createRoute(request.type.ordinal)) + } + is NavigationRequest.PluginPreferences -> guarded(ElementType.SETTINGS.protection) { navController.navigate(AppRoute.PluginPreferences.createRoute(request.pluginKey)) } + + NavigationRequest.TrioStatistics -> navController.navigate(AppRoute.TrioStats.route) } } @@ -118,7 +121,6 @@ class ElementNavigator( ElementType.PROFILE_HELPER -> navController.navigate(AppRoute.ProfileHelper.route) ElementType.HISTORY_BROWSER -> navController.navigate(AppRoute.HistoryBrowser.route) - ElementType.SETUP_WIZARD -> navController.navigate(AppRoute.SetupWizard.route) ElementType.MAINTENANCE -> mainViewModel.setShowMaintenanceSheet(true) ElementType.CONFIGURATION -> navController.navigate(AppRoute.Configuration.route) ElementType.ABOUT -> mainViewModel.setShowAboutDialog(true) @@ -250,26 +252,3 @@ fun ElementNavigator.handleNotificationAction(notificationId: NotificationId) { else -> Unit } } - -/** - * A search result. - * - * The search stays active on purpose, so back returns to the results rather than to the overview. - */ -fun ElementNavigator.handleSearchResultClick(entry: SearchIndexEntry) { - when (val item = entry.item) { - is SearchableItem.Category -> guarded(ProtectionCheck.Protection.PREFERENCES) { - navController.navigate(AppRoute.PreferenceScreen.createRoute(item.screenDef.key)) - } - - is SearchableItem.Preference -> guarded(ProtectionCheck.Protection.PREFERENCES) { - val screenKey = item.parentScreenKey - if (screenKey != null) navController.navigate(AppRoute.PreferenceScreen.createRoute(screenKey, item.preferenceKey.key)) - else navController.navigate(AppRoute.Preferences.route) - } - - is SearchableItem.Dialog -> handleNavigationRequest(NavigationRequest.Element(item.elementType)) - is SearchableItem.Plugin -> openPlugin(item.pluginRef, navController, activePlugin) - is SearchableItem.Wiki -> onOpenUrl(item.url) - } -} diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 1d9dbfe776a2..fc54ed556749 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -10,7 +10,7 @@ object Versions { const val compileSdk = 37 const val minSdk = 31 - const val targetSdk = 35 + const val targetSdk = 36 const val wearMinSdk = 30 const val wearTargetSdk = 30 diff --git a/core/data/src/commonMain/kotlin/app/aaps/core/data/ue/Sources.kt b/core/data/src/commonMain/kotlin/app/aaps/core/data/ue/Sources.kt index 5154ce9acd5c..cb7a6b5eeeeb 100644 --- a/core/data/src/commonMain/kotlin/app/aaps/core/data/ue/Sources.kt +++ b/core/data/src/commonMain/kotlin/app/aaps/core/data/ue/Sources.kt @@ -50,7 +50,7 @@ enum class Sources { Maintenance, //From Maintenance plugin NSClient, //From NSClient plugin NSProfile, //From NSProfile plugin - Objectives, //From Objectives plugin + Objectives, //From the removed Objectives plugin - kept so old history entries still read Pump, //To update with one Source per pump Dana, //Only one UserEntry in Common module Dana DanaR, diff --git a/core/interfaces/src/androidMain/res/values/strings.xml b/core/interfaces/src/androidMain/res/values/strings.xml index a86eeddeac14..e770c7823859 100644 --- a/core/interfaces/src/androidMain/res/values/strings.xml +++ b/core/interfaces/src/androidMain/res/values/strings.xml @@ -133,7 +133,7 @@ mg/dL/U mmol/L/U %1$+.2f U - %1$d g + %1$dg %1$s: %2$s Carbs Run alarm in %1$d min diff --git a/core/interfaces/src/commonMain/kotlin/app/aaps/core/interfaces/alerts/LocalAlertUtils.kt b/core/interfaces/src/commonMain/kotlin/app/aaps/core/interfaces/alerts/LocalAlertUtils.kt index 0c1bfc46fd0a..41ea230df2a8 100644 --- a/core/interfaces/src/commonMain/kotlin/app/aaps/core/interfaces/alerts/LocalAlertUtils.kt +++ b/core/interfaces/src/commonMain/kotlin/app/aaps/core/interfaces/alerts/LocalAlertUtils.kt @@ -5,7 +5,7 @@ interface LocalAlertUtils { /** * Check for unreachable pump (there was no connection with pump for some time). * Raise alarm if needed. - * Overview notification with sound, Therapy event, SMS + * Overview notification, therapy event, SMS */ fun checkPumpUnreachableAlarm(lastConnection: Long, isStatusOutdated: Boolean, isDisconnected: Boolean) @@ -29,7 +29,7 @@ interface LocalAlertUtils { /** * Check for missing BGs. * Raise alarm if needed. - * Overview notification with sound, Therapy event + * Overview notification, therapy event */ suspend fun checkStaleBGAlert() } \ No newline at end of file diff --git a/core/interfaces/src/commonMain/kotlin/app/aaps/core/interfaces/constraints/Objectives.kt b/core/interfaces/src/commonMain/kotlin/app/aaps/core/interfaces/constraints/Objectives.kt deleted file mode 100644 index fcb9ec52eb8f..000000000000 --- a/core/interfaces/src/commonMain/kotlin/app/aaps/core/interfaces/constraints/Objectives.kt +++ /dev/null @@ -1,24 +0,0 @@ -package app.aaps.core.interfaces.constraints - -interface Objectives { - companion object { - - const val FIRST_OBJECTIVE = 0 - @Suppress("unused") const val USAGE_OBJECTIVE = 1 - @Suppress("unused") const val EXAM_OBJECTIVE = 2 - @Suppress("unused") const val OPEN_LOOP_OBJECTIVE = 3 - @Suppress("unused") const val SAFETY_MAX_BASAL_OBJECTIVE = 4 - const val LGS_OBJECTIVE = 5 - const val CLOSED_LOOP_OBJECTIVE = 6 - const val AUTOSENS_OBJECTIVE = 7 - const val SMB_OBJECTIVE = 8 - const val AUTO_OBJECTIVE = 9 - } - - val size: Int - val accomplishedCount: Int - val allAccomplished: Boolean get() = size > 0 && accomplishedCount >= size - - fun isAccomplished(index: Int): Boolean - fun isStarted(index: Int): Boolean -} \ No newline at end of file diff --git a/core/interfaces/src/commonMain/kotlin/app/aaps/core/interfaces/maintenance/BackupDatabaseConstants.kt b/core/interfaces/src/commonMain/kotlin/app/aaps/core/interfaces/maintenance/BackupDatabaseConstants.kt new file mode 100644 index 000000000000..2a9e63ecdc5a --- /dev/null +++ b/core/interfaces/src/commonMain/kotlin/app/aaps/core/interfaces/maintenance/BackupDatabaseConstants.kt @@ -0,0 +1,10 @@ +package app.aaps.core.interfaces.maintenance + +object BackupDatabaseConstants { + const val DATABASE_MAIN_FILE = "androidaps.db" + const val DATABASE_WAL_FILE = "androidaps.db-wal" + const val DATABASE_SHM_FILE = "androidaps.db-shm" + const val PENDING_DB_RESTORE_DIR = "pending-database-restore" + const val PENDING_DB_RESTORE_FLAG = "AAPS.PendingDatabaseRestore" + const val SHARED_PREFERENCES_SUFFIX = "_preferences" +} diff --git a/core/interfaces/src/commonMain/kotlin/app/aaps/core/interfaces/navigation/ElementType.kt b/core/interfaces/src/commonMain/kotlin/app/aaps/core/interfaces/navigation/ElementType.kt index 6a77c120a964..147c4fb83212 100644 --- a/core/interfaces/src/commonMain/kotlin/app/aaps/core/interfaces/navigation/ElementType.kt +++ b/core/interfaces/src/commonMain/kotlin/app/aaps/core/interfaces/navigation/ElementType.kt @@ -10,85 +10,82 @@ import app.aaps.core.keys.interfaces.ElementVisibility * in ElementTypeStyle.kt. * * @param category Logical grouping for configuration screens and bottom sheets - * @param searchable Whether this element appears in global search results * @param protection Protection level required for navigation - * @param visibility Runtime condition gating where this element may surface (e.g. in search) + * @param visibility Runtime condition gating where this element may surface */ enum class ElementType( val category: ElementCategory = ElementCategory.INTERNAL, - val searchable: Boolean = false, val protection: ProtectionCheck.Protection = ProtectionCheck.Protection.NONE, val visibility: ElementVisibility = ElementVisibility.ALWAYS ) { // Treatment dialogs — all ride the signed Client-Control channel (RoleBranch/BatchExecutor), so an // unpaired client must not surface them: CLIENT_PAIRED hides them until paired (always shown on master). - INSULIN(category = ElementCategory.TREATMENT, searchable = true, protection = ProtectionCheck.Protection.BOLUS, visibility = ElementVisibility.MASTER_OR_PAIRED_CLIENT), - CARBS(category = ElementCategory.TREATMENT, searchable = true, protection = ProtectionCheck.Protection.BOLUS, visibility = ElementVisibility.MASTER_OR_PAIRED_CLIENT), - BOLUS_WIZARD(category = ElementCategory.TREATMENT, searchable = true, protection = ProtectionCheck.Protection.BOLUS, visibility = ElementVisibility.MASTER_OR_PAIRED_CLIENT), + INSULIN(category = ElementCategory.TREATMENT, protection = ProtectionCheck.Protection.BOLUS, visibility = ElementVisibility.MASTER_OR_PAIRED_CLIENT), + CARBS(category = ElementCategory.TREATMENT, protection = ProtectionCheck.Protection.BOLUS, visibility = ElementVisibility.MASTER_OR_PAIRED_CLIENT), + BOLUS_WIZARD(category = ElementCategory.TREATMENT, protection = ProtectionCheck.Protection.BOLUS, visibility = ElementVisibility.MASTER_OR_PAIRED_CLIENT), QUICK_WIZARD(protection = ProtectionCheck.Protection.BOLUS, visibility = ElementVisibility.MASTER_OR_PAIRED_CLIENT), - TREATMENT(category = ElementCategory.TREATMENT, searchable = true, protection = ProtectionCheck.Protection.BOLUS, visibility = ElementVisibility.MASTER_OR_PAIRED_CLIENT), + TREATMENT(category = ElementCategory.TREATMENT, protection = ProtectionCheck.Protection.BOLUS, visibility = ElementVisibility.MASTER_OR_PAIRED_CLIENT), // CGM - CGM_XDRIP(category = ElementCategory.CGM, searchable = true), + CGM_XDRIP(category = ElementCategory.CGM), CGM_DEX(category = ElementCategory.CGM), // CALIBRATION is intentionally NOT migrated/gated: it's a CGM-plugin command (activeCalibration.addEntry), not a // DB write, and a client has no CGM source to calibrate — so it stays local/master-only (see Track B calibration notes). - CALIBRATION(category = ElementCategory.CGM, searchable = true), + CALIBRATION(category = ElementCategory.CGM), // Profile & Targets — minimum level is BOLUS; screen mode (PLAY/EDIT) determined by granted auth level. // Mutating editors whose writes ride Client-Control → CLIENT_PAIRED (hidden on an unpaired client). // PROFILE_MANAGEMENT is the exception and stays visible: profiles are state an unpaired client still // needs to see and calculate with (it receives them from Nightscout), so the screen opens READ-ONLY // there instead of disappearing — same rule as the overview chips and status lights. - PROFILE_MANAGEMENT(category = ElementCategory.MANAGEMENT, searchable = true, protection = ProtectionCheck.Protection.BOLUS), - TEMP_TARGET_MANAGEMENT(category = ElementCategory.MANAGEMENT, searchable = true, protection = ProtectionCheck.Protection.BOLUS, visibility = ElementVisibility.MASTER_OR_PAIRED_CLIENT), - INSULIN_MANAGEMENT(category = ElementCategory.MANAGEMENT, searchable = true, protection = ProtectionCheck.Protection.BOLUS, visibility = ElementVisibility.MASTER_OR_PAIRED_CLIENT), - QUICK_WIZARD_MANAGEMENT(category = ElementCategory.MANAGEMENT, searchable = true, protection = ProtectionCheck.Protection.BOLUS, visibility = ElementVisibility.MASTER_OR_PAIRED_CLIENT), - FOOD_MANAGEMENT(category = ElementCategory.MANAGEMENT, searchable = true, visibility = ElementVisibility.MASTER_OR_PAIRED_CLIENT), + PROFILE_MANAGEMENT(category = ElementCategory.MANAGEMENT, protection = ProtectionCheck.Protection.BOLUS), + TEMP_TARGET_MANAGEMENT(category = ElementCategory.MANAGEMENT, protection = ProtectionCheck.Protection.BOLUS, visibility = ElementVisibility.MASTER_OR_PAIRED_CLIENT), + INSULIN_MANAGEMENT(category = ElementCategory.MANAGEMENT, protection = ProtectionCheck.Protection.BOLUS, visibility = ElementVisibility.MASTER_OR_PAIRED_CLIENT), + QUICK_WIZARD_MANAGEMENT(category = ElementCategory.MANAGEMENT, protection = ProtectionCheck.Protection.BOLUS, visibility = ElementVisibility.MASTER_OR_PAIRED_CLIENT), + FOOD_MANAGEMENT(category = ElementCategory.MANAGEMENT, visibility = ElementVisibility.MASTER_OR_PAIRED_CLIENT), // Careportal — migrated to the Client-Control batch channel (BatchAction.TherapyEvent via CareDialogViewModel): // the master is the sole writer and the event syncs back. Gated MASTER_OR_PAIRED_CLIENT (hidden on an unpaired client). - BG_CHECK(category = ElementCategory.CAREPORTAL, searchable = true, visibility = ElementVisibility.MASTER_OR_PAIRED_CLIENT), - NOTE(category = ElementCategory.CAREPORTAL, searchable = true, visibility = ElementVisibility.MASTER_OR_PAIRED_CLIENT), - EXERCISE(category = ElementCategory.CAREPORTAL, searchable = true, visibility = ElementVisibility.MASTER_OR_PAIRED_CLIENT), - QUESTION(category = ElementCategory.CAREPORTAL, searchable = true, visibility = ElementVisibility.MASTER_OR_PAIRED_CLIENT), - ANNOUNCEMENT(category = ElementCategory.CAREPORTAL, searchable = true, visibility = ElementVisibility.MASTER_OR_PAIRED_CLIENT), + BG_CHECK(category = ElementCategory.CAREPORTAL, visibility = ElementVisibility.MASTER_OR_PAIRED_CLIENT), + NOTE(category = ElementCategory.CAREPORTAL, visibility = ElementVisibility.MASTER_OR_PAIRED_CLIENT), + EXERCISE(category = ElementCategory.CAREPORTAL, visibility = ElementVisibility.MASTER_OR_PAIRED_CLIENT), + QUESTION(category = ElementCategory.CAREPORTAL, visibility = ElementVisibility.MASTER_OR_PAIRED_CLIENT), + ANNOUNCEMENT(category = ElementCategory.CAREPORTAL, visibility = ElementVisibility.MASTER_OR_PAIRED_CLIENT), // Device maintenance. SENSOR_INSERT + BATTERY_CHANGE route through CareDialog; CANNULA_CHANGE + FILL both open the // FillDialog (site / cartridge); SITE_ROTATION records + edits via the batch channel — all Client-Control-migrated → gated. - SENSOR_INSERT(category = ElementCategory.DEVICE, searchable = true, visibility = ElementVisibility.MASTER_OR_PAIRED_CLIENT), - BATTERY_CHANGE(category = ElementCategory.DEVICE, searchable = true, visibility = ElementVisibility.MASTER_OR_PAIRED_CLIENT), + SENSOR_INSERT(category = ElementCategory.DEVICE, visibility = ElementVisibility.MASTER_OR_PAIRED_CLIENT), + BATTERY_CHANGE(category = ElementCategory.DEVICE, visibility = ElementVisibility.MASTER_OR_PAIRED_CLIENT), CANNULA_CHANGE(category = ElementCategory.DEVICE, protection = ProtectionCheck.Protection.BOLUS, visibility = ElementVisibility.MASTER_OR_PAIRED_CLIENT), - FILL(category = ElementCategory.DEVICE, searchable = true, protection = ProtectionCheck.Protection.BOLUS, visibility = ElementVisibility.MASTER_OR_PAIRED_CLIENT), - SITE_ROTATION(category = ElementCategory.DEVICE, searchable = true, visibility = ElementVisibility.MASTER_OR_PAIRED_CLIENT), + FILL(category = ElementCategory.DEVICE, protection = ProtectionCheck.Protection.BOLUS, visibility = ElementVisibility.MASTER_OR_PAIRED_CLIENT), + SITE_ROTATION(category = ElementCategory.DEVICE, visibility = ElementVisibility.MASTER_OR_PAIRED_CLIENT), // Basal — both ride Client-Control → CLIENT_PAIRED. - TEMP_BASAL(category = ElementCategory.BASAL, searchable = true, protection = ProtectionCheck.Protection.BOLUS, visibility = ElementVisibility.MASTER_OR_PAIRED_CLIENT), - EXTENDED_BOLUS(category = ElementCategory.BASAL, searchable = true, protection = ProtectionCheck.Protection.BOLUS, visibility = ElementVisibility.MASTER_OR_PAIRED_CLIENT), + TEMP_BASAL(category = ElementCategory.BASAL, protection = ProtectionCheck.Protection.BOLUS, visibility = ElementVisibility.MASTER_OR_PAIRED_CLIENT), + EXTENDED_BOLUS(category = ElementCategory.BASAL, protection = ProtectionCheck.Protection.BOLUS, visibility = ElementVisibility.MASTER_OR_PAIRED_CLIENT), // System AUTOMATION(category = ElementCategory.SYSTEM), - AUTOMATION_MANAGEMENT(category = ElementCategory.MANAGEMENT, searchable = true, protection = ProtectionCheck.Protection.PREFERENCES, visibility = ElementVisibility.MASTER_OR_PAIRED_CLIENT), + AUTOMATION_MANAGEMENT(category = ElementCategory.MANAGEMENT, protection = ProtectionCheck.Protection.PREFERENCES, visibility = ElementVisibility.MASTER_OR_PAIRED_CLIENT), // Pump management — only where the build drives a real pump: full + pumpcontrol (i.e. !isClient). // An aapsclient has no real pump (VirtualPump is hidden). NOT gated on pairing (a paired client still // has no pump), so this is plain !isClient, distinct from MASTER_OR_PAIRED_CLIENT. PUMP(category = ElementCategory.SYSTEM, visibility = ElementVisibility { !it.isClient }), SETTINGS(category = ElementCategory.SYSTEM, protection = ProtectionCheck.Protection.PREFERENCES), - QUICK_LAUNCH_CONFIG(category = ElementCategory.SYSTEM, searchable = true), + QUICK_LAUNCH_CONFIG(category = ElementCategory.SYSTEM), // Navigation screens - TREATMENTS(category = ElementCategory.NAVIGATION, searchable = true), - STATISTICS(category = ElementCategory.NAVIGATION, searchable = true), - TDD_CYCLE_PATTERN(category = ElementCategory.NAVIGATION, searchable = true), - PROFILE_HELPER(category = ElementCategory.NAVIGATION, searchable = true), - HISTORY_BROWSER(category = ElementCategory.NAVIGATION, searchable = true), - SETUP_WIZARD(category = ElementCategory.NAVIGATION, searchable = true, protection = ProtectionCheck.Protection.PREFERENCES), - MAINTENANCE(category = ElementCategory.NAVIGATION, searchable = true, protection = ProtectionCheck.Protection.PREFERENCES), - CONFIGURATION(category = ElementCategory.NAVIGATION, searchable = true, protection = ProtectionCheck.Protection.PREFERENCES), - ABOUT(category = ElementCategory.NAVIGATION, searchable = true), + TREATMENTS(category = ElementCategory.NAVIGATION), + STATISTICS(category = ElementCategory.NAVIGATION), + TDD_CYCLE_PATTERN(category = ElementCategory.NAVIGATION), + PROFILE_HELPER(category = ElementCategory.NAVIGATION), + HISTORY_BROWSER(category = ElementCategory.NAVIGATION), + MAINTENANCE(category = ElementCategory.NAVIGATION, protection = ProtectionCheck.Protection.PREFERENCES), + CONFIGURATION(category = ElementCategory.NAVIGATION, protection = ProtectionCheck.Protection.PREFERENCES), + ABOUT(category = ElementCategory.NAVIGATION), // Display indicators COB, @@ -96,29 +93,21 @@ enum class ElementType( // Scenes (situation presets) — activation + management ride Client-Control → CLIENT_PAIRED. SCENE(category = ElementCategory.MANAGEMENT, protection = ProtectionCheck.Protection.BOLUS, visibility = ElementVisibility.MASTER_OR_PAIRED_CLIENT), - SCENE_MANAGEMENT(category = ElementCategory.MANAGEMENT, searchable = true, protection = ProtectionCheck.Protection.PREFERENCES, visibility = ElementVisibility.MASTER_OR_PAIRED_CLIENT), + SCENE_MANAGEMENT(category = ElementCategory.MANAGEMENT, protection = ProtectionCheck.Protection.PREFERENCES, visibility = ElementVisibility.MASTER_OR_PAIRED_CLIENT), // NSCv3 client control — paired devices that can issue signed commands // Master only AND NSCv3-WS enabled — keeps search in lock-step with the Manage-sheet button (ManageViewModel). - AUTHORIZED_CLIENTS(category = ElementCategory.MANAGEMENT, searchable = true, protection = ProtectionCheck.Protection.PREFERENCES, visibility = ElementVisibility { !it.isClient && it.preferences.get(BooleanKey.NsClient3UseWs) }), + AUTHORIZED_CLIENTS(category = ElementCategory.MANAGEMENT, protection = ProtectionCheck.Protection.PREFERENCES, visibility = ElementVisibility { !it.isClient && it.preferences.get(BooleanKey.NsClient3UseWs) }), // Client only AND NSCv3-WS enabled (the transport client control rides) — in lock-step with its Manage-sheet button. - PAIR_WITH_MASTER(category = ElementCategory.MANAGEMENT, searchable = true, protection = ProtectionCheck.Protection.PREFERENCES, visibility = ElementVisibility { it.isClient && it.preferences.get(BooleanKey.NsClient3UseWs) }), + PAIR_WITH_MASTER(category = ElementCategory.MANAGEMENT, protection = ProtectionCheck.Protection.PREFERENCES, visibility = ElementVisibility { it.isClient && it.preferences.get(BooleanKey.NsClient3UseWs) }), // Running mode / loop (used by UserEntry) — mode changes ride Client-Control → CLIENT_PAIRED. - RUNNING_MODE(category = ElementCategory.MANAGEMENT, searchable = true, protection = ProtectionCheck.Protection.BOLUS, visibility = ElementVisibility.MASTER_OR_PAIRED_CLIENT), + RUNNING_MODE(category = ElementCategory.MANAGEMENT, protection = ProtectionCheck.Protection.BOLUS, visibility = ElementVisibility.MASTER_OR_PAIRED_CLIENT), USER_ENTRY, LOOP, AAPS, // App lifecycle - EXIT; - - companion object { - - /** All searchable elements — use this to auto-populate search results. */ - val searchableEntries: List by lazy { - entries.filter { it.searchable } - } - } + EXIT } diff --git a/core/interfaces/src/commonMain/kotlin/app/aaps/core/interfaces/overview/graph/OverviewDataCache.kt b/core/interfaces/src/commonMain/kotlin/app/aaps/core/interfaces/overview/graph/OverviewDataCache.kt index d041af7f25ba..0ddb64b7b21e 100644 --- a/core/interfaces/src/commonMain/kotlin/app/aaps/core/interfaces/overview/graph/OverviewDataCache.kt +++ b/core/interfaces/src/commonMain/kotlin/app/aaps/core/interfaces/overview/graph/OverviewDataCache.kt @@ -46,6 +46,7 @@ interface OverviewDataCache { val profileFlow: StateFlow val runningModeFlow: StateFlow val tbrFlow: StateFlow + suspend fun hydrateOverviewData() fun refreshTempTarget() fun refreshProfile() fun refreshRunningMode() diff --git a/core/interfaces/src/commonMain/kotlin/app/aaps/core/interfaces/overview/graph/PredictionDataPoints.kt b/core/interfaces/src/commonMain/kotlin/app/aaps/core/interfaces/overview/graph/PredictionDataPoints.kt new file mode 100644 index 000000000000..f468aca6766f --- /dev/null +++ b/core/interfaces/src/commonMain/kotlin/app/aaps/core/interfaces/overview/graph/PredictionDataPoints.kt @@ -0,0 +1,34 @@ +package app.aaps.core.interfaces.overview.graph + +import app.aaps.core.data.model.SourceSensor +import app.aaps.core.interfaces.aps.APSResult +import app.aaps.core.interfaces.profile.ProfileUtil + +fun APSResult.toPredictionDataPoints( + profileUtil: ProfileUtil, + lowMarkInUnits: Double, + highMarkInUnits: Double +): List = + predictionsAsGv + .filter { it.value >= 40 } + .map { gv -> + val valueInUnits = profileUtil.fromMgdlToUnits(gv.value) + BgDataPoint( + timestamp = gv.timestamp, + value = valueInUnits, + range = when { + valueInUnits > highMarkInUnits -> BgRange.HIGH + valueInUnits < lowMarkInUnits -> BgRange.LOW + else -> BgRange.IN_RANGE + }, + type = when (gv.sourceSensor) { + SourceSensor.IOB_PREDICTION -> BgType.IOB_PREDICTION + SourceSensor.COB_PREDICTION -> BgType.COB_PREDICTION + SourceSensor.A_COB_PREDICTION -> BgType.A_COB_PREDICTION + SourceSensor.UAM_PREDICTION -> BgType.UAM_PREDICTION + SourceSensor.ZT_PREDICTION -> BgType.ZT_PREDICTION + else -> BgType.IOB_PREDICTION + } + ) + } + .sortedBy(BgDataPoint::timestamp) diff --git a/core/interfaces/src/commonMain/kotlin/app/aaps/core/interfaces/plugin/ActivePlugin.kt b/core/interfaces/src/commonMain/kotlin/app/aaps/core/interfaces/plugin/ActivePlugin.kt index 3e1b509be867..62c22fd2df26 100644 --- a/core/interfaces/src/commonMain/kotlin/app/aaps/core/interfaces/plugin/ActivePlugin.kt +++ b/core/interfaces/src/commonMain/kotlin/app/aaps/core/interfaces/plugin/ActivePlugin.kt @@ -4,7 +4,6 @@ import app.aaps.core.data.plugin.PluginType import app.aaps.core.interfaces.aps.APS import app.aaps.core.interfaces.aps.Sensitivity import app.aaps.core.interfaces.calibration.Calibration -import app.aaps.core.interfaces.constraints.Objectives import app.aaps.core.interfaces.constraints.Safety import app.aaps.core.interfaces.iob.IobCobCalculator import app.aaps.core.interfaces.pump.Pump @@ -59,11 +58,6 @@ interface ActivePlugin { */ val activeIobCobCalculator: IobCobCalculator - /** - * Objectives plugin - */ - val activeObjectives: Objectives? - /** * Smoothing plugin */ diff --git a/core/interfaces/src/commonMain/kotlin/app/aaps/core/interfaces/pump/PumpTimeRemaining.kt b/core/interfaces/src/commonMain/kotlin/app/aaps/core/interfaces/pump/PumpTimeRemaining.kt new file mode 100644 index 000000000000..72691b27fc66 --- /dev/null +++ b/core/interfaces/src/commonMain/kotlin/app/aaps/core/interfaces/pump/PumpTimeRemaining.kt @@ -0,0 +1,6 @@ +package app.aaps.core.interfaces.pump + +interface PumpTimeRemaining { + + fun expectedEndTimeMillis(): Long? +} diff --git a/core/interfaces/src/commonMain/kotlin/app/aaps/core/interfaces/stats/DexcomTirCalculator.kt b/core/interfaces/src/commonMain/kotlin/app/aaps/core/interfaces/stats/DexcomTirCalculator.kt index 04d0da156e9e..6767fb975441 100644 --- a/core/interfaces/src/commonMain/kotlin/app/aaps/core/interfaces/stats/DexcomTirCalculator.kt +++ b/core/interfaces/src/commonMain/kotlin/app/aaps/core/interfaces/stats/DexcomTirCalculator.kt @@ -35,4 +35,11 @@ interface DexcomTirCalculator { * @return DexcomTIR object containing all calculated statistics and percentages */ suspend fun calculate(): DexcomTIR + + /** + * Calculates statistics ending at the current time for a selectable recent range. + * + * @param days number of recent days, or null for all available glucose history + */ + suspend fun calculateRecent(days: Long?): DexcomTIR } \ No newline at end of file diff --git a/core/interfaces/src/iosMain/kotlin/app/aaps/core/interfaces/notifications/IosNotificationDelegate.kt b/core/interfaces/src/iosMain/kotlin/app/aaps/core/interfaces/notifications/IosNotificationDelegate.kt index b3e2fc2f67e8..3de096e99340 100644 --- a/core/interfaces/src/iosMain/kotlin/app/aaps/core/interfaces/notifications/IosNotificationDelegate.kt +++ b/core/interfaces/src/iosMain/kotlin/app/aaps/core/interfaces/notifications/IosNotificationDelegate.kt @@ -4,7 +4,6 @@ import platform.UserNotifications.UNNotification import platform.UserNotifications.UNNotificationCategory import platform.UserNotifications.UNNotificationPresentationOptionBanner import platform.UserNotifications.UNNotificationPresentationOptionList -import platform.UserNotifications.UNNotificationPresentationOptionSound import platform.UserNotifications.UNNotificationPresentationOptions import platform.UserNotifications.UNNotificationResponse import platform.UserNotifications.UNUserNotificationCenter @@ -110,19 +109,14 @@ object IosNotificationDelegate { * Without a `willPresent` answer iOS shows **nothing** in that case. The default assumes an app * in front is already displaying whatever the notification would say, which is not true here: * the in-app notification list is one screen among many, so an alarm raised while the user was - * looking at the overview produced no banner, no entry in Notification Centre and no sound. + * looking at the overview produced no banner and no entry in Notification Centre. * Android has no such rule - a posted notification appears whatever is on screen - so this was a * silent gap between the platforms rather than a deliberate difference. * - * `Banner` shows it now, `List` keeps it in Notification Centre afterwards. `Sound` only permits - * the sound the notification itself carries: `IosSystemNotificationPlatform` deliberately posts - * without one and drives alarm audio through `AlarmSoundPlayer`, so this does not double up, - * while the loop notifier's own sound is let through. + * `Banner` shows it now and `List` keeps it in Notification Centre afterwards. */ internal val PRESENTATION_OPTIONS: UNNotificationPresentationOptions = - UNNotificationPresentationOptionBanner or - UNNotificationPresentationOptionList or - UNNotificationPresentationOptionSound + UNNotificationPresentationOptionBanner or UNNotificationPresentationOptionList private class RoutingDelegate : NSObject(), UNUserNotificationCenterDelegateProtocol { diff --git a/core/interfaces/src/iosTest/kotlin/app/aaps/core/interfaces/notifications/IosNotificationDelegateTest.kt b/core/interfaces/src/iosTest/kotlin/app/aaps/core/interfaces/notifications/IosNotificationDelegateTest.kt index 08ea11303ef5..dfa2dd2f05e3 100644 --- a/core/interfaces/src/iosTest/kotlin/app/aaps/core/interfaces/notifications/IosNotificationDelegateTest.kt +++ b/core/interfaces/src/iosTest/kotlin/app/aaps/core/interfaces/notifications/IosNotificationDelegateTest.kt @@ -8,7 +8,6 @@ import kotlin.test.assertFalse import kotlin.test.assertTrue import platform.UserNotifications.UNNotificationPresentationOptionBanner import platform.UserNotifications.UNNotificationPresentationOptionList -import platform.UserNotifications.UNNotificationPresentationOptionSound /** * Routing between the handlers that share iOS's one delegate slot. @@ -73,7 +72,7 @@ class IosNotificationDelegateTest { * showing nothing while AAPS is frontmost; these three are what it should show. */ @Test - fun `a notification arriving while the app is in front is shown and listed and keeps its sound`() { + fun `a notification arriving while the app is in front is shown and listed`() { val options = IosNotificationDelegate.PRESENTATION_OPTIONS assertEquals( @@ -86,11 +85,6 @@ class IosNotificationDelegateTest { options and UNNotificationPresentationOptionList, "not kept in Notification Centre" ) - assertEquals( - UNNotificationPresentationOptionSound, - options and UNNotificationPresentationOptionSound, - "the notification's own sound is suppressed" - ) } /** Both real users register: the notification platform and the loop notifier. */ diff --git a/core/keys/src/androidMain/res/values/strings.xml b/core/keys/src/androidMain/res/values/strings.xml index d3c277e8f4f0..ff414a85609c 100644 --- a/core/keys/src/androidMain/res/values/strings.xml +++ b/core/keys/src/androidMain/res/values/strings.xml @@ -2,6 +2,7 @@ Simple mode + eA1c and GMI units Insulin concentration support Enable support for different insulin concentrations (U50, U200, etc.) diff --git a/core/keys/src/commonMain/kotlin/app/aaps/core/keys/BooleanNonKey.kt b/core/keys/src/commonMain/kotlin/app/aaps/core/keys/BooleanNonKey.kt index 8c27ad49ec7d..1036d3930629 100644 --- a/core/keys/src/commonMain/kotlin/app/aaps/core/keys/BooleanNonKey.kt +++ b/core/keys/src/commonMain/kotlin/app/aaps/core/keys/BooleanNonKey.kt @@ -11,14 +11,6 @@ enum class BooleanNonKey( GeneralSetupWizardProcessed("startupwizard_processed", false), SetupWizardIUnderstand("I_understand", false), - ObjectivesLoopUsed("ObjectivesLoopUsed", false), - ObjectivesScaleUsed("ObjectivesScaleUsed", false), - ObjectivesPumpStatusIsAvailableInNS("ObjectivespumpStatusIsAvailableInNS", false), - ObjectivesBgIsAvailableInNs("ObjectivesbgIsAvailableInNS", false), - ObjectivesProfileSwitchUsed("ObjectivesProfileSwitchUsed", false), - ObjectivesDisconnectUsed("ObjectivesDisconnectUsed", false), - ObjectivesReconnectUsed("ObjectivesReconnectUsed", false), - ObjectivesTempTargetUsed("ObjectivesTempTargetUsed", false), AutosensUsedOnMainPhone("used_autosens_on_main_phone", false), // Wizard toggle states (persisted across restarts, not user-facing preferences) @@ -43,6 +35,8 @@ enum class BooleanNonKey( StatsActivityExpanded("stats_activity_expanded", true, exportable = false), StatsTddCycleExpanded("stats_tdd_cycle_expanded", false, exportable = false), + LastOverviewProfileModified("last_overview_profile_modified", false, exportable = false), + // Set (committed) right before a startup VACUUM and cleared after it finishes. If it is still // set on the next launch, the previous VACUUM died below the JVM (native abort / OOM) — used to // break the boot-crash loop. Transient device state, not a user setting → not exportable. diff --git a/core/keys/src/commonMain/kotlin/app/aaps/core/keys/DoubleNonKey.kt b/core/keys/src/commonMain/kotlin/app/aaps/core/keys/DoubleNonKey.kt index ee477cb4044f..43d9ae94ce99 100644 --- a/core/keys/src/commonMain/kotlin/app/aaps/core/keys/DoubleNonKey.kt +++ b/core/keys/src/commonMain/kotlin/app/aaps/core/keys/DoubleNonKey.kt @@ -5,6 +5,8 @@ import app.aaps.core.keys.interfaces.DoubleNonPreferenceKey enum class DoubleNonKey( override val key: String, override val defaultValue: Double, + override val exportable: Boolean = true ) : DoubleNonPreferenceKey { + LastPumpReservoirUnits("last_pump_reservoir_units", -1.0, exportable = false), } \ No newline at end of file diff --git a/core/keys/src/commonMain/kotlin/app/aaps/core/keys/IntNonKey.kt b/core/keys/src/commonMain/kotlin/app/aaps/core/keys/IntNonKey.kt index 22f425ec6c1d..b439c303a959 100644 --- a/core/keys/src/commonMain/kotlin/app/aaps/core/keys/IntNonKey.kt +++ b/core/keys/src/commonMain/kotlin/app/aaps/core/keys/IntNonKey.kt @@ -6,8 +6,10 @@ import app.aaps.core.keys.interfaces.IntNonPreferenceKey enum class IntNonKey( override val key: String, override val defaultValue: Int, + override val exportable: Boolean = true ) : IntNonPreferenceKey { ObjectivesManualEnacts("ObjectivesmanualEnacts", 0), - TddCycleOffset("tdd_cycle_offset", 0) + TddCycleOffset("tdd_cycle_offset", 0), + LastOverviewProfilePercentage("last_overview_profile_percentage", 100, exportable = false) } \ No newline at end of file diff --git a/core/keys/src/commonMain/kotlin/app/aaps/core/keys/LongNonKey.kt b/core/keys/src/commonMain/kotlin/app/aaps/core/keys/LongNonKey.kt index c9f42bb07776..4e4cb45ec172 100644 --- a/core/keys/src/commonMain/kotlin/app/aaps/core/keys/LongNonKey.kt +++ b/core/keys/src/commonMain/kotlin/app/aaps/core/keys/LongNonKey.kt @@ -13,6 +13,8 @@ enum class LongNonKey( BtWatchdogLastBark("bt_watchdog_last", 0L), ActivePumpChangeTimestamp("active_pump_change_timestamp", 0L), LastCleanupRun("last_cleanup_run", 0L), + LastLoopRunTimestamp("last_loop_run_timestamp", 0L, exportable = false), + LastPumpExpectedEndTimeMillis("last_pump_expected_end_time_millis", 0L, exportable = false), // NSCv3 client-control pairing (excluded from export — replay protection regresses if restored) NsClientControlCounterSent("nsclient_control_counter_sent", 0L, exportable = false), @@ -23,4 +25,3 @@ enum class LongNonKey( NsClientControlPairedAt("nsclient_control_paired_at", 0L, exportable = false), LastVacuumRun("last_vacuum_run", 0L), } - diff --git a/core/keys/src/commonMain/kotlin/app/aaps/core/keys/StringKey.kt b/core/keys/src/commonMain/kotlin/app/aaps/core/keys/StringKey.kt index 472835eef403..65d3c202350a 100644 --- a/core/keys/src/commonMain/kotlin/app/aaps/core/keys/StringKey.kt +++ b/core/keys/src/commonMain/kotlin/app/aaps/core/keys/StringKey.kt @@ -45,6 +45,16 @@ enum class StringKey( ), sync = SyncSpec(SyncChannel.Cold, SyncDirection.Bidirectional) ), + TrioGlycemicMetricUnits( + key = "trio_glycemic_metric_units", + defaultValue = "percent", + title = KeysStrings.pref_title_trio_glycemic_metric_units, + preferenceType = PreferenceType.LIST, + entriesLiterals = mapOf( + "percent" to "%", + "mmol/mol" to "mmol/mol" + ) + ), GeneralLanguage( key = "language", defaultValue = "default", @@ -89,7 +99,7 @@ enum class StringKey( ), GeneralDarkMode( key = "use_dark_mode", - defaultValue = "dark", + defaultValue = "system", title = KeysStrings.pref_title_app_color_scheme, summary = KeysStrings.pref_summary_theme_switcher, preferenceType = PreferenceType.LIST, diff --git a/core/keys/src/commonMain/kotlin/app/aaps/core/keys/StringNonKey.kt b/core/keys/src/commonMain/kotlin/app/aaps/core/keys/StringNonKey.kt index b05a1d0dc152..1a68c915965c 100644 --- a/core/keys/src/commonMain/kotlin/app/aaps/core/keys/StringNonKey.kt +++ b/core/keys/src/commonMain/kotlin/app/aaps/core/keys/StringNonKey.kt @@ -26,6 +26,9 @@ enum class StringNonKey( TempTargetPresets(key = "temp_target_presets", defaultValue = "[]", sync = SyncSpec(SyncChannel.Cold, SyncDirection.Bidirectional)), SceneDefinitions(key = "scene_definitions", defaultValue = "[]", sync = SyncSpec(SyncChannel.Cold, SyncDirection.Bidirectional)), ActiveScene(key = "active_scene", defaultValue = ""), + LastOverviewProfileName("last_overview_profile_name", "", exportable = false), + LastOverviewProfileTargetRange("last_overview_profile_target_range", "", exportable = false), + LastOverviewRunningMode("last_overview_running_mode", "", exportable = false), // Whole local profile list as one JSON document: {"lastChange": , "profiles": [ … ]}. // One key means one atomic apply and one last-writer-wins unit, which is what makes the profile diff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.kts index 2bafe253ac58..2138ecdd524a 100644 --- a/core/ui/build.gradle.kts +++ b/core/ui/build.gradle.kts @@ -37,7 +37,7 @@ kotlin { compileSdk = Versions.compileSdk minSdk = min(Versions.minSdk, Versions.wearMinSdk) // Compatible with wear module // Off by default for a multiplatform library, unlike a plain android library. This module is - // where most of the app's strings, drawables and raw alarm sounds live, so it must be on. + // where most of the app's strings and drawables live, so it must be on. androidResources { enable = true } // Creates the androidHostTest compilation, which also pulls in commonTest. // isIncludeAndroidResources is what makes Robolectric work: the Compose UI tests here need a diff --git a/core/ui/src/androidHostTest/kotlin/app/aaps/core/ui/compose/navigation/ElementTypeStyleTest.kt b/core/ui/src/androidHostTest/kotlin/app/aaps/core/ui/compose/navigation/ElementTypeStyleTest.kt index 76fc846e5a69..da62271d924f 100644 --- a/core/ui/src/androidHostTest/kotlin/app/aaps/core/ui/compose/navigation/ElementTypeStyleTest.kt +++ b/core/ui/src/androidHostTest/kotlin/app/aaps/core/ui/compose/navigation/ElementTypeStyleTest.kt @@ -7,10 +7,8 @@ import org.junit.jupiter.api.Test /** * Structural guard for the non-`@Composable` extensions in `ElementTypeStyle.kt`. Adding a new * [ElementType] without updating the icon/label/description `when` branches would compile-fail - * Kotlin's exhaustiveness check, but the more interesting bugs are subtler: - * - a searchable element with no label/description (user-facing identifier missing) - * - an entry mapped to label `0` outside the documented "dynamic label" set - * These tests catch those drifts. + * Kotlin's exhaustiveness check, but the more interesting bug is subtler: an entry mapped to + * label `0` outside the documented "dynamic label" set. These tests catch that drift. */ class ElementTypeStyleTest { @@ -60,13 +58,4 @@ class ElementTypeStyleTest { val actualZero = ElementType.entries.filter { it.description() == null }.toSet() assertThat(actualZero).isEqualTo(typesWithoutDescription) } - - @Test - fun searchableEntries_haveDisplayableLabel() { - // A search hit with no label and no dynamic-label fallback would show as a blank row. - val blank = ElementType.searchableEntries.filter { - it.label() == null && it !in typesWithDynamicLabel - } - assertThat(blank).isEmpty() - } } diff --git a/core/ui/src/androidHostTest/kotlin/app/aaps/core/ui/compose/navigation/ElementTypeTest.kt b/core/ui/src/androidHostTest/kotlin/app/aaps/core/ui/compose/navigation/ElementTypeTest.kt index cad3f504e70a..c85e7d51ad30 100644 --- a/core/ui/src/androidHostTest/kotlin/app/aaps/core/ui/compose/navigation/ElementTypeTest.kt +++ b/core/ui/src/androidHostTest/kotlin/app/aaps/core/ui/compose/navigation/ElementTypeTest.kt @@ -8,39 +8,9 @@ import org.junit.jupiter.api.Test /** * Invariant tests on the [ElementType] enum itself. Pure data — no Compose or Android. - * - * The `searchableEntries` companion is `by lazy` so we also implicitly check that the lazy - * initializer holds across repeated calls. */ class ElementTypeTest { - @Test - fun searchableEntries_matchesEntriesFilteredBySearchableFlag() { - val expected = ElementType.entries.filter { it.searchable } - assertThat(ElementType.searchableEntries).containsExactlyElementsIn(expected).inOrder() - } - - @Test - fun searchableEntries_isStableAcrossCalls() { - // `by lazy` should return the same instance every time. - assertThat(ElementType.searchableEntries).isSameInstanceAs(ElementType.searchableEntries) - } - - @Test - fun searchableEntries_isNotEmpty() { - // A regression where every searchable=true is dropped would cause the global search UI to - // silently return nothing; the only way that's correct is if we deliberately strip the - // flag from every enum value, which would be a major intentional change. - assertThat(ElementType.searchableEntries).isNotEmpty() - } - - @Test - fun searchableEntries_neverIncludeInternalCategory() { - // INTERNAL is for non-user-facing utilities — they must not surface in search. - val internalSearchables = ElementType.searchableEntries.filter { it.category == ElementCategory.INTERNAL } - assertThat(internalSearchables).isEmpty() - } - @Test fun defaultCategory_isInternal() { // Entries declared without a category should fall through to INTERNAL. If the default @@ -86,7 +56,6 @@ class ElementTypeTest { fun settingsLikeElements_requirePreferencesAuth() { val expectedPreferences = setOf( ElementType.SETTINGS, - ElementType.SETUP_WIZARD, ElementType.MAINTENANCE, ElementType.CONFIGURATION, ElementType.SCENE_MANAGEMENT @@ -95,14 +64,4 @@ class ElementTypeTest { assertThat(type.protection).isEqualTo(ProtectionCheck.Protection.PREFERENCES) } } - - @Test - fun navigationCategory_entries_areAllSearchable() { - // The navigation drawer surfaces these via global search; missing one would make it - // unreachable from search. - val navUnreachable = ElementType.entries - .filter { it.category == ElementCategory.NAVIGATION } - .filterNot { it.searchable } - assertThat(navUnreachable).isEmpty() - } } diff --git a/core/ui/src/androidMain/kotlin/app/aaps/core/ui/compose/MetroAppCompatActivity.kt b/core/ui/src/androidMain/kotlin/app/aaps/core/ui/compose/MetroAppCompatActivity.kt index 9946a3f0b8d8..164cdabaf41a 100644 --- a/core/ui/src/androidMain/kotlin/app/aaps/core/ui/compose/MetroAppCompatActivity.kt +++ b/core/ui/src/androidMain/kotlin/app/aaps/core/ui/compose/MetroAppCompatActivity.kt @@ -19,6 +19,9 @@ abstract class MetroAppCompatActivity : AppCompatActivity() { check(application.injectMembers(this)) { "No Metro binding for ${this::class.java.name}. Add a @Provides @IntoMap @ClassKey entry for it." } + onMembersInjected() super.onCreate(savedInstanceState) } + + protected open fun onMembersInjected() = Unit } diff --git a/core/ui/src/androidMain/kotlin/app/aaps/core/ui/compose/PlatformTheme.android.kt b/core/ui/src/androidMain/kotlin/app/aaps/core/ui/compose/PlatformTheme.android.kt index 1327a11ebe76..6e8e9e8fcf17 100644 --- a/core/ui/src/androidMain/kotlin/app/aaps/core/ui/compose/PlatformTheme.android.kt +++ b/core/ui/src/androidMain/kotlin/app/aaps/core/ui/compose/PlatformTheme.android.kt @@ -3,9 +3,13 @@ package app.aaps.core.ui.compose import androidx.compose.runtime.DisposableEffect import androidx.appcompat.app.AppCompatActivity import android.content.pm.ActivityInfo +import android.os.Build import android.text.format.DateFormat import android.content.res.Configuration import androidx.activity.compose.LocalActivity +import androidx.compose.material3.ColorScheme +import androidx.compose.material3.dynamicDarkColorScheme +import androidx.compose.material3.dynamicLightColorScheme import androidx.compose.runtime.Composable import androidx.compose.runtime.SideEffect import androidx.compose.ui.platform.LocalConfiguration @@ -29,6 +33,13 @@ actual fun SystemBarAppearance(isDark: Boolean) { } } +@Composable +actual fun platformColorScheme(isDark: Boolean, fallback: ColorScheme): ColorScheme { + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) return fallback + val context = LocalContext.current + return if (isDark) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context) +} + @Composable actual fun smallestScreenWidthDp(): Int = LocalConfiguration.current.smallestScreenWidthDp diff --git a/core/ui/src/androidMain/res/drawable-nodpi/trio_launcher_art.png b/core/ui/src/androidMain/res/drawable-nodpi/trio_launcher_art.png new file mode 100644 index 0000000000000000000000000000000000000000..347db2b3684208784ccee4fe458fda78c98a61e4 GIT binary patch literal 464158 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

)mNBjuuDslRwLpyWOE%L|8Com6(vm%xDD4V2J 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

avtfw8Mggso@;Yhqs-K)LfH4pFc_ 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�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¼HEQhc4e_&6DE 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 + + + + + diff --git a/core/ui/src/androidMain/res/drawable/ic_launcher_background.xml b/core/ui/src/androidMain/res/drawable/ic_launcher_background.xml new file mode 100644 index 000000000000..9d33d5912c35 --- /dev/null +++ b/core/ui/src/androidMain/res/drawable/ic_launcher_background.xml @@ -0,0 +1,5 @@ + + + + diff --git a/core/ui/src/androidMain/res/drawable/ic_launcher_foreground.xml b/core/ui/src/androidMain/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 000000000000..c4562fb70cf9 --- /dev/null +++ b/core/ui/src/androidMain/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,13 @@ + + + + + + diff --git a/core/ui/src/androidMain/res/drawable/ic_launcher_monochrome.xml b/core/ui/src/androidMain/res/drawable/ic_launcher_monochrome.xml new file mode 100644 index 000000000000..d02d33f79fef --- /dev/null +++ b/core/ui/src/androidMain/res/drawable/ic_launcher_monochrome.xml @@ -0,0 +1,14 @@ + + + + + + diff --git a/core/ui/src/androidMain/res/drawable/ic_notif_aaps.xml b/core/ui/src/androidMain/res/drawable/ic_notif_aaps.xml index c52cf8989a06..eee0cf3a084e 100644 --- a/core/ui/src/androidMain/res/drawable/ic_notif_aaps.xml +++ b/core/ui/src/androidMain/res/drawable/ic_notif_aaps.xml @@ -3,10 +3,45 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> - - + + + + + + + + + diff --git a/core/ui/src/androidMain/res/drawable/notif_icon.png b/core/ui/src/androidMain/res/drawable/notif_icon.png deleted file mode 100644 index 480d0eaf778f20b95946a31a32b13136dd303327..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3123 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 N002ovPDHLkV1oL{+4uke diff --git a/core/ui/src/androidMain/res/drawable/splash_logo.xml b/core/ui/src/androidMain/res/drawable/splash_logo.xml deleted file mode 100644 index d6fe6ac7716c..000000000000 --- a/core/ui/src/androidMain/res/drawable/splash_logo.xml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/core/ui/src/androidMain/res/mipmap-hdpi/ic_launcher.png b/core/ui/src/androidMain/res/mipmap-hdpi/ic_launcher.png index 6cae040848e0c94a54782589e13bf476883a58bd..d33f9c45bbcd4fa2232b315f837f0553bf25cf67 100644 GIT binary patch literal 10307 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 diff --git a/core/ui/src/androidMain/res/mipmap-mdpi/ic_launcher_round.png b/core/ui/src/androidMain/res/mipmap-mdpi/ic_launcher_round.png index 48b4b8f3e5358c81845fa150583fc0dd73b3a936..1ca1f112855218fba6766a6d4caf1f0c1005b652 100644 GIT binary patch literal 5915 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 diff --git a/core/ui/src/androidMain/res/mipmap-xhdpi/ic_launcher.png b/core/ui/src/androidMain/res/mipmap-xhdpi/ic_launcher.png index 1d30691afa5862fc6420dc7abf848f6cf4cd1fec..44275be2abbe1321ea30d295f46ae78166ca28e5 100644 GIT binary patch literal 15459 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 UMW_7!`Kne%LQ%Y4)F}A>12ewFA^-pY literal 8597 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 b*X92JIlZgw!EwD500000NkvXXu0mjf0d$57 diff --git a/core/ui/src/androidMain/res/mipmap-xhdpi/ic_launcher_round.png b/core/ui/src/androidMain/res/mipmap-xhdpi/ic_launcher_round.png index 1d30691afa5862fc6420dc7abf848f6cf4cd1fec..44275be2abbe1321ea30d295f46ae78166ca28e5 100644 GIT binary patch literal 15459 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 UMW_7!`Kne%LQ%Y4)F}A>12ewFA^-pY literal 8597 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 b*X92JIlZgw!EwD500000NkvXXu0mjf0d$57 diff --git a/core/ui/src/androidMain/res/mipmap-xxhdpi/ic_launcher.png b/core/ui/src/androidMain/res/mipmap-xxhdpi/ic_launcher.png index 1ba1807ec3317fa1448fc65d21ca4e5fe1b0787a..f90ad0264527eeb3e8190201d9622ba916eceb5c 100644 GIT binary patch literal 28357 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 YUkTac;&Cn+^jjK0R#Hi#Ud%Z3e*l-5O8@`> diff --git a/core/ui/src/androidMain/res/mipmap-xxhdpi/ic_launcher_round.png b/core/ui/src/androidMain/res/mipmap-xxhdpi/ic_launcher_round.png index 1ba1807ec3317fa1448fc65d21ca4e5fe1b0787a..f90ad0264527eeb3e8190201d9622ba916eceb5c 100644 GIT binary patch literal 28357 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 YUkTac;&Cn+^jjK0R#Hi#Ud%Z3e*l-5O8@`> diff --git a/core/ui/src/androidMain/res/mipmap-xxxhdpi/ic_launcher.png b/core/ui/src/androidMain/res/mipmap-xxxhdpi/ic_launcher.png index d0d441de4b6ba7a7e20a4690b473c56c7dabf22b..40e4f6163006409371bfbee4bf47c8837a0c20bd 100644 GIT binary patch literal 43935 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 LNkvXXu0mjf(;g#0 literal 20439 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 LNkvXXu0mjf(;g#0 literal 20439 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.2f ч %1$d мин %1$s %2$s - Цели Моля изчакайте... Стоп Натиснат СТОП @@ -971,14 +970,6 @@ Търси Изчисти - Категории - Опции - Менюта - Плъгини - Документация - Търсенето в документацията изисква интернет - Няма резултати - Плъгин %1$s е изключен Храна Изтрита храна diff --git a/core/ui/src/androidMain/res/values-ca-rES/strings.xml b/core/ui/src/androidMain/res/values-ca-rES/strings.xml index e967adf60baa..ad8e8e49f9d1 100644 --- a/core/ui/src/androidMain/res/values-ca-rES/strings.xml +++ b/core/ui/src/androidMain/res/values-ca-rES/strings.xml @@ -54,7 +54,6 @@ TDD Total A punt de lliurar %1$.2f U %1$.2f h - Objectius Espereu si us plau… Stop ]]> diff --git a/core/ui/src/androidMain/res/values-cs-rCZ/strings.xml b/core/ui/src/androidMain/res/values-cs-rCZ/strings.xml index 4c2dbdfc103a..e4146d717d45 100644 --- a/core/ui/src/androidMain/res/values-cs-rCZ/strings.xml +++ b/core/ui/src/androidMain/res/values-cs-rCZ/strings.xml @@ -107,7 +107,6 @@ %1$.2f h %1$d min %1$s %2$s - Cíle Počkejte prosím… Stop STISKNUTO STOP @@ -985,14 +984,6 @@ Hledat Vymazat - Kategorie předvoleb - Předvolby - Dialogy - Pluginy - Dokumentace - Hledání v dokumentaci vyžaduje připojení k internetu - Nebyly nalezeny žádné výsledky - Plugin %1$s zakázán Potravina Potravina odstraněna diff --git a/core/ui/src/androidMain/res/values-da-rDK/strings.xml b/core/ui/src/androidMain/res/values-da-rDK/strings.xml index 6b6897ac0f3e..68c177f44456 100644 --- a/core/ui/src/androidMain/res/values-da-rDK/strings.xml +++ b/core/ui/src/androidMain/res/values-da-rDK/strings.xml @@ -61,7 +61,6 @@ Leverer %1$.2f IE AAPS startet %1$.2f t - Mål Vent venligst… Stop Ugyldig profil! diff --git a/core/ui/src/androidMain/res/values-de-rDE/strings.xml b/core/ui/src/androidMain/res/values-de-rDE/strings.xml index c93ce8de639f..3d59b44d2d8d 100644 --- a/core/ui/src/androidMain/res/values-de-rDE/strings.xml +++ b/core/ui/src/androidMain/res/values-de-rDE/strings.xml @@ -45,7 +45,6 @@ Werde %1$.2f IE abgeben AAPS gestartet %1$.2f h - Objectives (Ziele) Bitte warten… Stopp Ungültiges Profil! diff --git a/core/ui/src/androidMain/res/values-el-rGR/strings.xml b/core/ui/src/androidMain/res/values-el-rGR/strings.xml index 51c5cf038b3e..69e4211ae077 100644 --- a/core/ui/src/androidMain/res/values-el-rGR/strings.xml +++ b/core/ui/src/androidMain/res/values-el-rGR/strings.xml @@ -61,7 +61,6 @@ Πρόκειται να εγχυθούν %1$.2f μονάδες Το AAPS ξεκίνησε %1$.2f h - Βήματα Περιμένετε… Stop Μη έγκυρο προφίλ! diff --git a/core/ui/src/androidMain/res/values-es-rES/strings.xml b/core/ui/src/androidMain/res/values-es-rES/strings.xml index 3ec574ea8c6a..235a8775fe7a 100644 --- a/core/ui/src/androidMain/res/values-es-rES/strings.xml +++ b/core/ui/src/androidMain/res/values-es-rES/strings.xml @@ -107,7 +107,6 @@ %1$.2f h %1$d min %1$s %2$s - Objetivos Por favor, espere… Detener PARADA PULSADA @@ -967,14 +966,6 @@ Buscar Limpiar - Categorías de preferencias - Preferencias - Diálogos - Complementos - Documentación - La búsqueda en la documentación requiere conexión a internet - No se encontraron resultados - Complemento %1$s desactivado Comida Comida eliminada diff --git a/core/ui/src/androidMain/res/values-fr-rFR/strings.xml b/core/ui/src/androidMain/res/values-fr-rFR/strings.xml index 89a483dac7ce..360a425635a8 100644 --- a/core/ui/src/androidMain/res/values-fr-rFR/strings.xml +++ b/core/ui/src/androidMain/res/values-fr-rFR/strings.xml @@ -107,7 +107,6 @@ %1$.2f h %1$d min %1$s %2$s - Objectifs Merci de patienter... Arrêt ARRÊT APPUYÉ @@ -968,14 +967,6 @@ Recherche Effacer - Catégories de préférence - Préférences - Dialogues - Plugins - Documentation - La recherche dans la documentation nécessite une connexion internet - Aucun résultat trouvé - Plugin %1$s désactivé Aliments Aliment supprimé diff --git a/core/ui/src/androidMain/res/values-hr-rHR/strings.xml b/core/ui/src/androidMain/res/values-hr-rHR/strings.xml index 9220add9ca7f..85dda5cea57e 100644 --- a/core/ui/src/androidMain/res/values-hr-rHR/strings.xml +++ b/core/ui/src/androidMain/res/values-hr-rHR/strings.xml @@ -41,7 +41,6 @@ Isporučit ću %1$.2f U AAPS je počeo %1$.2f h - Ciljevi Molimo pričekajte… Zaustavi ]]> diff --git a/core/ui/src/androidMain/res/values-it-rIT/strings.xml b/core/ui/src/androidMain/res/values-it-rIT/strings.xml index 85a26daa8423..55d9e059da2d 100644 --- a/core/ui/src/androidMain/res/values-it-rIT/strings.xml +++ b/core/ui/src/androidMain/res/values-it-rIT/strings.xml @@ -107,7 +107,6 @@ %1$.2f h %1$d min %1$s %2$s - Obiettivi Attendi… Stop STOP PREMUTO @@ -979,14 +978,6 @@ Cerca Pulisci - Categorie di preferenze - Preferenze - Finestre di dialogo - Plugins - Documentazione - La ricerca della documentazione richiede connessione internet - Nessun risultato trovato - Plugin %1$s disabilitato Cibo Cibo eliminato diff --git a/core/ui/src/androidMain/res/values-iw-rIL/strings.xml b/core/ui/src/androidMain/res/values-iw-rIL/strings.xml index 2a9b85de22fc..796616568a32 100644 --- a/core/ui/src/androidMain/res/values-iw-rIL/strings.xml +++ b/core/ui/src/androidMain/res/values-iw-rIL/strings.xml @@ -61,7 +61,6 @@ עומד להזריק %1$.2f יח\' הופעל AndroidAPS %1$.2f ש\' - משימות נא להמתין… עצור פרופיל לא חוקי! diff --git a/core/ui/src/androidMain/res/values-ko-rKR/strings.xml b/core/ui/src/androidMain/res/values-ko-rKR/strings.xml index faee70c5e10f..efd3ac798d88 100644 --- a/core/ui/src/androidMain/res/values-ko-rKR/strings.xml +++ b/core/ui/src/androidMain/res/values-ko-rKR/strings.xml @@ -62,7 +62,6 @@ %1$.2f U을 주입합니다. AAPS 시작 %1$.2f 시간 - 목표 잠시 기다려 주세요... 정지 유효하지 않은 프로파일! diff --git a/core/ui/src/androidMain/res/values-lt-rLT/strings.xml b/core/ui/src/androidMain/res/values-lt-rLT/strings.xml index a57295419707..d24d25cb351e 100644 --- a/core/ui/src/androidMain/res/values-lt-rLT/strings.xml +++ b/core/ui/src/androidMain/res/values-lt-rLT/strings.xml @@ -63,7 +63,6 @@ Bus suleista %1$.2f vv AAPS paleista %1$.2f val. - Tikslai Palaukite… Stop Netinkamas profilis! diff --git a/core/ui/src/androidMain/res/values-nb-rNO/strings.xml b/core/ui/src/androidMain/res/values-nb-rNO/strings.xml index 85aa1b464969..3da4e77777c6 100644 --- a/core/ui/src/androidMain/res/values-nb-rNO/strings.xml +++ b/core/ui/src/androidMain/res/values-nb-rNO/strings.xml @@ -107,7 +107,6 @@ %1$.2f t %1$d min %1$s %2$s - Opplæringsmål Vennligst vent… Stopp STOPP TRYKKET @@ -979,14 +978,6 @@ Søk Tøm - Innstillingskategorier - Innstillinger - Dialoger - Plugins - Dokumentasjon - Søk etter dokumentasjon krever internettforbindelse - Ingen resultater funnet - Plugin %1$s deaktivert Mat Mat slettet diff --git a/core/ui/src/androidMain/res/values-nl-rNL/strings.xml b/core/ui/src/androidMain/res/values-nl-rNL/strings.xml index 819c1df50940..f03af57a5685 100644 --- a/core/ui/src/androidMain/res/values-nl-rNL/strings.xml +++ b/core/ui/src/androidMain/res/values-nl-rNL/strings.xml @@ -45,7 +45,6 @@ %1$.2f E toedienen AAPS gestart %1$.2f u - Doelen Even geduld a.u.b.… Stop Ongeldig profiel! diff --git a/core/ui/src/androidMain/res/values-pl-rPL/strings.xml b/core/ui/src/androidMain/res/values-pl-rPL/strings.xml index 9ab572b15378..630831a2596f 100644 --- a/core/ui/src/androidMain/res/values-pl-rPL/strings.xml +++ b/core/ui/src/androidMain/res/values-pl-rPL/strings.xml @@ -63,7 +63,6 @@ Zamierzam podać %1$.2f U AAPS uruchomiony %1$.2f h - Zadania Proszę czekać… Stop Nieprawidłowy profil! diff --git a/core/ui/src/androidMain/res/values-pt-rBR/strings.xml b/core/ui/src/androidMain/res/values-pt-rBR/strings.xml index c637c4fd77ad..05626e9d806b 100644 --- a/core/ui/src/androidMain/res/values-pt-rBR/strings.xml +++ b/core/ui/src/androidMain/res/values-pt-rBR/strings.xml @@ -61,7 +61,6 @@ Iniciando aplicação de %1$.2f U AAPS iniciado %1$.2f h - Objetivos Por favor aguarde… Parar Perfil inválido! diff --git a/core/ui/src/androidMain/res/values-pt-rPT/strings.xml b/core/ui/src/androidMain/res/values-pt-rPT/strings.xml index 8a359190363b..e81b6a3b193d 100644 --- a/core/ui/src/androidMain/res/values-pt-rPT/strings.xml +++ b/core/ui/src/androidMain/res/values-pt-rPT/strings.xml @@ -61,7 +61,6 @@ A ser administrado %1$.2f U AAPS iniciada %1$.2f h - Objectivos Por favor aguarde… Parar Perfil inválido! diff --git a/core/ui/src/androidMain/res/values-ro-rRO/strings.xml b/core/ui/src/androidMain/res/values-ro-rRO/strings.xml index 26b55b653eac..d1754b393b88 100644 --- a/core/ui/src/androidMain/res/values-ro-rRO/strings.xml +++ b/core/ui/src/androidMain/res/values-ro-rRO/strings.xml @@ -107,7 +107,6 @@ %1$.2f h %1$d min %1$s %2$s - Obiective Așteptați… Stop STOP APĂSAT @@ -973,14 +972,6 @@ Căutați Ștergeți - Categorii de preferințe - Preferințe - Dialoguri - Module - Documentație - Căutarea în documentație necesită o conexiune la internet - Nu s-au găsit rezultate - Modul %1$s dezactivat Mâncare Mâncare ștearsă diff --git a/core/ui/src/androidMain/res/values-ru-rRU/strings.xml b/core/ui/src/androidMain/res/values-ru-rRU/strings.xml index c7a684d9f79c..6c2f3039c33b 100644 --- a/core/ui/src/androidMain/res/values-ru-rRU/strings.xml +++ b/core/ui/src/androidMain/res/values-ru-rRU/strings.xml @@ -55,7 +55,6 @@ Будет подано %1$.2f ед инс AAPS запущен %1$.2f ч - Цели Подождите… Стоп Недопустимый профиль! diff --git a/core/ui/src/androidMain/res/values-sk-rSK/strings.xml b/core/ui/src/androidMain/res/values-sk-rSK/strings.xml index 01dc780f6158..c7a453b614b9 100644 --- a/core/ui/src/androidMain/res/values-sk-rSK/strings.xml +++ b/core/ui/src/androidMain/res/values-sk-rSK/strings.xml @@ -106,7 +106,6 @@ %1$.2f h %1$d min %1$s %2$s - Ciele Čakajte prosím... Stop STLAČENÝ STOP @@ -973,14 +972,6 @@ Hľadať Vyčistiť - Kategórie vyhľadávania - Nastavenie kategórii vyhľadávania - Dialógy - Pluginy - Dokumentácia - Vyhľadávanie v dokumntácii vyžaduje internetové pripojenie - Nenašli sa žiadne výsledky - Plugin %1$s je deaktivovaný Jedlo Jedlo odstránené diff --git a/core/ui/src/androidMain/res/values-sv-rSE/strings.xml b/core/ui/src/androidMain/res/values-sv-rSE/strings.xml index 98fc2654cc77..3d53326cb1f7 100644 --- a/core/ui/src/androidMain/res/values-sv-rSE/strings.xml +++ b/core/ui/src/androidMain/res/values-sv-rSE/strings.xml @@ -45,7 +45,6 @@ Kommer att leverera %1$.2f enheter AAPS startad %1$.2f h - Mål Var god vänta… Stopp Ogiltig profil! diff --git a/core/ui/src/androidMain/res/values-tr-rTR/strings.xml b/core/ui/src/androidMain/res/values-tr-rTR/strings.xml index d500e3fb8a8d..627d66a1851e 100644 --- a/core/ui/src/androidMain/res/values-tr-rTR/strings.xml +++ b/core/ui/src/androidMain/res/values-tr-rTR/strings.xml @@ -63,7 +63,6 @@ %1$.2f Ü gönderilecek AAPS başladı %1$.2f s - Görevler Lütfen bekleyin… Dur Geçersiz profil! @@ -562,8 +561,6 @@ Algoritmanız IC\'nizi dinamik olarak hesaplayabilir. Aşağıdaki değerler yalnızca eksik veri olması durumunda bir geri dönüş olarak veya yalnızca bir referans değeri olarak kullanılabilir Algoritmanız İDF\'nizi dinamik olarak hesaplayabilir. Aşağıdaki değerler yalnızca eksik veri olması durumunda bir geri dönüş olarak veya yalnızca bir referans değeri olarak kullanılabilir - Eklentiler - Dökümantasyon Yiyecek Kategori diff --git a/core/ui/src/androidMain/res/values-vi-rVN/strings.xml b/core/ui/src/androidMain/res/values-vi-rVN/strings.xml index 155ae06d24a7..46df0808def5 100644 --- a/core/ui/src/androidMain/res/values-vi-rVN/strings.xml +++ b/core/ui/src/androidMain/res/values-vi-rVN/strings.xml @@ -107,7 +107,6 @@ %1$.2f h %1$d phút %1$s %2$s - Mục tiêu học tập Vui lòng chờ… Dừng lại Đã nhấn DỪNG @@ -976,14 +975,6 @@ Tìm kiếm Xóa - Danh mục tùy chọn - Tùy chọn - Hộp thoại - Plugins - Tài liệu - Cần có Internet để tìm kiếm tài liệu - Không tìm thấy kết quả - Plugin %1$s đã bị tắt Món ăn Đã xóa món ăn diff --git a/core/ui/src/androidMain/res/values-zh-rCN/strings.xml b/core/ui/src/androidMain/res/values-zh-rCN/strings.xml index 9e567ad6551c..5c98eff5775e 100644 --- a/core/ui/src/androidMain/res/values-zh-rCN/strings.xml +++ b/core/ui/src/androidMain/res/values-zh-rCN/strings.xml @@ -107,7 +107,6 @@ %1$.2f 小时 %1$d min %1$s %2$s - 目标 请稍等... 停止 已按下停止 @@ -976,14 +975,6 @@ 搜索 清除 - 首选项类别 - 首选项设置 - 对话框 - 插件 - 文档 - 文档搜索需要互联网连接 - 未找到结果 - 插件 %1$s 已禁用 食物 食物已删除 diff --git a/core/ui/src/androidMain/res/values-zh-rTW/strings.xml b/core/ui/src/androidMain/res/values-zh-rTW/strings.xml index 8ca99d2578ff..b4747bf82d64 100644 --- a/core/ui/src/androidMain/res/values-zh-rTW/strings.xml +++ b/core/ui/src/androidMain/res/values-zh-rTW/strings.xml @@ -107,7 +107,6 @@ %1$.2f 小時 %1$d 分鐘 %1$s %2$s - 目標 請稍候… 停止 已按下停止鍵 @@ -978,14 +977,6 @@ 搜尋 清除 - 偏好設定類別 - 偏好設定 - 對話方塊 - 外掛 - 說明文件 - 說明文件搜尋需要網際網路連線 - 找不到結果 - 外掛 %1$s 已停用 食物 食物已刪除 diff --git a/core/ui/src/androidMain/res/values/colors.xml b/core/ui/src/androidMain/res/values/colors.xml index 6f16cc9848ba..6bbd9f0545d6 100644 --- a/core/ui/src/androidMain/res/values/colors.xml +++ b/core/ui/src/androidMain/res/values/colors.xml @@ -26,6 +26,10 @@ #1D1B1E #17DECA #0F0F0F + #0F766E + #0D9488 + #F8FAFC + #F8FAFC #00FF00 diff --git a/core/ui/src/androidMain/res/values/drawables.xml b/core/ui/src/androidMain/res/values/drawables.xml new file mode 100644 index 000000000000..1ad7d47dca61 --- /dev/null +++ b/core/ui/src/androidMain/res/values/drawables.xml @@ -0,0 +1,4 @@ + + + @drawable/ic_notif_aaps + diff --git a/core/ui/src/androidMain/res/values/strings.xml b/core/ui/src/androidMain/res/values/strings.xml index 8db19436bc66..72474ed3a9f7 100644 --- a/core/ui/src/androidMain/res/values/strings.xml +++ b/core/ui/src/androidMain/res/values/strings.xml @@ -100,14 +100,13 @@ Running TDD Total Old data - Going to deliver %1$.2f U + Delivering %1$.2f U Bolus delivered, but the carbs could not be saved. Please enter the carbs again. AAPS started %1$d+%2$d g %1$.2f h %1$d min %1$s %2$s - Objectives Please wait… Stop STOP PRESSED @@ -937,7 +936,7 @@ Open navigation History browser Browse historical graphs - Appearance + Display Manage Profile Setup Wizard @@ -1044,14 +1043,6 @@ Search Clear - Preference categories - Preferences - Dialogs - Plugins - Documentation - Documentation search requires internet connection - No results found - Plugin %1$s disabled Food @@ -1148,7 +1139,7 @@ %1$.1f (%2$.1f - %3$.1f) %1$d g %1$d g (%2$d - %3$d) - %1$d h + %1$dh %1$.1f h %1$.1f h (%2$.1f - %3$.1f) %1$d h (%2$d - %3$d) diff --git a/core/ui/src/androidMain/res/values/styles.xml b/core/ui/src/androidMain/res/values/styles.xml index 14f96cfb3487..4b3c6a70d185 100644 --- a/core/ui/src/androidMain/res/values/styles.xml +++ b/core/ui/src/androidMain/res/values/styles.xml @@ -28,6 +28,21 @@ true + + + + - - - -