From: Adimarantis <74186638+bublath@users.noreply.github.com>
Date: Sun, 7 Mar 2021 20:05:49 +0000 (+0100)
Subject: some small dbus return code fixes (#556)
X-Git-Tag: v0.8.2~69
X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/a7b414a8703d27a012811f5621ecab28b329351f

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 d8a1f563..99099e92 100644
--- 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 d55e7e6c..45201e18 100644
--- 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 6df283f3..b59eeee2 100644
--- 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 fe416c66..24a90662 100644
--- 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());