Release 3.4.2.6

.circleci/config.yml

@@ -42,6 +42,28 @@ jobs:
             emulator -avd citest -delay-adb -verbose -no-window -gpu swiftshader_indirect -no-snapshot -noaudio -no-boot-anim
           background: true
 
+      - run:
+          name: Wait for emulator boot
+          command: |
+            export ANDROID_SDK_ROOT=/usr/lib/android-sdk
+            export ANDROID_HOME=/usr/lib/android-sdk
+            # Boot gate: the emulator above is launched in the background, so without this the test task
+            # can start before the device is online and fail with the misleading
+            # "com.android.builder.testing.api.DeviceException: No online devices found".
+            # Block until adb sees the device AND the system has fully booted, with a hard timeout so a
+            # stuck emulator fails loudly HERE (clear message) instead of later.
+            adb wait-for-device
+            timeout 420 bash -c 'until [ "$(adb shell getprop sys.boot_completed 2>/dev/null | tr -d "\r")" = "1" ]; do sleep 2; done'
+            adb shell getprop sys.boot_completed
+            # Settle, dismiss keyguard and disable animations so ComposeMainActivity launches cleanly:
+            # a heavy UI launch on an unsettled emulator can ANR system_server and drop the device offline
+            # mid-run (the failure mode this hardening targets).
+            adb shell input keyevent 82 || true
+            adb shell settings put global window_animation_scale 0 || true
+            adb shell settings put global transition_animation_scale 0 || true
+            adb shell settings put global animator_duration_scale 0 || true
+            adb devices
+
       - run:
           name: Run connectedFullDebugAndroidTest
           command: |

.github/workflows/aaps-ci.yml

@@ -6,10 +6,12 @@ on:
       tagName:
         description: 'Select AAPS Version'
         required: true
-        default: '3.4.2.3'
+        default: '3.4.2.6'
         type: choice
         options:
           # ── 3.4.x (JDK 21) ──────────────────────────────
+          - 3.4.2.6
+          - 3.4.2.4
           - 3.4.2.3
           - 3.4.2.2
           - 3.4.2.1
@@ -354,3 +356,17 @@ jobs:
           upload_to_gdrive "aaps-wear-${VERSION}${VERSION_SUFFIX}.apk" "aaps-wear-${VERSION}${VERSION_SUFFIX}.apk"
 
           echo "🎉 APKs successfully uploaded to Google Drive!"
+
+  # Configuration: Threshold-based cleanup
+  # Clean up only occurs when total runs exceed: keep_runs + keep_threshold (e.g., 20 + 5 = 25)
+  cleanup:
+    name: Cleanup Old Workflow Runs
+    needs: build
+    if: always()
+    permissions:
+      actions: write
+    uses: ./.github/workflows/cleanup-workflow-runs.yml
+    with:
+      workflow_name: 'AAPS CI'
+      keep_runs: 20
+      keep_threshold: 5

.github/workflows/branch-ci.yml

@@ -302,6 +302,8 @@ jobs:
     name: Cleanup Old Workflow Runs
     needs: build
     if: always()
+    permissions:
+      actions: write
     uses: ./.github/workflows/cleanup-workflow-runs.yml
     with:
       workflow_name: 'Branch CI'

buildSrc/src/main/kotlin/Versions.kt

