From 70c79eac01304cd2bae5da2973a33e3253d400dc Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 24 Jun 2025 23:13:00 +0200
Subject: [PATCH] Keep all unhandled fields of remote storage record

Fixes #1792
---
 .../signal/manager/syncStorage/AccountRecordProcessor.java      | 2 +-
 .../signal/manager/syncStorage/ContactRecordProcessor.java      | 2 +-
 .../signal/manager/syncStorage/GroupV1RecordProcessor.java      | 2 +-
 .../signal/manager/syncStorage/GroupV2RecordProcessor.java      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/AccountRecordProcessor.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/AccountRecordProcessor.java
index 21c0d97a..30816060 100644
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/AccountRecordProcessor.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/AccountRecordProcessor.java
@@ -111,7 +111,7 @@ public class AccountRecordProcessor extends DefaultStorageRecordProcessor<Signal
             backupsPurchaseToken = IAPSubscriptionId.Companion.from(local.backupSubscriberData);
         }
 
-        final var mergedBuilder = SignalAccountRecord.Companion.newBuilder(remote.unknownFields().toByteArray())
+        final var mergedBuilder = remote.newBuilder()
                 .givenName(givenName)
                 .familyName(familyName)
                 .avatarUrlPath(firstNonEmpty(remote.avatarUrlPath, local.avatarUrlPath))
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 d4841c7a..3858bd06 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
@@ -172,7 +172,7 @@ public class ContactRecordProcessor extends DefaultStorageRecordProcessor<Signal
             e164 = firstNonEmpty(remote.e164, local.e164);
         }
 
-        final var mergedBuilder = SignalContactRecord.Companion.newBuilder(remote.unknownFields().toByteArray())
+        final var mergedBuilder = remote.newBuilder()
                 .aci(local.aci.isEmpty() ? remote.aci : local.aci)
                 .e164(e164)
                 .pni(pni)
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/GroupV1RecordProcessor.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/GroupV1RecordProcessor.java
index 22d18c8b..a5c3e3e0 100644
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/GroupV1RecordProcessor.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/GroupV1RecordProcessor.java
@@ -74,7 +74,7 @@ public final class GroupV1RecordProcessor extends DefaultStorageRecordProcessor<
         final var remote = remoteRecord.getProto();
         final var local = localRecord.getProto();
 
-        final var mergedBuilder = SignalGroupV1Record.Companion.newBuilder(remote.unknownFields().toByteArray())
+        final var mergedBuilder = remote.newBuilder()
                 .id(remote.id)
                 .blocked(remote.blocked)
                 .whitelisted(remote.whitelisted)
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/GroupV2RecordProcessor.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/GroupV2RecordProcessor.java
index 3c014463..dfbe7c4b 100644
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/GroupV2RecordProcessor.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/GroupV2RecordProcessor.java
@@ -53,7 +53,7 @@ public final class GroupV2RecordProcessor extends DefaultStorageRecordProcessor<
         final var remote = remoteRecord.getProto();
         final var local = localRecord.getProto();
 
-        final var mergedBuilder = SignalGroupV2Record.Companion.newBuilder(remote.unknownFields().toByteArray())
+        final var mergedBuilder = remote.newBuilder()
                 .masterKey(remote.masterKey)
                 .blocked(remote.blocked)
                 .whitelisted(remote.whitelisted)
-- 
2.50.1