webmaster/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli synced 2025-08-29 10:30:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update dbus-java

Browse source
This commit is contained in:
AsamK 2022-05-26 12:41:29 +02:00
parent d8d859ab02
commit 425e451237
3 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
build.gradle.kts
View file

@ -35,7 +35,7 @@ dependencies {
implementation("org.bouncycastle", "bcprov-jdk15on", "1.70") implementation("org.bouncycastle", "bcprov-jdk15on", "1.70")
implementation("com.fasterxml.jackson.core", "jackson-databind", "2.13.3") implementation("com.fasterxml.jackson.core", "jackson-databind", "2.13.3")
implementation("net.sourceforge.argparse4j", "argparse4j", "0.9.0") implementation("net.sourceforge.argparse4j", "argparse4j", "0.9.0")
implementation("com.github.hypfvieh", "dbus-java-transport-native-unixsocket", "4.0.0") implementation("com.github.hypfvieh", "dbus-java-transport-native-unixsocket", "4.1.0")
implementation("org.slf4j", "slf4j-api", "1.7.36") implementation("org.slf4j", "slf4j-api", "1.7.36")
implementation("ch.qos.logback", "logback-classic", "1.2.11") implementation("ch.qos.logback", "logback-classic", "1.2.11")
implementation("org.slf4j", "jul-to-slf4j", "1.7.36") implementation("org.slf4j", "jul-to-slf4j", "1.7.36")

3
src/main/java/org/asamk/signal/App.java
View file

@ -34,6 +34,7 @@ import org.asamk.signal.output.OutputWriter;
import org.asamk.signal.output.PlainTextWriterImpl; import org.asamk.signal.output.PlainTextWriterImpl;
import org.asamk.signal.util.IOUtils; import org.asamk.signal.util.IOUtils;
import org.freedesktop.dbus.connections.impl.DBusConnection; import org.freedesktop.dbus.connections.impl.DBusConnection;
import org.freedesktop.dbus.connections.impl.DBusConnectionBuilder;
import org.freedesktop.dbus.errors.ServiceUnknown; import org.freedesktop.dbus.errors.ServiceUnknown;
import org.freedesktop.dbus.errors.UnknownMethod; import org.freedesktop.dbus.errors.UnknownMethod;
import org.freedesktop.dbus.exceptions.DBusException; import org.freedesktop.dbus.exceptions.DBusException;
@ -365,7 +366,7 @@ public class App {
} else { } else {
busType = DBusConnection.DBusBusType.SESSION; busType = DBusConnection.DBusBusType.SESSION;
} }
try (var dBusConn = DBusConnection.getConnection(busType)) { try (var dBusConn = DBusConnectionBuilder.forType(busType).build()) {
if (command instanceof ProvisioningCommand c) { if (command instanceof ProvisioningCommand c) {
if (account != null) { if (account != null) {
throw new UserErrorException("You cannot specify a account (phone number) when linking"); throw new UserErrorException("You cannot specify a account (phone number) when linking");

3
src/main/java/org/asamk/signal/commands/DaemonCommand.java
View file

@ -23,6 +23,7 @@ import org.asamk.signal.output.OutputWriter;
import org.asamk.signal.output.PlainTextWriter; import org.asamk.signal.output.PlainTextWriter;
import org.asamk.signal.util.IOUtils; import org.asamk.signal.util.IOUtils;
import org.freedesktop.dbus.connections.impl.DBusConnection; import org.freedesktop.dbus.connections.impl.DBusConnection;
import org.freedesktop.dbus.connections.impl.DBusConnectionBuilder;
import org.freedesktop.dbus.exceptions.DBusException; import org.freedesktop.dbus.exceptions.DBusException;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -342,7 +343,7 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
} }
DBusConnection conn; DBusConnection conn;
try { try {
conn = DBusConnection.getConnection(busType); conn = DBusConnectionBuilder.forType(busType).build();
dbusRunner.run(conn, DbusConfig.getObjectPath()); dbusRunner.run(conn, DbusConfig.getObjectPath());
} catch (DBusException e) { } catch (DBusException e) {
throw new UnexpectedErrorException("Dbus command failed: " + e.getMessage(), e); throw new UnexpectedErrorException("Dbus command failed: " + e.getMessage(), e);