@@ -5,7 +5,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 object Versions {
 
     // On change edit aaps-ci.yml
-    const val appVersion = "3.4.2.3"
+    const val appVersion = "3.4.2.6"
     const val versionCode = 1500
 
     const val compileSdk = 36

core/data/src/main/kotlin/app/aaps/core/data/pump/defs/PumpDescription.kt

@@ -34,7 +34,7 @@ class PumpDescription {
     var isPatchPump = false
     var maxResorvoirReading = 50
     var useHardwareLink = false
-
+    var extendedBolusMinAmount = 0.0
     fun resetSettings() {
         isBolusCapable = true
         bolusStep = 0.1
@@ -64,6 +64,7 @@ class PumpDescription {
         needsManualTDDLoad = true
         hasCustomUnreachableAlertCheck = false
         useHardwareLink = false
+        extendedBolusMinAmount = extendedBolusStep
     }
 
     companion object {

core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/defs/PumpDescriptionExtension.kt

@@ -41,6 +41,7 @@ fun PumpDescription.fillFor(pumpType: PumpType): PumpDescription {
     isPatchPump = pumpType.isPatchPump()
     maxResorvoirReading = pumpType.maxReservoirReading()
     useHardwareLink = pumpType.useHardwareLink
+    pumpType.extendedBolusSettings()?.minDose?.let { extendedBolusMinAmount = it }
 
     return this
 }

plugins/sync/src/main/kotlin/app/aaps/plugins/sync/nsclientV3/extensions/ProfileSwitchExtension.kt

@@ -33,7 +33,7 @@ fun NSProfileSwitch.toProfileSwitch(activePlugin: ActivePlugin, dateUtil: DateUt
         profileName = originalProfileName ?: profile,
         timeshift = timeShift ?: 0,
         percentage = percentage ?: 100,
-        duration = duration ?: 0L,
+        duration = originalDuration ?: duration ?: 0L,
         iCfg = profileSealed.iCfg,
         ids = IDs(nightscoutId = identifier, pumpId = pumpId, pumpType = PumpType.fromString(pumpType), pumpSerial = pumpSerial, endId = endId)
     )

plugins/sync/src/test/kotlin/app/aaps/plugins/sync/nsclientV3/extensions/ProfileSwitchExtensionKtTest.kt

@@ -5,6 +5,7 @@ import app.aaps.core.data.model.IDs
 import app.aaps.core.data.model.PS
 import app.aaps.core.data.pump.defs.PumpType
 import app.aaps.core.interfaces.insulin.Insulin
+import app.aaps.core.nssdk.localmodel.treatment.EventType
 import app.aaps.core.nssdk.localmodel.treatment.NSProfileSwitch
 import app.aaps.core.nssdk.mapper.convertToRemoteAndBack
 import app.aaps.plugins.sync.extensions.contentEqualsTo
@@ -83,4 +84,45 @@ internal class ProfileSwitchExtensionKtTest : TestBaseWithProfile() {
         assertThat(profileSwitch.contentEqualsTo(profileSwitch2)).isTrue()
         assertThat(profileSwitch.ids.contentEqualsTo(profileSwitch2.ids)).isTrue()
     }
+
+    private fun nsProfileSwitch(duration: Long?, originalDuration: Long?) = NSProfileSwitch(
+        date = 10000,
+        identifier = "nightscoutId",
+        utcOffset = 0,
+        isValid = true,
+        eventType = EventType.PROFILE_SWITCH,
+        pumpId = 11000,
+        endId = null,
+        pumpType = PumpType.DANA_I.name,
+        pumpSerial = "bbbb",
+        profileJson = validProfile.toPureNsJson(dateUtil),
+        profile = "SomeProfile",
+        originalProfileName = "SomeProfile",
+        timeShift = 0,
+        percentage = 100,
+        duration = duration,
+        originalDuration = originalDuration
+    )
+
+    /**
+     * Documents uploaded before 9b90eea774 carry a duration inflated by 60000 and no
+     * durationInMilliseconds, so TreatmentMapper inflates it by 60000 a second time.
+     * originalDuration is written in milliseconds by every AAPS version and must win.
+     */
+    @Test
+    fun inflatedLegacyDurationIsIgnoredInFavourOfOriginalDuration() {
+        val nineHours = 9 * 3600000L
+        val parsed = nsProfileSwitch(duration = nineHours * 60000 * 60000, originalDuration = nineHours)
+            .toProfileSwitch(activePlugin, dateUtil)!!
+        assertThat(parsed.duration).isEqualTo(nineHours)
+    }
+
+    /** A writer that supplies no originalDuration must still fall back to the mapped duration. */
+    @Test
+    fun durationIsUsedWhenOriginalDurationIsMissing() {
+        val nineHours = 9 * 3600000L
+        val parsed = nsProfileSwitch(duration = nineHours, originalDuration = null)
+            .toProfileSwitch(activePlugin, dateUtil)!!
+        assertThat(parsed.duration).isEqualTo(nineHours)
+    }
 }

pump/equil/src/main/kotlin/app/aaps/pump/equil/EquilPumpPlugin.kt

@@ -61,6 +61,7 @@ import app.aaps.pump.equil.manager.command.PumpEvent
 import app.aaps.pump.equil.manager.customCommands.CmdModeAndHistoryGet
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
+import kotlin.math.max
 import org.joda.time.DateTime
 import org.joda.time.Duration
 import javax.inject.Inject
@@ -115,20 +116,19 @@ class EquilPumpPlugin @Inject constructor(
             .toObservable(EventEquilAlarm::class.java)
             .observeOn(aapsSchedulers.io)
             .subscribe({ eventEquilError ->
-                           commandQueue.performing()?.let {
-                               if (it.commandType == Command.CommandType.BOLUS) {
-                                   aapsLogger.info(
-                                       LTag.PUMPCOMM,
-                                       "eventEquilError.tips====${eventEquilError.tips}"
-                                   )
-                                   rxBus.send(EventDismissNotification(Notification.EQUIL_ALARM))
-                                   equilManager.showNotification(
-                                       Notification.EQUIL_ALARM,
-                                       eventEquilError.tips,
-                                       Notification.URGENT, app.aaps.core.ui.R.raw.alarm
-                                   )
-                                   stopBolusDelivering()
-                               }
+                           aapsLogger.info(LTag.PUMPCOMM, "eventEquilError.tips====${eventEquilError.tips}")
+                           // Always surface the pump alarm - it is no longer gated on a bolus being in
+                           // progress (alarms now come from the GATT history read on every connection, not
+                           // just from an advertisement scan caught mid-bolus). See #5040.
+                           rxBus.send(EventDismissNotification(Notification.EQUIL_ALARM))
+                           equilManager.showNotification(
+                               Notification.EQUIL_ALARM,
+                               eventEquilError.tips,
+                               Notification.URGENT, app.aaps.core.ui.R.raw.alarm
+                           )
+                           // But only halt bolus tracking if a bolus is actually delivering.
+                           if (commandQueue.performing()?.commandType == Command.CommandType.BOLUS) {
+                               stopBolusDelivering()
                            }
                        }, fabricPrivacy::logException)
 
@@ -146,20 +146,30 @@ class EquilPumpPlugin @Inject constructor(
                                            else ToastUtils.infoToast(context, rh.gs(R.string.equil_error))
                                        }
                                    })
-                           } else if (event.isChanged(DoubleKey.SafetyMaxBolus.key)) {
-                               val profile = pumpSync.expectedPumpState().profile ?: return@subscribe
-                               commandQueue.customCommand(
-                                   CmdSettingSet(constraintsChecker.getMaxBolusAllowed().value(), constraintsChecker.getMaxBasalAllowed(profile).value(), aapsLogger, preferences, equilManager),
-                                   object : Callback() {
-                                       override fun run() {
-                                           if (result.success) ToastUtils.infoToast(context, rh.gs(R.string.equil_pump_updated))
-                                           else ToastUtils.infoToast(context, rh.gs(R.string.equil_error))
-                                       }
-                                   })
+                           } else if (event.isChanged(DoubleKey.SafetyMaxBolus.key) || event.isChanged(DoubleKey.ApsMaxBasal.key)) {
+                               resendPumpSettings()
                            }
                        }, fabricPrivacy::logException)
     }
 
