Skip to content

Commit 70c79ea

Browse files
committed
Keep all unhandled fields of remote storage record
Fixes #1792
1 parent 5dc66f8 commit 70c79ea

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

lib/src/main/java/org/asamk/signal/manager/syncStorage/AccountRecordProcessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ protected SignalAccountRecord merge(SignalAccountRecord remoteRecord, SignalAcco
111111
backupsPurchaseToken = IAPSubscriptionId.Companion.from(local.backupSubscriberData);
112112
}
113113

114-
final var mergedBuilder = SignalAccountRecord.Companion.newBuilder(remote.unknownFields().toByteArray())
114+
final var mergedBuilder = remote.newBuilder()
115115
.givenName(givenName)
116116
.familyName(familyName)
117117
.avatarUrlPath(firstNonEmpty(remote.avatarUrlPath, local.avatarUrlPath))

lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ protected SignalContactRecord merge(SignalContactRecord remoteRecord, SignalCont
172172
e164 = firstNonEmpty(remote.e164, local.e164);
173173
}
174174

175-
final var mergedBuilder = SignalContactRecord.Companion.newBuilder(remote.unknownFields().toByteArray())
175+
final var mergedBuilder = remote.newBuilder()
176176
.aci(local.aci.isEmpty() ? remote.aci : local.aci)
177177
.e164(e164)
178178
.pni(pni)

lib/src/main/java/org/asamk/signal/manager/syncStorage/GroupV1RecordProcessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ protected SignalGroupV1Record merge(SignalGroupV1Record remoteRecord, SignalGrou
7474
final var remote = remoteRecord.getProto();
7575
final var local = localRecord.getProto();
7676

77-
final var mergedBuilder = SignalGroupV1Record.Companion.newBuilder(remote.unknownFields().toByteArray())
77+
final var mergedBuilder = remote.newBuilder()
7878
.id(remote.id)
7979
.blocked(remote.blocked)
8080
.whitelisted(remote.whitelisted)

lib/src/main/java/org/asamk/signal/manager/syncStorage/GroupV2RecordProcessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ protected SignalGroupV2Record merge(SignalGroupV2Record remoteRecord, SignalGrou
5353
final var remote = remoteRecord.getProto();
5454
final var local = localRecord.getProto();
5555

56-
final var mergedBuilder = SignalGroupV2Record.Companion.newBuilder(remote.unknownFields().toByteArray())
56+
final var mergedBuilder = remote.newBuilder()
5757
.masterKey(remote.masterKey)
5858
.blocked(remote.blocked)
5959
.whitelisted(remote.whitelisted)

0 commit comments

Comments
 (0)