mirror of
https://github.com/signalapp/Signal-Desktop.git
synced 2026-05-02 22:31:31 +01:00
Support unregisteredAtTimestamp in storage service
This commit is contained in:
@@ -175,6 +175,9 @@ export async function toContactRecord(
|
||||
if (conversation.get('hideStory') !== undefined) {
|
||||
contactRecord.hideStory = Boolean(conversation.get('hideStory'));
|
||||
}
|
||||
contactRecord.unregisteredAtTimestamp = getSafeLongFromTimestamp(
|
||||
conversation.get('firstUnregisteredAt')
|
||||
);
|
||||
|
||||
applyUnknownFields(contactRecord, conversation);
|
||||
|
||||
@@ -986,6 +989,19 @@ export async function mergeContactRecord(
|
||||
}
|
||||
);
|
||||
|
||||
if (
|
||||
!contactRecord.unregisteredAtTimestamp ||
|
||||
contactRecord.unregisteredAtTimestamp.equals(0)
|
||||
) {
|
||||
conversation.setRegistered({ fromStorageService: true, shouldSave: false });
|
||||
} else {
|
||||
conversation.setUnregistered({
|
||||
timestamp: getTimestampFromLong(contactRecord.unregisteredAtTimestamp),
|
||||
fromStorageService: true,
|
||||
shouldSave: false,
|
||||
});
|
||||
}
|
||||
|
||||
const { hasConflict, details: extraDetails } = doesRecordHavePendingChanges(
|
||||
await toContactRecord(conversation),
|
||||
contactRecord,
|
||||
|
||||
Reference in New Issue
Block a user