From 6e677ceee1c8e5882165101659a59a99e25b6c6b Mon Sep 17 00:00:00 2001 From: Arne Seime Date: Sun, 15 Dec 2024 16:33:28 +0100 Subject: [PATCH] Merge bluetooth branch --- .../internal/bluetooth/ESPHomeBluetoothProxyHandler.java | 4 ++-- .../esphome/internal/handler/ESPHomeHandlerFactory.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/no/seime/openhab/binding/esphome/internal/bluetooth/ESPHomeBluetoothProxyHandler.java b/src/main/java/no/seime/openhab/binding/esphome/internal/bluetooth/ESPHomeBluetoothProxyHandler.java index 853b4e6..86297a3 100644 --- a/src/main/java/no/seime/openhab/binding/esphome/internal/bluetooth/ESPHomeBluetoothProxyHandler.java +++ b/src/main/java/no/seime/openhab/binding/esphome/internal/bluetooth/ESPHomeBluetoothProxyHandler.java @@ -17,7 +17,7 @@ import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.GeneratedMessage; import io.esphome.api.BluetoothDeviceConnectionResponse; import io.esphome.api.BluetoothGATTGetServicesDoneResponse; @@ -143,7 +143,7 @@ protected ESPHomeBluetoothDevice createDevice(BluetoothAddress address) { return new ESPHomeBluetoothDevice(this, address); } - public void handleBluetoothMessage(@NonNull GeneratedMessageV3 message, ESPHomeHandler handler) { + public void handleBluetoothMessage(@NonNull GeneratedMessage message, ESPHomeHandler handler) { // Update RSSi list diff --git a/src/main/java/no/seime/openhab/binding/esphome/internal/handler/ESPHomeHandlerFactory.java b/src/main/java/no/seime/openhab/binding/esphome/internal/handler/ESPHomeHandlerFactory.java index 5bba882..2427c2b 100644 --- a/src/main/java/no/seime/openhab/binding/esphome/internal/handler/ESPHomeHandlerFactory.java +++ b/src/main/java/no/seime/openhab/binding/esphome/internal/handler/ESPHomeHandlerFactory.java @@ -99,7 +99,8 @@ public ESPHomeHandlerFactory(@Reference ESPChannelTypeProvider dynamicChannelTyp ThingTypeUID thingTypeUID = thing.getThingTypeUID(); if (BindingConstants.THING_TYPE_DEVICE.equals(thingTypeUID)) { - return new ESPHomeHandler(thing, connectionSelector, dynamicChannelTypeProvider, eventSubscriber, scheduler); + return new ESPHomeHandler(thing, connectionSelector, dynamicChannelTypeProvider, eventSubscriber, + scheduler); } else if (BindingConstants.THING_TYPE_BLE_PROXY.equals(thingTypeUID)) { ESPHomeBluetoothProxyHandler handler = new ESPHomeBluetoothProxyHandler((Bridge) thing, thingRegistry); registerBluetoothAdapter(handler);