From 4461d6cf7fd32879c6d84cf2730bc7894e6ed778 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Mon, 26 Apr 2021 12:04:06 -0400 Subject: [PATCH] Rename StorageSyncJobV2 -> StorageSyncJob. --- .../securesms/contacts/sync/DirectoryHelper.java | 4 ++-- .../securesms/jobs/DirectoryRefreshJob.java | 2 +- .../securesms/jobs/JobManagerFactories.java | 4 ++-- .../securesms/jobs/StorageAccountRestoreJob.java | 2 +- .../securesms/jobs/StorageForcePushJob.java | 2 +- .../{StorageSyncJobV2.java => StorageSyncJob.java} | 14 +++++++------- .../migrations/StorageServiceMigrationJob.java | 6 +++--- .../securesms/pin/PinRestoreRepository.java | 4 ++-- .../securesms/registration/RegistrationUtil.java | 4 ++-- .../securesms/storage/StorageSyncHelper.java | 4 ++-- 10 files changed, 23 insertions(+), 23 deletions(-) rename app/src/main/java/org/thoughtcrime/securesms/jobs/{StorageSyncJobV2.java => StorageSyncJob.java} (98%) diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/DirectoryHelper.java b/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/DirectoryHelper.java index 5135addfbc..693012bee7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/DirectoryHelper.java +++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/DirectoryHelper.java @@ -32,7 +32,7 @@ import org.thoughtcrime.securesms.database.RecipientDatabase.RegisteredState; import org.thoughtcrime.securesms.dependencies.ApplicationDependencies; import org.thoughtcrime.securesms.jobs.MultiDeviceContactUpdateJob; import org.thoughtcrime.securesms.jobs.RetrieveProfileJob; -import org.thoughtcrime.securesms.jobs.StorageSyncJobV2; +import org.thoughtcrime.securesms.jobs.StorageSyncJob; import org.thoughtcrime.securesms.keyvalue.SignalStore; import org.thoughtcrime.securesms.notifications.NotificationChannels; import org.thoughtcrime.securesms.permissions.Permissions; @@ -194,7 +194,7 @@ public class DirectoryHelper { if (newRegisteredState != originalRegisteredState) { ApplicationDependencies.getJobManager().add(new MultiDeviceContactUpdateJob()); - ApplicationDependencies.getJobManager().add(new StorageSyncJobV2()); + ApplicationDependencies.getJobManager().add(new StorageSyncJob()); if (notifyOfNewUsers && newRegisteredState == RegisteredState.REGISTERED && recipient.resolve().isSystemContact()) { notifyNewUsers(context, Collections.singletonList(recipient.getId())); diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/DirectoryRefreshJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/DirectoryRefreshJob.java index 5d8b386e91..be2395d28f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/DirectoryRefreshJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/DirectoryRefreshJob.java @@ -34,7 +34,7 @@ public class DirectoryRefreshJob extends BaseJob { boolean notifyOfNewUsers) { this(new Job.Parameters.Builder() - .setQueue(StorageSyncJobV2.QUEUE_KEY) + .setQueue(StorageSyncJob.QUEUE_KEY) .addConstraint(NetworkConstraint.KEY) .setMaxAttempts(10) .build(), diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/JobManagerFactories.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/JobManagerFactories.java index ebcd326439..fdde286d5f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/JobManagerFactories.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/JobManagerFactories.java @@ -141,7 +141,7 @@ public final class JobManagerFactories { put(StickerDownloadJob.KEY, new StickerDownloadJob.Factory()); put(StickerPackDownloadJob.KEY, new StickerPackDownloadJob.Factory()); put(StorageForcePushJob.KEY, new StorageForcePushJob.Factory()); - put(StorageSyncJobV2.KEY, new StorageSyncJobV2.Factory()); + put(StorageSyncJob.KEY, new StorageSyncJob.Factory()); put(TrimThreadJob.KEY, new TrimThreadJob.Factory()); put(TypingSendJob.KEY, new TypingSendJob.Factory()); put(UpdateApkJob.KEY, new UpdateApkJob.Factory()); @@ -189,7 +189,7 @@ public final class JobManagerFactories { put("Argon2TestJob", new FailingJob.Factory()); put("Argon2TestMigrationJob", new PassingMigrationJob.Factory()); put("StorageKeyRotationMigrationJob", new PassingMigrationJob.Factory()); - put("StorageSyncJob", new StorageSyncJobV2.Factory()); + put("StorageSyncJob", new StorageSyncJob.Factory()); put("WakeGroupV2Job", new FailingJob.Factory()); }}; } diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageAccountRestoreJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageAccountRestoreJob.java index 3be4ace3fd..b5946875ed 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageAccountRestoreJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageAccountRestoreJob.java @@ -40,7 +40,7 @@ public class StorageAccountRestoreJob extends BaseJob { public StorageAccountRestoreJob() { this(new Parameters.Builder() - .setQueue(StorageSyncJobV2.QUEUE_KEY) + .setQueue(StorageSyncJob.QUEUE_KEY) .addConstraint(NetworkConstraint.KEY) .setMaxInstancesForFactory(1) .setMaxAttempts(1) diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageForcePushJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageForcePushJob.java index be2b6668d1..130f8050a7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageForcePushJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageForcePushJob.java @@ -50,7 +50,7 @@ public class StorageForcePushJob extends BaseJob { public StorageForcePushJob() { this(new Parameters.Builder().addConstraint(NetworkConstraint.KEY) - .setQueue(StorageSyncJobV2.QUEUE_KEY) + .setQueue(StorageSyncJob.QUEUE_KEY) .setMaxInstancesForFactory(1) .setLifespan(TimeUnit.DAYS.toMillis(1)) .build()); diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageSyncJobV2.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageSyncJob.java similarity index 98% rename from app/src/main/java/org/thoughtcrime/securesms/jobs/StorageSyncJobV2.java rename to app/src/main/java/org/thoughtcrime/securesms/jobs/StorageSyncJob.java index c53faf3a68..a5ef11a9cb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageSyncJobV2.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageSyncJob.java @@ -136,14 +136,14 @@ import java.util.concurrent.TimeUnit; * to enqueue a {@link StorageServiceMigrationJob} as an app migration to make sure it gets * synced. */ -public class StorageSyncJobV2 extends BaseJob { +public class StorageSyncJob extends BaseJob { public static final String KEY = "StorageSyncJobV2"; public static final String QUEUE_KEY = "StorageSyncingJobs"; - private static final String TAG = Log.tag(StorageSyncJobV2.class); + private static final String TAG = Log.tag(StorageSyncJob.class); - public StorageSyncJobV2() { + public StorageSyncJob() { this(new Parameters.Builder().addConstraint(NetworkConstraint.KEY) .setQueue(QUEUE_KEY) .setMaxInstancesForFactory(2) @@ -152,7 +152,7 @@ public class StorageSyncJobV2 extends BaseJob { .build()); } - private StorageSyncJobV2(@NonNull Parameters parameters) { + private StorageSyncJob(@NonNull Parameters parameters) { super(parameters); } @@ -506,10 +506,10 @@ public class StorageSyncJobV2 extends BaseJob { } } - public static final class Factory implements Job.Factory { + public static final class Factory implements Job.Factory { @Override - public @NonNull StorageSyncJobV2 create(@NonNull Parameters parameters, @NonNull Data data) { - return new StorageSyncJobV2(parameters); + public @NonNull StorageSyncJob create(@NonNull Parameters parameters, @NonNull Data data) { + return new StorageSyncJob(parameters); } } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/migrations/StorageServiceMigrationJob.java b/app/src/main/java/org/thoughtcrime/securesms/migrations/StorageServiceMigrationJob.java index 1b909bc468..da24ebe06b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/migrations/StorageServiceMigrationJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/migrations/StorageServiceMigrationJob.java @@ -8,7 +8,7 @@ import org.thoughtcrime.securesms.jobmanager.Data; import org.thoughtcrime.securesms.jobmanager.Job; import org.thoughtcrime.securesms.jobmanager.JobManager; import org.thoughtcrime.securesms.jobs.MultiDeviceKeysUpdateJob; -import org.thoughtcrime.securesms.jobs.StorageSyncJobV2; +import org.thoughtcrime.securesms.jobs.StorageSyncJob; import org.thoughtcrime.securesms.util.TextSecurePreferences; /** @@ -44,12 +44,12 @@ public class StorageServiceMigrationJob extends MigrationJob { if (TextSecurePreferences.isMultiDevice(context)) { Log.i(TAG, "Multi-device."); - jobManager.startChain(new StorageSyncJobV2()) + jobManager.startChain(new StorageSyncJob()) .then(new MultiDeviceKeysUpdateJob()) .enqueue(); } else { Log.i(TAG, "Single-device."); - jobManager.add(new StorageSyncJobV2()); + jobManager.add(new StorageSyncJob()); } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/pin/PinRestoreRepository.java b/app/src/main/java/org/thoughtcrime/securesms/pin/PinRestoreRepository.java index c39f83e4bd..9ab5d810f4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/pin/PinRestoreRepository.java +++ b/app/src/main/java/org/thoughtcrime/securesms/pin/PinRestoreRepository.java @@ -11,7 +11,7 @@ import org.signal.core.util.logging.Log; import org.thoughtcrime.securesms.KbsEnclave; import org.thoughtcrime.securesms.dependencies.ApplicationDependencies; import org.thoughtcrime.securesms.jobs.StorageAccountRestoreJob; -import org.thoughtcrime.securesms.jobs.StorageSyncJobV2; +import org.thoughtcrime.securesms.jobs.StorageSyncJob; import org.thoughtcrime.securesms.registration.service.KeyBackupSystemWrongPinException; import org.thoughtcrime.securesms.util.Stopwatch; import org.whispersystems.libsignal.util.guava.Optional; @@ -83,7 +83,7 @@ public class PinRestoreRepository { ApplicationDependencies.getJobManager().runSynchronously(new StorageAccountRestoreJob(), StorageAccountRestoreJob.LIFESPAN); stopwatch.split("AccountRestore"); - ApplicationDependencies.getJobManager().runSynchronously(new StorageSyncJobV2(), TimeUnit.SECONDS.toMillis(10)); + ApplicationDependencies.getJobManager().runSynchronously(new StorageSyncJob(), TimeUnit.SECONDS.toMillis(10)); stopwatch.split("ContactRestore"); stopwatch.stop(TAG); diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/RegistrationUtil.java b/app/src/main/java/org/thoughtcrime/securesms/registration/RegistrationUtil.java index e4a3e986c3..e68119ceb1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/RegistrationUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/RegistrationUtil.java @@ -7,7 +7,7 @@ import androidx.annotation.NonNull; import org.signal.core.util.logging.Log; import org.thoughtcrime.securesms.dependencies.ApplicationDependencies; import org.thoughtcrime.securesms.jobs.DirectoryRefreshJob; -import org.thoughtcrime.securesms.jobs.StorageSyncJobV2; +import org.thoughtcrime.securesms.jobs.StorageSyncJob; import org.thoughtcrime.securesms.keyvalue.SignalStore; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.util.TextSecurePreferences; @@ -31,7 +31,7 @@ public final class RegistrationUtil { { Log.i(TAG, "Marking registration completed.", new Throwable()); SignalStore.registrationValues().setRegistrationComplete(); - ApplicationDependencies.getJobManager().startChain(new StorageSyncJobV2()) + ApplicationDependencies.getJobManager().startChain(new StorageSyncJob()) .then(new DirectoryRefreshJob(false)) .enqueue(); } else if (!SignalStore.registrationValues().isRegistrationComplete()) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncHelper.java b/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncHelper.java index a02a94e668..ba4b87e584 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncHelper.java +++ b/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncHelper.java @@ -15,7 +15,7 @@ import org.thoughtcrime.securesms.database.RecipientDatabase; import org.thoughtcrime.securesms.database.RecipientDatabase.RecipientSettings; import org.thoughtcrime.securesms.dependencies.ApplicationDependencies; import org.thoughtcrime.securesms.jobs.RetrieveProfileAvatarJob; -import org.thoughtcrime.securesms.jobs.StorageSyncJobV2; +import org.thoughtcrime.securesms.jobs.StorageSyncJob; import org.thoughtcrime.securesms.keyvalue.PhoneNumberPrivacyValues; import org.thoughtcrime.securesms.keyvalue.SignalStore; import org.thoughtcrime.securesms.payments.Entropy; @@ -292,7 +292,7 @@ public final class StorageSyncHelper { Log.d(TAG, "Registration still ongoing. Ignore sync request."); return; } - ApplicationDependencies.getJobManager().add(new StorageSyncJobV2()); + ApplicationDependencies.getJobManager().add(new StorageSyncJob()); } public static void scheduleRoutineSync() {