From 1033299122ee0f45c7ddac4b42c0579fe0bbfbb4 Mon Sep 17 00:00:00 2001 From: Thomas Kuehne Date: Thu, 15 May 2025 22:12:20 +0200 Subject: [PATCH] ble: fix wrong Logger in performInitialized --- .../service/btle/AbstractBTLEDeviceSupport.java | 7 ++----- .../service/btle/AbstractBTLEMultiDeviceSupport.java | 5 ++--- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractBTLEDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractBTLEDeviceSupport.java index 1a33aef18e..1e088ea0d6 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractBTLEDeviceSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractBTLEDeviceSupport.java @@ -28,7 +28,6 @@ import android.content.Context; import androidx.annotation.CallSuper; import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import java.io.IOException; import java.util.ArrayList; @@ -57,8 +56,6 @@ import nodomain.freeyourgadget.gadgetbridge.service.btle.profiles.AbstractBlePro * @see BtLEQueue */ public abstract class AbstractBTLEDeviceSupport extends AbstractDeviceSupport implements GattCallback, GattServerCallback { - private static final Logger LOG = LoggerFactory.getLogger(AbstractBTLEDeviceSupport.class); - private int mMTU = 23; private BtLEQueue mQueue; private Map mAvailableCharacteristics; @@ -202,13 +199,13 @@ public abstract class AbstractBTLEDeviceSupport extends AbstractDeviceSupport im */ public TransactionBuilder performInitialized(String taskName) throws IOException { if (!isConnected()) { - LOG.debug("Connecting to device for {}", taskName); + logger.debug("Connecting to device for {}", taskName); if (!connect()) { throw new IOException("1: Unable to connect to device: " + getDevice()); } } if (!isInitialized()) { - LOG.debug("Initializing device for {}", taskName); + logger.debug("Initializing device for {}", taskName); // first, add a transaction that performs device initialization TransactionBuilder builder = createTransactionBuilder("Initialize device"); builder.add(new CheckInitializedAction(gbDevice)); 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 d49f25573e..7dd430d26c 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 @@ -57,7 +57,6 @@ import nodomain.freeyourgadget.gadgetbridge.service.btle.profiles.AbstractBlePro public abstract class AbstractBTLEMultiDeviceSupport extends AbstractDeviceSupport implements GattCallback, GattServerCallback { public static final String BASE_UUID = "0000%s-0000-1000-8000-00805f9b34fb"; - private static final Logger LOG = LoggerFactory.getLogger(AbstractBTLEMultiDeviceSupport.class); private final int deviceCount; private final Set[] mSupportedServices; @@ -278,13 +277,13 @@ public abstract class AbstractBTLEMultiDeviceSupport extends AbstractDeviceSuppo "Requested device index " + deviceIdx + " doesn't exist."); } if (!isConnected()) { - LOG.debug("Connecting to device for {}", taskName); + logger.debug("Connecting to device for {}", taskName); if (!connect()) { throw new IOException("1: Unable to connect to device: " + getDevice(deviceIdx)); } } if (!devices[deviceIdx].isInitialized()) { - LOG.debug("Initializing device for {}", taskName); + logger.debug("Initializing device for {}", taskName); // first, add a transaction that performs device initialization TransactionBuilder builder = createTransactionBuilder("Initialize device"); builder.add(new CheckInitializedAction(devices[deviceIdx]));