Merge remote-tracking branch 'origin/dev3' into 3422-master/GNTM-dev

# Conflicts:
#	buildSrc/src/main/kotlin/Versions.kt

Author: ga-zelle

.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,11 @@ on:
       tagName:
         description: 'Select AAPS Version'
         required: true
-        default: '3.4.2.4'
+        default: '3.4.2.5-dev'
         type: choice
         options:
           # ── 3.4.x (JDK 21) ──────────────────────────────
+          - 3.4.2.5
           - 3.4.2.4
           - 3.4.2.3
           - 3.4.2.2

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.4dev+aisf3.2.1"
+    const val appVersion = "3.4.2.5dev+aisf3.2.1"
     const val versionCode = 1500
 
     const val compileSdk = 36

pump/equil/src/main/kotlin/app/aaps/pump/equil/ble/EquilBLE.kt

@@ -123,6 +123,11 @@ class EquilBLE @Inject constructor(
                     isConnected = true
                     equilManager.equilState?.bluetoothConnectionState = BluetoothConnectionState.CONNECTED
                     handler.removeMessages(TIME_OUT_CONNECT_WHAT)
+                    synchronized(notifyLock) {
+                        // New link: notifications not yet enabled. Block command dispatch until onDescriptorWrite.
+                        notificationEnabled = false
+                        pendingCmd = null
+                    }
                     bluetoothGatt?.discoverServices()
                     updateCmdStatus(ResolvedResult.FAILURE)
                     //                    rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.CONNECTED));
@@ -175,7 +180,14 @@ class EquilBLE @Inject constructor(
                 aapsLogger.debug(LTag.PUMPBTCOMM, "onDescriptorWrite received: $status")
                 if (status == BluetoothGatt.GATT_SUCCESS) {
                     aapsLogger.debug(LTag.PUMPBTCOMM, "onDescriptorWrite: Wrote GATT Descriptor successfully.")
-                    ready()
+                    synchronized(notifyLock) {
+                        notificationEnabled = true
+                        // Flush a command that writeCmd deferred while notifications were coming up.
+                        if (pendingCmd != null) {
+                            pendingCmd = null
+                            ready()
+                        }
+                    }
                 }
             }
         }
@@ -236,6 +248,10 @@ class EquilBLE @Inject constructor(
         bluetoothGatt = null
         baseCmd = null
         preCmd = null
+        synchronized(notifyLock) {
+            notificationEnabled = false
+            pendingCmd = null
+        }
         rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTED))
     }
 
@@ -267,6 +283,21 @@ class EquilBLE @Inject constructor(
 
     private var baseCmd: BaseCmd? = null
     private var preCmd: BaseCmd? = null
+
+    // Notification-readiness gate for the current GATT connection. Android allows only ONE outstanding
+    // GATT operation at a time. When the queue's connect() phase opens the link, `isConnected` flips
+    // true at onConnectionStateChange(CONNECTED) - BEFORE onServicesDiscovered runs openNotification()
+    // (the notify-descriptor write). If a command's writeCmd then writes its first characteristic packet
+    // in that window, it collides with the pending descriptor write: writeDescriptor() returns false
+    // (log: "openNotification: false"), notifications never enable, the pump's replies never arrive, and
+    // the command idle-times-out after ~9 s -> "Pump connection failure / manually check delivered
+    // insulin" (bolus, tempBasal, and profile/CmdSettingSet all hit this via different writeCmd branches).
+    // Fix: never send on a connected link until onDescriptorWrite confirms notifications are enabled;
+    // hold the command in `pendingCmd` and let onDescriptorWrite flush it. See #4910 (and its follow-up).
+    private val notifyLock = Any()
+    @Volatile private var notificationEnabled = false
+    private var pendingCmd: BaseCmd? = null
+
     fun writeCmd(baseCmd: BaseCmd) {
         aapsLogger.debug(LTag.PUMPCOMM, "writeCmd {}", baseCmd)
         this.baseCmd = baseCmd
@@ -276,6 +307,18 @@ class EquilBLE @Inject constructor(
             else -> equilManager?.equilState?.address ?: error("Unknown MAC address")
         }
         autoScan = baseCmd is CmdRunningModeGet || baseCmd is CmdInsulinGet
+        if (isConnected) {
+            synchronized(notifyLock) {
+                if (!notificationEnabled) {
+                    // Fresh link, notifications not enabled yet: defer ALL send paths (pair step,
+                    // continuation, or first command) so the characteristic write does not collide with
+                    // the openNotification() descriptor write. onDescriptorWrite flushes pendingCmd.
+                    pendingCmd = baseCmd
+                    preCmd = baseCmd
+                    return
+                }
+            }
+        }
         if (isConnected && baseCmd.isPairStep()) {
             ready()
         } else if (isConnected) {
@@ -285,11 +328,8 @@ class EquilBLE @Inject constructor(
                 baseCmd.runPwd = prevCmd.runPwd
                 nextCmd2()
             } else {
-                // The GATT link was opened by the queue's connect() phase, which leaves no prior
-                // command context (baseCmd/preCmd are null, so the connect-time ready() was a no-op).
-                // Send this command as the first one on the open connection instead of silently
-                // dropping it - otherwise the pump receives nothing and idle-disconnects (status 19),
-                // surfacing as a bolus/command timeout. See issue #4910.
+                // GATT link opened by the queue's connect() phase, notifications already up: send this
+                // command as the first one on the open link (else the pump idle-disconnects, status 19).
                 ready()
             }
         } else {