empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Do not run StorageSyncJob if you are missing e164/aci.

Browse source
This commit is contained in:
Greyson Parrelli 2022-02-14 12:02:45 -05:00
parent 590b4dec12
commit d2e09607fa
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/org/thoughtcrime/securesms/jobs/StorageSyncJob.java
View file

@ -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;

2
app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncValidations.java
View file

@ -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();
}
}