Switch to hypfvieh dbus-java

Removes transitive dependency on libmatthew-unix-java

Fixes #285

diff --git a/build.gradle b/build.gradle
index 157e8601d001809161567028e5cd557b5c0ba9bc..0fc3d1f92846b9f469f839134369b0274f6dde37 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -13,9 +13,6 @@ compileJava.options.encoding = 'UTF-8'
 
 repositories {
     mavenLocal()
-    maven {
-        url "https://raw.github.com/AsamK/maven/master/releases/"
-    }
     mavenCentral()
 }
 
@@ -23,7 +20,8 @@ dependencies {
     compile 'com.github.turasa:signal-service-java:2.15.3_unofficial_7'
     compile 'org.bouncycastle:bcprov-jdk15on:1.64'
     compile 'net.sourceforge.argparse4j:argparse4j:0.8.1'
-    compile 'org.freedesktop.dbus:dbus-java:2.7.0'
+    compile 'com.github.hypfvieh:dbus-java:3.2.0'
+    compile 'org.slf4j:slf4j-nop:1.7.30'
 }
 
 jar {

diff --git a/src/main/java/org/asamk/Signal.java b/src/main/java/org/asamk/Signal.java
index f0e01dd8b7ed873ce1a94605c5aaa9a7806f4af3..654f365f2de0768dc6187cdf3f39c1ef5aa3fdab 100644 (file)
--- a/src/main/java/org/asamk/Signal.java
+++ b/src/main/java/org/asamk/Signal.java
@@ -2,9 +2,9 @@ package org.asamk;
 
 import org.asamk.signal.AttachmentInvalidException;
 import org.asamk.signal.GroupNotFoundException;
-import org.freedesktop.dbus.DBusInterface;
-import org.freedesktop.dbus.DBusSignal;
 import org.freedesktop.dbus.exceptions.DBusException;
+import org.freedesktop.dbus.interfaces.DBusInterface;
+import org.freedesktop.dbus.messages.DBusSignal;
 import org.whispersystems.signalservice.api.push.exceptions.EncapsulatedExceptions;
 import org.whispersystems.signalservice.api.util.InvalidNumberException;
 
@@ -98,6 +98,7 @@ public interface Signal extends DBusInterface {
     }
 
     class SyncMessageReceived extends DBusSignal {
+
         private long timestamp;
         private String source;
         private String destination;

diff --git a/src/main/java/org/asamk/signal/DbusReceiveMessageHandler.java b/src/main/java/org/asamk/signal/DbusReceiveMessageHandler.java
index cebabc18c677040d2113100ea8d4cab6e831eecb..8fb11a592ebeffbfe2b57adacd446e59154c00b6 100644 (file)
--- a/src/main/java/org/asamk/signal/DbusReceiveMessageHandler.java
+++ b/src/main/java/org/asamk/signal/DbusReceiveMessageHandler.java
@@ -1,7 +1,7 @@
 package org.asamk.signal;
 
 import org.asamk.signal.manager.Manager;
-import org.freedesktop.dbus.DBusConnection;
+import org.freedesktop.dbus.connections.impl.DBusConnection;
 import org.whispersystems.signalservice.api.messages.SignalServiceContent;
 import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;
 

diff --git a/src/main/java/org/asamk/signal/JsonDbusReceiveMessageHandler.java b/src/main/java/org/asamk/signal/JsonDbusReceiveMessageHandler.java
index ecb54d079ba87c4fc709b7572bec86cf8c3c3c68..0c5775dbfe3dd8e974fac6490071687edb16b81f 100644 (file)
--- a/src/main/java/org/asamk/signal/JsonDbusReceiveMessageHandler.java
+++ b/src/main/java/org/asamk/signal/JsonDbusReceiveMessageHandler.java
@@ -2,7 +2,7 @@ package org.asamk.signal;
 
 import org.asamk.Signal;
 import org.asamk.signal.manager.Manager;
-import org.freedesktop.dbus.DBusConnection;
+import org.freedesktop.dbus.connections.impl.DBusConnection;
 import org.freedesktop.dbus.exceptions.DBusException;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachment;
 import org.whispersystems.signalservice.api.messages.SignalServiceContent;
@@ -31,7 +31,7 @@ public class JsonDbusReceiveMessageHandler extends JsonReceiveMessageHandler {
     static void sendReceivedMessageToDbus(SignalServiceEnvelope envelope, SignalServiceContent content, DBusConnection conn, final String objectPath, Manager m) {
         if (envelope.isReceipt()) {
             try {
-                conn.sendSignal(new Signal.ReceiptReceived(
+                conn.sendMessage(new Signal.ReceiptReceived(
                         objectPath,
                         envelope.getTimestamp(),
                         !envelope.isUnidentifiedSender() && envelope.hasSource() ? envelope.getSourceE164().get() : content.getSender().getNumber().get()
@@ -46,7 +46,7 @@ public class JsonDbusReceiveMessageHandler extends JsonReceiveMessageHandler {
                     final String sender = !envelope.isUnidentifiedSender() && envelope.hasSource() ? envelope.getSourceE164().get() : content.getSender().getNumber().get();
                     for (long timestamp : receiptMessage.getTimestamps()) {
                         try {
-                            conn.sendSignal(new Signal.ReceiptReceived(
+                            conn.sendMessage(new Signal.ReceiptReceived(
                                     objectPath,
                                     timestamp,
                                     sender
@@ -63,7 +63,7 @@ public class JsonDbusReceiveMessageHandler extends JsonReceiveMessageHandler {
                         !(message.getGroupContext().isPresent() &&
                                 message.getGroupContext().get().getGroupV1Type() != SignalServiceGroup.Type.DELIVER)) {
                     try {
-                        conn.sendSignal(new Signal.MessageReceived(
+                        conn.sendMessage(new Signal.MessageReceived(
                                 objectPath,
                                 message.getTimestamp(),
                                 envelope.isUnidentifiedSender() || !envelope.hasSource() ? content.getSender().getNumber().get() : envelope.getSourceE164().get(),
@@ -84,7 +84,7 @@ public class JsonDbusReceiveMessageHandler extends JsonReceiveMessageHandler {
                         SignalServiceDataMessage message = transcript.getMessage();
 
                         try {
-                            conn.sendSignal(new Signal.SyncMessageReceived(
+                            conn.sendMessage(new Signal.SyncMessageReceived(
                                     objectPath,
                                     transcript.getTimestamp(),
                                     envelope.getSourceAddress().getNumber().get(),

diff --git a/src/main/java/org/asamk/signal/Main.java b/src/main/java/org/asamk/signal/Main.java
index 5e37bf3b539be19cc00c7a4dfb0841cbf96a74f9..38c7a68d93e9c6f90e9bcd24bd492f212620ba28 100644 (file)
--- a/src/main/java/org/asamk/signal/Main.java
+++ b/src/main/java/org/asamk/signal/Main.java
@@ -36,7 +36,7 @@ import org.asamk.signal.manager.Manager;
 import org.asamk.signal.util.IOUtils;
 import org.asamk.signal.util.SecurityProvider;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.freedesktop.dbus.DBusConnection;
+import org.freedesktop.dbus.connections.impl.DBusConnection;
 import org.freedesktop.dbus.exceptions.DBusException;
 import org.whispersystems.signalservice.api.push.exceptions.AuthorizationFailedException;
 import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
@@ -76,11 +76,11 @@ public class Main {
             if (ns.getBoolean("dbus") || ns.getBoolean("dbus_system")) {
                 try {
                     m = null;
-                    int busType;
+                    DBusConnection.DBusBusType busType;
                     if (ns.getBoolean("dbus_system")) {
-                        busType = DBusConnection.SYSTEM;
+                        busType = DBusConnection.DBusBusType.SYSTEM;
                     } else {
-                        busType = DBusConnection.SESSION;
+                        busType = DBusConnection.DBusBusType.SESSION;
                     }
                     dBusConn = DBusConnection.getConnection(busType);
                     ts = dBusConn.getRemoteObject(

diff --git a/src/main/java/org/asamk/signal/commands/DaemonCommand.java b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
index 85fee723874c2d22b7ac05dbcdf11531175ea56d..11805b442ca0bd7cc278ecb4a759bae82f0668b7 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/DaemonCommand.java
+++ b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
@@ -7,7 +7,7 @@ import net.sourceforge.argparse4j.inf.Subparser;
 import org.asamk.signal.DbusReceiveMessageHandler;
 import org.asamk.signal.JsonDbusReceiveMessageHandler;
 import org.asamk.signal.manager.Manager;
-import org.freedesktop.dbus.DBusConnection;
+import org.freedesktop.dbus.connections.impl.DBusConnection;
 import org.freedesktop.dbus.exceptions.DBusException;
 
 import java.io.IOException;
@@ -41,11 +41,11 @@ public class DaemonCommand implements LocalCommand {
         DBusConnection conn = null;
         try {
             try {
-                int busType;
+                DBusConnection.DBusBusType busType;
                 if (ns.getBoolean("system")) {
-                    busType = DBusConnection.SYSTEM;
+                    busType = DBusConnection.DBusBusType.SYSTEM;
                 } else {
-                    busType = DBusConnection.SESSION;
+                    busType = DBusConnection.DBusBusType.SESSION;
                 }
                 conn = DBusConnection.getConnection(busType);
                 conn.exportObject(SIGNAL_OBJECTPATH, m);

diff --git a/src/main/java/org/asamk/signal/commands/ExtendedDbusCommand.java b/src/main/java/org/asamk/signal/commands/ExtendedDbusCommand.java
index b7f70dee047ec6710ac191953cc9e3d7d5f0ff33..f9cd9de85c1817196f3145f652071b10a5b9b0af 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/ExtendedDbusCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ExtendedDbusCommand.java
@@ -3,7 +3,7 @@ package org.asamk.signal.commands;
 import net.sourceforge.argparse4j.inf.Namespace;
 
 import org.asamk.Signal;
-import org.freedesktop.dbus.DBusConnection;
+import org.freedesktop.dbus.connections.impl.DBusConnection;
 
 public interface ExtendedDbusCommand extends Command {
 

diff --git a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
index f85aea8b77857cd841d812639ecf10496ddc787f..bc3acbde93b6604f30a3237a8440b20aa6c17f33 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
@@ -16,7 +16,7 @@ import org.asamk.signal.ReceiveMessageHandler;
 import org.asamk.signal.json.JsonMessageEnvelope;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.util.DateUtils;
-import org.freedesktop.dbus.DBusConnection;
+import org.freedesktop.dbus.connections.impl.DBusConnection;
 import org.freedesktop.dbus.exceptions.DBusException;
 import org.whispersystems.util.Base64;
 

diff --git a/src/main/java/org/asamk/signal/manager/Manager.java b/src/main/java/org/asamk/signal/manager/Manager.java
index b696491712d611c2709a195f4b3101fcbe7145f2..ad770617910243e0c11924e03a52e7cb2bab3fd7 100644 (file)
--- a/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/src/main/java/org/asamk/signal/manager/Manager.java
@@ -20,6 +20,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 
 import org.asamk.Signal;
 import org.asamk.signal.AttachmentInvalidException;
+import org.asamk.signal.DbusConfig;
 import org.asamk.signal.GroupNotFoundException;
 import org.asamk.signal.NotAGroupMemberException;
 import org.asamk.signal.StickerPackInvalidException;
@@ -1825,6 +1826,11 @@ public class Manager implements Signal {
         return false;
     }
 
+    @Override
+    public String getObjectPath() {
+        return null;
+    }
+
     private void sendGroups() throws IOException, UntrustedIdentityException {
         File groupsFile = IOUtils.createTempFile();