X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/f60a10eb6e40921c32045c1e38843d6b87f3d274..HEAD:/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 c0d23175..39fbf68e 100644
--- a/src/main/java/org/asamk/signal/DbusConfig.java
+++ b/src/main/java/org/asamk/signal/DbusConfig.java
@@ -1,7 +1,32 @@
 package org.asamk.signal;
 
+import org.asamk.signal.dbus.DbusUtils;
+
+import java.io.File;
+
 public class DbusConfig {
 
-    public static final String SIGNAL_BUSNAME = "org.asamk.Signal";
-    public static final String SIGNAL_OBJECTPATH = "/org/asamk/Signal";
+    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() {
+        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 account) {
+        if (account == null) {
+            return SIGNAL_OBJECT_BASE_PATH;
+        }
+
+        return SIGNAL_OBJECT_BASE_PATH + "/" + DbusUtils.makeValidObjectPathElement(account);
+    }
 }