From: AsamK Date: Fri, 9 Feb 2024 16:59:18 +0000 (+0100) Subject: Use app id as dbus name for flatpak version X-Git-Tag: v0.13.0~24 X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/4e61f2b2e51f4f3f35e719fc429c53884e5319f0?ds=inline Use app id as dbus name for flatpak version --- diff --git a/src/main/java/org/asamk/signal/DbusConfig.java b/src/main/java/org/asamk/signal/DbusConfig.java index c4c923cf..39fbf68e 100644 --- a/src/main/java/org/asamk/signal/DbusConfig.java +++ b/src/main/java/org/asamk/signal/DbusConfig.java @@ -2,13 +2,20 @@ 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() {