Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-21 00:59:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rewrite the AppDependencies system.

Browse Source
This commit is contained in:
Greyson Parrelli
2024-05-22 15:44:24 -04:00
committed by Cody Henthorne
parent a0131bf39b
commit b6a4e1f145
560 changed files with 2909 additions and 3036 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/migrations/AccountConsistencyMigrationJob.kt
View File

@@ -1,7 +1,7 @@
package org.thoughtcrime.securesms.migrations
import org.signal.core.util.logging.Log
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
import org.thoughtcrime.securesms.dependencies.AppDependencies
import org.thoughtcrime.securesms.jobmanager.Job
import org.thoughtcrime.securesms.jobs.AccountConsistencyWorkerJob
import org.thoughtcrime.securesms.keyvalue.SignalStore
@@ -34,7 +34,7 @@ internal class AccountConsistencyMigrationJob(
return
}
ApplicationDependencies.getJobManager().add(AccountConsistencyWorkerJob())
AppDependencies.jobManager.add(AccountConsistencyWorkerJob())
}
override fun shouldRetry(e: Exception): Boolean = false

4
app/src/main/java/org/thoughtcrime/securesms/migrations/AccountRecordMigrationJob.java
View File

@@ -5,7 +5,7 @@ import androidx.annotation.Nullable;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.database.SignalDatabase;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.dependencies.AppDependencies;
import org.thoughtcrime.securesms.jobmanager.Job;
import org.thoughtcrime.securesms.jobs.StorageSyncJob;
import org.thoughtcrime.securesms.keyvalue.SignalStore;
@@ -47,7 +47,7 @@ public class AccountRecordMigrationJob extends MigrationJob {
}
SignalDatabase.recipients().markNeedsSync(Recipient.self().getId());
ApplicationDependencies.getJobManager().add(new StorageSyncJob());
AppDependencies.getJobManager().add(new StorageSyncJob());
}
@Override

4
app/src/main/java/org/thoughtcrime/securesms/migrations/AttachmentHashBackfillMigrationJob.kt
View File

