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

Remove unused e164 field from account record

Browse source
This commit is contained in:
AsamK 2025-05-08 20:36:27 +02:00
parent 4fd9e55c3c
commit bcc1eadc7d
2 changed files with 1 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,7 +2,6 @@ package org.asamk.signal.manager.syncStorage;
import org.asamk.signal.manager.api.Profile; import org.asamk.signal.manager.api.Profile;
import org.asamk.signal.manager.internal.JobExecutor; import org.asamk.signal.manager.internal.JobExecutor;
import org.asamk.signal.manager.jobs.CheckWhoAmIJob;
import org.asamk.signal.manager.jobs.DownloadProfileAvatarJob; import org.asamk.signal.manager.jobs.DownloadProfileAvatarJob;
import org.asamk.signal.manager.storage.SignalAccount; import org.asamk.signal.manager.storage.SignalAccount;
import org.asamk.signal.manager.util.KeyUtils; import org.asamk.signal.manager.util.KeyUtils;
@ -146,7 +145,7 @@ public class AccountRecordProcessor extends DefaultStorageRecordProcessor<Signal
: remote.storyViewReceiptsEnabled) : remote.storyViewReceiptsEnabled)
.username(remote.username) .username(remote.username)
.usernameLink(remote.usernameLink) .usernameLink(remote.usernameLink)
.e164(account.isPrimaryDevice() ? local.e164 : remote.e164); .avatarColor(remote.avatarColor);
safeSetPayments(mergedBuilder, safeSetPayments(mergedBuilder,
payments != null && payments.enabled, payments != null && payments.enabled,
payments == null ? null : payments.entropy.toByteArray()); payments == null ? null : payments.entropy.toByteArray());
@ -179,10 +178,6 @@ public class AccountRecordProcessor extends DefaultStorageRecordProcessor<Signal
final var accountRecord = update.newRecord(); final var accountRecord = update.newRecord();
final var accountProto = accountRecord.getProto(); final var accountProto = accountRecord.getProto();
if (!accountProto.e164.equals(account.getNumber())) {
jobExecutor.enqueueJob(new CheckWhoAmIJob());
}
account.getConfigurationStore().setReadReceipts(connection, accountProto.readReceipts); account.getConfigurationStore().setReadReceipts(connection, accountProto.readReceipts);
account.getConfigurationStore().setTypingIndicators(connection, accountProto.typingIndicators); account.getConfigurationStore().setTypingIndicators(connection, accountProto.typingIndicators);
account.getConfigurationStore() account.getConfigurationStore()

1
lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncModels.java
View file

@ -74,7 +74,6 @@ public final class StorageSyncModels {
.phoneNumberSharingMode(Optional.ofNullable(configStore.getPhoneNumberSharingMode(connection)) .phoneNumberSharingMode(Optional.ofNullable(configStore.getPhoneNumberSharingMode(connection))
.map(StorageSyncModels::localToRemote) .map(StorageSyncModels::localToRemote)
.orElse(AccountRecord.PhoneNumberSharingMode.UNKNOWN)) .orElse(AccountRecord.PhoneNumberSharingMode.UNKNOWN))
.e164(self.getAddress().number().orElse(""))
.username(self.getAddress().username().orElse("")); .username(self.getAddress().username().orElse(""));
if (usernameLinkComponents != null) { if (usernameLinkComponents != null) {
final var linkColor = configStore.getUsernameLinkColor(connection); final var linkColor = configStore.getUsernameLinkColor(connection);