Add helper method to create valid dbus object path

[signal-cli] / 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 afc4e03d3ef771e281d85ae4866f076a6d09728e..b1d648869e6e59b83920422f210002208f68d0fb 100644 (file)
--- 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 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;
 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) {
     }
 
     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() {
     }
 
     private void updateGroups() {