Rewrite the AppDependencies system.

app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java

@@ -39,7 +39,7 @@ import org.thoughtcrime.securesms.contacts.avatars.ProfileContactPhoto;
 import org.thoughtcrime.securesms.contacts.avatars.ResourceContactPhoto;
 import org.thoughtcrime.securesms.conversation.colors.AvatarColor;
 import org.thoughtcrime.securesms.conversation.colors.ChatColors;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobs.RetrieveProfileAvatarJob;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.ui.bottomsheet.RecipientBottomSheetDialogFragment;
@@ -205,7 +205,7 @@ public final class AvatarImageView extends AppCompatImageView {
 
           List<Transformation<Bitmap>> transforms = new ArrayList<>();
           if (shouldBlur) {
-            transforms.add(new BlurTransformation(ApplicationDependencies.getApplication(), 0.25f, BlurTransformation.MAX_RADIUS));
+            transforms.add(new BlurTransformation(AppDependencies.getApplication(), 0.25f, BlurTransformation.MAX_RADIUS));
           }
           transforms.add(new CircleCrop());
           blurred = shouldBlur;

app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemFooter.java

@@ -33,7 +33,7 @@ import org.thoughtcrime.securesms.conversation.v2.computed.FormattedDate;
 import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.DateUtils;
@@ -373,7 +373,7 @@ public class ConversationItemFooter extends ConstraintLayout {
         this.timerView.startAnimation();
 
         if (messageRecord.getExpireStarted() + messageRecord.getExpiresIn() <= System.currentTimeMillis()) {
-          ApplicationDependencies.getExpiringMessageManager().checkSchedule();
+          AppDependencies.getExpiringMessageManager().checkSchedule();
         }
       } else if (!messageRecord.isOutgoing() && !messageRecord.isMediaPending()) {
         SignalExecutors.BOUNDED.execute(() -> {
@@ -382,7 +382,7 @@ public class ConversationItemFooter extends ConstraintLayout {
           long    now = System.currentTimeMillis();
 
           SignalDatabase.messages().markExpireStarted(id, now);
-          ApplicationDependencies.getExpiringMessageManager().scheduleDeletion(id, mms, now, messageRecord.getExpiresIn());
+          AppDependencies.getExpiringMessageManager().scheduleDeletion(id, mms, now, messageRecord.getExpiresIn());
         });
       }
     } else {

app/src/main/java/org/thoughtcrime/securesms/components/DebugLogsPromptDialogFragment.kt

@@ -19,7 +19,7 @@ import org.signal.core.util.ResourceUtil
 import org.signal.core.util.concurrent.LifecycleDisposable
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.databinding.PromptLogsBottomSheetBinding
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.notifications.SlowNotificationHeuristics
 import org.thoughtcrime.securesms.util.BottomSheetUtil
@@ -63,7 +63,7 @@ class DebugLogsPromptDialogFragment : FixedRoundedCornerBottomSheetDialogFragmen
   private val viewModel: PromptLogsViewModel by viewModels(
     factoryProducer = {
       val purpose = Purpose.deserialize(requireArguments().getInt(KEY_PURPOSE))
-      PromptLogsViewModel.Factory(ApplicationDependencies.getApplication(), purpose)
+      PromptLogsViewModel.Factory(AppDependencies.application, purpose)
     }
   )
 

app/src/main/java/org/thoughtcrime/securesms/components/DeleteSyncEducationDialog.kt

@@ -30,7 +30,7 @@ import org.signal.core.ui.Previews
 import org.signal.core.ui.SignalPreview
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.compose.ComposeBottomSheetDialogFragment
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.util.FeatureFlags
 import org.thoughtcrime.securesms.util.TextSecurePreferences
@@ -46,7 +46,7 @@ class DeleteSyncEducationDialog : ComposeBottomSheetDialogFragment() {
 
     @JvmStatic
     fun shouldShow(): Boolean {
-      return TextSecurePreferences.isMultiDevice(ApplicationDependencies.getApplication()) &&
+      return TextSecurePreferences.isMultiDevice(AppDependencies.application) &&
         !SignalStore.uiHints().hasSeenDeleteSyncEducationSheet &&
         FeatureFlags.deleteSyncEnabled()
     }

app/src/main/java/org/thoughtcrime/securesms/components/TypingStatusSender.java

@@ -4,7 +4,7 @@ import android.annotation.SuppressLint;
 
 import org.signal.core.util.ThreadUtil;
 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobs.TypingSendJob;
 import org.thoughtcrime.securesms.util.Util;
 
@@ -76,7 +76,7 @@ public class TypingStatusSender {
   }
 
   private void sendTyping(long threadId, boolean typingStarted) {
-    ApplicationDependencies.getJobManager().add(new TypingSendJob(threadId, typingStarted));
+    AppDependencies.getJobManager().add(new TypingSendJob(threadId, typingStarted));
   }
 
   private class StartRunnable implements Runnable {

app/src/main/java/org/thoughtcrime/securesms/components/identity/UntrustedSendDialog.java

@@ -11,7 +11,7 @@ import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.crypto.ReentrantSessionLock;
 import org.thoughtcrime.securesms.crypto.storage.SignalIdentityKeyStore;
 import org.thoughtcrime.securesms.database.model.IdentityRecord;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.signal.core.util.concurrent.SimpleTask;
 import org.whispersystems.signalservice.api.SignalSessionLock;
 
@@ -40,7 +40,7 @@ public class UntrustedSendDialog extends AlertDialog.Builder implements DialogIn
 
   @Override
   public void onClick(DialogInterface dialog, int which) {
-    final SignalIdentityKeyStore identityStore = ApplicationDependencies.getProtocolStore().aci().identities();
+    final SignalIdentityKeyStore identityStore = AppDependencies.getProtocolStore().aci().identities();
 
     SimpleTask.run(() -> {
       try(SignalSessionLock.Lock unused = ReentrantSessionLock.INSTANCE.acquire()) {

app/src/main/java/org/thoughtcrime/securesms/components/identity/UnverifiedSendDialog.java

@@ -10,7 +10,7 @@ import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.crypto.ReentrantSessionLock;
 import org.thoughtcrime.securesms.database.IdentityTable;
 import org.thoughtcrime.securesms.database.model.IdentityRecord;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.signal.core.util.concurrent.SimpleTask;
 import org.whispersystems.signalservice.api.SignalSessionLock;
 
@@ -42,9 +42,9 @@ public class UnverifiedSendDialog extends AlertDialog.Builder implements DialogI
     SimpleTask.run(() -> {
       try(SignalSessionLock.Lock unused = ReentrantSessionLock.INSTANCE.acquire()) {
         for (IdentityRecord identityRecord : untrustedRecords) {
-          ApplicationDependencies.getProtocolStore().aci().identities().setVerified(identityRecord.getRecipientId(),
-                                                                                    identityRecord.getIdentityKey(),
-                                                                                    IdentityTable.VerifiedStatus.DEFAULT);
+          AppDependencies.getProtocolStore().aci().identities().setVerified(identityRecord.getRecipientId(),
+                                                                            identityRecord.getIdentityKey(),
+                                                                            IdentityTable.VerifiedStatus.DEFAULT);
         }
       }
       return null;

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsViewModel.kt

@@ -9,14 +9,14 @@ import org.thoughtcrime.securesms.components.settings.app.subscription.InAppDona
 import org.thoughtcrime.securesms.components.settings.app.subscription.RecurringInAppPaymentRepository
 import org.thoughtcrime.securesms.conversationlist.model.UnreadPaymentsLiveData
 import org.thoughtcrime.securesms.database.model.InAppPaymentSubscriberRecord
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.util.TextSecurePreferences
 import org.thoughtcrime.securesms.util.livedata.Store
 
 class AppSettingsViewModel(
-  recurringInAppPaymentRepository: RecurringInAppPaymentRepository = RecurringInAppPaymentRepository(ApplicationDependencies.getDonationsService())
+  recurringInAppPaymentRepository: RecurringInAppPaymentRepository = RecurringInAppPaymentRepository(AppDependencies.donationsService)
 ) : ViewModel() {
 
   private val store = Store(
@@ -25,7 +25,7 @@ class AppSettingsViewModel(
       0,
       SignalStore.donationsValues().getExpiredGiftBadge() != null,
       SignalStore.donationsValues().isLikelyASustainer() || InAppDonations.hasAtLeastOnePaymentMethodAvailable(),
-      TextSecurePreferences.isUnauthorizedReceived(ApplicationDependencies.getApplication()) || !SignalStore.account().isRegistered,
+      TextSecurePreferences.isUnauthorizedReceived(AppDependencies.application) || !SignalStore.account().isRegistered,
       SignalStore.misc().isClientDeprecated
     )
   )
@@ -58,7 +58,7 @@ class AppSettingsViewModel(
     store.update {
       it.copy(
         clientDeprecated = SignalStore.misc().isClientDeprecated,
-        userUnregistered = TextSecurePreferences.isUnauthorizedReceived(ApplicationDependencies.getApplication()) || !SignalStore.account().isRegistered
+        userUnregistered = TextSecurePreferences.isUnauthorizedReceived(AppDependencies.application) || !SignalStore.account().isRegistered
       )
     }
   }

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/AccountSettingsFragment.kt

@@ -26,7 +26,7 @@ import org.thoughtcrime.securesms.components.settings.DSLSettingsFragment
 import org.thoughtcrime.securesms.components.settings.DSLSettingsText
 import org.thoughtcrime.securesms.components.settings.configure
 import org.thoughtcrime.securesms.contactshare.SimpleTextWatcher
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.lock.v2.CreateSvrPinActivity
 import org.thoughtcrime.securesms.lock.v2.PinKeyboardType
@@ -163,7 +163,7 @@ class AccountSettingsFragment : DSLSettingsFragment(R.string.AccountSettingsFrag
               .setTitle(R.string.preferences_account_delete_all_data_confirmation_title)
               .setMessage(R.string.preferences_account_delete_all_data_confirmation_message)
               .setPositiveButton(R.string.preferences_account_delete_all_data_confirmation_proceed) { _: DialogInterface, _: Int ->
-                if (!ServiceUtil.getActivityManager(ApplicationDependencies.getApplication()).clearApplicationUserData()) {
+                if (!ServiceUtil.getActivityManager(AppDependencies.application).clearApplicationUserData()) {
                   Toast.makeText(requireContext(), R.string.preferences_account_delete_all_data_failed, Toast.LENGTH_LONG).show()
                 }
               }

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/AccountSettingsViewModel.kt

@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.components.settings.app.account
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.ViewModel
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.util.TextSecurePreferences
 import org.thoughtcrime.securesms.util.livedata.Store
@@ -21,7 +21,7 @@ class AccountSettingsViewModel : ViewModel() {
       hasPin = SignalStore.svr().hasPin() && !SignalStore.svr().hasOptedOut(),
       pinRemindersEnabled = SignalStore.pinValues().arePinRemindersEnabled(),
       registrationLockEnabled = SignalStore.svr().isRegistrationLockEnabled,
-      userUnregistered = TextSecurePreferences.isUnauthorizedReceived(ApplicationDependencies.getApplication()),
+      userUnregistered = TextSecurePreferences.isUnauthorizedReceived(AppDependencies.application),
       clientDeprecated = SignalStore.misc().isClientDeprecated
     )
   }

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/export/ExportAccountDataRepository.kt

@@ -5,14 +5,14 @@ import com.fasterxml.jackson.databind.JsonNode
 import com.fasterxml.jackson.databind.node.ObjectNode
 import io.reactivex.rxjava3.core.Single
 import io.reactivex.rxjava3.schedulers.Schedulers
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.providers.BlobProvider
 import org.thoughtcrime.securesms.util.JsonUtils
 import org.whispersystems.signalservice.api.SignalServiceAccountManager
 import java.io.IOException
 
 class ExportAccountDataRepository(
-  private val accountManager: SignalServiceAccountManager = ApplicationDependencies.getSignalServiceAccountManager()
+  private val accountManager: SignalServiceAccountManager = AppDependencies.signalServiceAccountManager
 ) {
 
   fun downloadAccountDataReport(exportAsJson: Boolean): Single<ExportedReport> {

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberRepository.kt

@@ -18,7 +18,7 @@ import org.thoughtcrime.securesms.crypto.PreKeyUtil
 import org.thoughtcrime.securesms.database.IdentityTable
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.database.model.databaseprotos.PendingChangeNumberMetadata
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobs.RefreshAttributesJob
 import org.thoughtcrime.securesms.keyvalue.CertificateType
 import org.thoughtcrime.securesms.keyvalue.SignalStore
@@ -59,8 +59,8 @@ private val TAG: String = Log.tag(ChangeNumberRepository::class.java)
  * the global "I am changing the number" lock exclusivity.
  */
 class ChangeNumberRepository(
-  private val accountManager: SignalServiceAccountManager = ApplicationDependencies.getSignalServiceAccountManager(),
-  private val messageSender: SignalServiceMessageSender = ApplicationDependencies.getSignalServiceMessageSender()
+  private val accountManager: SignalServiceAccountManager = AppDependencies.signalServiceAccountManager,
+  private val messageSender: SignalServiceMessageSender = AppDependencies.signalServiceMessageSender
 ) {
 
   companion object {
@@ -93,20 +93,20 @@ class ChangeNumberRepository(
       val drainedListener = object : Runnable {
         override fun run() {
           emitter.onComplete()
-          ApplicationDependencies
-            .getIncomingMessageObserver()
+          AppDependencies
+            .incomingMessageObserver
             .removeDecryptionDrainedListener(this)
         }
       }
 
       emitter.setCancellable {
-        ApplicationDependencies
-          .getIncomingMessageObserver()
+        AppDependencies
+          .incomingMessageObserver
           .removeDecryptionDrainedListener(drainedListener)
       }
 
-      ApplicationDependencies
-        .getIncomingMessageObserver()
+      AppDependencies
+        .incomingMessageObserver
         .addDecryptionDrainedListener(drainedListener)
     }.subscribeOn(Schedulers.single())
       .timeout(15, TimeUnit.SECONDS)
@@ -209,7 +209,7 @@ class ChangeNumberRepository(
 
   @Suppress("UsePropertyAccessSyntax")
   fun whoAmI(): Single<WhoAmIResponse> {
-    return Single.fromCallable { ApplicationDependencies.getSignalServiceAccountManager().getWhoAmI() }
+    return Single.fromCallable { AppDependencies.signalServiceAccountManager.getWhoAmI() }
       .subscribeOn(Schedulers.single())
   }
 
@@ -229,13 +229,13 @@ class ChangeNumberRepository(
       }
     }
 
-    ApplicationDependencies.getRecipientCache().clear()
+    AppDependencies.recipientCache.clear()
 
     SignalStore.account().setE164(e164)
     SignalStore.account().setPni(pni)
-    ApplicationDependencies.resetProtocolStores()
+    AppDependencies.resetProtocolStores()
 
-    ApplicationDependencies.getGroupsV2Authorization().clear()
+    AppDependencies.groupsV2Authorization.clear()
 
     val metadata: PendingChangeNumberMetadata? = SignalStore.misc().pendingChangeNumberMetadata
     if (metadata == null) {
@@ -253,7 +253,7 @@ class ChangeNumberRepository(
       val pniSignedPreyKeyId = metadata.pniSignedPreKeyId
       val pniLastResortKyberPreKeyId = metadata.pniLastResortKyberPreKeyId
 
-      val pniProtocolStore = ApplicationDependencies.getProtocolStore().pni()
+      val pniProtocolStore = AppDependencies.protocolStore.pni()
       val pniMetadataStore = SignalStore.account().pniPreKeys
 
       SignalStore.account().pniRegistrationId = pniRegistrationId
@@ -292,16 +292,16 @@ class ChangeNumberRepository(
       )
 
       SignalStore.misc().hasPniInitializedDevices = true
-      ApplicationDependencies.getGroupsV2Authorization().clear()
+      AppDependencies.groupsV2Authorization.clear()
     }
 
     Recipient.self().live().refresh()
     StorageSyncHelper.scheduleSyncForDataChange()
 
-    ApplicationDependencies.closeConnections()
-    ApplicationDependencies.getIncomingMessageObserver()
+    AppDependencies.resetNetwork()
+    AppDependencies.incomingMessageObserver
 
-    ApplicationDependencies.getJobManager().add(RefreshAttributesJob())
+    AppDependencies.jobManager.add(RefreshAttributesJob())
 
     return rotateCertificates()
   }
@@ -335,7 +335,7 @@ class ChangeNumberRepository(
     registrationLock: String? = null
   ): ChangeNumberRequestData {
     val selfIdentifier: String = SignalStore.account().requireAci().toString()
-    val aciProtocolStore: SignalProtocolStore = ApplicationDependencies.getProtocolStore().aci()
+    val aciProtocolStore: SignalProtocolStore = AppDependencies.protocolStore.aci()
 
     val pniIdentity: IdentityKeyPair = IdentityKeyUtil.generateIdentityKeyPair()
     val deviceMessages = mutableListOf<OutgoingPushMessage>()
@@ -351,7 +351,7 @@ class ChangeNumberRepository(
       .forEach { deviceId ->
         // Signed Prekeys
         val signedPreKeyRecord: SignedPreKeyRecord = if (deviceId == primaryDeviceId) {
-          PreKeyUtil.generateAndStoreSignedPreKey(ApplicationDependencies.getProtocolStore().pni(), SignalStore.account().pniPreKeys, pniIdentity.privateKey)
+          PreKeyUtil.generateAndStoreSignedPreKey(AppDependencies.protocolStore.pni(), SignalStore.account().pniPreKeys, pniIdentity.privateKey)
         } else {
           PreKeyUtil.generateSignedPreKey(SecureRandom().nextInt(Medium.MAX_VALUE), pniIdentity.privateKey)
         }
@@ -359,7 +359,7 @@ class ChangeNumberRepository(
 
         // Last-resort kyber prekeys
         val lastResortKyberPreKeyRecord: KyberPreKeyRecord = if (deviceId == primaryDeviceId) {
-          PreKeyUtil.generateAndStoreLastResortKyberPreKey(ApplicationDependencies.getProtocolStore().pni(), SignalStore.account().pniPreKeys, pniIdentity.privateKey)
+          PreKeyUtil.generateAndStoreLastResortKyberPreKey(AppDependencies.protocolStore.pni(), SignalStore.account().pniPreKeys, pniIdentity.privateKey)
         } else {
           PreKeyUtil.generateLastResortKyberPreKey(SecureRandom().nextInt(Medium.MAX_VALUE), pniIdentity.privateKey)
         }

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberViewModel.kt

@@ -14,7 +14,7 @@ import io.reactivex.rxjava3.core.Completable
 import io.reactivex.rxjava3.core.Single
 import io.reactivex.rxjava3.schedulers.Schedulers
 import org.signal.core.util.logging.Log
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.registration.RegistrationSessionProcessor
 import org.thoughtcrime.securesms.registration.SmsRetrieverReceiver
@@ -40,7 +40,7 @@ class ChangeNumberViewModel(
   savedState: SavedStateHandle,
   password: String,
   verifyAccountRepository: VerifyAccountRepository,
-  private val smsRetrieverReceiver: SmsRetrieverReceiver = SmsRetrieverReceiver(ApplicationDependencies.getApplication())
+  private val smsRetrieverReceiver: SmsRetrieverReceiver = SmsRetrieverReceiver(AppDependencies.application)
 ) : BaseRegistrationViewModel(savedState, verifyAccountRepository, password) {
 
   var oldNumberState: NumberViewState = NumberViewState.Builder().build()
@@ -222,7 +222,7 @@ class ChangeNumberViewModel(
   class Factory(owner: SavedStateRegistryOwner) : AbstractSavedStateViewModelFactory(owner, null) {
 
     override fun <T : ViewModel> create(key: String, modelClass: Class<T>, handle: SavedStateHandle): T {
-      val context: Application = ApplicationDependencies.getApplication()
+      val context: Application = AppDependencies.application
       val localNumber: String = SignalStore.account().e164!!
       val password: String = SignalStore.account().servicePassword!!
 

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/ChatsSettingsRepository.kt

@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.components.settings.app.chats
 import android.content.Context
 import org.signal.core.util.concurrent.SignalExecutors
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobs.MultiDeviceConfigurationUpdateJob
 import org.thoughtcrime.securesms.jobs.MultiDeviceContactUpdateJob
 import org.thoughtcrime.securesms.keyvalue.SignalStore
@@ -13,7 +13,7 @@ import org.thoughtcrime.securesms.util.TextSecurePreferences
 
 class ChatsSettingsRepository {
 
-  private val context: Context = ApplicationDependencies.getApplication()
+  private val context: Context = AppDependencies.application
 
   fun syncLinkPreviewsState() {
     SignalExecutors.BOUNDED.execute {
@@ -21,7 +21,7 @@ class ChatsSettingsRepository {
 
       SignalDatabase.recipients.markNeedsSync(Recipient.self().id)
       StorageSyncHelper.scheduleSyncForDataChange()
-      ApplicationDependencies.getJobManager().add(
+      AppDependencies.jobManager.add(
         MultiDeviceConfigurationUpdateJob(
           TextSecurePreferences.isReadReceiptsEnabled(context),
           TextSecurePreferences.isTypingIndicatorsEnabled(context),
@@ -35,7 +35,7 @@ class ChatsSettingsRepository {
   fun syncPreferSystemContactPhotos() {
     SignalExecutors.BOUNDED.execute {
       SignalDatabase.recipients.markNeedsSync(Recipient.self().id)
-      ApplicationDependencies.getJobManager().add(MultiDeviceContactUpdateJob(true))
+      AppDependencies.jobManager.add(MultiDeviceContactUpdateJob(true))
       StorageSyncHelper.scheduleSyncForDataChange()
     }
   }

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/ChatsSettingsViewModel.kt

@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.components.settings.app.chats
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.ViewModel
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.util.BackupUtil
 import org.thoughtcrime.securesms.util.ConversationUtil
@@ -22,7 +22,7 @@ class ChatsSettingsViewModel @JvmOverloads constructor(
       keepMutedChatsArchived = SignalStore.settings().shouldKeepMutedChatsArchived(),
       useSystemEmoji = SignalStore.settings().isPreferSystemEmoji,
       enterKeySends = SignalStore.settings().isEnterKeySends,
-      localBackupsEnabled = SignalStore.settings().isBackupEnabled && BackupUtil.canUserAccessBackupDirectory(ApplicationDependencies.getApplication()),
+      localBackupsEnabled = SignalStore.settings().isBackupEnabled && BackupUtil.canUserAccessBackupDirectory(AppDependencies.application),
       remoteBackupsEnabled = SignalStore.backup().areBackupsEnabled
     )
   )
@@ -59,7 +59,7 @@ class ChatsSettingsViewModel @JvmOverloads constructor(
   }
 
   fun refresh() {
-    val backupsEnabled = SignalStore.settings().isBackupEnabled && BackupUtil.canUserAccessBackupDirectory(ApplicationDependencies.getApplication())
+    val backupsEnabled = SignalStore.settings().isBackupEnabled && BackupUtil.canUserAccessBackupDirectory(AppDependencies.application)
     val remoteBackupsEnabled = SignalStore.backup().areBackupsEnabled
 
     if (store.state.localBackupsEnabled != backupsEnabled ||

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/backups/RemoteBackupsSettingsViewModel.kt

@@ -10,7 +10,7 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.lifecycle.ViewModel
 import org.thoughtcrime.securesms.backup.v2.BackupFrequency
 import org.thoughtcrime.securesms.backup.v2.BackupV2Event
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobs.BackupMessagesJob
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.service.MessageBackupListener
@@ -39,7 +39,7 @@ class RemoteBackupsSettingsViewModel : ViewModel() {
     SignalStore.backup().backupFrequency = backupsFrequency
     internalState.value = state.value.copy(backupsFrequency = backupsFrequency)
     MessageBackupListener.setNextBackupTimeToIntervalFromNow()
-    MessageBackupListener.schedule(ApplicationDependencies.getApplication())
+    MessageBackupListener.schedule(AppDependencies.application)
   }
 
   fun requestDialog(dialog: RemoteBackupsSettingsState.Dialog) {

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/data/DataAndStorageSettingsRepository.kt

@@ -3,11 +3,11 @@ package org.thoughtcrime.securesms.components.settings.app.data
 import android.content.Context
 import org.signal.core.util.concurrent.SignalExecutors
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 
 class DataAndStorageSettingsRepository {
 
-  private val context: Context = ApplicationDependencies.getApplication()
+  private val context: Context = AppDependencies.application
 
   fun getTotalStorageUse(consumer: (Long) -> Unit) {
     SignalExecutors.BOUNDED.execute {

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/data/DataAndStorageSettingsViewModel.kt

@@ -4,7 +4,7 @@ import android.content.SharedPreferences
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.mms.SentMediaQuality
 import org.thoughtcrime.securesms.util.TextSecurePreferences
@@ -43,7 +43,7 @@ class DataAndStorageSettingsViewModel(
 
   fun setCallDataMode(callDataMode: CallDataMode) {
     SignalStore.settings().callDataMode = callDataMode
-    ApplicationDependencies.getSignalCallManager().dataModeUpdate()
+    AppDependencies.signalCallManager.dataModeUpdate()
     getStateAndCopyStorageUsage()
   }
 
@@ -59,13 +59,13 @@ class DataAndStorageSettingsViewModel(
   private fun getState() = DataAndStorageSettingsState(
     totalStorageUse = 0,
     mobileAutoDownloadValues = TextSecurePreferences.getMobileMediaDownloadAllowed(
-      ApplicationDependencies.getApplication()
+      AppDependencies.application
     ),
     wifiAutoDownloadValues = TextSecurePreferences.getWifiMediaDownloadAllowed(
-      ApplicationDependencies.getApplication()
+      AppDependencies.application
     ),
     roamingAutoDownloadValues = TextSecurePreferences.getRoamingMediaDownloadAllowed(
-      ApplicationDependencies.getApplication()
+      AppDependencies.application
     ),
     callDataMode = SignalStore.settings().callDataMode,
     isProxyEnabled = SignalStore.proxy().isProxyEnabled,

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalPendingOneTimeDonationConfigurationViewModel.kt

@@ -16,7 +16,7 @@ import org.signal.core.util.money.FiatMoney
 import org.thoughtcrime.securesms.badges.Badges
 import org.thoughtcrime.securesms.components.settings.app.subscription.DonationSerializationHelper.toFiatValue
 import org.thoughtcrime.securesms.database.model.databaseprotos.PendingOneTimeDonation
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import java.math.BigDecimal
 import java.util.Currency
 import java.util.Locale
@@ -35,7 +35,7 @@ class InternalPendingOneTimeDonationConfigurationViewModel : ViewModel() {
 
   val disposable: Disposable = Single
     .fromCallable {
-      ApplicationDependencies.getDonationsService()
+      AppDependencies.donationsService
         .getDonationsConfiguration(Locale.getDefault())
     }
     .flatMap { it.flattenResult() }

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsFragment.kt

@@ -35,7 +35,7 @@ import org.thoughtcrime.securesms.database.MegaphoneDatabase
 import org.thoughtcrime.securesms.database.OneTimePreKeyTable
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.database.model.InAppPaymentSubscriberRecord
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobmanager.JobTracker
 import org.thoughtcrime.securesms.jobs.DownloadLatestEmojiDataJob
 import org.thoughtcrime.securesms.jobs.EmojiSearchIndexDownloadJob
@@ -208,7 +208,7 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
         summary = DSLSettingsText.from("Clear backoff intervals, app will restart"),
         onClick = {
           SimpleTask.run({
-            JobDatabase.getInstance(ApplicationDependencies.getApplication()).debugResetBackoffInterval()
+            JobDatabase.getInstance(AppDependencies.application).debugResetBackoffInterval()
           }) {
             AppUtil.restart(requireContext())
           }
@@ -360,7 +360,7 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
         onClick = {
           viewModel.setForceWebsocketMode(!state.forceWebsocketMode)
           SimpleTask.run({
-            val jobState = ApplicationDependencies.getJobManager().runSynchronously(RefreshAttributesJob(), 10.seconds.inWholeMilliseconds)
+            val jobState = AppDependencies.jobManager.runSynchronously(RefreshAttributesJob(), 10.seconds.inWholeMilliseconds)
             return@run jobState.isPresent && jobState.get().isComplete
           }, { success ->
             if (success) {
@@ -416,7 +416,7 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
         title = DSLSettingsText.from("Force emoji download"),
         summary = DSLSettingsText.from("Download the latest emoji set if it\\'s newer than what we have."),
         onClick = {
-          ApplicationDependencies.getJobManager().add(DownloadLatestEmojiDataJob(true))
+          AppDependencies.jobManager.add(DownloadLatestEmojiDataJob(true))
         }
       )
 
@@ -604,12 +604,12 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
         title = DSLSettingsText.from("Reset donation megaphone"),
         onClick = {
           SignalDatabase.remoteMegaphones.debugRemoveAll()
-          MegaphoneDatabase.getInstance(ApplicationDependencies.getApplication()).let {
+          MegaphoneDatabase.getInstance(AppDependencies.application).let {
             it.delete(Megaphones.Event.REMOTE_MEGAPHONE)
             it.markFirstVisible(Megaphones.Event.DONATE_Q2_2022, System.currentTimeMillis() - TimeUnit.DAYS.toMillis(31))
           }
           // Force repository database cache refresh
-          MegaphoneRepository(ApplicationDependencies.getApplication()).onFirstEverAppLaunch()
+          MegaphoneRepository(AppDependencies.application).onFirstEverAppLaunch()
         }
       )
 
@@ -715,7 +715,7 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
         isEnabled = true,
         onClick = {
           SimpleTask.run(viewLifecycleOwner.lifecycle, {
-            ApplicationDependencies.getJobManager().runSynchronously(PnpInitializeDevicesJob(), 10.seconds.inWholeMilliseconds)
+            AppDependencies.jobManager.runSynchronously(PnpInitializeDevicesJob(), 10.seconds.inWholeMilliseconds)
           }, { state ->
             if (state.isPresent) {
               Toast.makeText(context, "Job finished with result: ${state.get()}!", Toast.LENGTH_SHORT).show()
@@ -842,7 +842,7 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
       .setPositiveButton(
         "Copy"
       ) { _: DialogInterface?, _: Int ->
-        val context: Context = ApplicationDependencies.getApplication()
+        val context: Context = AppDependencies.application
         val clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
 
         SimpleTask.run<Any?>(
@@ -867,7 +867,7 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
   }
 
   private fun refreshAttributes() {
-    ApplicationDependencies.getJobManager()
+    AppDependencies.jobManager
       .startChain(RefreshAttributesJob())
       .then(RefreshOwnProfileJob())
       .enqueue()
@@ -875,19 +875,19 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
   }
 
   private fun refreshProfile() {
-    ApplicationDependencies.getJobManager().add(RefreshOwnProfileJob())
+    AppDependencies.jobManager.add(RefreshOwnProfileJob())
     Toast.makeText(context, "Scheduled profile refresh", Toast.LENGTH_SHORT).show()
   }
 
   private fun rotateProfileKey() {
-    ApplicationDependencies.getJobManager().add(RotateProfileKeyJob())
+    AppDependencies.jobManager.add(RotateProfileKeyJob())
     Toast.makeText(context, "Scheduled profile key rotation", Toast.LENGTH_SHORT).show()
   }
 
   private fun refreshRemoteValues() {
     Toast.makeText(context, "Running remote config refresh, app will restart after completion.", Toast.LENGTH_LONG).show()
     SignalExecutors.BOUNDED.execute {
-      val result: Optional<JobTracker.JobState> = ApplicationDependencies.getJobManager().runSynchronously(RemoteConfigRefreshJob(), TimeUnit.SECONDS.toMillis(10))
+      val result: Optional<JobTracker.JobState> = AppDependencies.jobManager.runSynchronously(RemoteConfigRefreshJob(), TimeUnit.SECONDS.toMillis(10))
 
       if (result.isPresent && result.get() == JobTracker.JobState.SUCCESS) {
         AppUtil.restart(requireContext())
@@ -903,7 +903,7 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
   }
 
   private fun enqueueStorageServiceForcePush() {
-    ApplicationDependencies.getJobManager().add(StorageForcePushJob())
+    AppDependencies.jobManager.add(StorageForcePushJob())
     Toast.makeText(context, "Scheduled storage force push", Toast.LENGTH_SHORT).show()
   }
 
@@ -924,7 +924,7 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
   }
 
   private fun clearAllLocalMetricsState() {
-    LocalMetricsDatabase.getInstance(ApplicationDependencies.getApplication()).clear()
+    LocalMetricsDatabase.getInstance(AppDependencies.application).clear()
     Toast.makeText(context, "Cleared all local metrics state.", Toast.LENGTH_SHORT).show()
   }
 

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsRepository.kt

@@ -9,7 +9,7 @@ import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.database.model.RemoteMegaphoneRecord
 import org.thoughtcrime.securesms.database.model.addStyle
 import org.thoughtcrime.securesms.database.model.databaseprotos.BodyRangeList
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.emoji.EmojiFiles
 import org.thoughtcrime.securesms.jobs.AttachmentDownloadJob
 import org.thoughtcrime.securesms.jobs.CreateReleaseChannelJob
@@ -43,7 +43,7 @@ class InternalSettingsRepository(context: Context) {
 
   fun addSampleReleaseNote() {
     SignalExecutors.UNBOUNDED.execute {
-      ApplicationDependencies.getJobManager().runSynchronously(CreateReleaseChannelJob.create(), 5000)
+      AppDependencies.jobManager.runSynchronously(CreateReleaseChannelJob.create(), 5000)
 
       val title = "Release Note Title"
       val bodyText = "Release note body. Aren't I awesome?"
@@ -68,9 +68,9 @@ class InternalSettingsRepository(context: Context) {
 
       if (insertResult != null) {
         SignalDatabase.attachments.getAttachmentsForMessage(insertResult.messageId)
-          .forEach { ApplicationDependencies.getJobManager().add(AttachmentDownloadJob(insertResult.messageId, it.attachmentId, false)) }
+          .forEach { AppDependencies.jobManager.add(AttachmentDownloadJob(insertResult.messageId, it.attachmentId, false)) }
 
-        ApplicationDependencies.getMessageNotifier().updateNotification(context, ConversationId.forConversation(insertResult.threadId))
+        AppDependencies.messageNotifier.updateNotification(context, ConversationId.forConversation(insertResult.threadId))
       }
     }
   }
@@ -100,7 +100,7 @@ class InternalSettingsRepository(context: Context) {
       SignalDatabase.remoteMegaphones.insert(record)
 
       if (record.imageUrl != null) {
-        ApplicationDependencies.getJobManager().add(FetchRemoteMegaphoneImageJob(record.uuid, record.imageUrl))
+        AppDependencies.jobManager.add(FetchRemoteMegaphoneImageJob(record.uuid, record.imageUrl))
       }
     }
   }

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/backup/InternalBackupPlaygroundViewModel.kt

@@ -23,7 +23,7 @@ import org.thoughtcrime.securesms.backup.v2.BackupMetadata
 import org.thoughtcrime.securesms.backup.v2.BackupRepository
 import org.thoughtcrime.securesms.database.MessageType
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobs.ArchiveAttachmentJob
 import org.thoughtcrime.securesms.jobs.AttachmentDownloadJob
 import org.thoughtcrime.securesms.jobs.AttachmentUploadJob
@@ -69,7 +69,7 @@ class InternalBackupPlaygroundViewModel : ViewModel() {
   fun triggerBackupJob() {
     _state.value = _state.value.copy(backupState = BackupState.EXPORT_IN_PROGRESS)
 
-    disposables += Single.fromCallable { ApplicationDependencies.getJobManager().runSynchronously(BackupMessagesJob(), 120_000) }
+    disposables += Single.fromCallable { AppDependencies.jobManager.runSynchronously(BackupMessagesJob(), 120_000) }
       .subscribeOn(Schedulers.io())
       .observeOn(AndroidSchedulers.mainThread())
       .subscribeBy {
@@ -166,8 +166,8 @@ class InternalBackupPlaygroundViewModel : ViewModel() {
     _state.value = _state.value.copy(backupState = BackupState.IMPORT_IN_PROGRESS)
 
     disposables += Single.fromCallable {
-      ApplicationDependencies
-        .getJobManager()
+      AppDependencies
+        .jobManager
         .startChain(BackupRestoreJob())
         .then(SyncArchivedMediaJob())
         .then(BackupRestoreMediaJob())
@@ -245,8 +245,8 @@ class InternalBackupPlaygroundViewModel : ViewModel() {
   private fun reUploadAndArchiveMedia(attachmentId: AttachmentId) {
     disposables += Single
       .fromCallable {
-        ApplicationDependencies
-          .getJobManager()
+        AppDependencies
+          .jobManager
           .startChain(AttachmentUploadJob(attachmentId))
           .then(ArchiveAttachmentJob(attachmentId))
           .enqueueAndBlockUntilCompletion(15.seconds.inWholeMilliseconds)
@@ -325,7 +325,7 @@ class InternalBackupPlaygroundViewModel : ViewModel() {
 
         val archivedAttachment = SignalDatabase.attachments.getAttachmentsForMessage(insertMessage.messageId).first()
 
-        ApplicationDependencies.getJobManager().add(
+        AppDependencies.jobManager.add(
           AttachmentDownloadJob(
             messageId = insertMessage.messageId,
             attachmentId = archivedAttachment.attachmentId,

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/donor/InternalDonorErrorConfigurationViewModel.kt

@@ -15,7 +15,7 @@ import org.thoughtcrime.securesms.components.settings.app.subscription.getBoostB
 import org.thoughtcrime.securesms.components.settings.app.subscription.getGiftBadges
 import org.thoughtcrime.securesms.components.settings.app.subscription.getSubscriptionLevels
 import org.thoughtcrime.securesms.database.model.InAppPaymentSubscriberRecord
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.util.rx.RxStore
 import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription
@@ -31,7 +31,7 @@ class InternalDonorErrorConfigurationViewModel : ViewModel() {
   init {
     val giftBadges: Single<List<Badge>> = Single
       .fromCallable {
-        ApplicationDependencies.getDonationsService()
+        AppDependencies.donationsService
           .getDonationsConfiguration(Locale.getDefault())
       }
       .flatMap { it.flattenResult() }
@@ -40,7 +40,7 @@ class InternalDonorErrorConfigurationViewModel : ViewModel() {
 
     val boostBadges: Single<List<Badge>> = Single
       .fromCallable {
-        ApplicationDependencies.getDonationsService()
+        AppDependencies.donationsService
           .getDonationsConfiguration(Locale.getDefault())
       }
       .flatMap { it.flattenResult() }
@@ -49,7 +49,7 @@ class InternalDonorErrorConfigurationViewModel : ViewModel() {
 
     val subscriptionBadges: Single<List<Badge>> = Single
       .fromCallable {
-        ApplicationDependencies.getDonationsService()
+        AppDependencies.donationsService
           .getDonationsConfiguration(Locale.getDefault())
       }
       .flatMap { it.flattenResult() }

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/svr/InternalSvrPlaygroundViewModel.kt

@@ -16,7 +16,7 @@ import io.reactivex.rxjava3.kotlin.plusAssign
 import io.reactivex.rxjava3.schedulers.Schedulers
 import kotlinx.collections.immutable.persistentListOf
 import org.thoughtcrime.securesms.BuildConfig
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.whispersystems.signalservice.api.svr.SecureValueRecovery
 import org.whispersystems.signalservice.api.svr.SecureValueRecoveryV3
@@ -104,8 +104,8 @@ class InternalSvrPlaygroundViewModel : ViewModel() {
 
   private fun SvrImplementation.toImplementation(): SecureValueRecovery {
     return when (this) {
-      SvrImplementation.SVR2 -> ApplicationDependencies.getSignalServiceAccountManager().getSecureValueRecoveryV2(BuildConfig.SVR2_MRENCLAVE)
-      SvrImplementation.SVR3 -> ApplicationDependencies.getSignalServiceAccountManager().getSecureValueRecoveryV3(ApplicationDependencies.getLibsignalNetwork().network, TestShareSetStorage())
+      SvrImplementation.SVR2 -> AppDependencies.signalServiceAccountManager.getSecureValueRecoveryV2(BuildConfig.SVR2_MRENCLAVE)
+      SvrImplementation.SVR3 -> AppDependencies.signalServiceAccountManager.getSecureValueRecoveryV3(AppDependencies.libsignalNetwork.network, TestShareSetStorage())
     }
   }
 

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/NotificationsSettingsViewModel.kt

@@ -6,7 +6,7 @@ import android.os.Build
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.notifications.NotificationChannels
 import org.thoughtcrime.securesms.notifications.SlowNotificationHeuristics
@@ -118,7 +118,7 @@ class NotificationsSettingsViewModel(private val sharedPreferences: SharedPrefer
       inChatSoundsEnabled = SignalStore.settings().isMessageNotificationsInChatSoundsEnabled,
       repeatAlerts = SignalStore.settings().messageNotificationsRepeatAlerts,
       messagePrivacy = SignalStore.settings().messageNotificationsPrivacy.toString(),
-      priority = TextSecurePreferences.getNotificationPriority(ApplicationDependencies.getApplication()),
+      priority = TextSecurePreferences.getNotificationPriority(AppDependencies.application),
       troubleshootNotifications = if (calculateSlowNotifications) {
         SlowNotificationHeuristics.isPotentiallyCausedByBatteryOptimizations() && SlowNotificationHeuristics.isHavingDelayedNotifications()
       } else if (currentState != null) {

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/NotificationProfilesRepository.kt

@@ -11,7 +11,7 @@ import org.thoughtcrime.securesms.database.DatabaseObserver
 import org.thoughtcrime.securesms.database.NotificationProfileDatabase
 import org.thoughtcrime.securesms.database.RxDatabaseObserver
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.notifications.profiles.NotificationProfile
 import org.thoughtcrime.securesms.notifications.profiles.NotificationProfileSchedule
@@ -44,7 +44,7 @@ class NotificationProfilesRepository {
         }
       }
 
-      val databaseObserver: DatabaseObserver = ApplicationDependencies.getDatabaseObserver()
+      val databaseObserver: DatabaseObserver = AppDependencies.databaseObserver
       val profileObserver = DatabaseObserver.Observer { emitProfile() }
 
       databaseObserver.registerNotificationProfileObserver(profileObserver)
@@ -132,7 +132,7 @@ class NotificationProfilesRepository {
         SignalStore.notificationProfileValues().manuallyDisabledAt = now
       }
     }
-      .doOnComplete { ApplicationDependencies.getDatabaseObserver().notifyNotificationProfileObservers() }
+      .doOnComplete { AppDependencies.databaseObserver.notifyNotificationProfileObservers() }
       .subscribeOn(Schedulers.io())
   }
 
@@ -142,7 +142,7 @@ class NotificationProfilesRepository {
       SignalStore.notificationProfileValues().manuallyEnabledUntil = enableUntil
       SignalStore.notificationProfileValues().manuallyDisabledAt = now
     }
-      .doOnComplete { ApplicationDependencies.getDatabaseObserver().notifyNotificationProfileObservers() }
+      .doOnComplete { AppDependencies.databaseObserver.notifyNotificationProfileObservers() }
       .subscribeOn(Schedulers.io())
   }
 
@@ -153,7 +153,7 @@ class NotificationProfilesRepository {
       SignalStore.notificationProfileValues().manuallyEnabledUntil = if (inScheduledWindow) schedule.endDateTime(now.toLocalDateTime()).toMillis() else Long.MAX_VALUE
       SignalStore.notificationProfileValues().manuallyDisabledAt = if (inScheduledWindow) now else 0
     }
-      .doOnComplete { ApplicationDependencies.getDatabaseObserver().notifyNotificationProfileObservers() }
+      .doOnComplete { AppDependencies.databaseObserver.notifyNotificationProfileObservers() }
       .subscribeOn(Schedulers.io())
   }
 

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsRepository.kt

@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.components.settings.app.privacy
 import android.content.Context
 import org.signal.core.util.concurrent.SignalExecutors
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobs.MultiDeviceConfigurationUpdateJob
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.recipients.Recipient
@@ -12,7 +12,7 @@ import org.thoughtcrime.securesms.util.TextSecurePreferences
 
 class PrivacySettingsRepository {
 
-  private val context: Context = ApplicationDependencies.getApplication()
+  private val context: Context = AppDependencies.application
 
   fun getBlockedCount(consumer: (Int) -> Unit) {
     SignalExecutors.BOUNDED.execute {
@@ -26,7 +26,7 @@ class PrivacySettingsRepository {
     SignalExecutors.BOUNDED.execute {
       SignalDatabase.recipients.markNeedsSync(Recipient.self().id)
       StorageSyncHelper.scheduleSyncForDataChange()
-      ApplicationDependencies.getJobManager().add(
+      AppDependencies.jobManager.add(
         MultiDeviceConfigurationUpdateJob(
           TextSecurePreferences.isReadReceiptsEnabled(context),
           TextSecurePreferences.isTypingIndicatorsEnabled(context),
@@ -42,7 +42,7 @@ class PrivacySettingsRepository {
 
     SignalDatabase.recipients.markNeedsSync(Recipient.self().id)
     StorageSyncHelper.scheduleSyncForDataChange()
-    ApplicationDependencies.getJobManager().add(
+    AppDependencies.jobManager.add(
       MultiDeviceConfigurationUpdateJob(
         TextSecurePreferences.isReadReceiptsEnabled(context),
         enabled,
@@ -52,7 +52,7 @@ class PrivacySettingsRepository {
     )
 
     if (!enabled) {
-      ApplicationDependencies.getTypingStatusRepository().clear()
+      AppDependencies.typingStatusRepository.clear()
     }
   }
 }

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsViewModel.kt

@@ -4,7 +4,7 @@ import android.content.SharedPreferences
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.util.TextSecurePreferences
 import org.thoughtcrime.securesms.util.livedata.Store
@@ -43,7 +43,7 @@ class PrivacySettingsViewModel(
   }
 
   fun setScreenLockTimeout(seconds: Long) {
-    TextSecurePreferences.setScreenLockTimeout(ApplicationDependencies.getApplication(), seconds)
+    TextSecurePreferences.setScreenLockTimeout(AppDependencies.application, seconds)
     refresh()
   }
 
@@ -68,7 +68,7 @@ class PrivacySettingsViewModel(
   }
 
   fun setObsoletePasswordTimeout(minutes: Int) {
-    TextSecurePreferences.setPassphraseTimeoutInterval(ApplicationDependencies.getApplication(), minutes)
+    TextSecurePreferences.setPassphraseTimeoutInterval(AppDependencies.application, minutes)
     refresh()
   }
 
@@ -79,16 +79,16 @@ class PrivacySettingsViewModel(
   private fun getState(): PrivacySettingsState {
     return PrivacySettingsState(
       blockedCount = 0,
-      readReceipts = TextSecurePreferences.isReadReceiptsEnabled(ApplicationDependencies.getApplication()),
-      typingIndicators = TextSecurePreferences.isTypingIndicatorsEnabled(ApplicationDependencies.getApplication()),
-      screenLock = TextSecurePreferences.isScreenLockEnabled(ApplicationDependencies.getApplication()),
-      screenLockActivityTimeout = TextSecurePreferences.getScreenLockTimeout(ApplicationDependencies.getApplication()),
-      screenSecurity = TextSecurePreferences.isScreenSecurityEnabled(ApplicationDependencies.getApplication()),
-      incognitoKeyboard = TextSecurePreferences.isIncognitoKeyboardEnabled(ApplicationDependencies.getApplication()),
+      readReceipts = TextSecurePreferences.isReadReceiptsEnabled(AppDependencies.application),
+      typingIndicators = TextSecurePreferences.isTypingIndicatorsEnabled(AppDependencies.application),
+      screenLock = TextSecurePreferences.isScreenLockEnabled(AppDependencies.application),
+      screenLockActivityTimeout = TextSecurePreferences.getScreenLockTimeout(AppDependencies.application),
+      screenSecurity = TextSecurePreferences.isScreenSecurityEnabled(AppDependencies.application),
+      incognitoKeyboard = TextSecurePreferences.isIncognitoKeyboardEnabled(AppDependencies.application),
       paymentLock = SignalStore.paymentsValues().paymentLock,
-      isObsoletePasswordEnabled = !TextSecurePreferences.isPasswordDisabled(ApplicationDependencies.getApplication()),
-      isObsoletePasswordTimeoutEnabled = TextSecurePreferences.isPassphraseTimeoutEnabled(ApplicationDependencies.getApplication()),
-      obsoletePasswordTimeout = TextSecurePreferences.getPassphraseTimeoutInterval(ApplicationDependencies.getApplication()),
+      isObsoletePasswordEnabled = !TextSecurePreferences.isPasswordDisabled(AppDependencies.application),
+      isObsoletePasswordTimeoutEnabled = TextSecurePreferences.isPassphraseTimeoutEnabled(AppDependencies.application),
+      obsoletePasswordTimeout = TextSecurePreferences.getPassphraseTimeoutInterval(AppDependencies.application),
       universalExpireTimer = SignalStore.settings().universalExpireTimer
     )
   }

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/advanced/AdvancedPrivacySettingsRepository.kt

@@ -6,7 +6,7 @@ import com.google.firebase.installations.FirebaseInstallations
 import org.signal.core.util.concurrent.SignalExecutors
 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.jobs.MultiDeviceConfigurationUpdateJob
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.recipients.Recipient
@@ -24,7 +24,7 @@ class AdvancedPrivacySettingsRepository(private val context: Context) {
   fun disablePushMessages(consumer: (DisablePushMessagesResult) -> Unit) {
     SignalExecutors.BOUNDED.execute {
       val result = try {
-        val accountManager = ApplicationDependencies.getSignalServiceAccountManager()
+        val accountManager = AppDependencies.signalServiceAccountManager
         try {
           accountManager.setGcmId(Optional.empty())
         } catch (e: AuthorizationFailedException) {
@@ -53,7 +53,7 @@ class AdvancedPrivacySettingsRepository(private val context: Context) {
     SignalExecutors.BOUNDED.execute {
       SignalDatabase.recipients.markNeedsSync(Recipient.self().id)
       StorageSyncHelper.scheduleSyncForDataChange()
-      ApplicationDependencies.getJobManager().add(
+      AppDependencies.jobManager.add(
         MultiDeviceConfigurationUpdateJob(
           TextSecurePreferences.isReadReceiptsEnabled(context),
           TextSecurePreferences.isTypingIndicatorsEnabled(context),

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/advanced/AdvancedPrivacySettingsViewModel.kt

@@ -6,7 +6,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.disposables.CompositeDisposable
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint
 import org.thoughtcrime.securesms.jobs.RefreshAttributesJob
 import org.thoughtcrime.securesms.jobs.RefreshOwnProfileJob
@@ -32,7 +32,7 @@ class AdvancedPrivacySettingsViewModel(
 
   init {
     disposables.add(
-      ApplicationDependencies.getSignalWebSocket().webSocketState
+      AppDependencies.webSocketObserver
         .observeOn(AndroidSchedulers.mainThread())
         .subscribe { refresh() }
     )
@@ -51,14 +51,14 @@ class AdvancedPrivacySettingsViewModel(
 
   fun setAllowSealedSenderFromAnyone(enabled: Boolean) {
     sharedPreferences.edit().putBoolean(TextSecurePreferences.UNIVERSAL_UNIDENTIFIED_ACCESS, enabled).apply()
-    ApplicationDependencies.getJobManager().startChain(RefreshAttributesJob()).then(RefreshOwnProfileJob()).enqueue()
+    AppDependencies.jobManager.startChain(RefreshAttributesJob()).then(RefreshOwnProfileJob()).enqueue()
     refresh()
   }
 
   fun setCensorshipCircumventionEnabled(enabled: Boolean) {
     SignalStore.settings().setCensorshipCircumventionEnabled(enabled)
     SignalStore.misc().isServiceReachableWithoutCircumvention = false
-    ApplicationDependencies.resetAllNetworkConnections()
+    AppDependencies.resetNetwork()
     refresh()
   }
 
@@ -75,14 +75,14 @@ class AdvancedPrivacySettingsViewModel(
 
     return AdvancedPrivacySettingsState(
       isPushEnabled = SignalStore.account().isRegistered,
-      alwaysRelayCalls = TextSecurePreferences.isTurnOnly(ApplicationDependencies.getApplication()),
+      alwaysRelayCalls = TextSecurePreferences.isTurnOnly(AppDependencies.application),
       censorshipCircumventionState = censorshipCircumventionState,
       censorshipCircumventionEnabled = getCensorshipCircumventionEnabled(censorshipCircumventionState),
       showSealedSenderStatusIcon = TextSecurePreferences.isShowUnidentifiedDeliveryIndicatorsEnabled(
-        ApplicationDependencies.getApplication()
+        AppDependencies.application
       ),
       allowSealedSenderFromAnyone = TextSecurePreferences.isUniversalUnidentifiedAccess(
-        ApplicationDependencies.getApplication()
+        AppDependencies.application
       ),
       false
     )
@@ -90,10 +90,10 @@ class AdvancedPrivacySettingsViewModel(
 
   private fun getCensorshipCircumventionState(): CensorshipCircumventionState {
     val countryCode: Int = PhoneNumberFormatter.getLocalCountryCode()
-    val isCountryCodeCensoredByDefault: Boolean = ApplicationDependencies.getSignalServiceNetworkAccess().isCountryCodeCensoredByDefault(countryCode)
+    val isCountryCodeCensoredByDefault: Boolean = AppDependencies.signalServiceNetworkAccess.isCountryCodeCensoredByDefault(countryCode)
     val enabledState: SettingsValues.CensorshipCircumventionEnabled = SignalStore.settings().censorshipCircumventionEnabled
-    val hasInternet: Boolean = NetworkConstraint.isMet(ApplicationDependencies.getApplication())
-    val websocketConnected: Boolean = ApplicationDependencies.getSignalWebSocket().webSocketState.firstOrError().blockingGet() == WebSocketConnectionState.CONNECTED
+    val hasInternet: Boolean = NetworkConstraint.isMet(AppDependencies.application)
+    val websocketConnected: Boolean = AppDependencies.signalWebSocket.webSocketState.firstOrError().blockingGet() == WebSocketConnectionState.CONNECTED
 
     return when {
       SignalStore.internalValues().allowChangingCensorshipSetting() -> {

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/pnp/PhoneNumberPrivacySettingsViewModel.kt

@@ -4,7 +4,7 @@ import androidx.compose.runtime.State
 import androidx.compose.runtime.mutableStateOf
 import androidx.lifecycle.ViewModel
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobs.ProfileUploadJob
 import org.thoughtcrime.securesms.jobs.RefreshAttributesJob
 import org.thoughtcrime.securesms.jobs.RefreshOwnProfileJob
@@ -46,14 +46,14 @@ class PhoneNumberPrivacySettingsViewModel : ViewModel() {
     SignalStore.phoneNumberPrivacy().phoneNumberSharingMode = if (phoneNumberSharingEnabled) PhoneNumberSharingMode.EVERYBODY else PhoneNumberSharingMode.NOBODY
     SignalDatabase.recipients.markNeedsSync(Recipient.self().id)
     StorageSyncHelper.scheduleSyncForDataChange()
-    ApplicationDependencies.getJobManager().add(ProfileUploadJob())
+    AppDependencies.jobManager.add(ProfileUploadJob())
     refresh()
   }
 
   private fun setDiscoverableByPhoneNumber(discoverable: Boolean) {
     SignalStore.phoneNumberPrivacy().phoneNumberDiscoverabilityMode = if (discoverable) PhoneNumberDiscoverabilityMode.DISCOVERABLE else PhoneNumberDiscoverabilityMode.NOT_DISCOVERABLE
     StorageSyncHelper.scheduleSyncForDataChange()
-    ApplicationDependencies.getJobManager().startChain(RefreshAttributesJob()).then(RefreshOwnProfileJob()).enqueue()
+    AppDependencies.jobManager.startChain(RefreshAttributesJob()).then(RefreshOwnProfileJob()).enqueue()
     refresh()
   }
 

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/storage/ManageStorageSettingsViewModel.kt

@@ -17,7 +17,7 @@ import org.thoughtcrime.securesms.database.MediaTable
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.database.SignalDatabase.Companion.media
 import org.thoughtcrime.securesms.database.ThreadTable
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.KeepMessagesDuration
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 
@@ -42,13 +42,13 @@ class ManageStorageSettingsViewModel : ViewModel() {
   fun deleteChatHistory() {
     viewModelScope.launch {
       SignalDatabase.threads.deleteAllConversations()
-      ApplicationDependencies.getMessageNotifier().updateNotification(ApplicationDependencies.getApplication())
+      AppDependencies.messageNotifier.updateNotification(AppDependencies.application)
     }
   }
 
   fun setKeepMessagesDuration(newDuration: KeepMessagesDuration) {
     SignalStore.settings().setKeepMessagesForDuration(newDuration)
-    ApplicationDependencies.getTrimThreadsByDateManager().scheduleIfNecessary()
+    AppDependencies.trimThreadsByDateManager.scheduleIfNecessary()
 
     store.update { it.copy(keepMessagesDuration = newDuration) }
   }

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/InAppPaymentsRepository.kt

@@ -7,7 +7,6 @@ package org.thoughtcrime.securesms.components.settings.app.subscription
 
 import android.annotation.SuppressLint
 import androidx.annotation.WorkerThread
-import com.squareup.wire.get
 import io.reactivex.rxjava3.core.BackpressureStrategy
 import io.reactivex.rxjava3.core.Completable
 import io.reactivex.rxjava3.core.Flowable
@@ -37,7 +36,7 @@ import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.database.model.InAppPaymentSubscriberRecord
 import org.thoughtcrime.securesms.database.model.databaseprotos.InAppPaymentData
 import org.thoughtcrime.securesms.database.model.databaseprotos.PendingOneTimeDonation
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.util.Util
 import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription
@@ -147,9 +146,9 @@ object InAppPaymentsRepository {
         }
       }
 
-      ApplicationDependencies.getDatabaseObserver().registerInAppPaymentObserver(observer)
+      AppDependencies.databaseObserver.registerInAppPaymentObserver(observer)
       emitter.setCancellable {
-        ApplicationDependencies.getDatabaseObserver().unregisterObserver(observer)
+        AppDependencies.databaseObserver.unregisterObserver(observer)
       }
 
       SignalDatabase.inAppPayments.getById(inAppPaymentId)?.also {
@@ -415,8 +414,8 @@ object InAppPaymentsRepository {
         emitter.onNext(Optional.ofNullable(latestInAppPayment))
       }
 
-      ApplicationDependencies.getDatabaseObserver().registerInAppPaymentObserver(observer)
-      emitter.setCancellable { ApplicationDependencies.getDatabaseObserver().unregisterObserver(observer) }
+      AppDependencies.databaseObserver.registerInAppPaymentObserver(observer)
+      emitter.setCancellable { AppDependencies.databaseObserver.unregisterObserver(observer) }
     }.switchMap { inAppPaymentOptional ->
       val inAppPayment = inAppPaymentOptional.getOrNull() ?: return@switchMap jobStatusObservable
 
@@ -504,7 +503,7 @@ object InAppPaymentsRepository {
 
     return try {
       val receiptSerial = ReceiptSerial(randomBytes)
-      val operations = ApplicationDependencies.getClientZkReceiptOperations()
+      val operations = AppDependencies.clientZkReceiptOperations
       operations.createReceiptCredentialRequestContext(secureRandom, receiptSerial)
     } catch (e: InvalidInputException) {
       Log.e(TAG, "Failed to create credential.", e)

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/OneTimeInAppPaymentRepository.kt

@@ -17,7 +17,7 @@ import org.thoughtcrime.securesms.database.RecipientTable
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.database.model.DonationReceiptRecord
 import org.thoughtcrime.securesms.database.model.databaseprotos.InAppPaymentData
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobs.InAppPaymentOneTimeContextJob
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
@@ -75,7 +75,7 @@ class OneTimeInAppPaymentRepository(private val donationsService: DonationsServi
   fun getBoostBadge(): Single<Badge> {
     return Single
       .fromCallable {
-        ApplicationDependencies.getDonationsService()
+        AppDependencies.donationsService
           .getDonationsConfiguration(Locale.getDefault())
       }
       .subscribeOn(Schedulers.io())

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/RecurringInAppPaymentRepository.kt

@@ -13,7 +13,7 @@ import org.thoughtcrime.securesms.database.InAppPaymentTable
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.database.model.InAppPaymentSubscriberRecord
 import org.thoughtcrime.securesms.database.model.databaseprotos.InAppPaymentData
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobs.InAppPaymentKeepAliveJob
 import org.thoughtcrime.securesms.jobs.InAppPaymentRecurringContextJob
 import org.thoughtcrime.securesms.jobs.MultiDeviceSubscriptionSyncRequestJob
@@ -190,7 +190,7 @@ class RecurringInAppPaymentRepository(private val donationsService: DonationsSer
         Log.d(TAG, "Attempting to set user subscription level to $subscriptionLevel", true)
         Single
           .fromCallable {
-            ApplicationDependencies.getDonationsService().updateSubscriptionLevel(
+            AppDependencies.donationsService.updateSubscriptionLevel(
               subscriber.subscriberId,
               subscriptionLevel,
               subscriber.currencyCode,

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/StripeRepository.kt

@@ -19,7 +19,7 @@ import org.thoughtcrime.securesms.components.settings.app.subscription.errors.Do
 import org.thoughtcrime.securesms.components.settings.app.subscription.errors.DonationErrorSource
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.database.model.InAppPaymentSubscriberRecord
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.storage.StorageSyncHelper
@@ -51,8 +51,8 @@ class StripeRepository(
 ) : StripeApi.PaymentIntentFetcher, StripeApi.SetupIntentHelper {
 
   private val googlePayApi = GooglePayApi(activity, StripeApi.Gateway(Environment.Donations.STRIPE_CONFIGURATION), Environment.Donations.GOOGLE_PAY_CONFIGURATION)
-  private val stripeApi = StripeApi(Environment.Donations.STRIPE_CONFIGURATION, this, this, ApplicationDependencies.getOkHttpClient())
-  private val recurringInAppPaymentRepository = RecurringInAppPaymentRepository(ApplicationDependencies.getDonationsService())
+  private val stripeApi = StripeApi(Environment.Donations.STRIPE_CONFIGURATION, this, this, AppDependencies.okHttpClient)
+  private val recurringInAppPaymentRepository = RecurringInAppPaymentRepository(AppDependencies.donationsService)
 
   fun isGooglePayAvailable(): Completable {
     return googlePayApi.queryIsReadyToPay()
@@ -148,8 +148,8 @@ class StripeRepository(
     Log.d(TAG, "Fetching payment intent from Signal service for $price... (Locale.US minimum precision: ${price.minimumUnitPrecisionString})")
     return Single
       .fromCallable {
-        ApplicationDependencies
-          .getDonationsService()
+        AppDependencies
+          .donationsService
           .createDonationIntentWithAmount(price.minimumUnitPrecisionString, price.currency.currencyCode, level, sourceType.paymentMethod)
       }
       .flatMap(ServiceResponse<StripeClientSecret>::flattenResult)
@@ -173,8 +173,8 @@ class StripeRepository(
     return Single.fromCallable { InAppPaymentsRepository.requireSubscriber(subscriberType) }
       .flatMap {
         Single.fromCallable {
-          ApplicationDependencies
-            .getDonationsService()
+          AppDependencies
+            .donationsService
             .createStripeSubscriptionPaymentMethod(it.subscriberId, paymentSourceType.paymentMethod)
         }
       }
@@ -240,12 +240,12 @@ class StripeRepository(
       Log.d(TAG, "Setting default payment method via Signal service...")
       Single.fromCallable {
         if (paymentSourceType == PaymentSourceType.Stripe.IDEAL) {
-          ApplicationDependencies
-            .getDonationsService()
+          AppDependencies
+            .donationsService
             .setDefaultIdealPaymentMethod(subscriberRecord.subscriberId, setupIntentId)
         } else {
-          ApplicationDependencies
-            .getDonationsService()
+          AppDependencies
+            .donationsService
             .setDefaultStripePaymentMethod(subscriberRecord.subscriberId, paymentMethodId)
         }
       }.flatMap(ServiceResponse<EmptyResponse>::flattenResult).ignoreElement().doOnComplete {

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/completed/TerminalDonationRepository.kt

@@ -10,12 +10,12 @@ import io.reactivex.rxjava3.schedulers.Schedulers
 import org.thoughtcrime.securesms.badges.Badges
 import org.thoughtcrime.securesms.badges.models.Badge
 import org.thoughtcrime.securesms.database.model.databaseprotos.TerminalDonationQueue
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.whispersystems.signalservice.api.services.DonationsService
 import java.util.Locale
 
 class TerminalDonationRepository(
-  private val donationsService: DonationsService = ApplicationDependencies.getDonationsService()
+  private val donationsService: DonationsService = AppDependencies.donationsService
 ) {
   fun getBadge(terminalDonation: TerminalDonationQueue.TerminalDonation): Single<Badge> {
     return Single

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonateToSignalViewModel.kt

@@ -29,7 +29,7 @@ import org.thoughtcrime.securesms.database.model.InAppPaymentSubscriberRecord
 import org.thoughtcrime.securesms.database.model.databaseprotos.InAppPaymentData
 import org.thoughtcrime.securesms.database.model.databaseprotos.PendingOneTimeDonation
 import org.thoughtcrime.securesms.database.model.isExpired
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.subscription.LevelUpdate
@@ -421,8 +421,8 @@ class DonateToSignalViewModel(
 
   class Factory(
     private val startType: InAppPaymentTable.Type,
-    private val subscriptionsRepository: RecurringInAppPaymentRepository = RecurringInAppPaymentRepository(ApplicationDependencies.getDonationsService()),
-    private val oneTimeInAppPaymentRepository: OneTimeInAppPaymentRepository = OneTimeInAppPaymentRepository(ApplicationDependencies.getDonationsService())
+    private val subscriptionsRepository: RecurringInAppPaymentRepository = RecurringInAppPaymentRepository(AppDependencies.donationsService),
+    private val oneTimeInAppPaymentRepository: OneTimeInAppPaymentRepository = OneTimeInAppPaymentRepository(AppDependencies.donationsService)
   ) : ViewModelProvider.Factory {
     override fun <T : ViewModel> create(modelClass: Class<T>): T {
       return modelClass.cast(DonateToSignalViewModel(startType, subscriptionsRepository, oneTimeInAppPaymentRepository)) as T

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/gateway/GatewaySelectorViewModel.kt

@@ -12,7 +12,7 @@ import org.thoughtcrime.securesms.components.settings.app.subscription.InAppDona
 import org.thoughtcrime.securesms.components.settings.app.subscription.StripeRepository
 import org.thoughtcrime.securesms.database.InAppPaymentTable
 import org.thoughtcrime.securesms.database.model.databaseprotos.InAppPaymentData
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.util.rx.RxStore
 
@@ -69,7 +69,7 @@ class GatewaySelectorViewModel(
   class Factory(
     private val args: GatewaySelectorBottomSheetArgs,
     private val repository: StripeRepository,
-    private val gatewaySelectorRepository: GatewaySelectorRepository = GatewaySelectorRepository(ApplicationDependencies.getDonationsService())
+    private val gatewaySelectorRepository: GatewaySelectorRepository = GatewaySelectorRepository(AppDependencies.donationsService)
   ) : ViewModelProvider.Factory {
     override fun <T : ViewModel> create(modelClass: Class<T>): T {
       return modelClass.cast(GatewaySelectorViewModel(args, repository, gatewaySelectorRepository)) as T

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/paypal/PayPalPaymentInProgressViewModel.kt

@@ -22,7 +22,7 @@ import org.thoughtcrime.securesms.components.settings.app.subscription.errors.Do
 import org.thoughtcrime.securesms.components.settings.app.subscription.errors.DonationErrorSource
 import org.thoughtcrime.securesms.database.InAppPaymentTable
 import org.thoughtcrime.securesms.database.model.InAppPaymentSubscriberRecord
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobs.MultiDeviceSubscriptionSyncRequestJob
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.recipients.Recipient
@@ -192,9 +192,9 @@ class PayPalPaymentInProgressViewModel(
   }
 
   class Factory(
-    private val payPalRepository: PayPalRepository = PayPalRepository(ApplicationDependencies.getDonationsService()),
-    private val recurringInAppPaymentRepository: RecurringInAppPaymentRepository = RecurringInAppPaymentRepository(ApplicationDependencies.getDonationsService()),
-    private val oneTimeInAppPaymentRepository: OneTimeInAppPaymentRepository = OneTimeInAppPaymentRepository(ApplicationDependencies.getDonationsService())
+    private val payPalRepository: PayPalRepository = PayPalRepository(AppDependencies.donationsService),
+    private val recurringInAppPaymentRepository: RecurringInAppPaymentRepository = RecurringInAppPaymentRepository(AppDependencies.donationsService),
+    private val oneTimeInAppPaymentRepository: OneTimeInAppPaymentRepository = OneTimeInAppPaymentRepository(AppDependencies.donationsService)
   ) : ViewModelProvider.Factory {
     override fun <T : ViewModel> create(modelClass: Class<T>): T {
       return modelClass.cast(PayPalPaymentInProgressViewModel(payPalRepository, recurringInAppPaymentRepository, oneTimeInAppPaymentRepository)) as T

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/stripe/StripePaymentInProgressViewModel.kt

@@ -29,7 +29,7 @@ import org.thoughtcrime.securesms.components.settings.app.subscription.errors.to
 import org.thoughtcrime.securesms.database.InAppPaymentTable
 import org.thoughtcrime.securesms.database.model.InAppPaymentSubscriberRecord
 import org.thoughtcrime.securesms.database.model.databaseprotos.InAppPaymentData
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobs.MultiDeviceSubscriptionSyncRequestJob
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.recipients.Recipient
@@ -305,8 +305,8 @@ class StripePaymentInProgressViewModel(
 
   class Factory(
     private val stripeRepository: StripeRepository,
-    private val recurringInAppPaymentRepository: RecurringInAppPaymentRepository = RecurringInAppPaymentRepository(ApplicationDependencies.getDonationsService()),
-    private val oneTimeInAppPaymentRepository: OneTimeInAppPaymentRepository = OneTimeInAppPaymentRepository(ApplicationDependencies.getDonationsService())
+    private val recurringInAppPaymentRepository: RecurringInAppPaymentRepository = RecurringInAppPaymentRepository(AppDependencies.donationsService),
+    private val oneTimeInAppPaymentRepository: OneTimeInAppPaymentRepository = OneTimeInAppPaymentRepository(AppDependencies.donationsService)
   ) : ViewModelProvider.Factory {
     override fun <T : ViewModel> create(modelClass: Class<T>): T {
       return modelClass.cast(StripePaymentInProgressViewModel(stripeRepository, recurringInAppPaymentRepository, oneTimeInAppPaymentRepository)) as T

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/mandate/BankTransferMandateRepository.kt

@@ -8,14 +8,14 @@ package org.thoughtcrime.securesms.components.settings.app.subscription.donate.t
 import io.reactivex.rxjava3.core.Single
 import io.reactivex.rxjava3.schedulers.Schedulers
 import org.signal.donations.PaymentSourceType
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import java.util.Locale
 
 class BankTransferMandateRepository {
 
   fun getMandate(paymentSourceType: PaymentSourceType.Stripe): Single<String> {
     return Single
-      .fromCallable { ApplicationDependencies.getDonationsService().getBankMandate(Locale.getDefault(), paymentSourceType.paymentMethod) }
+      .fromCallable { AppDependencies.donationsService.getBankMandate(Locale.getDefault(), paymentSourceType.paymentMethod) }
       .flatMap { it.flattenResult() }
       .map { it.mandate }
       .subscribeOn(Schedulers.io())

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/manage/DonationRedemptionJobWatcher.kt

@@ -7,7 +7,7 @@ import org.thoughtcrime.securesms.components.settings.app.subscription.DonationS
 import org.thoughtcrime.securesms.components.settings.app.subscription.DonationSerializationHelper.toFiatMoney
 import org.thoughtcrime.securesms.components.settings.app.subscription.donate.stripe.Stripe3DSData
 import org.thoughtcrime.securesms.database.model.databaseprotos.PendingOneTimeDonation
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobmanager.persistence.JobSpec
 import org.thoughtcrime.securesms.jobs.BoostReceiptRequestResponseJob
 import org.thoughtcrime.securesms.jobs.DonationReceiptRedemptionJob
@@ -58,8 +58,8 @@ object DonationRedemptionJobWatcher {
       RedemptionType.ONE_TIME -> DonationReceiptRedemptionJob.ONE_TIME_QUEUE
     }
 
-    val donationJobSpecs = ApplicationDependencies
-      .getJobManager()
+    val donationJobSpecs = AppDependencies
+      .jobManager
       .find { it.queueKey?.startsWith(queue) == true }
       .sortedBy { it.createTime }
 

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/manage/ManageDonationsFragment.kt

@@ -29,7 +29,7 @@ import org.thoughtcrime.securesms.components.settings.models.IndeterminateLoadin
 import org.thoughtcrime.securesms.database.InAppPaymentTable
 import org.thoughtcrime.securesms.database.model.databaseprotos.DonationErrorValue
 import org.thoughtcrime.securesms.database.model.databaseprotos.PendingOneTimeDonation
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.help.HelpFragment
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.payments.FiatMoneyUtil
@@ -70,7 +70,7 @@ class ManageDonationsFragment :
 
   private val viewModel: ManageDonationsViewModel by viewModels(
     factoryProducer = {
-      ManageDonationsViewModel.Factory(RecurringInAppPaymentRepository(ApplicationDependencies.getDonationsService()))
+      ManageDonationsViewModel.Factory(RecurringInAppPaymentRepository(AppDependencies.donationsService))
     }
   )
 

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/detail/DonationReceiptDetailRepository.kt

@@ -5,15 +5,15 @@ import io.reactivex.rxjava3.schedulers.Schedulers
 import org.thoughtcrime.securesms.components.settings.app.subscription.getSubscriptionLevels
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.database.model.DonationReceiptRecord
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import java.util.Locale
 
 class DonationReceiptDetailRepository {
   fun getSubscriptionLevelName(subscriptionLevel: Int): Single<String> {
     return Single
       .fromCallable {
-        ApplicationDependencies
-          .getDonationsService()
+        AppDependencies
+          .donationsService
           .getDonationsConfiguration(Locale.getDefault())
       }
       .flatMap { it.flattenResult() }

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/list/DonationReceiptListRepository.kt

@@ -6,13 +6,13 @@ import org.thoughtcrime.securesms.components.settings.app.subscription.getBoostB
 import org.thoughtcrime.securesms.components.settings.app.subscription.getGiftBadges
 import org.thoughtcrime.securesms.components.settings.app.subscription.getSubscriptionLevels
 import org.thoughtcrime.securesms.database.model.DonationReceiptRecord
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import java.util.Locale
 
 class DonationReceiptListRepository {
   fun getBadges(): Single<List<DonationReceiptBadge>> {
     return Single.fromCallable {
-      ApplicationDependencies.getDonationsService()
+      AppDependencies.donationsService
         .getDonationsConfiguration(Locale.getDefault())
     }.map { response ->
       if (response.result.isPresent) {

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/updates/AppUpdatesSettingsFragment.kt

@@ -11,7 +11,7 @@ import org.thoughtcrime.securesms.components.settings.DSLConfiguration
 import org.thoughtcrime.securesms.components.settings.DSLSettingsFragment
 import org.thoughtcrime.securesms.components.settings.DSLSettingsText
 import org.thoughtcrime.securesms.components.settings.configure
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobs.ApkUpdateJob
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
@@ -45,7 +45,7 @@ class AppUpdatesSettingsFragment : DSLSettingsFragment(R.string.preferences_app_
         title = DSLSettingsText.from("Check for updates"),
         summary = DSLSettingsText.from("Last checked on: $lastSuccessfulUpdateString"),
         onClick = {
-          ApplicationDependencies.getJobManager().add(ApkUpdateJob())
+          AppDependencies.jobManager.add(ApkUpdateJob())
         }
       )
     }

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/UsernameLinkSettingsViewModel.kt

@@ -40,7 +40,7 @@ import org.thoughtcrime.securesms.components.settings.app.usernamelinks.QrCodeDa
 import org.thoughtcrime.securesms.components.settings.app.usernamelinks.QrCodeState
 import org.thoughtcrime.securesms.components.settings.app.usernamelinks.drawQr
 import org.thoughtcrime.securesms.components.settings.app.usernamelinks.main.UsernameLinkSettingsState.ActiveTab
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.profiles.manage.UsernameRepository
 import org.thoughtcrime.securesms.profiles.manage.UsernameRepository.toLink
@@ -104,7 +104,7 @@ class UsernameLinkSettingsViewModel : ViewModel() {
   }
 
   fun onUsernameLinkReset() {
-    if (!NetworkUtil.isConnected(ApplicationDependencies.getApplication())) {
+    if (!NetworkUtil.isConnected(AppDependencies.application)) {
       _state.value = _state.value.copy(
         usernameLinkResetResult = UsernameLinkResetResult.NetworkUnavailable
       )
@@ -298,7 +298,7 @@ class UsernameLinkSettingsViewModel : ViewModel() {
     }
 
     // Draw the signal logo -- unfortunately can't have the normal QR code drawing handle it because it requires a composable ImageBitmap
-    BitmapFactory.decodeResource(ApplicationDependencies.getApplication().resources, R.drawable.qrcode_logo).also { logoBitmap ->
+    BitmapFactory.decodeResource(AppDependencies.application.resources, R.drawable.qrcode_logo).also { logoBitmap ->
       val tintedPaint = Paint().apply {
         colorFilter = PorterDuffColorFilter(state.qrCodeColorScheme.foregroundColor.toArgb(), PorterDuff.Mode.SRC_IN)
       }

app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsRepository.kt

@@ -18,7 +18,7 @@ import org.thoughtcrime.securesms.database.model.GroupRecord
 import org.thoughtcrime.securesms.database.model.IdentityRecord
 import org.thoughtcrime.securesms.database.model.MessageRecord
 import org.thoughtcrime.securesms.database.model.StoryViewState
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.groups.GroupId
 import org.thoughtcrime.securesms.groups.GroupProtoUtil
 import org.thoughtcrime.securesms.groups.LiveGroup
@@ -93,7 +93,7 @@ class ConversationSettingsRepository(
   fun getIdentity(recipientId: RecipientId, consumer: (IdentityRecord?) -> Unit) {
     SignalExecutors.BOUNDED.execute {
       if (SignalStore.account().aci != null && SignalStore.account().pni != null) {
-        consumer(ApplicationDependencies.getProtocolStore().aci().identities().getIdentityRecord(recipientId).orElse(null))
+        consumer(AppDependencies.protocolStore.aci().identities().getIdentityRecord(recipientId).orElse(null))
       } else {
         consumer(null)
       }

app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsViewModel.kt

@@ -23,7 +23,7 @@ import org.thoughtcrime.securesms.components.settings.conversation.preferences.L
 import org.thoughtcrime.securesms.database.MediaTable
 import org.thoughtcrime.securesms.database.RecipientTable
 import org.thoughtcrime.securesms.database.model.StoryViewState
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.groups.GroupId
 import org.thoughtcrime.securesms.groups.LiveGroup
 import org.thoughtcrime.securesms.groups.ui.GroupChangeFailureReason
@@ -50,7 +50,7 @@ sealed class ConversationSettingsViewModel(
   protected val store = Store(
     ConversationSettingsState(
       specificSettingsState = specificSettingsState,
-      isDeprecatedOrUnregistered = SignalStore.misc().isClientDeprecated || TextSecurePreferences.isUnauthorizedReceived(ApplicationDependencies.getApplication())
+      isDeprecatedOrUnregistered = SignalStore.misc().isClientDeprecated || TextSecurePreferences.isUnauthorizedReceived(AppDependencies.application)
     )
   )
   protected val internalEvents: Subject<ConversationSettingsEvent> = PublishSubject.create()

app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/InternalConversationSettingsFragment.kt

@@ -23,7 +23,7 @@ import org.thoughtcrime.securesms.components.settings.configure
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.database.model.InAppPaymentSubscriberRecord
 import org.thoughtcrime.securesms.database.model.RecipientRecord
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.groups.GroupId
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.mms.OutgoingMessage
@@ -219,13 +219,13 @@ class InternalConversationSettingsFragment : DSLSettingsFragment(
               if (recipient.hasAci) {
                 SignalDatabase.sessions.deleteAllFor(serviceId = SignalStore.account().requireAci(), addressName = recipient.requireAci().toString())
                 SignalDatabase.sessions.deleteAllFor(serviceId = SignalStore.account().requirePni(), addressName = recipient.requireAci().toString())
-                ApplicationDependencies.getProtocolStore().aci().identities().delete(recipient.requireAci().toString())
+                AppDependencies.protocolStore.aci().identities().delete(recipient.requireAci().toString())
               }
 
               if (recipient.hasPni) {
                 SignalDatabase.sessions.deleteAllFor(serviceId = SignalStore.account().requireAci(), addressName = recipient.requirePni().toString())
                 SignalDatabase.sessions.deleteAllFor(serviceId = SignalStore.account().requirePni(), addressName = recipient.requirePni().toString())
-                ApplicationDependencies.getProtocolStore().aci().identities().delete(recipient.requirePni().toString())
+                AppDependencies.protocolStore.aci().identities().delete(recipient.requirePni().toString())
               }
 
               startActivity(MainActivity.clearTop(requireContext()))

app/src/main/java/org/thoughtcrime/securesms/components/spoiler/SpoilerPaint.kt

@@ -11,7 +11,7 @@ import androidx.annotation.MainThread
 import org.signal.core.util.DimensionUnit
 import org.signal.core.util.dp
 import org.thoughtcrime.securesms.components.spoiler.SpoilerPaint.update
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.util.Util
 import kotlin.random.Random
 
@@ -28,9 +28,9 @@ object SpoilerPaint {
    */
   var shader: BitmapShader? = null
 
-  private val WIDTH = if (Util.isLowMemory(ApplicationDependencies.getApplication())) 50.dp else 100.dp
-  private val HEIGHT = if (Util.isLowMemory(ApplicationDependencies.getApplication())) 20.dp else 40.dp
-  private val PARTICLES_PER_PIXEL = if (Util.isLowMemory(ApplicationDependencies.getApplication())) 0.001f else 0.002f
+  private val WIDTH = if (Util.isLowMemory(AppDependencies.application)) 50.dp else 100.dp
+  private val HEIGHT = if (Util.isLowMemory(AppDependencies.application)) 20.dp else 40.dp
+  private val PARTICLES_PER_PIXEL = if (Util.isLowMemory(AppDependencies.application)) 0.001f else 0.002f
 
   private var shaderBitmap: Bitmap = Bitmap.createBitmap(WIDTH, HEIGHT, Bitmap.Config.ALPHA_8)
   private var bufferBitmap: Bitmap = Bitmap.createBitmap(WIDTH, HEIGHT, Bitmap.Config.ALPHA_8)

app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNotePlaybackService.java

@@ -40,7 +40,7 @@ import org.thoughtcrime.securesms.database.DatabaseObserver;
 import org.thoughtcrime.securesms.database.MessageTable;
 import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.model.MessageId;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobs.MultiDeviceViewedUpdateJob;
 import org.thoughtcrime.securesms.jobs.SendViewedReceiptJob;
 import org.thoughtcrime.securesms.mms.PartUriParser;
@@ -89,7 +89,7 @@ public class VoiceNotePlaybackService extends MediaSessionService {
 
     setMediaNotificationProvider(new VoiceNoteMediaNotificationProvider(this));
     setListener(new MediaSessionServiceListener());
-    ApplicationDependencies.getDatabaseObserver().registerAttachmentObserver(attachmentDeletionObserver);
+    AppDependencies.getDatabaseObserver().registerAttachmentObserver(attachmentDeletionObserver);
   }
 
   @Override
@@ -102,7 +102,7 @@ public class VoiceNotePlaybackService extends MediaSessionService {
 
   @Override
   public void onDestroy() {
-    ApplicationDependencies.getDatabaseObserver().unregisterObserver(attachmentDeletionObserver);
+    AppDependencies.getDatabaseObserver().unregisterObserver(attachmentDeletionObserver);
     player.release();
     mediaSession.release();
     mediaSession = null;
@@ -321,10 +321,10 @@ public class VoiceNotePlaybackService extends MediaSessionService {
         MessageTable.MarkedMessageInfo markedMessageInfo = messageDatabase.setIncomingMessageViewed(messageId);
 
         if (markedMessageInfo != null) {
-          ApplicationDependencies.getJobManager().add(new SendViewedReceiptJob(markedMessageInfo.getThreadId(),
-                                                                               recipientId,
-                                                                               markedMessageInfo.getSyncMessageId().getTimetamp(),
-                                                                               new MessageId(messageId)));
+          AppDependencies.getJobManager().add(new SendViewedReceiptJob(markedMessageInfo.getThreadId(),
+                                                                       recipientId,
+                                                                       markedMessageInfo.getSyncMessageId().getTimetamp(),
+                                                                       new MessageId(messageId)));
           MultiDeviceViewedUpdateJob.enqueue(Collections.singletonList(markedMessageInfo.getSyncMessageId()));
         }
       });

app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallLinkProfileKeySender.kt

@@ -7,7 +7,7 @@ package org.thoughtcrime.securesms.components.webrtc
 
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.database.identity.IdentityRecordList
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobs.ProfileKeySendJob
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
@@ -34,7 +34,7 @@ object CallLinkProfileKeySender {
     if (toSendMessagesTo.isNotEmpty()) {
       Log.i(TAG, "Sending profile key to $toSendMessagesTo users.")
       val job = ProfileKeySendJob.createForCallLinks(toSendMessagesTo.toList())
-      ApplicationDependencies.getJobManager().add(job)
+      AppDependencies.jobManager.add(job)
     } else {
       Log.i(TAG, "No users to send profile key to.")
     }
@@ -46,8 +46,8 @@ object CallLinkProfileKeySender {
   fun onRecipientsUpdated(recipients: Set<Recipient>) {
     val nonBlockedNonSelfRecipients: List<Recipient> = recipients.filterNot { it.isBlocked || it.isSelf }
 
-    val identityRecords: IdentityRecordList = ApplicationDependencies
-      .getProtocolStore()
+    val identityRecords: IdentityRecordList = AppDependencies
+      .protocolStore
       .aci()
       .identities()
       .getIdentityRecords(nonBlockedNonSelfRecipients)

app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallOverflowPopupWindow.kt

@@ -17,7 +17,7 @@ import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.widget.PopupWindowCompat
 import androidx.fragment.app.FragmentActivity
 import org.thoughtcrime.securesms.R
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.util.FeatureFlags
 import org.thoughtcrime.securesms.util.visible
 
@@ -36,14 +36,14 @@ class CallOverflowPopupWindow(private val activity: FragmentActivity, parentView
     val root = (contentView as LinearLayout)
     val reactionScrubber = root.findViewById<CallReactionScrubber>(R.id.reaction_scrubber)
     reactionScrubber.initialize(activity.supportFragmentManager) {
-      ApplicationDependencies.getSignalCallManager().react(it)
+      AppDependencies.signalCallManager.react(it)
       dismiss()
     }
     if (FeatureFlags.groupCallRaiseHand()) {
       val raiseHand = root.findViewById<ConstraintLayout>(R.id.raise_hand_layout_parent)
       raiseHand.visible = true
       raiseHand.setOnClickListener {
-        ApplicationDependencies.getSignalCallManager().raiseHand(!raisedHandDelegate.isSelfHandRaised())
+        AppDependencies.signalCallManager.raiseHand(!raisedHandDelegate.isSelfHandRaised())
         dismiss()
       }
     }

app/src/main/java/org/thoughtcrime/securesms/components/webrtc/PendingParticipantsBottomSheet.kt

@@ -48,7 +48,7 @@ import org.signal.core.ui.theme.SignalTheme
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.AvatarImageView
 import org.thoughtcrime.securesms.compose.ComposeBottomSheetDialogFragment
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.service.webrtc.PendingParticipantCollection
 import org.thoughtcrime.securesms.util.activityViewModel
@@ -96,11 +96,11 @@ class PendingParticipantsBottomSheet : ComposeBottomSheetDialogFragment() {
   }
 
   private fun onApprove(recipient: Recipient) {
-    ApplicationDependencies.getSignalCallManager().setCallLinkJoinRequestAccepted(recipient.id)
+    AppDependencies.signalCallManager.setCallLinkJoinRequestAccepted(recipient.id)
   }
 
   private fun onDeny(recipient: Recipient) {
-    ApplicationDependencies.getSignalCallManager().setCallLinkJoinRequestRejected(recipient.id)
+    AppDependencies.signalCallManager.setCallLinkJoinRequestRejected(recipient.id)
   }
 
   private fun onApproveAll() {

app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcAudioPicker31.kt

@@ -8,7 +8,7 @@ import androidx.annotation.RequiresApi
 import androidx.fragment.app.FragmentActivity
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.R
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.webrtc.audio.AudioDeviceMapping
 import org.thoughtcrime.securesms.webrtc.audio.SignalAudioManager
 
@@ -24,7 +24,7 @@ class WebRtcAudioPicker31(private val audioOutputChangedListener: OnAudioOutputC
   }
 
   fun showPicker(fragmentActivity: FragmentActivity, threshold: Int, onDismiss: (DialogInterface) -> Unit): DialogInterface? {
-    val am = ApplicationDependencies.getAndroidCallAudioManager()
+    val am = AppDependencies.androidCallAudioManager
     if (am.availableCommunicationDevices.isEmpty()) {
       Toast.makeText(fragmentActivity, R.string.WebRtcAudioOutputToggleButton_no_eligible_audio_i_o_detected, Toast.LENGTH_LONG).show()
       return null

app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallRepository.java

@@ -10,7 +10,7 @@ import org.signal.core.util.concurrent.SignalExecutors;
 import org.thoughtcrime.securesms.database.GroupTable;
 import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.identity.IdentityRecordList;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.recipients.Recipient;
 
 import java.util.Collections;
@@ -35,7 +35,7 @@ class WebRtcCallRepository {
         recipients = Collections.singletonList(recipient);
       }
 
-      consumer.accept(ApplicationDependencies.getProtocolStore().aci().identities().getIdentityRecords(recipients));
+      consumer.accept(AppDependencies.getProtocolStore().aci().identities().getIdentityRecords(recipients));
     });
   }
 }

app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallViewModel.java

@@ -20,7 +20,7 @@ import org.signal.core.util.ThreadUtil;
 import org.thoughtcrime.securesms.components.sensors.DeviceOrientationMonitor;
 import org.thoughtcrime.securesms.components.sensors.Orientation;
 import org.thoughtcrime.securesms.database.model.IdentityRecord;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.events.CallParticipant;
 import org.thoughtcrime.securesms.events.CallParticipantId;
 import org.thoughtcrime.securesms.events.WebRtcViewModel;
@@ -32,7 +32,6 @@ import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.service.webrtc.PendingParticipantCollection;
 import org.thoughtcrime.securesms.service.webrtc.state.WebRtcEphemeralState;
-import org.thoughtcrime.securesms.util.DefaultValueLiveData;
 import org.thoughtcrime.securesms.util.NetworkUtil;
 import org.thoughtcrime.securesms.util.SingleLiveEvent;
 import org.thoughtcrime.securesms.util.Util;
@@ -94,7 +93,7 @@ public class WebRtcCallViewModel extends ViewModel {
   private boolean               switchOnFirstScreenShare              = true;
   private boolean               showScreenShareTip                    = true;
 
-  private final WebRtcCallRepository repository = new WebRtcCallRepository(ApplicationDependencies.getApplication());
+  private final WebRtcCallRepository repository = new WebRtcCallRepository(AppDependencies.getApplication());
 
   private WebRtcCallViewModel(@NonNull DeviceOrientationMonitor deviceOrientationMonitor) {
     orientation      = deviceOrientationMonitor.getOrientation();
@@ -342,7 +341,7 @@ public class WebRtcCallViewModel extends ViewModel {
       events.setValue(new Event.ShowVideoTooltip());
     }
 
-    if (canDisplayPopupIfNeeded && webRtcViewModel.isCellularConnection() && NetworkUtil.isConnectedWifi(ApplicationDependencies.getApplication())) {
+    if (canDisplayPopupIfNeeded && webRtcViewModel.isCellularConnection() && NetworkUtil.isConnectedWifi(AppDependencies.getApplication())) {
       canDisplayPopupIfNeeded = false;
       events.setValue(new Event.ShowWifiToCellularPopup());
     } else if (!webRtcViewModel.isCellularConnection()) {

app/src/main/java/org/thoughtcrime/securesms/components/webrtc/controls/CallInfoView.kt

@@ -53,7 +53,7 @@ import org.signal.ringrtc.CallLinkState
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.AvatarImageView
 import org.thoughtcrime.securesms.components.webrtc.WebRtcCallViewModel
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.events.CallParticipant
 import org.thoughtcrime.securesms.events.GroupCallRaiseHandEvent
 import org.thoughtcrime.securesms.events.WebRtcViewModel
@@ -492,7 +492,7 @@ private fun showLowerHandDialog(context: Context) {
     .setTitle(R.string.CallOverflowPopupWindow__lower_your_hand)
     .setPositiveButton(
       R.string.CallOverflowPopupWindow__lower_hand
-    ) { _, _ -> ApplicationDependencies.getSignalCallManager().raiseHand(false) }
+    ) { _, _ -> AppDependencies.signalCallManager.raiseHand(false) }
     .setNegativeButton(R.string.CallOverflowPopupWindow__cancel, null)
     .show()
 }

app/src/main/java/org/thoughtcrime/securesms/components/webrtc/controls/ControlsAndInfoController.kt

@@ -52,7 +52,7 @@ import org.thoughtcrime.securesms.components.webrtc.CallOverflowPopupWindow
 import org.thoughtcrime.securesms.components.webrtc.WebRtcCallView
 import org.thoughtcrime.securesms.components.webrtc.WebRtcCallViewModel
 import org.thoughtcrime.securesms.components.webrtc.WebRtcControls
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.events.CallParticipant
 import org.thoughtcrime.securesms.service.webrtc.links.UpdateCallLinkResult
 import org.thoughtcrime.securesms.util.padding
@@ -411,10 +411,10 @@ class ControlsAndInfoController(
       .setNegativeButton(android.R.string.cancel, null)
       .setMessage(webRtcCallView.resources.getString(R.string.CallLinkInfoSheet__remove_s_from_the_call, callParticipant.recipient.getShortDisplayName(webRtcCallActivity)))
       .setPositiveButton(R.string.CallLinkInfoSheet__remove) { _, _ ->
-        ApplicationDependencies.getSignalCallManager().removeFromCallLink(callParticipant)
+        AppDependencies.signalCallManager.removeFromCallLink(callParticipant)
       }
       .setNeutralButton(R.string.CallLinkInfoSheet__block_from_call) { _, _ ->
-        ApplicationDependencies.getSignalCallManager().blockFromCallLink(callParticipant)
+        AppDependencies.signalCallManager.blockFromCallLink(callParticipant)
       }
       .show()
   }

app/src/main/java/org/thoughtcrime/securesms/components/webrtc/controls/RaiseHandSnackbar.kt

@@ -48,7 +48,7 @@ import kotlinx.coroutines.delay
 import org.signal.core.ui.theme.SignalTheme
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.webrtc.WebRtcCallViewModel
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.events.GroupCallRaiseHandEvent
 import org.thoughtcrime.securesms.recipients.Recipient
 import java.util.concurrent.TimeUnit
@@ -158,7 +158,7 @@ private fun RaiseHand(
                 val context = LocalContext.current
                 TextButton(
                   onClick = {
-                    ApplicationDependencies.getSignalCallManager().raiseHand(false)
+                    AppDependencies.signalCallManager.raiseHand(false)
                   },
                   modifier = Modifier.wrapContentWidth(Alignment.End)
                 ) {

app/src/main/java/org/thoughtcrime/securesms/components/webrtc/requests/CallLinkIncomingRequestSheet.kt

@@ -40,7 +40,7 @@ import org.signal.core.util.getParcelableCompat
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.AvatarImageView
 import org.thoughtcrime.securesms.compose.ComposeBottomSheetDialogFragment
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.util.BottomSheetUtil
@@ -90,12 +90,12 @@ class CallLinkIncomingRequestSheet : ComposeBottomSheetDialogFragment() {
   }
 
   private fun onApproveEntry() {
-    ApplicationDependencies.getSignalCallManager().setCallLinkJoinRequestAccepted(recipientId)
+    AppDependencies.signalCallManager.setCallLinkJoinRequestAccepted(recipientId)
     dismissAllowingStateLoss()
   }
 
   private fun onDenyEntry() {
-    ApplicationDependencies.getSignalCallManager().setCallLinkJoinRequestRejected(recipientId)
+    AppDependencies.signalCallManager.setCallLinkJoinRequestRejected(recipientId)
     dismissAllowingStateLoss()
   }
 }