some small dbus return code fixes (#556)

* some small dbus return code fixes

* Added DBus manpage

* changed getDisplayName behaviour

* reverted change in manager

diff --git a/lib/src/main/java/org/asamk/signal/manager/Manager.java b/lib/src/main/java/org/asamk/signal/manager/Manager.java
index d8a1f56389e9f2bfff9de410147ba6cba3846182..99099e92535848848406dd85bb2836827451ad1e 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/Manager.java
@@ -2367,7 +2367,6 @@ public class Manager implements Closeable {
         if (profileEntry != null && profileEntry.getProfile() != null) {
             return profileEntry.getProfile().getDisplayName();
         }
-
         return null;
     }
 

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/profiles/SignalProfile.java b/lib/src/main/java/org/asamk/signal/manager/storage/profiles/SignalProfile.java
index d55e7e6cd64a0a2eeb1edc2a67abfc3ccfa7d1bb..45201e188156136c53190ecb87c0a8b03c4c5b81 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/storage/profiles/SignalProfile.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/profiles/SignalProfile.java
@@ -77,7 +77,7 @@ public class SignalProfile {
 
     public String getDisplayName() {
         // First name and last name (if set) are separated by a NULL char + trim space in case only one is filled
-        return name == null ? null : name.replace("\0", " ").trim();
+        return name == null ? "" : name.replace("\0", " ").trim();
     }
 
     public String getAbout() {

diff --git a/src/main/java/org/asamk/signal/ReceiveMessageHandler.java b/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
index 6df283f367679077c32e0618a178213d1ad64840..b59eeee251035ef4b71c2720300342c70f3438bb 100644 (file)
--- a/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
+++ b/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
@@ -665,7 +665,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
     private String formatContact(SignalServiceAddress address) {
         final var number = address.getLegacyIdentifier();
         var name = m.getContactOrProfileName(number);
-        if (name == null) {
+        if (name == null || name.isEmpty()) {
             return number;
         } else {
             return MessageFormatter.arrayFormat("“{}” {}", new Object[]{name, number}).getMessage();

diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
index fe416c66e485f978e7a9108aeb971f66c5206d5a..24a90662ab2eb567d7449c44a2574e81a547dfac 100644 (file)
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
@@ -333,6 +333,9 @@ public class DbusSignalImpl implements Signal {
     public void joinGroup(final String groupLink) {
         try {
             final var linkUrl = GroupInviteLinkUrl.fromUri(groupLink);
+            if (linkUrl == null) {
+                throw new Error.Failure("Group link is invalid:");
+            }
             m.joinGroup(linkUrl);
         } catch (GroupInviteLinkUrl.InvalidGroupLinkException | GroupLinkNotActiveException e) {
             throw new Error.Failure("Group link is invalid: " + e.getMessage());