Merge remote-tracking branch 'upstream/master'

CONTRIBUTING.md

@@ -0,0 +1,8 @@
+# Question
+If you have a question you can ask it in the [GitHub discussions page](https://github.com/AsamK/signal-cli/discussions)
+
+# Report a bug
+- Search [existing issues](https://github.com/AsamK/signal-cli/issues?q=is%3Aissue) if it has been reported already
+- If you're unable to find an open issue addressing the problem, [open a new one](https://github.com/AsamK/signal-cli/issues/new).
+  - Be sure to include a **title and clear description**, as much relevant information as possible.
+  - Run the failing command with `--verbose` flag to get a more detailed log output and include that in the bug report

FUNDING.yml

@@ -0,0 +1 @@
+liberapay: asamk

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

src/main/java/org/asamk/signal/App.java

@@ -181,7 +181,11 @@ public class App {
         try {
             manager = RegistrationManager.init(username, dataPath, serviceEnvironment, BaseConfig.USER_AGENT);
         } catch (Throwable e) {
-            throw new UnexpectedErrorException("Error loading or creating state file: " + e.getMessage());
+            throw new UnexpectedErrorException("Error loading or creating state file: "
+                    + e.getMessage()
+                    + " ("
+                    + e.getClass().getSimpleName()
+                    + ")");
         }
         try (var m = manager) {
             command.handleCommand(ns, m);
@@ -234,7 +238,13 @@ public class App {
         } catch (NotRegisteredException e) {
             throw new UserErrorException("User " + username + " is not registered.");
         } catch (Throwable e) {
-            throw new UnexpectedErrorException("Error loading state file for user " + username + ": " + e.getMessage());
+            throw new UnexpectedErrorException("Error loading state file for user "
+                    + username
+                    + ": "
+                    + e.getMessage()
+                    + " ("
+                    + e.getClass().getSimpleName()
+                    + ")");
         }
 
         try {