Fix storage sync issues

[signal-cli] / lib / src / main / java / org / asamk / signal / manager / helper / SyncHelper.java

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
index ac61104624aa7314d758cc89c953eea674dfed2e..de3a495aa3a336c246e911f235871e1a601161d1 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
@@ -324,7 +324,12 @@ public class SyncHelper {
             final var recipientId = account.getRecipientTrustedResolver().resolveRecipientTrusted(c.getAddress());
             var contact = account.getContactStore().getContact(recipientId);
             final var builder = contact == null ? Contact.newBuilder() : Contact.newBuilder(contact);
-            if (c.getName().isPresent()) {
+            if (c.getName().isPresent() && (
+                    contact == null || (
+                            contact.givenName() == null
+                                    && contact.familyName() == null
+                    )
+            )) {
                 builder.withGivenName(c.getName().get());
                 builder.withFamilyName(null);
             }