Fix various storage service issues.

Resolves #13466
signalapp · Mar 19, 2024 · 5e1ebaa · 5e1ebaa
1 parent 742c348
commit 5e1ebaa
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageSyncJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageSyncJob.java
@@ -411,10 +411,7 @@ private static void processKnownRecords(@NonNull Context context, @NonNull Stora
     new GroupV1RecordProcessor(context).process(records.gv1, StorageSyncHelper.KEY_GENERATOR);
     new GroupV2RecordProcessor(context).process(records.gv2, StorageSyncHelper.KEY_GENERATOR);
     new AccountRecordProcessor(context, freshSelf()).process(records.account, StorageSyncHelper.KEY_GENERATOR);
-
-    if (getKnownTypes().contains(ManifestRecord.Identifier.Type.STORY_DISTRIBUTION_LIST.getValue())) {
-      new StoryDistributionListRecordProcessor().process(records.storyDistributionLists, StorageSyncHelper.KEY_GENERATOR);
-    }
+    new StoryDistributionListRecordProcessor().process(records.storyDistributionLists, StorageSyncHelper.KEY_GENERATOR);
   }
 
   private static @NonNull List<StorageId> getAllLocalStorageIds(@NonNull Recipient self) {

diff --git a/app/src/main/java/org/thoughtcrime/securesms/storage/AccountRecordProcessor.java b/app/src/main/java/org/thoughtcrime/securesms/storage/AccountRecordProcessor.java
@@ -157,6 +157,7 @@ boolean isInvalid(@NonNull SignalAccountRecord remote) {
                                                                    .setPrimarySendsSms(primarySendsSms)
                                                                    .setDefaultReactions(defaultReactions)
                                                                    .setSubscriber(subscriber)
+                                                                   .setStoryViewReceiptsState(storyViewReceiptsState)
                                                                    .setDisplayBadgesOnProfile(displayBadgesOnProfile)
                                                                    .setSubscriptionManuallyCancelled(subscriptionManuallyCancelled)
                                                                    .setKeepMutedChatsArchived(keepMutedChatsArchived)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/storage/ContactRecordProcessor.java b/app/src/main/java/org/thoughtcrime/securesms/storage/ContactRecordProcessor.java
@@ -262,7 +262,7 @@ void updateLocal(@NonNull StorageRecordUpdate<SignalContactRecord> update) {
 
   @Override
   public int compare(@NonNull SignalContactRecord lhs, @NonNull SignalContactRecord rhs) {
-    if (Objects.equals(lhs.getAci(), rhs.getAci()) ||
+    if ((lhs.getAci().isPresent() && Objects.equals(lhs.getAci(), rhs.getAci())) ||
         (lhs.getNumber().isPresent() && Objects.equals(lhs.getNumber(), rhs.getNumber())) ||
         (lhs.getPni().isPresent() && Objects.equals(lhs.getPni(), rhs.getPni())))
     {

diff --git a/app/src/main/java/org/thoughtcrime/securesms/storage/GroupV1RecordProcessor.java b/app/src/main/java/org/thoughtcrime/securesms/storage/GroupV1RecordProcessor.java
@@ -92,7 +92,8 @@ boolean isInvalid(@NonNull SignalGroupV1Record remote) {
     } else {
       return new SignalGroupV1Record.Builder(keyGenerator.generate(), remote.getGroupId(), unknownFields)
                                     .setBlocked(blocked)
-                                    .setProfileSharingEnabled(blocked)
+                                    .setProfileSharingEnabled(profileSharing)
+                                    .setArchived(archived)
                                     .setForcedUnread(forcedUnread)
                                     .setMuteUntil(muteUntil)
                                     .build();

diff --git a/app/src/main/java/org/thoughtcrime/securesms/storage/GroupV2RecordProcessor.java b/app/src/main/java/org/thoughtcrime/securesms/storage/GroupV2RecordProcessor.java
@@ -85,7 +85,7 @@ boolean isInvalid(@NonNull SignalGroupV2Record remote) {
     } else {
       return new SignalGroupV2Record.Builder(keyGenerator.generate(), remote.getMasterKeyBytes(), unknownFields)
                                     .setBlocked(blocked)
-                                    .setProfileSharingEnabled(blocked)
+                                    .setProfileSharingEnabled(profileSharing)
                                     .setArchived(archived)
                                     .setForcedUnread(forcedUnread)
                                     .setMuteUntil(muteUntil)