empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix storage service record merge.

Browse source
This commit is contained in:
Greyson Parrelli 2021-05-12 10:56:34 -04:00 • committed by GitHub
parent 01f8823fb2
commit 2d2de1a652
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/org/thoughtcrime/securesms/keyvalue/PaymentsValues.java
View file

@ -308,6 +308,9 @@ public final class PaymentsValues extends SignalStoreValues {
Currency.getInstance(DEFAULT_CURRENCY_CODE)); Currency.getInstance(DEFAULT_CURRENCY_CODE));
} }
/**
* Does not trigger a storage sync.
*/
public void setEnabledAndEntropy(boolean enabled, @Nullable Entropy entropy) { public void setEnabledAndEntropy(boolean enabled, @Nullable Entropy entropy) {
KeyValueStore.Writer writer = getStore().beginWrite(); KeyValueStore.Writer writer = getStore().beginWrite();
@ -317,8 +320,6 @@ public final class PaymentsValues extends SignalStoreValues {
writer.putBoolean(MOB_PAYMENTS_ENABLED, enabled) writer.putBoolean(MOB_PAYMENTS_ENABLED, enabled)
.commit(); .commit();
StorageSyncHelper.scheduleSyncForDataChange();
} }
@WorkerThread @WorkerThread

17
app/src/main/java/org/thoughtcrime/securesms/storage/AccountRecordProcessor.java
View file

@ -78,6 +78,14 @@ public class AccountRecordProcessor extends DefaultStorageRecordProcessor<Signal
familyName = local.getFamilyName().or(""); familyName = local.getFamilyName().or("");
} }
SignalAccountRecord.Payments payments;
if (remote.getPayments().getEntropy().isPresent()) {
payments = remote.getPayments();
} else {
payments = local.getPayments();
}
byte[] unknownFields = remote.serializeUnknownFields(); byte[] unknownFields = remote.serializeUnknownFields();
String avatarUrlPath = remote.getAvatarUrlPath().or(local.getAvatarUrlPath()).or(""); String avatarUrlPath = remote.getAvatarUrlPath().or(local.getAvatarUrlPath()).or("");
byte[] profileKey = remote.getProfileKey().or(local.getProfileKey()).orNull(); byte[] profileKey = remote.getProfileKey().or(local.getProfileKey()).orNull();
@ -91,8 +99,8 @@ public class AccountRecordProcessor extends DefaultStorageRecordProcessor<Signal
List<PinnedConversation> pinnedConversations = remote.getPinnedConversations(); List<PinnedConversation> pinnedConversations = remote.getPinnedConversations();
AccountRecord.PhoneNumberSharingMode phoneNumberSharingMode = remote.getPhoneNumberSharingMode(); AccountRecord.PhoneNumberSharingMode phoneNumberSharingMode = remote.getPhoneNumberSharingMode();
boolean preferContactAvatars = remote.isPreferContactAvatars(); boolean preferContactAvatars = remote.isPreferContactAvatars();
boolean matchesRemote = doParamsMatch(remote, unknownFields, givenName, familyName, avatarUrlPath, profileKey, noteToSelfArchived, noteToSelfForcedUnread, readReceipts, typingIndicators, sealedSenderIndicators, linkPreviews, phoneNumberSharingMode, unlisted, pinnedConversations, preferContactAvatars); boolean matchesRemote = doParamsMatch(remote, unknownFields, givenName, familyName, avatarUrlPath, profileKey, noteToSelfArchived, noteToSelfForcedUnread, readReceipts, typingIndicators, sealedSenderIndicators, linkPreviews, phoneNumberSharingMode, unlisted, pinnedConversations, preferContactAvatars, payments);
boolean matchesLocal = doParamsMatch(local, unknownFields, givenName, familyName, avatarUrlPath, profileKey, noteToSelfArchived, noteToSelfForcedUnread, readReceipts, typingIndicators, sealedSenderIndicators, linkPreviews, phoneNumberSharingMode, unlisted, pinnedConversations, preferContactAvatars); boolean matchesLocal = doParamsMatch(local, unknownFields, givenName, familyName, avatarUrlPath, profileKey, noteToSelfArchived, noteToSelfForcedUnread, readReceipts, typingIndicators, sealedSenderIndicators, linkPreviews, phoneNumberSharingMode, unlisted, pinnedConversations, preferContactAvatars, payments);
if (matchesRemote) { if (matchesRemote) {
return remote; return remote;
@ -116,6 +124,7 @@ public class AccountRecordProcessor extends DefaultStorageRecordProcessor<Signal
.setUnlistedPhoneNumber(unlisted) .setUnlistedPhoneNumber(unlisted)
.setPinnedConversations(pinnedConversations) .setPinnedConversations(pinnedConversations)
.setPreferContactAvatars(preferContactAvatars) .setPreferContactAvatars(preferContactAvatars)
.setPayments(payments.isEnabled(), payments.getEntropy().orNull())
.build(); .build();
} }
} }
@ -150,12 +159,14 @@ public class AccountRecordProcessor extends DefaultStorageRecordProcessor<Signal
AccountRecord.PhoneNumberSharingMode phoneNumberSharingMode, AccountRecord.PhoneNumberSharingMode phoneNumberSharingMode,
boolean unlistedPhoneNumber, boolean unlistedPhoneNumber,
@NonNull List<PinnedConversation> pinnedConversations, @NonNull List<PinnedConversation> pinnedConversations,
boolean preferContactAvatars) boolean preferContactAvatars,
SignalAccountRecord.Payments payments)
{ {
return Arrays.equals(contact.serializeUnknownFields(), unknownFields) && return Arrays.equals(contact.serializeUnknownFields(), unknownFields) &&
Objects.equals(contact.getGivenName().or(""), givenName) && Objects.equals(contact.getGivenName().or(""), givenName) &&
Objects.equals(contact.getFamilyName().or(""), familyName) && Objects.equals(contact.getFamilyName().or(""), familyName) &&
Objects.equals(contact.getAvatarUrlPath().or(""), avatarUrlPath) && Objects.equals(contact.getAvatarUrlPath().or(""), avatarUrlPath) &&
Objects.equals(contact.getPayments(), payments) &&
Arrays.equals(contact.getProfileKey().orNull(), profileKey) && Arrays.equals(contact.getProfileKey().orNull(), profileKey) &&
contact.isNoteToSelfArchived() == noteToSelfArchived && contact.isNoteToSelfArchived() == noteToSelfArchived &&
contact.isNoteToSelfForcedUnread() == noteToSelfForcedUnread && contact.isNoteToSelfForcedUnread() == noteToSelfForcedUnread &&

2
libsignal/service/src/main/java/org/whispersystems/signalservice/api/storage/SignalAccountRecord.java
View file

@ -126,7 +126,7 @@ public final class SignalAccountRecord implements SignalRecord {
} }
if (!Objects.equals(this.payments, that.payments)) { if (!Objects.equals(this.payments, that.payments)) {
diff.add("PreferContactAvatars"); diff.add("Payments");
} }
if (!Objects.equals(this.hasUnknownFields(), that.hasUnknownFields())) { if (!Objects.equals(this.hasUnknownFields(), that.hasUnknownFields())) {