From d28d6015166858df7ffddc166ebb8602410a1779 Mon Sep 17 00:00:00 2001
From: "Jan N. Klug" <github@klug.nrw>
Date: Mon, 1 Jan 2024 11:38:32 +0100
Subject: [PATCH 1/2] [androiddebugbridge] Use core channel updates

Signed-off-by: Jan N. Klug <github@klug.nrw>
---
 .../pom.xml                                        |  6 ------
 .../internal/AndroidDebugBridgeHandler.java        |  4 ++--
 .../main/resources/OH-INF/update/instructions.xml  | 14 ++++++++++++++
 .../src/main/resources/update/android.update       |  1 -
 4 files changed, 16 insertions(+), 9 deletions(-)
 create mode 100644 bundles/org.smarthomej.binding.androiddebugbridge/src/main/resources/OH-INF/update/instructions.xml
 delete mode 100644 bundles/org.smarthomej.binding.androiddebugbridge/src/main/resources/update/android.update

diff --git a/bundles/org.smarthomej.binding.androiddebugbridge/pom.xml b/bundles/org.smarthomej.binding.androiddebugbridge/pom.xml
index b864b68377..016e6e6271 100644
--- a/bundles/org.smarthomej.binding.androiddebugbridge/pom.xml
+++ b/bundles/org.smarthomej.binding.androiddebugbridge/pom.xml
@@ -15,12 +15,6 @@
   <name>SmartHome/J Add-ons :: Bundles :: Android Debug Bridge Binding</name>
 
   <dependencies>
-    <dependency>
-      <groupId>org.smarthomej.addons.bundles</groupId>
-      <artifactId>org.smarthomej.commons</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>com.tananaev</groupId>
       <artifactId>adblib</artifactId>
diff --git a/bundles/org.smarthomej.binding.androiddebugbridge/src/main/java/org/smarthomej/binding/androiddebugbridge/internal/AndroidDebugBridgeHandler.java b/bundles/org.smarthomej.binding.androiddebugbridge/src/main/java/org/smarthomej/binding/androiddebugbridge/internal/AndroidDebugBridgeHandler.java
index f072e2ba6b..5b936ce622 100644
--- a/bundles/org.smarthomej.binding.androiddebugbridge/src/main/java/org/smarthomej/binding/androiddebugbridge/internal/AndroidDebugBridgeHandler.java
+++ b/bundles/org.smarthomej.binding.androiddebugbridge/src/main/java/org/smarthomej/binding/androiddebugbridge/internal/AndroidDebugBridgeHandler.java
@@ -38,13 +38,13 @@
 import org.openhab.core.thing.Thing;
 import org.openhab.core.thing.ThingStatus;
 import org.openhab.core.thing.ThingStatusDetail;
+import org.openhab.core.thing.binding.BaseThingHandler;
 import org.openhab.core.types.Command;
 import org.openhab.core.types.CommandOption;
 import org.openhab.core.types.RefreshType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.smarthomej.binding.androiddebugbridge.internal.AndroidDebugBridgeDevice.VolumeInfo;
-import org.smarthomej.commons.UpdatingBaseThingHandler;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonSyntaxException;
@@ -56,7 +56,7 @@
  * @author Miguel Álvarez - Initial contribution
  */
 @NonNullByDefault
-public class AndroidDebugBridgeHandler extends UpdatingBaseThingHandler {
+public class AndroidDebugBridgeHandler extends BaseThingHandler {
 
     public static final String KEY_EVENT_PLAY = "126";
     public static final String KEY_EVENT_PAUSE = "127";
diff --git a/bundles/org.smarthomej.binding.androiddebugbridge/src/main/resources/OH-INF/update/instructions.xml b/bundles/org.smarthomej.binding.androiddebugbridge/src/main/resources/OH-INF/update/instructions.xml
new file mode 100644
index 0000000000..3377d23299
--- /dev/null
+++ b/bundles/org.smarthomej.binding.androiddebugbridge/src/main/resources/OH-INF/update/instructions.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<update:update-descriptions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:update="https://openhab.org/schemas/update-description/v1.0.0"
+	xsi:schemaLocation="https://openhab.org/schemas/update-description/v1.0.0 https://openhab.org/schemas/update-description-1.0.0.xsd">
+
+	<thing-type uid="androiddebugbridge:android">
+		<instruction-set targetVersion="1">
+			<add-channel id="start-intent">
+				<type>androiddebugbridge:start-intent-channel</type>
+			</add-channel>
+		</instruction-set>
+	</thing-type>
+
+</update:update-descriptions>
diff --git a/bundles/org.smarthomej.binding.androiddebugbridge/src/main/resources/update/android.update b/bundles/org.smarthomej.binding.androiddebugbridge/src/main/resources/update/android.update
deleted file mode 100644
index 531616e4f9..0000000000
--- a/bundles/org.smarthomej.binding.androiddebugbridge/src/main/resources/update/android.update
+++ /dev/null
@@ -1 +0,0 @@
-1;ADD_CHANNEL;start-intent,String,androiddebugbridge:start-intent-channel

From 18293b5fddb5013fe601758e7f2dc29354025e3b Mon Sep 17 00:00:00 2001
From: "Jan N. Klug" <github@klug.nrw>
Date: Mon, 1 Jan 2024 11:54:54 +0100
Subject: [PATCH 2/2] Fix feature

Signed-off-by: Jan N. Klug <github@klug.nrw>
---
 .../src/main/feature/feature.xml                                 | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bundles/org.smarthomej.binding.androiddebugbridge/src/main/feature/feature.xml b/bundles/org.smarthomej.binding.androiddebugbridge/src/main/feature/feature.xml
index 832234d015..c5e733c072 100644
--- a/bundles/org.smarthomej.binding.androiddebugbridge/src/main/feature/feature.xml
+++ b/bundles/org.smarthomej.binding.androiddebugbridge/src/main/feature/feature.xml
@@ -2,7 +2,6 @@
 <features name="org.smarthomej.binding.androiddebugbridge-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.4.0">
 	<feature name="smarthomej-binding-androiddebugbridge" description="Android Debug Bridge Binding" version="${project.version}">
 		<feature>openhab-runtime-base</feature>
-		<bundle dependency="true">mvn:org.smarthomej.addons.bundles/org.smarthomej.commons/${project.version}</bundle>
 		<bundle start-level="80">mvn:org.smarthomej.addons.bundles/org.smarthomej.binding.androiddebugbridge/${project.version}</bundle>
 	</feature>
 </features>