X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/ff162cb44d1c5ea784d584a5fff03c4de8b2b5c8..c62a1e829fc394fa1d00e04c717b43ae8896a6ee:/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java

diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
index afc4e03d..b1d64886 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
@@ -56,6 +56,8 @@ import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import static org.asamk.signal.dbus.DbusUtils.makeValidObjectPathElement;
+
 public class DbusSignalImpl implements Signal {
 
     private final Manager m;
@@ -980,11 +982,7 @@ public class DbusSignalImpl implements Signal {
     }
 
     private static String getGroupObjectPath(String basePath, byte[] groupId) {
-        return basePath + "/Groups/" + Base64.getEncoder()
-                .encodeToString(groupId)
-                .replace("+", "_")
-                .replace("/", "_")
-                .replace("=", "_");
+        return basePath + "/Groups/" + makeValidObjectPathElement(Base64.getEncoder().encodeToString(groupId));
     }
 
     private void updateGroups() {