Remove unused e164 field from account record

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 656297bf7fe6653869d1298e6c9484ebd54d3db5..21c0d97a7114fae2c1d4408dc63713afd405ddb0 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/AccountRecordProcessor.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/AccountRecordProcessor.java
@@ -2,7 +2,6 @@ package org.asamk.signal.manager.syncStorage;
 
 import org.asamk.signal.manager.api.Profile;
 import org.asamk.signal.manager.internal.JobExecutor;
 
 import org.asamk.signal.manager.api.Profile;
 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.storage.SignalAccount;
 import org.asamk.signal.manager.util.KeyUtils;
 import org.asamk.signal.manager.jobs.DownloadProfileAvatarJob;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.util.KeyUtils;


@@ -146,7 +145,7 @@ public class AccountRecordProcessor extends DefaultStorageRecordProcessor<Signal
                         : remote.storyViewReceiptsEnabled)
                 .username(remote.username)
                 .usernameLink(remote.usernameLink)
                         : remote.storyViewReceiptsEnabled)
                 .username(remote.username)
                 .usernameLink(remote.usernameLink)

-                .e164(account.isPrimaryDevice() ? local.e164 : remote.e164);
+                .avatarColor(remote.avatarColor);

         safeSetPayments(mergedBuilder,
                 payments != null && payments.enabled,
                 payments == null ? null : payments.entropy.toByteArray());
         safeSetPayments(mergedBuilder,
                 payments != null && payments.enabled,
                 payments == null ? null : payments.entropy.toByteArray());


@@ -179,10 +178,6 @@ public class AccountRecordProcessor extends DefaultStorageRecordProcessor<Signal
         final var accountRecord = update.newRecord();
         final var accountProto = accountRecord.getProto();
 
         final var accountRecord = update.newRecord();
         final var accountProto = accountRecord.getProto();
 

-        if (!accountProto.e164.equals(account.getNumber())) {
-            jobExecutor.enqueueJob(new CheckWhoAmIJob());
-        }
-

         account.getConfigurationStore().setReadReceipts(connection, accountProto.readReceipts);
         account.getConfigurationStore().setTypingIndicators(connection, accountProto.typingIndicators);
         account.getConfigurationStore()
         account.getConfigurationStore().setReadReceipts(connection, accountProto.readReceipts);
         account.getConfigurationStore().setTypingIndicators(connection, accountProto.typingIndicators);
         account.getConfigurationStore()

diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncModels.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncModels.java
index b5d702b4264e96a4361c9bcbc654ffd1327a8198..7ca71bfc6319f8645e482b5c6b54191fe197e853 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncModels.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncModels.java
@@ -74,7 +74,6 @@ public final class StorageSyncModels {
                 .phoneNumberSharingMode(Optional.ofNullable(configStore.getPhoneNumberSharingMode(connection))
                         .map(StorageSyncModels::localToRemote)
                         .orElse(AccountRecord.PhoneNumberSharingMode.UNKNOWN))
                 .phoneNumberSharingMode(Optional.ofNullable(configStore.getPhoneNumberSharingMode(connection))
                         .map(StorageSyncModels::localToRemote)
                         .orElse(AccountRecord.PhoneNumberSharingMode.UNKNOWN))

-                .e164(self.getAddress().number().orElse(""))

                 .username(self.getAddress().username().orElse(""));
         if (usernameLinkComponents != null) {
             final var linkColor = configStore.getUsernameLinkColor(connection);
                 .username(self.getAddress().username().orElse(""));
         if (usernameLinkComponents != null) {
             final var linkColor = configStore.getUsernameLinkColor(connection);