From 8d0de675302fa4f3e0ea953cbb473c7a018e2bae Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 28 Feb 2021 10:19:40 +0100
Subject: [PATCH] Add getDisplayName to SignalProfile

---
 lib/src/main/java/org/asamk/signal/manager/Manager.java      | 2 +-
 .../java/org/asamk/signal/manager/helper/GroupHelper.java    | 2 +-
 .../asamk/signal/manager/storage/profiles/SignalProfile.java | 5 +++++
 3 files changed, 7 insertions(+), 2 deletions(-)

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 88335916..d34f4e08 100644
--- a/lib/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/Manager.java
@@ -2365,7 +2365,7 @@ public class Manager implements Closeable {
 
         final var profileEntry = account.getProfileStore().getProfileEntry(address);
         if (profileEntry != null && profileEntry.getProfile() != null) {
-            return profileEntry.getProfile().getName();
+            return profileEntry.getProfile().getDisplayName();
         }
 
         return null;
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
index 2efc18ad..c76075be 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
@@ -183,7 +183,7 @@ public class GroupHelper {
                 .collect(Collectors.toSet());
         if (noGv2Capability.size() > 0) {
             logger.warn("Cannot create a V2 group as some members don't support Groups V2: {}",
-                    noGv2Capability.stream().map(SignalProfile::getName).collect(Collectors.joining(", ")));
+                    noGv2Capability.stream().map(SignalProfile::getDisplayName).collect(Collectors.joining(", ")));
             return false;
         }
 
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 6a761c29..9e5add98 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
@@ -75,6 +75,11 @@ public class SignalProfile {
         return name;
     }
 
+    public String getDisplayName() {
+        // First name and last name (if set) are separated by a NULL char
+        return name == null ? null : name.replace("\0", " ");
+    }
+
     public String getAbout() {
         return about;
     }
-- 
2.50.1