Update libsignal-service-java

[signal-cli] / src / main / java / org / asamk / signal / DbusConfig.java

diff --git a/src/main/java/org/asamk/signal/DbusConfig.java b/src/main/java/org/asamk/signal/DbusConfig.java
index eb457c392318b012bafee897ca5263546f735468..c4c923cf210884d4f8301ccea4438a0299040f21 100644 (file)
--- a/src/main/java/org/asamk/signal/DbusConfig.java
+++ b/src/main/java/org/asamk/signal/DbusConfig.java
@@ -1,5 +1,7 @@
 package org.asamk.signal;
 
+import org.asamk.signal.dbus.DbusUtils;
+
 public class DbusConfig {
 
     private static final String SIGNAL_BUSNAME = "org.asamk.Signal";
@@ -13,11 +15,11 @@ public class DbusConfig {
         return getObjectPath(null);
     }
 
-    public static String getObjectPath(String username) {
-        if (username == null) {
+    public static String getObjectPath(String account) {
+        if (account == null) {
             return SIGNAL_OBJECT_BASE_PATH;
         }
 
-        return SIGNAL_OBJECT_BASE_PATH + "/" + username.replace('+', '_');
+        return SIGNAL_OBJECT_BASE_PATH + "/" + DbusUtils.makeValidObjectPathElement(account);
     }
 }