+    // Re-program the pod's bolus/basal thresholds. The pod enforces the basal threshold (see CmdSettingSet)
+    // as a hard limit; if it goes stale-low, temp basals in the gap are silently rejected (the pump drops
+    // BLE with status 19). Use the STABLE max(ApsMaxBasal, maxDailyBasal) for basal — the same ceiling
+    // OpenAPS caps temp basals to — not the time-of-day-dependent getMaxBasalAllowed. Kept in sync on
+    // max-bolus / max-basal pref changes and on profile set (maxDailyBasal is profile-dependent).
+    private fun resendPumpSettings() {
+        val profile = pumpSync.expectedPumpState().profile ?: return
+        val maxBasal = max(preferences.get(DoubleKey.ApsMaxBasal), profile.getMaxDailyBasal())
+        commandQueue.customCommand(
+            CmdSettingSet(constraintsChecker.getMaxBolusAllowed().value(), maxBasal, aapsLogger, preferences, equilManager),
+            object : Callback() {
+                override fun run() {
+                    if (result.success) ToastUtils.infoToast(context, rh.gs(R.string.equil_pump_updated))
+                    else ToastUtils.infoToast(context, rh.gs(R.string.equil_error))
+                }
+            })
+    }
+
     var tempActivationProgress = ActivationProgress.NONE
     var indexEquilReadStatus = 5
 
@@ -210,6 +220,17 @@ class EquilPumpPlugin @Inject constructor(
         val mode = equilManager.equilState?.runMode
         if (mode === RunMode.RUN || mode === RunMode.SUSPEND) {
             val basalSchedule = BasalSchedule.mapProfileToBasalSchedule(profile)
+            // Raise the pod's max-basal threshold BEFORE programming the schedule, so the pod accepts both
+            // the base schedule and later temp basals. Use the STABLE max(ApsMaxBasal, maxDailyBasal) — the
+            // same ceiling OpenAPS caps temp basals to — NOT getMaxBasalAllowed, which is time-of-day
+            // dependent (4x current basal) and can dip below the profile's own peak, wrongly starving the
+            // threshold. Sent directly (we're already inside a queued command — don't re-queue), gated on
+            // success (don't program the schedule on a stale threshold), and paced by EQUIL_BLE_NEXT_CMD
+            // like every other chained-command site so the second BLE write isn't dropped.
+            val maxBasal = max(preferences.get(DoubleKey.ApsMaxBasal), profile.getMaxDailyBasal())
+            val settingResult = equilManager.executeCmd(CmdSettingSet(constraintsChecker.getMaxBolusAllowed().value(), maxBasal, aapsLogger, preferences, equilManager))
+            if (!settingResult.success) return settingResult
+            SystemClock.sleep(EquilConst.EQUIL_BLE_NEXT_CMD)
             val pumpEnactResult = equilManager.executeCmd(CmdBasalSet(basalSchedule, profile, aapsLogger, preferences, equilManager))
             if (pumpEnactResult.success) equilManager.equilState?.basalSchedule = basalSchedule
             return pumpEnactResult