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..39fbf68e17a2774abeb9ac9ed6e82084a6d55d65 100644 (file)
--- a/src/main/java/org/asamk/signal/DbusConfig.java
+++ b/src/main/java/org/asamk/signal/DbusConfig.java
@@ -1,23 +1,32 @@
 package org.asamk.signal;
 
+import org.asamk.signal.dbus.DbusUtils;
+
+import java.io.File;
+
 public class DbusConfig {
 
     private static final String SIGNAL_BUSNAME = "org.asamk.Signal";
+    private static final String SIGNAL_BUSNAME_FLATPAK = "org.asamk.SignalCli";
     private static final String SIGNAL_OBJECT_BASE_PATH = "/org/asamk/Signal";
 
     public static String getBusname() {
-        return SIGNAL_BUSNAME;
+        if (new File("/.flatpak-info").exists()) {
+            return SIGNAL_BUSNAME_FLATPAK;
+        } else {
+            return SIGNAL_BUSNAME;
+        }
     }
 
     public static String getObjectPath() {
         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);
     }
 }