From dde2b141852001d0ed42f3f7e1e4cdebc92fa954 Mon Sep 17 00:00:00 2001
From: Ralph Plawetzki <ralph@purejava.org>
Date: Wed, 31 Jan 2024 09:54:18 +0100
Subject: [PATCH] Update to dbus-java 5.0.0

---
 pom.xml                                                |  2 +-
 .../secretservice/handlers/MessageHandler.java         | 10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index f27ba33..e1a5461 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,7 @@
 
         <!-- 3rd party dependencies -->
         <hkdf.version>2.0.0</hkdf.version>
-        <dbus-java.version>4.3.0</dbus-java.version>
+        <dbus-java.version>5.0.0</dbus-java.version>
         <slf4j.version>2.0.9</slf4j.version>
 
         <!-- test dependencies -->
diff --git a/src/main/java/de/swiesend/secretservice/handlers/MessageHandler.java b/src/main/java/de/swiesend/secretservice/handlers/MessageHandler.java
index 1e46ac9..cbf0cc0 100644
--- a/src/main/java/de/swiesend/secretservice/handlers/MessageHandler.java
+++ b/src/main/java/de/swiesend/secretservice/handlers/MessageHandler.java
@@ -24,12 +24,8 @@ public MessageHandler(DBusConnection connection) {
 
     public Object[] send(String service, String path, String iface, String method, String signature, Object... args) {
         try {
-            org.freedesktop.dbus.messages.Message message = new MethodCall(
-                    service,
-                    path,
-                    iface,
-                    method, (byte) 0, signature, args);
-
+            org.freedesktop.dbus.messages.MessageFactory msgFactory = connection.getMessageFactory();
+            org.freedesktop.dbus.messages.Message message = msgFactory.createMethodCall(service, path, iface, method, (byte) 0, signature, args);
             connection.sendMessage(message);
 
             org.freedesktop.dbus.messages.Message response = ((MethodCall) message).getReply(MAX_DELAY_MILLIS);
@@ -41,7 +37,7 @@ public Object[] send(String service, String path, String iface, String method, S
                 if (log.isDebugEnabled()) log.debug(Arrays.deepToString(parameters));
             }
 
-            if (response instanceof org.freedesktop.dbus.errors.Error) {
+            if (response instanceof org.freedesktop.dbus.messages.Error) {
                 String error = response.getName();
                 switch (error) {
                     case "org.freedesktop.Secret.Error.NoSession":