From d98e51190dc674946a2a59c43cb8c6cf390bf488 Mon Sep 17 00:00:00 2001 From: Thomas Kuehne Date: Mon, 30 Jun 2025 00:00:00 +0200 Subject: [PATCH] ble: always use the TransactionBuilder provided to createTransactionBuilder The use of initializeDevice's TransactionBuilder was inconsistent: onServicesDiscovered used the input argument performInitialized used the return --- .../service/btle/AbstractBTLEMultiDeviceSupport.java | 3 ++- .../service/btle/AbstractBTLESingleDeviceSupport.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractBTLEMultiDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractBTLEMultiDeviceSupport.java index 59c11a56a7..037e47523e 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractBTLEMultiDeviceSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractBTLEMultiDeviceSupport.java @@ -249,7 +249,8 @@ public abstract class AbstractBTLEMultiDeviceSupport extends AbstractBTLEDeviceS // first, add a transaction that performs device initialization TransactionBuilder builder = createTransactionBuilder("Initialize device"); builder.add(new CheckInitializedAction(devices[deviceIdx])); - initializeDevice(builder, deviceIdx).queue(getQueue(deviceIdx)); + initializeDevice(builder, deviceIdx); + builder.queue(getQueue(deviceIdx)); } return createTransactionBuilder(taskName); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractBTLESingleDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractBTLESingleDeviceSupport.java index 9cff9f23a3..7bcf6c40a5 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractBTLESingleDeviceSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractBTLESingleDeviceSupport.java @@ -184,7 +184,8 @@ public abstract class AbstractBTLESingleDeviceSupport extends AbstractBTLEDevice // first, add a transaction that performs device initialization TransactionBuilder builder = createTransactionBuilder("Initialize device"); builder.add(new CheckInitializedAction(gbDevice)); - initializeDevice(builder).queue(getQueue()); + initializeDevice(builder); + builder.queue(getQueue()); } return createTransactionBuilder(taskName); }