@@ -6,7 +6,7 @@
package org.thoughtcrime.securesms.migrations
import org.signal.core.util.logging.Log
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
import org.thoughtcrime.securesms.dependencies.AppDependencies
import org.thoughtcrime.securesms.jobmanager.Job
import org.thoughtcrime.securesms.jobs.AttachmentHashBackfillJob
import java.lang.Exception
@@ -26,7 +26,7 @@ internal class AttachmentHashBackfillMigrationJob(parameters: Parameters = Param
override fun isUiBlocking(): Boolean = false
override fun performMigration() {
ApplicationDependencies.getJobManager().add(AttachmentHashBackfillJob())
AppDependencies.jobManager.add(AttachmentHashBackfillJob())
}
override fun shouldRetry(e: Exception): Boolean = false

8
app/src/main/java/org/thoughtcrime/securesms/migrations/AttributesMigrationJob.java
View File

@@ -4,7 +4,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.dependencies.AppDependencies;
import org.thoughtcrime.securesms.jobmanager.Job;
import org.thoughtcrime.securesms.jobs.RefreshAttributesJob;
import org.thoughtcrime.securesms.jobs.RefreshOwnProfileJob;
@@ -39,9 +39,9 @@ public final class AttributesMigrationJob extends MigrationJob {
@Override
public void performMigration() {
Log.i(TAG, "Scheduling attributes upload and profile refresh job chain");
ApplicationDependencies.getJobManager().startChain(new RefreshAttributesJob())
.then(new RefreshOwnProfileJob())
.enqueue();
AppDependencies.getJobManager().startChain(new RefreshAttributesJob())
.then(new RefreshOwnProfileJob())
.enqueue();
}
@Override

4
app/src/main/java/org/thoughtcrime/securesms/migrations/AvatarIdRemovalMigrationJob.java
View File

@@ -4,7 +4,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.dependencies.AppDependencies;
import org.thoughtcrime.securesms.jobmanager.Job;
import org.thoughtcrime.securesms.jobs.RefreshOwnProfileJob;
@@ -38,7 +38,7 @@ public class AvatarIdRemovalMigrationJob extends MigrationJob {
@Override
public void performMigration() {
ApplicationDependencies.getJobManager().add(new RefreshOwnProfileJob());
AppDependencies.getJobManager().add(new RefreshOwnProfileJob());
}
@Override

4
app/src/main/java/org/thoughtcrime/securesms/migrations/ContactLinkRebuildMigrationJob.kt
View File

@@ -12,7 +12,7 @@ import org.signal.contacts.SystemContactsRepository
import org.signal.core.util.logging.Log
import org.thoughtcrime.securesms.BuildConfig
import org.thoughtcrime.securesms.R
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
import org.thoughtcrime.securesms.dependencies.AppDependencies
import org.thoughtcrime.securesms.jobmanager.Job
import org.thoughtcrime.securesms.jobs.SyncSystemContactLinksJob
@@ -53,7 +53,7 @@ internal class ContactLinkRebuildMigrationJob(parameters: Parameters = Parameter
removeIfMissing = true
)
ApplicationDependencies.getJobManager().add(SyncSystemContactLinksJob())
AppDependencies.jobManager.add(SyncSystemContactLinksJob())
}
override fun shouldRetry(e: Exception): Boolean = false

4
app/src/main/java/org/thoughtcrime/securesms/migrations/EmojiDownloadMigrationJob.java
View File

@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.migrations;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.dependencies.AppDependencies;
import org.thoughtcrime.securesms.jobmanager.Job;
import org.thoughtcrime.securesms.jobs.DownloadLatestEmojiDataJob;
import org.thoughtcrime.securesms.jobs.EmojiSearchIndexDownloadJob;
@@ -35,7 +35,7 @@ public final class EmojiDownloadMigrationJob extends MigrationJob {
@Override
public void performMigration() {
ApplicationDependencies.getJobManager().add(new DownloadLatestEmojiDataJob(false));
AppDependencies.getJobManager().add(new DownloadLatestEmojiDataJob(false));
EmojiSearchIndexDownloadJob.scheduleImmediately();
}

2
app/src/main/java/org/thoughtcrime/securesms/migrations/EmojiSearchIndexCheckMigrationJob.java
View File

@@ -6,9 +6,7 @@ import androidx.annotation.Nullable;
import org.signal.core.util.SqlUtil;
import org.thoughtcrime.securesms.database.EmojiSearchTable;
import org.thoughtcrime.securesms.database.SignalDatabase;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.jobmanager.Job;
import org.thoughtcrime.securesms.jobs.DownloadLatestEmojiDataJob;
import org.thoughtcrime.securesms.jobs.EmojiSearchIndexDownloadJob;
import org.thoughtcrime.securesms.keyvalue.SignalStore;

8
app/src/main/java/org/thoughtcrime/securesms/migrations/IdentityTableCleanupMigrationJob.kt
View File

@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.migrations
import org.signal.core.util.logging.Log
import org.thoughtcrime.securesms.database.IdentityTable
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
import org.thoughtcrime.securesms.dependencies.AppDependencies
import org.thoughtcrime.securesms.jobmanager.Job
import org.thoughtcrime.securesms.jobs.AccountConsistencyWorkerJob
import org.thoughtcrime.securesms.keyvalue.SignalStore
@@ -41,7 +41,7 @@ internal class IdentityTableCleanupMigrationJob(
return
}
ApplicationDependencies.getProtocolStore().aci().identities().saveIdentityWithoutSideEffects(
AppDependencies.protocolStore.aci().identities().saveIdentityWithoutSideEffects(
Recipient.self().id,
SignalStore.account().aci!!,
SignalStore.account().aciIdentityKey.publicKey,
@@ -51,7 +51,7 @@ internal class IdentityTableCleanupMigrationJob(
true
)
ApplicationDependencies.getProtocolStore().pni().identities().saveIdentityWithoutSideEffects(
AppDependencies.protocolStore.pni().identities().saveIdentityWithoutSideEffects(
Recipient.self().id,
SignalStore.account().pni!!,
SignalStore.account().pniIdentityKey.publicKey,
@@ -61,7 +61,7 @@ internal class IdentityTableCleanupMigrationJob(
true
)
ApplicationDependencies.getJobManager().add(AccountConsistencyWorkerJob())
AppDependencies.jobManager.add(AccountConsistencyWorkerJob())
}
override fun shouldRetry(e: Exception): Boolean = false

16
app/src/main/java/org/thoughtcrime/securesms/migrations/LegacyMigrationJob.java
View File

@@ -16,7 +16,7 @@ import org.thoughtcrime.securesms.database.MessageTable;
import org.thoughtcrime.securesms.database.MessageTable.MmsReader;
import org.thoughtcrime.securesms.database.SignalDatabase;
import org.thoughtcrime.securesms.database.model.MessageRecord;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.dependencies.AppDependencies;
import org.thoughtcrime.securesms.jobmanager.Job;
import org.thoughtcrime.securesms.jobs.AttachmentDownloadJob;
import org.thoughtcrime.securesms.jobs.DirectoryRefreshJob;
@@ -144,7 +144,7 @@ public class LegacyMigrationJob extends MigrationJob {
// }
if (lastSeenVersion < CONTACTS_ACCOUNT_VERSION) {
ApplicationDependencies.getJobManager().add(new DirectoryRefreshJob(false));
AppDependencies.getJobManager().add(new DirectoryRefreshJob(false));
}
if (lastSeenVersion < MEDIA_DOWNLOAD_CONTROLS_VERSION) {
@@ -152,12 +152,12 @@ public class LegacyMigrationJob extends MigrationJob {
}
if (lastSeenVersion < REDPHONE_SUPPORT_VERSION) {
ApplicationDependencies.getJobManager().add(new RefreshAttributesJob());
ApplicationDependencies.getJobManager().add(new DirectoryRefreshJob(false));
AppDependencies.getJobManager().add(new RefreshAttributesJob());
AppDependencies.getJobManager().add(new DirectoryRefreshJob(false));
}
if (lastSeenVersion < PROFILES) {
ApplicationDependencies.getJobManager().add(new DirectoryRefreshJob(false));
AppDependencies.getJobManager().add(new DirectoryRefreshJob(false));
}
if (lastSeenVersion < SCREENSHOTS) {
@@ -226,12 +226,12 @@ public class LegacyMigrationJob extends MigrationJob {
if (lastSeenVersion < UNIDENTIFIED_DELIVERY) {
Log.i(TAG, "Scheduling UD attributes refresh.");
ApplicationDependencies.getJobManager().add(new RefreshAttributesJob());
AppDependencies.getJobManager().add(new RefreshAttributesJob());
}
if (lastSeenVersion < SIGNALING_KEY_DEPRECATION) {
Log.i(TAG, "Scheduling a RefreshAttributesJob to remove the signaling key remotely.");
ApplicationDependencies.getJobManager().add(new RefreshAttributesJob());
AppDependencies.getJobManager().add(new RefreshAttributesJob());
}
}
@@ -255,7 +255,7 @@ public class LegacyMigrationJob extends MigrationJob {
attachmentDb.setTransferState(attachment.mmsId, attachment.attachmentId, AttachmentTable.TRANSFER_PROGRESS_DONE);
} else if (record != null && !record.isOutgoing() && record.isPush()) {
Log.i(TAG, "queuing new attachment download job for incoming push part " + attachment.attachmentId + ".");
ApplicationDependencies.getJobManager().add(new AttachmentDownloadJob(attachment.mmsId, attachment.attachmentId, false, false));
AppDependencies.getJobManager().add(new AttachmentDownloadJob(attachment.mmsId, attachment.attachmentId, false, false));
}
reader.close();
}

10
app/src/main/java/org/thoughtcrime/securesms/migrations/PinOptOutMigration.java
View File

@@ -4,7 +4,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.dependencies.AppDependencies;
import org.thoughtcrime.securesms.jobmanager.Job;
import org.thoughtcrime.securesms.jobs.RefreshAttributesJob;
import org.thoughtcrime.securesms.jobs.RefreshOwnProfileJob;
@@ -41,10 +41,10 @@ public final class PinOptOutMigration extends MigrationJob {
Log.w(TAG, "Discovered a legacy opt-out user! Resetting the state.");
SignalStore.svr().optOut();
ApplicationDependencies.getJobManager().startChain(new RefreshAttributesJob())
.then(new RefreshOwnProfileJob())
.then(new StorageForcePushJob())
.enqueue();
AppDependencies.getJobManager().startChain(new RefreshAttributesJob())
.then(new RefreshOwnProfileJob())
.then(new StorageForcePushJob())
.enqueue();
} else if (SignalStore.svr().hasOptedOut()) {
Log.i(TAG, "Discovered an opt-out user, but they're already in a good state. No action required.");
} else {

6
app/src/main/java/org/thoughtcrime/securesms/migrations/PniAccountInitializationMigrationJob.java
View File

@@ -8,7 +8,7 @@ import org.signal.libsignal.protocol.state.PreKeyRecord;
import org.signal.libsignal.protocol.state.SignedPreKeyRecord;
import org.thoughtcrime.securesms.crypto.PreKeyUtil;
import org.thoughtcrime.securesms.crypto.storage.PreKeyMetadataStore;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.dependencies.AppDependencies;
import org.thoughtcrime.securesms.jobmanager.Job;
import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
import org.thoughtcrime.securesms.keyvalue.SignalStore;
@@ -70,8 +70,8 @@ public class PniAccountInitializationMigrationJob extends MigrationJob {
Log.w(TAG, "Already generated the PNI identity. Skipping this step.");
}
SignalServiceAccountManager accountManager = ApplicationDependencies.getSignalServiceAccountManager();
SignalServiceAccountDataStore protocolStore = ApplicationDependencies.getProtocolStore().pni();
SignalServiceAccountManager accountManager = AppDependencies.getSignalServiceAccountManager();
SignalServiceAccountDataStore protocolStore = AppDependencies.getProtocolStore().pni();
PreKeyMetadataStore metadataStore = SignalStore.account().pniPreKeys();
if (!metadataStore.isSignedPreKeyRegistered()) {

4
app/src/main/java/org/thoughtcrime/securesms/migrations/PniMigrationJob.java
View File

@@ -5,7 +5,7 @@ import androidx.annotation.Nullable;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.database.SignalDatabase;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.dependencies.AppDependencies;
import org.thoughtcrime.securesms.jobmanager.Job;
import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
import org.thoughtcrime.securesms.keyvalue.SignalStore;
@@ -47,7 +47,7 @@ public class PniMigrationJob extends MigrationJob {
return;
}
PNI pni = PNI.parseOrNull(ApplicationDependencies.getSignalServiceAccountManager().getWhoAmI().getPni());
PNI pni = PNI.parseOrNull(AppDependencies.getSignalServiceAccountManager().getWhoAmI().getPni());
if (pni == null) {
throw new IOException("Invalid PNI!");

4
app/src/main/java/org/thoughtcrime/securesms/migrations/PnpLaunchMigrationJob.kt
View File

@@ -5,7 +5,7 @@
package org.thoughtcrime.securesms.migrations
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
import org.thoughtcrime.securesms.dependencies.AppDependencies
import org.thoughtcrime.securesms.jobmanager.Job
import org.thoughtcrime.securesms.jobs.ProfileUploadJob
import org.thoughtcrime.securesms.jobs.RefreshAttributesJob
@@ -24,7 +24,7 @@ internal class PnpLaunchMigrationJob(parameters: Parameters = Parameters.Builder
override fun isUiBlocking(): Boolean = false
override fun performMigration() {
ApplicationDependencies.getJobManager()
AppDependencies.jobManager
.startChain(RefreshAttributesJob())
.then(ProfileUploadJob())
.enqueue()

4
app/src/main/java/org/thoughtcrime/securesms/migrations/ProfileMigrationJob.java
View File

@@ -4,7 +4,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.dependencies.AppDependencies;
import org.thoughtcrime.securesms.jobmanager.Job;
import org.thoughtcrime.securesms.jobs.ProfileUploadJob;
@@ -38,7 +38,7 @@ public final class ProfileMigrationJob extends MigrationJob {
@Override
public void performMigration() {
Log.i(TAG, "Scheduling profile upload job");
ApplicationDependencies.getJobManager().add(new ProfileUploadJob());
AppDependencies.getJobManager().add(new ProfileUploadJob());
}
@Override

4
app/src/main/java/org/thoughtcrime/securesms/migrations/RecheckPaymentsMigrationJob.kt
View File

@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.migrations
import org.signal.core.util.logging.Log
import org.thoughtcrime.securesms.database.SignalDatabase
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
import org.thoughtcrime.securesms.dependencies.AppDependencies
import org.thoughtcrime.securesms.jobmanager.Job
import org.thoughtcrime.securesms.jobs.PaymentLedgerUpdateJob
import org.thoughtcrime.securesms.jobs.PaymentTransactionCheckJob
@@ -37,7 +37,7 @@ internal class RecheckPaymentsMigrationJob(
if (jobs.isNotEmpty()) {
jobs += PaymentLedgerUpdateJob.updateLedger()
}
ApplicationDependencies.getJobManager().addAll(jobs)
AppDependencies.jobManager.addAll(jobs)
}
override fun shouldRetry(e: Exception): Boolean = false

4
app/src/main/java/org/thoughtcrime/securesms/migrations/StickerAdditionMigrationJob.java
View File

@@ -6,7 +6,7 @@ import androidx.annotation.Nullable;
import com.annimon.stream.Stream;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.dependencies.AppDependencies;
import org.thoughtcrime.securesms.jobmanager.JsonJobData;
import org.thoughtcrime.securesms.jobmanager.Job;
import org.thoughtcrime.securesms.jobmanager.JobManager;
@@ -57,7 +57,7 @@ public class StickerAdditionMigrationJob extends MigrationJob {
@Override
public void performMigration() {
JobManager jobManager = ApplicationDependencies.getJobManager();
JobManager jobManager = AppDependencies.getJobManager();
for (BlessedPacks.Pack pack : packs) {
Log.i(TAG, "Installing reference for blessed pack: " + pack.getPackId());

4
app/src/main/java/org/thoughtcrime/securesms/migrations/StickerDayByDayMigrationJob.java
View File

@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.migrations;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.dependencies.AppDependencies;
import org.thoughtcrime.securesms.jobmanager.Job;
import org.thoughtcrime.securesms.jobs.StickerPackDownloadJob;
import org.thoughtcrime.securesms.stickers.BlessedPacks;
@@ -35,7 +35,7 @@ public class StickerDayByDayMigrationJob extends MigrationJob {
@Override
public void performMigration() {
ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forInstall(BlessedPacks.DAY_BY_DAY.getPackId(), BlessedPacks.DAY_BY_DAY.getPackKey(), false));
AppDependencies.getJobManager().add(StickerPackDownloadJob.forInstall(BlessedPacks.DAY_BY_DAY.getPackId(), BlessedPacks.DAY_BY_DAY.getPackKey(), false));
}
@Override

4
app/src/main/java/org/thoughtcrime/securesms/migrations/StickerLaunchMigrationJob.java
View File

@@ -7,7 +7,7 @@ import androidx.annotation.Nullable;
import org.thoughtcrime.securesms.database.SignalDatabase;
import org.thoughtcrime.securesms.database.StickerTable;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.dependencies.AppDependencies;
import org.thoughtcrime.securesms.jobmanager.Job;
import org.thoughtcrime.securesms.jobmanager.JobManager;
import org.thoughtcrime.securesms.jobs.MultiDeviceStickerPackOperationJob;
@@ -49,7 +49,7 @@ public class StickerLaunchMigrationJob extends MigrationJob {
}
private static void installPack(@NonNull Context context, @NonNull BlessedPacks.Pack pack) {
JobManager jobManager = ApplicationDependencies.getJobManager();
JobManager jobManager = AppDependencies.getJobManager();
StickerTable stickerDatabase = SignalDatabase.stickers();
if (stickerDatabase.isPackAvailableAsReference(pack.getPackId())) {

4
app/src/main/java/org/thoughtcrime/securesms/migrations/StickerMyDailyLifeMigrationJob.java
View File

@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.migrations;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.dependencies.AppDependencies;
import org.thoughtcrime.securesms.jobmanager.Job;
import org.thoughtcrime.securesms.jobs.StickerPackDownloadJob;
import org.thoughtcrime.securesms.stickers.BlessedPacks;
@@ -35,7 +35,7 @@ public class StickerMyDailyLifeMigrationJob extends MigrationJob {
@Override
public void performMigration() {
ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forInstall(BlessedPacks.MY_DAILY_LIFE.getPackId(), BlessedPacks.MY_DAILY_LIFE.getPackKey(), false));
AppDependencies.getJobManager().add(StickerPackDownloadJob.forInstall(BlessedPacks.MY_DAILY_LIFE.getPackId(), BlessedPacks.MY_DAILY_LIFE.getPackKey(), false));
}
@Override

4
app/src/main/java/org/thoughtcrime/securesms/migrations/StorageCapabilityMigrationJob.java
View File

@@ -4,7 +4,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.dependencies.AppDependencies;
import org.thoughtcrime.securesms.jobmanager.Job;
import org.thoughtcrime.securesms.jobmanager.JobManager;
import org.thoughtcrime.securesms.jobs.MultiDeviceKeysUpdateJob;
@@ -49,7 +49,7 @@ public class StorageCapabilityMigrationJob extends MigrationJob {
@Override
public void performMigration() {
JobManager jobManager = ApplicationDependencies.getJobManager();
JobManager jobManager = AppDependencies.getJobManager();
jobManager.startChain(new RefreshAttributesJob()).then(new RefreshOwnProfileJob()).enqueue();

4
app/src/main/java/org/thoughtcrime/securesms/migrations/StorageFixLocalUnknownMigrationJob.kt
View File

@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.migrations
import org.signal.core.util.logging.Log
import org.signal.core.util.withinTransaction
import org.thoughtcrime.securesms.database.SignalDatabase
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
import org.thoughtcrime.securesms.dependencies.AppDependencies
import org.thoughtcrime.securesms.jobmanager.Job
import org.thoughtcrime.securesms.jobs.MultiDeviceKeysUpdateJob
import org.thoughtcrime.securesms.jobs.StorageSyncJob
@@ -42,7 +42,7 @@ internal class StorageFixLocalUnknownMigrationJob(
SignalDatabase.unknownStorageIds.delete(danglingLocalUnknownIds)
}
val jobManager = ApplicationDependencies.getJobManager()
val jobManager = AppDependencies.jobManager
if (TextSecurePreferences.isMultiDevice(context)) {
Log.i(TAG, "Multi-device.")

4
app/src/main/java/org/thoughtcrime/securesms/migrations/StorageServiceMigrationJob.java
View File

@@ -5,7 +5,7 @@ import androidx.annotation.Nullable;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.database.SignalDatabase;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.dependencies.AppDependencies;
import org.thoughtcrime.securesms.jobmanager.Job;
import org.thoughtcrime.securesms.jobmanager.JobManager;
import org.thoughtcrime.securesms.jobs.MultiDeviceKeysUpdateJob;
@@ -50,7 +50,7 @@ public class StorageServiceMigrationJob extends MigrationJob {
SignalDatabase.recipients().markNeedsSync(Recipient.self().getId());
JobManager jobManager = ApplicationDependencies.getJobManager();
JobManager jobManager = AppDependencies.getJobManager();
if (TextSecurePreferences.isMultiDevice(context)) {
Log.i(TAG, "Multi-device.");

4
app/src/main/java/org/thoughtcrime/securesms/migrations/Svr2MirrorMigrationJob.kt
View File

@@ -1,7 +1,7 @@
package org.thoughtcrime.securesms.migrations
import org.signal.core.util.logging.Log
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
import org.thoughtcrime.securesms.dependencies.AppDependencies
import org.thoughtcrime.securesms.jobmanager.Job
import org.thoughtcrime.securesms.jobs.Svr2MirrorJob
@@ -22,7 +22,7 @@ internal class Svr2MirrorMigrationJob(
override fun isUiBlocking(): Boolean = false
override fun performMigration() {
ApplicationDependencies.getJobManager().add(Svr2MirrorJob())
AppDependencies.jobManager.add(Svr2MirrorJob())
}
override fun shouldRetry(e: Exception): Boolean = false

4
app/src/main/java/org/thoughtcrime/securesms/migrations/SyncKeysMigrationJob.kt
View File

@@ -1,6 +1,6 @@
package org.thoughtcrime.securesms.migrations
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
import org.thoughtcrime.securesms.dependencies.AppDependencies
import org.thoughtcrime.securesms.jobmanager.Job
import org.thoughtcrime.securesms.jobs.MultiDeviceKeysUpdateJob
import org.thoughtcrime.securesms.util.TextSecurePreferences
@@ -22,7 +22,7 @@ internal class SyncKeysMigrationJob(
override fun performMigration() {
if (TextSecurePreferences.isMultiDevice(context)) {
ApplicationDependencies.getJobManager().add(MultiDeviceKeysUpdateJob())
AppDependencies.jobManager.add(MultiDeviceKeysUpdateJob())
}
}

4
app/src/main/java/org/thoughtcrime/securesms/migrations/TrimByLengthSettingsMigrationJob.java
View File

@@ -7,7 +7,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.dependencies.AppDependencies;
import org.thoughtcrime.securesms.jobmanager.Job;
import org.thoughtcrime.securesms.keyvalue.SignalStore;
@@ -35,7 +35,7 @@ public class TrimByLengthSettingsMigrationJob extends MigrationJob {
@Override
void performMigration() throws Exception {
SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(ApplicationDependencies.getApplication());
SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(AppDependencies.getApplication());
if (preferences.contains(THREAD_TRIM_ENABLED)) {
SignalStore.settings().setThreadTrimByLengthEnabled(preferences.getBoolean(THREAD_TRIM_ENABLED, false));
//noinspection ConstantConditions

4
app/src/main/java/org/thoughtcrime/securesms/migrations/UpdateSmsJobsMigrationJob.kt
View File

@@ -1,7 +1,7 @@
package org.thoughtcrime.securesms.migrations
import org.signal.core.util.logging.Log
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
import org.thoughtcrime.securesms.dependencies.AppDependencies
import org.thoughtcrime.securesms.jobmanager.Job
import org.thoughtcrime.securesms.jobmanager.JsonJobData
import org.thoughtcrime.securesms.jobmanager.persistence.JobSpec
@@ -34,7 +34,7 @@ internal class UpdateSmsJobsMigrationJob(
val idOffset = SignalStore.plaintext().smsMigrationIdOffset
check(idOffset >= 0) { "Invalid ID offset of $idOffset -- this shouldn't be possible!" }
ApplicationDependencies.getJobManager().update { jobSpec ->
AppDependencies.jobManager.update { jobSpec ->
when (jobSpec.factoryKey) {
"PushTextSendJob" -> jobSpec.updateAndSerialize("message_id", null, idOffset)
"ReactionSendJob" -> jobSpec.updateAndSerialize("message_id", "is_mms", idOffset)

4
app/src/main/java/org/thoughtcrime/securesms/migrations/UuidMigrationJob.java
View File

@@ -8,7 +8,7 @@ import androidx.annotation.Nullable;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.database.SignalDatabase;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.dependencies.AppDependencies;
import org.thoughtcrime.securesms.jobmanager.Job;
import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
import org.thoughtcrime.securesms.keyvalue.SignalStore;
@@ -71,7 +71,7 @@ public class UuidMigrationJob extends MigrationJob {
private static void fetchOwnUuid(@NonNull Context context) throws IOException {
RecipientId self = Recipient.self().getId();
ACI localUuid = ACI.parseOrNull(ApplicationDependencies.getSignalServiceAccountManager().getWhoAmI().getAci());
ACI localUuid = ACI.parseOrNull(AppDependencies.getSignalServiceAccountManager().getWhoAmI().getAci());
if (localUuid == null) {
throw new IOException("Invalid UUID!");