Merge remote-tracking branch 'upstream/master'

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;

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;
         }
 

lib/src/main/java/org/asamk/signal/manager/storage/messageCache/CachedMessage.java

@@ -22,7 +22,7 @@ public final class CachedMessage {
     public SignalServiceEnvelope loadEnvelope() {
         try {
             return MessageCacheUtils.loadEnvelope(file);
-        } catch (IOException e) {
+        } catch (Exception e) {
             logger.error("Failed to load cached message envelope “{}”: {}", file, e.getMessage());
             return null;
         }

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;
     }