From d2e09607fa43b013ea27d17130b0b19b44829247 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Mon, 14 Feb 2022 12:02:45 -0500 Subject: [PATCH] Do not run StorageSyncJob if you are missing e164/aci. --- .../java/org/thoughtcrime/securesms/jobs/StorageSyncJob.java | 5 +++++ .../securesms/storage/StorageSyncValidations.java | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageSyncJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageSyncJob.java index 22f477e2d9..ddaa5e8c1b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageSyncJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageSyncJob.java @@ -176,6 +176,11 @@ public class StorageSyncJob extends BaseJob { return; } + if (!Recipient.self().hasE164() || !Recipient.self().hasAci()) { + Log.w(TAG, "Missing E164 or ACI!"); + return; + } + if (SignalStore.internalValues().storageServiceDisabled()) { Log.w(TAG, "Storage service has been manually disabled. Skipping."); return; diff --git a/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncValidations.java b/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncValidations.java index 76950943a7..e9fbd6efea 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncValidations.java +++ b/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncValidations.java @@ -142,7 +142,7 @@ public final class StorageSyncValidations { if (insert.getContact().isPresent()) { SignalServiceAddress address = insert.getContact().get().getAddress(); - if (self.getE164().get().equals(address.getNumber().or("")) || self.requireAci().equals(address.getAci())) { + if (self.requireE164().equals(address.getNumber().or("")) || self.requireAci().equals(address.getAci())) { throw new SelfAddedAsContactError(); } }