webmaster/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli synced 2025-08-29 18:40:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update dependencies

Browse source
This commit is contained in:
AsamK 2025-01-14 17:31:15 +01:00
parent f91ca82902
commit d982633215
5 changed files with 49 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -11,6 +11,7 @@ import org.signal.libsignal.zkgroup.profiles.ProfileKey;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.whispersystems.signalservice.api.push.UsernameLinkComponents;
import org.whispersystems.signalservice.api.storage.IAPSubscriptionId;
import org.whispersystems.signalservice.api.storage.SignalAccountRecord;
import org.whispersystems.signalservice.api.storage.StorageId;
import org.whispersystems.signalservice.api.util.UuidUtil;
@ -22,8 +23,12 @@ import java.sql.SQLException;
import java.util.Arrays;
import java.util.Optional;
import okio.ByteString;
import static org.asamk.signal.manager.util.Utils.firstNonEmpty;
import static org.asamk.signal.manager.util.Utils.firstNonNull;
import static org.whispersystems.signalservice.api.storage.AccountRecordExtensionsKt.safeSetBackupsSubscriber;
import static org.whispersystems.signalservice.api.storage.AccountRecordExtensionsKt.safeSetPayments;
import static org.whispersystems.signalservice.api.storage.AccountRecordExtensionsKt.safeSetSubscriber;
/**
* Processes {@link SignalAccountRecord}s.
@ -77,6 +82,35 @@ public class AccountRecordProcessor extends DefaultStorageRecordProcessor<Signal
familyName = local.familyName;
}
final var payments = remote.payments != null && remote.payments.entropy.size() > 0
? remote.payments
: local.payments;
final ByteString donationSubscriberId;
final String donationSubscriberCurrencyCode;
if (remote.subscriberId.size() > 0) {
donationSubscriberId = remote.subscriberId;
donationSubscriberCurrencyCode = remote.subscriberCurrencyCode;
} else {
donationSubscriberId = local.subscriberId;
donationSubscriberCurrencyCode = local.subscriberCurrencyCode;
}
final ByteString backupsSubscriberId;
final IAPSubscriptionId backupsPurchaseToken;
final var remoteBackupSubscriberData = remote.backupSubscriberData;
if (remoteBackupSubscriberData != null && remoteBackupSubscriberData.subscriberId.size() > 0) {
backupsSubscriberId = remoteBackupSubscriberData.subscriberId;
backupsPurchaseToken = IAPSubscriptionId.Companion.from(remoteBackupSubscriberData);
} else {
backupsSubscriberId = local.backupSubscriberData != null
? local.backupSubscriberData.subscriberId
: ByteString.EMPTY;
backupsPurchaseToken = IAPSubscriptionId.Companion.from(local.backupSubscriberData);
}
final var mergedBuilder = SignalAccountRecord.Companion.newBuilder(remote.unknownFields().toByteArray())
.givenName(givenName)
.familyName(familyName)
@ -96,9 +130,6 @@ public class AccountRecordProcessor extends DefaultStorageRecordProcessor<Signal
.preferredReactionEmoji(firstNonEmpty(remote.preferredReactionEmoji, local.preferredReactionEmoji))
.subscriberId(firstNonEmpty(remote.subscriberId, local.subscriberId))
.subscriberCurrencyCode(firstNonEmpty(remote.subscriberCurrencyCode, local.subscriberCurrencyCode))
.backupsSubscriberId(firstNonEmpty(remote.backupsSubscriberId, local.backupsSubscriberId))
.backupsSubscriberCurrencyCode(firstNonEmpty(remote.backupsSubscriberCurrencyCode,
local.backupsSubscriberCurrencyCode))
.displayBadgesOnProfile(remote.displayBadgesOnProfile)
.subscriptionManuallyCancelled(remote.subscriptionManuallyCancelled)
.keepMutedChatsArchived(remote.keepMutedChatsArchived)
@ -115,9 +146,12 @@ public class AccountRecordProcessor extends DefaultStorageRecordProcessor<Signal
.username(remote.username)
.usernameLink(remote.usernameLink)
.e164(account.isPrimaryDevice() ? local.e164 : remote.e164);
if (firstNonNull(remote.payments, local.payments) != null) {
mergedBuilder.payments(firstNonNull(remote.payments, local.payments));
}
safeSetPayments(mergedBuilder,
payments != null && payments.enabled,
payments == null ? null : payments.entropy.toByteArray());
safeSetSubscriber(mergedBuilder, donationSubscriberId, donationSubscriberCurrencyCode);
safeSetBackupsSubscriber(mergedBuilder, backupsSubscriberId, backupsPurchaseToken);
final var merged = mergedBuilder.build();
final var matchesRemote = doProtosMatch(merged, remote);

2
lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageRecordProcessor.java
View file

@ -8,7 +8,7 @@ import java.sql.SQLException;
* Handles processing a remote record, which involves applying any local changes that need to be
* made based on the remote records.
*/
interface StorageRecordProcessor<E extends SignalRecord> {
interface StorageRecordProcessor<E extends SignalRecord<?>> {
void process(E remoteRecord) throws SQLException;
}

2
lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageRecordUpdate.java
View file

@ -5,7 +5,7 @@ import org.whispersystems.signalservice.api.storage.SignalRecord;
/**
* Represents a pair of records: one old, and one new. The new record should replace the old.
*/
record StorageRecordUpdate<E extends SignalRecord>(E oldRecord, E newRecord) {
record StorageRecordUpdate<E extends SignalRecord<?>>(E oldRecord, E newRecord) {
@Override
public String toString() {