From bd95373a709df83c4c37063f124997de31c2d747 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 14 Jan 2025 20:18:42 +0100
Subject: [PATCH] Parse unregisteredAtTimestamp correctly

Fixes #1651
Fixes #1646
---
 .../signal/manager/syncStorage/ContactRecordProcessor.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
index ee4b04fe..12740fbd 100644
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
@@ -270,7 +270,9 @@ public class ContactRecordProcessor extends DefaultStorageRecordProcessor<Signal
                     .withNickNameGivenName(nullIfEmpty(contactProto.givenName))
                     .withNickNameFamilyName(nullIfEmpty(contactProto.familyName))
                     .withNote(nullIfEmpty(contactProto.note))
-                    .withUnregisteredTimestamp(contactProto.unregisteredAtTimestamp);
+                    .withUnregisteredTimestamp(contactProto.unregisteredAtTimestamp == 0
+                            ? null
+                            : contactProto.unregisteredAtTimestamp);
             account.getRecipientStore().storeContact(connection, recipientId, newContact.build());
         }
 
-- 
2.50.1