Rewrite the AppDependencies system.

2026-04-21 09:20:19 +01:00 · 2024-05-22 15:44:24 -04:00
parent a0131bf39b
commit b6a4e1f145
560 changed files with 2909 additions and 3036 deletions
--- a/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentTable.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentTable.kt
@@ -73,7 +73,7 @@ import org.thoughtcrime.securesms.database.SignalDatabase.Companion.messages
 import org.thoughtcrime.securesms.database.SignalDatabase.Companion.stickers
 import org.thoughtcrime.securesms.database.SignalDatabase.Companion.threads
 import org.thoughtcrime.securesms.database.model.databaseprotos.AudioWaveFormData
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobs.AttachmentDownloadJob
 import org.thoughtcrime.securesms.jobs.AttachmentUploadJob
 import org.thoughtcrime.securesms.jobs.GenerateAudioWaveFormJob
@@ -529,7 +529,7 @@ class AttachmentTable(
        .forEach { cursor ->
          val attachmentId = AttachmentId(cursor.requireLong(ID))

-          ApplicationDependencies.getJobManager().cancelAllInQueue(AttachmentDownloadJob.constructQueueString(attachmentId))
+          AppDependencies.jobManager.cancelAllInQueue(AttachmentDownloadJob.constructQueueString(attachmentId))

          deleteDataFileIfPossible(
            filePath = cursor.requireString(DATA_FILE),
--- a/app/src/main/java/org/thoughtcrime/securesms/database/CallLinkTable.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/CallLinkTable.kt
@@ -28,7 +28,7 @@ import org.signal.ringrtc.CallLinkState.Restrictions
 import org.thoughtcrime.securesms.calls.log.CallLogRow
 import org.thoughtcrime.securesms.conversation.colors.AvatarColor
 import org.thoughtcrime.securesms.conversation.colors.AvatarColorHash
-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.service.webrtc.links.CallLinkCredentials
@@ -103,8 +103,8 @@ class CallLinkTable(context: Context, databaseHelper: SignalDatabase) : Database
      recipientId
    }

-    ApplicationDependencies.getDatabaseObserver().notifyCallLinkObservers(callLink.roomId)
-    ApplicationDependencies.getDatabaseObserver().notifyCallUpdateObservers()
+    AppDependencies.databaseObserver.notifyCallLinkObservers(callLink.roomId)
+    AppDependencies.databaseObserver.notifyCallUpdateObservers()

    return recipientId!!
  }
@@ -124,8 +124,8 @@ class CallLinkTable(context: Context, databaseHelper: SignalDatabase) : Database
      .where("$ROOM_ID = ?", roomId.serialize())
      .run()

-    ApplicationDependencies.getDatabaseObserver().notifyCallLinkObservers(roomId)
-    ApplicationDependencies.getDatabaseObserver().notifyCallUpdateObservers()
+    AppDependencies.databaseObserver.notifyCallLinkObservers(roomId)
+    AppDependencies.databaseObserver.notifyCallUpdateObservers()
  }

  fun updateCallLinkState(
@@ -151,8 +151,8 @@ class CallLinkTable(context: Context, databaseHelper: SignalDatabase) : Database
    }

    Recipient.live(recipientId).refresh()
-    ApplicationDependencies.getDatabaseObserver().notifyCallLinkObservers(roomId)
-    ApplicationDependencies.getDatabaseObserver().notifyCallUpdateObservers()
+    AppDependencies.databaseObserver.notifyCallLinkObservers(roomId)
+    AppDependencies.databaseObserver.notifyCallUpdateObservers()
  }

  fun callLinkExists(
@@ -230,7 +230,7 @@ class CallLinkTable(context: Context, databaseHelper: SignalDatabase) : Database
        record = callLink,
        recipient = peer,
        searchQuery = query,
-        callLinkPeekInfo = ApplicationDependencies.getSignalCallManager().peekInfoSnapshot[peer.id]
+        callLinkPeekInfo = AppDependencies.signalCallManager.peekInfoSnapshot[peer.id]
      )
    }
  }
--- a/app/src/main/java/org/thoughtcrime/securesms/database/CallTable.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/CallTable.kt
@@ -34,7 +34,7 @@ import org.thoughtcrime.securesms.calls.log.CallLogFilter
 import org.thoughtcrime.securesms.calls.log.CallLogRow
 import org.thoughtcrime.securesms.database.model.GroupCallUpdateDetailsUtil
 import org.thoughtcrime.securesms.database.model.MessageId
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobs.CallSyncEventJob
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
@@ -170,8 +170,8 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl
      writableDatabase.insert(TABLE_NAME, null, values)
    }

-    ApplicationDependencies.getMessageNotifier().updateNotification(context)
-    ApplicationDependencies.getDatabaseObserver().notifyCallUpdateObservers()
+    AppDependencies.messageNotifier.updateNotification(context)
+    AppDependencies.databaseObserver.notifyCallUpdateObservers()

    Log.i(TAG, "Inserted call: $callId type: $type direction: $direction event:$event")
  }
@@ -203,8 +203,8 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl
          SignalDatabase.messages.updateCallLog(call.messageId, call.messageType)
        }

-        ApplicationDependencies.getMessageNotifier().updateNotification(context)
-        ApplicationDependencies.getDatabaseObserver().notifyCallUpdateObservers()
+        AppDependencies.messageNotifier.updateNotification(context)
+        AppDependencies.databaseObserver.notifyCallUpdateObservers()
      }

      call
@@ -324,8 +324,8 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl
      CallSyncEventJob.enqueueDeleteSyncEvents(toSync)
    }

-    ApplicationDependencies.getDeletedCallEventManager().scheduleIfNecessary()
-    ApplicationDependencies.getDatabaseObserver().notifyCallUpdateObservers()
+    AppDependencies.deletedCallEventManager.scheduleIfNecessary()
+    AppDependencies.databaseObserver.notifyCallUpdateObservers()
  }

  /**
@@ -363,8 +363,8 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl
      CallSyncEventJob.enqueueDeleteSyncEvents(toSync)
    }

-    ApplicationDependencies.getDeletedCallEventManager().scheduleIfNecessary()
-    ApplicationDependencies.getDatabaseObserver().notifyCallUpdateObservers()
+    AppDependencies.deletedCallEventManager.scheduleIfNecessary()
+    AppDependencies.databaseObserver.notifyCallUpdateObservers()
  }

  // region Group / Ad-Hoc Calling
@@ -388,8 +388,8 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl
      }
    }

-    ApplicationDependencies.getMessageNotifier().updateNotification(context)
-    ApplicationDependencies.getDatabaseObserver().notifyCallUpdateObservers()
+    AppDependencies.messageNotifier.updateNotification(context)
+    AppDependencies.databaseObserver.notifyCallUpdateObservers()
    Log.d(TAG, "Marked group call event for deletion: ${call.callId}")
  }

@@ -416,7 +416,7 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl
      )
      .run(SQLiteDatabase.CONFLICT_ABORT)

-    ApplicationDependencies.getDeletedCallEventManager().scheduleIfNecessary()
+    AppDependencies.deletedCallEventManager.scheduleIfNecessary()
  }

  fun acceptIncomingGroupCall(call: Call) {
@@ -437,8 +437,8 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl
      .where("$CALL_ID = ?", call.callId)
      .run()

-    ApplicationDependencies.getMessageNotifier().updateNotification(context)
-    ApplicationDependencies.getDatabaseObserver().notifyCallUpdateObservers()
+    AppDependencies.messageNotifier.updateNotification(context)
+    AppDependencies.databaseObserver.notifyCallUpdateObservers()
    Log.d(TAG, "[acceptIncomingGroupCall] Transitioned group call ${call.callId} from ${call.event} to $newEvent")
  }

@@ -464,8 +464,8 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl
      .where("$CALL_ID = ?", call.callId)
      .run()

-    ApplicationDependencies.getMessageNotifier().updateNotification(context)
-    ApplicationDependencies.getDatabaseObserver().notifyCallUpdateObservers()
+    AppDependencies.messageNotifier.updateNotification(context)
+    AppDependencies.databaseObserver.notifyCallUpdateObservers()
    Log.d(TAG, "[acceptOutgoingGroupCall] Transitioned group call ${call.callId} from ${call.event} to $newEvent")
  }

@@ -488,8 +488,8 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl
      .where("$CALL_ID = ?", call.callId)
      .run()

-    ApplicationDependencies.getMessageNotifier().updateNotification(context)
-    ApplicationDependencies.getDatabaseObserver().notifyCallUpdateObservers()
+    AppDependencies.messageNotifier.updateNotification(context)
+    AppDependencies.databaseObserver.notifyCallUpdateObservers()
    Log.d(TAG, "Transitioned group call ${call.callId} from ${call.event} to $newEvent")
  }

@@ -535,7 +535,7 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl
        .run(SQLiteDatabase.CONFLICT_ABORT)
    }

-    ApplicationDependencies.getDatabaseObserver().notifyCallUpdateObservers()
+    AppDependencies.databaseObserver.notifyCallUpdateObservers()
  }

  fun insertDeclinedGroupCall(
@@ -577,7 +577,7 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl
        .run(SQLiteDatabase.CONFLICT_ABORT)
    }

-    ApplicationDependencies.getDatabaseObserver().notifyCallUpdateObservers()
+    AppDependencies.databaseObserver.notifyCallUpdateObservers()
  }

  fun insertOrUpdateGroupCallFromExternalEvent(
@@ -704,7 +704,7 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl
    }

    Log.d(TAG, "Inserted new call event for call link. Call Id: $callId")
-    ApplicationDependencies.getDatabaseObserver().notifyCallUpdateObservers()
+    AppDependencies.databaseObserver.notifyCallUpdateObservers()
  }

  private fun insertCallEventFromGroupUpdate(
@@ -755,7 +755,7 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl
      Log.d(TAG, "Skipping call event processing for null era id.")
    }

-    ApplicationDependencies.getDatabaseObserver().notifyCallUpdateObservers()
+    AppDependencies.databaseObserver.notifyCallUpdateObservers()
  }

  /**
@@ -787,7 +787,7 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl
      updateGroupCallState(call, peekJoinedUuids)
    }

-    ApplicationDependencies.getDatabaseObserver().notifyCallUpdateObservers()
+    AppDependencies.databaseObserver.notifyCallUpdateObservers()
    return sameEraId
  }

@@ -945,7 +945,7 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl
      }
    }

-    ApplicationDependencies.getDatabaseObserver().notifyCallUpdateObservers()
+    AppDependencies.databaseObserver.notifyCallUpdateObservers()
  }

  private fun updateEventFromRingState(
@@ -1040,7 +1040,7 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl
      }
    }

-    ApplicationDependencies.getDatabaseObserver().notifyCallUpdateObservers()
+    AppDependencies.databaseObserver.notifyCallUpdateObservers()
  }

  private fun setMessageId(callId: Long, messageId: MessageId) {
@@ -1406,7 +1406,7 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl
        groupCallState = CallLogRow.GroupCallState.fromDetails(groupCallDetails),
        children = actualChildren.toSet(),
        searchQuery = searchTerm,
-        callLinkPeekInfo = ApplicationDependencies.getSignalCallManager().peekInfoSnapshot[peer.id],
+        callLinkPeekInfo = AppDependencies.signalCallManager.peekInfoSnapshot[peer.id],
        canUserBeginCall = canUserBeginCall
      )
    }
--- a/app/src/main/java/org/thoughtcrime/securesms/database/ChatColorsTable.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/ChatColorsTable.kt
@@ -7,7 +7,7 @@ import org.signal.core.util.CursorUtil
 import org.signal.core.util.SqlUtil
 import org.thoughtcrime.securesms.conversation.colors.ChatColors
 import org.thoughtcrime.securesms.database.model.databaseprotos.ChatColor
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore

 class ChatColorsTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTable(context, databaseHelper) {
@@ -125,7 +125,7 @@ class ChatColorsTable(context: Context, databaseHelper: SignalDatabase) : Databa
  }

  private fun notifyListeners() {
-    ApplicationDependencies.getDatabaseObserver().notifyChatColorsListeners()
+    AppDependencies.databaseObserver.notifyChatColorsListeners()
  }

  private fun Cursor.getId(): Long = CursorUtil.requireLong(this, ID)
--- a/app/src/main/java/org/thoughtcrime/securesms/database/DatabaseTable.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/DatabaseTable.java
@@ -18,7 +18,7 @@ package org.thoughtcrime.securesms.database;

 import android.content.Context;

-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;

 import java.util.HashSet;
 import java.util.Set;
@@ -48,31 +48,31 @@ public abstract class DatabaseTable {
  }

  protected void notifyConversationListeners(Set<Long> threadIds) {
-    ApplicationDependencies.getDatabaseObserver().notifyConversationListeners(threadIds);
+    AppDependencies.getDatabaseObserver().notifyConversationListeners(threadIds);
  }

  protected void notifyConversationListeners(long threadId) {
-    ApplicationDependencies.getDatabaseObserver().notifyConversationListeners(threadId);
+    AppDependencies.getDatabaseObserver().notifyConversationListeners(threadId);
  }

  protected void notifyVerboseConversationListeners(Set<Long> threadIds) {
-    ApplicationDependencies.getDatabaseObserver().notifyVerboseConversationListeners(threadIds);
+    AppDependencies.getDatabaseObserver().notifyVerboseConversationListeners(threadIds);
  }

  protected void notifyConversationListListeners() {
-    ApplicationDependencies.getDatabaseObserver().notifyConversationListListeners();
+    AppDependencies.getDatabaseObserver().notifyConversationListListeners();
  }

  protected void notifyStickerPackListeners() {
-    ApplicationDependencies.getDatabaseObserver().notifyStickerPackObservers();
+    AppDependencies.getDatabaseObserver().notifyStickerPackObservers();
  }

  protected void notifyStickerListeners() {
-    ApplicationDependencies.getDatabaseObserver().notifyStickerObservers();
+    AppDependencies.getDatabaseObserver().notifyStickerObservers();
  }

  protected void notifyAttachmentListeners() {
-    ApplicationDependencies.getDatabaseObserver().notifyAttachmentObservers();
+    AppDependencies.getDatabaseObserver().notifyAttachmentObservers();
  }

  public void reset(SignalDatabase databaseHelper) {
--- a/app/src/main/java/org/thoughtcrime/securesms/database/GroupTable.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/GroupTable.kt
@@ -39,7 +39,7 @@ import org.thoughtcrime.securesms.contacts.paged.collections.ContactSearchIterat
 import org.thoughtcrime.securesms.crypto.SenderKeyUtil
 import org.thoughtcrime.securesms.database.SignalDatabase.Companion.recipients
 import org.thoughtcrime.securesms.database.model.GroupRecord
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.groups.BadGroupIdException
 import org.thoughtcrime.securesms.groups.GroupId
 import org.thoughtcrime.securesms.groups.GroupId.Push
@@ -617,7 +617,7 @@ class GroupTable(context: Context?, databaseHelper: SignalDatabase?) : DatabaseT
    }

    Log.w(TAG, "Scheduling request for latest group info for $groupId")
-    ApplicationDependencies.getJobManager().add(RequestGroupV2InfoJob(groupId))
+    AppDependencies.jobManager.add(RequestGroupV2InfoJob(groupId))
  }

  /**
--- a/app/src/main/java/org/thoughtcrime/securesms/database/IdentityTable.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/IdentityTable.kt
@@ -35,7 +35,7 @@ import org.signal.libsignal.protocol.IdentityKey
 import org.thoughtcrime.securesms.database.SignalDatabase.Companion.recipients
 import org.thoughtcrime.securesms.database.model.IdentityRecord
 import org.thoughtcrime.securesms.database.model.IdentityStoreRecord
-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
@@ -173,7 +173,7 @@ class IdentityTable internal constructor(context: Context?, databaseHelper: Sign
        EventBus.getDefault().post(record.get())
      }

-      ApplicationDependencies.getProtocolStore().aci().identities().invalidate(addressName)
+      AppDependencies.protocolStore.aci().identities().invalidate(addressName)
    }

    if (hadEntry && !keyMatches) {
--- a/app/src/main/java/org/thoughtcrime/securesms/database/InAppPaymentTable.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/InAppPaymentTable.kt
@@ -33,7 +33,7 @@ import org.signal.core.util.withinTransaction
 import org.thoughtcrime.securesms.components.settings.app.subscription.errors.DonationErrorSource
 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.util.parcelers.MillisecondDurationParceler
 import org.thoughtcrime.securesms.util.parcelers.NullableSubscriberIdParceler
 import org.whispersystems.signalservice.api.subscriptions.SubscriberId
@@ -160,7 +160,7 @@ class InAppPaymentTable(context: Context, databaseHelper: SignalDatabase) : Data
      .where(ID_WHERE, inAppPayment.id)
      .run()

-    ApplicationDependencies.getDatabaseObserver().notifyInAppPaymentsObservers(inAppPayment)
+    AppDependencies.databaseObserver.notifyInAppPaymentsObservers(inAppPayment)
  }

  fun getAllWaitingForAuth(): List<InAppPayment> {
--- a/app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.kt
@@ -110,7 +110,7 @@ import org.thoughtcrime.securesms.database.model.databaseprotos.MessageExtras
 import org.thoughtcrime.securesms.database.model.databaseprotos.ProfileChangeDetails
 import org.thoughtcrime.securesms.database.model.databaseprotos.SessionSwitchoverEvent
 import org.thoughtcrime.securesms.database.model.databaseprotos.ThreadMergeEvent
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.groups.GroupMigrationMembershipChange
 import org.thoughtcrime.securesms.jobs.OptimizeMessageSearchIndexJob
 import org.thoughtcrime.securesms.jobs.ThreadUpdateJob
@@ -680,8 +680,8 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
      threads.updateSnippetTypeSilently(threadId)
    }

-    ApplicationDependencies.getDatabaseObserver().notifyMessageUpdateObservers(MessageId(id))
-    ApplicationDependencies.getDatabaseObserver().notifyConversationListListeners()
+    AppDependencies.databaseObserver.notifyMessageUpdateObservers(MessageId(id))
+    AppDependencies.databaseObserver.notifyConversationListListeners()
  }

  private fun updateMessageBodyAndType(messageId: Long, body: String, maskOff: Long, maskOn: Long): InsertResult {
@@ -776,7 +776,7 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat

    notifyConversationListeners(threadsUpdated)
    notifyConversationListListeners()
-    ApplicationDependencies.getDatabaseObserver().notifyStoryObservers(storyRecipientsUpdated)
+    AppDependencies.databaseObserver.notifyStoryObservers(storyRecipientsUpdated)

    return results
  }
@@ -856,7 +856,7 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
    threads.update(threadId, true)

    notifyConversationListeners(threadId)
-    ApplicationDependencies.getDatabaseObserver().notifyMessageUpdateObservers(MessageId(messageId))
+    AppDependencies.databaseObserver.notifyMessageUpdateObservers(MessageId(messageId))
  }

  fun insertGroupCall(
@@ -1245,7 +1245,7 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
        BODY to Base64.encodeWithPadding(event.encode())
      )
      .run()
-    ApplicationDependencies.getDatabaseObserver().notifyConversationListeners(threadId)
+    AppDependencies.databaseObserver.notifyConversationListeners(threadId)
  }

  fun insertSessionSwitchoverEvent(recipientId: RecipientId, threadId: Long, event: SessionSwitchoverEvent) {
@@ -1263,7 +1263,7 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
        BODY to Base64.encodeWithPadding(event.encode())
      )
      .run()
-    ApplicationDependencies.getDatabaseObserver().notifyConversationListeners(threadId)
+    AppDependencies.databaseObserver.notifyConversationListeners(threadId)
  }

  fun insertSmsExportMessage(recipientId: RecipientId, threadId: Long) {
@@ -1289,7 +1289,7 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
    }

    if (updated) {
-      ApplicationDependencies.getDatabaseObserver().notifyConversationListeners(threadId)
+      AppDependencies.databaseObserver.notifyConversationListeners(threadId)
    }
  }

@@ -1635,7 +1635,7 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
        .where(storiesBeforeTimestampWhere, sharedArgs)
        .run()
        .readToList { RecipientId.from(it.requireLong(FROM_RECIPIENT_ID)) }
-        .forEach { id -> ApplicationDependencies.getDatabaseObserver().notifyStoryObservers(id) }
+        .forEach { id -> AppDependencies.databaseObserver.notifyStoryObservers(id) }

      val deletedStoryCount = db.select(ID)
        .from(TABLE_NAME)
@@ -1694,7 +1694,7 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
      db.execSQL(deleteStoryRepliesQuery, sharedArgs)
      db.execSQL(disassociateQuoteQuery, sharedArgs)

-      ApplicationDependencies.getDatabaseObserver().notifyStoryObservers(recipientId)
+      AppDependencies.databaseObserver.notifyStoryObservers(recipientId)

      val deletedStoryCount = db.select(ID)
        .from(TABLE_NAME)
@@ -2004,7 +2004,7 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
  fun markAsRateLimited(messageId: Long) {
    val threadId = getThreadIdForMessage(messageId)
    updateMailboxBitmask(messageId, 0, MessageTypes.MESSAGE_RATE_LIMITED_BIT, Optional.of(threadId))
-    ApplicationDependencies.getDatabaseObserver().notifyMessageUpdateObservers(MessageId(messageId))
+    AppDependencies.databaseObserver.notifyMessageUpdateObservers(MessageId(messageId))
  }

  fun clearRateLimitStatus(ids: Collection<Long>) {
@@ -2019,22 +2019,22 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
  fun markAsSending(messageId: Long) {
    val threadId = getThreadIdForMessage(messageId)
    updateMailboxBitmask(messageId, MessageTypes.BASE_TYPE_MASK, MessageTypes.BASE_SENDING_TYPE, Optional.of(threadId))
-    ApplicationDependencies.getDatabaseObserver().notifyMessageUpdateObservers(MessageId(messageId))
-    ApplicationDependencies.getDatabaseObserver().notifyConversationListListeners()
+    AppDependencies.databaseObserver.notifyMessageUpdateObservers(MessageId(messageId))
+    AppDependencies.databaseObserver.notifyConversationListListeners()
  }

  fun markAsSentFailed(messageId: Long) {
    val threadId = getThreadIdForMessage(messageId)
    updateMailboxBitmask(messageId, MessageTypes.BASE_TYPE_MASK, MessageTypes.BASE_SENT_FAILED_TYPE, Optional.of(threadId))
-    ApplicationDependencies.getDatabaseObserver().notifyMessageUpdateObservers(MessageId(messageId))
-    ApplicationDependencies.getDatabaseObserver().notifyConversationListListeners()
+    AppDependencies.databaseObserver.notifyMessageUpdateObservers(MessageId(messageId))
+    AppDependencies.databaseObserver.notifyConversationListListeners()
  }

  fun markAsSent(messageId: Long, secure: Boolean) {
    val threadId = getThreadIdForMessage(messageId)
    updateMailboxBitmask(messageId, MessageTypes.BASE_TYPE_MASK, MessageTypes.BASE_SENT_TYPE or if (secure) MessageTypes.PUSH_MESSAGE_BIT or MessageTypes.SECURE_MESSAGE_BIT else 0, Optional.of(threadId))
-    ApplicationDependencies.getDatabaseObserver().notifyMessageUpdateObservers(MessageId(messageId))
-    ApplicationDependencies.getDatabaseObserver().notifyConversationListListeners()
+    AppDependencies.databaseObserver.notifyMessageUpdateObservers(MessageId(messageId))
+    AppDependencies.databaseObserver.notifyConversationListListeners()
  }

  fun markAsRemoteDelete(targetMessage: MessageRecord) {
@@ -2094,11 +2094,11 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
    }

    OptimizeMessageSearchIndexJob.enqueue()
-    ApplicationDependencies.getDatabaseObserver().notifyMessageUpdateObservers(MessageId(messageId))
-    ApplicationDependencies.getDatabaseObserver().notifyConversationListListeners()
+    AppDependencies.databaseObserver.notifyMessageUpdateObservers(MessageId(messageId))
+    AppDependencies.databaseObserver.notifyConversationListListeners()

    if (deletedAttachments) {
-      ApplicationDependencies.getDatabaseObserver().notifyAttachmentObservers()
+      AppDependencies.databaseObserver.notifyAttachmentObservers()
    }
  }

@@ -2109,7 +2109,7 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
      .where("$ID = ?", messageId)
      .run()

-    ApplicationDependencies.getDatabaseObserver().notifyMessageUpdateObservers(MessageId(messageId))
+    AppDependencies.databaseObserver.notifyMessageUpdateObservers(MessageId(messageId))
  }

  fun clearScheduledStatus(threadId: Long, messageId: Long, expiresIn: Long): Boolean {
@@ -2124,8 +2124,8 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
      .where("$ID = ? AND $SCHEDULED_DATE != ?", messageId, -1)
      .run()

-    ApplicationDependencies.getDatabaseObserver().notifyMessageInsertObservers(threadId, MessageId(messageId))
-    ApplicationDependencies.getDatabaseObserver().notifyScheduledMessageObservers(threadId)
+    AppDependencies.databaseObserver.notifyMessageInsertObservers(threadId, MessageId(messageId))
+    AppDependencies.databaseObserver.notifyScheduledMessageObservers(threadId)

    return rowsUpdated > 0
  }
@@ -2137,8 +2137,8 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
      .where("$ID = ? AND $SCHEDULED_DATE != ?", messageId, -1)
      .run()

-    ApplicationDependencies.getDatabaseObserver().notifyScheduledMessageObservers(threadId)
-    ApplicationDependencies.getScheduledMessageManager().scheduleIfNecessary()
+    AppDependencies.databaseObserver.notifyScheduledMessageObservers(threadId)
+    AppDependencies.scheduledMessageManager.scheduleIfNecessary()

    if (rowsUpdated == 0) {
      Log.w(TAG, "Failed to reschedule messageId=$messageId to new time $time. may have been sent already")
@@ -2169,7 +2169,7 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
          .values(EXPIRE_STARTED to startedAtTimestamp)
          .where("$ID = ? AND ($EXPIRE_STARTED = 0 OR $EXPIRE_STARTED > ?)", id, startedAtTimestamp)
          .run()
-        ApplicationDependencies.getDatabaseObserver().notifyMessageUpdateObservers(MessageId(id))
+        AppDependencies.databaseObserver.notifyMessageUpdateObservers(MessageId(id))
      }
    }
  }
@@ -2697,7 +2697,7 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
    }

    if (retrieved.storyType.isStory) {
-      ApplicationDependencies.getDatabaseObserver().notifyStoryObservers(threads.getRecipientIdForThreadId(threadId)!!)
+      AppDependencies.databaseObserver.notifyStoryObservers(threads.getRecipientIdForThreadId(threadId)!!)
    }

    return Optional.of(
@@ -2807,7 +2807,7 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
    }

    if (updated) {
-      ApplicationDependencies.getDatabaseObserver().notifyMessageUpdateObservers(MessageId(messageId))
+      AppDependencies.databaseObserver.notifyMessageUpdateObservers(MessageId(messageId))
      notifyConversationListeners(threadId)
    }
  }
@@ -3085,16 +3085,16 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat

    if (!message.storyType.isStory) {
      if (message.outgoingQuote == null && editedMessage == null) {
-        ApplicationDependencies.getDatabaseObserver().notifyMessageInsertObservers(threadId, MessageId(messageId))
+        AppDependencies.databaseObserver.notifyMessageInsertObservers(threadId, MessageId(messageId))
      } else {
-        ApplicationDependencies.getDatabaseObserver().notifyConversationListeners(threadId)
+        AppDependencies.databaseObserver.notifyConversationListeners(threadId)
      }

      if (message.scheduledDate != -1L) {
-        ApplicationDependencies.getDatabaseObserver().notifyScheduledMessageObservers(threadId)
+        AppDependencies.databaseObserver.notifyScheduledMessageObservers(threadId)
      }
    } else {
-      ApplicationDependencies.getDatabaseObserver().notifyStoryObservers(message.threadRecipient.id)
+      AppDependencies.databaseObserver.notifyStoryObservers(message.threadRecipient.id)
    }

    if (!message.isIdentityVerified && !message.isIdentityDefault) {
@@ -3309,8 +3309,8 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
      }
    }

-    ApplicationDependencies.getScheduledMessageManager().scheduleIfNecessary()
-    ApplicationDependencies.getDatabaseObserver().notifyScheduledMessageObservers(threadId)
+    AppDependencies.scheduledMessageManager.scheduleIfNecessary()
+    AppDependencies.databaseObserver.notifyScheduledMessageObservers(threadId)
  }

  fun deleteScheduledMessages(recipientId: RecipientId) {
@@ -4316,8 +4316,8 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
    }

    for (update in messageUpdates) {
-      ApplicationDependencies.getDatabaseObserver().notifyMessageUpdateObservers(update.messageId)
-      ApplicationDependencies.getDatabaseObserver().notifyVerboseConversationListeners(setOf(update.threadId))
+      AppDependencies.databaseObserver.notifyMessageUpdateObservers(update.messageId)
+      AppDependencies.databaseObserver.notifyVerboseConversationListeners(setOf(update.threadId))
    }

    if (messageUpdates.isNotEmpty()) {
@@ -4344,7 +4344,7 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
    }

    for (threadUpdate in messageUpdates) {
-      ApplicationDependencies.getDatabaseObserver().notifyMessageUpdateObservers(threadUpdate.messageId)
+      AppDependencies.databaseObserver.notifyMessageUpdateObservers(threadUpdate.messageId)
    }

    return messageUpdates.isNotEmpty()
@@ -4377,11 +4377,11 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
    }

    for (update in messageUpdates) {
-      ApplicationDependencies.getDatabaseObserver().notifyMessageUpdateObservers(update.messageId)
-      ApplicationDependencies.getDatabaseObserver().notifyVerboseConversationListeners(setOf(update.threadId))
+      AppDependencies.databaseObserver.notifyMessageUpdateObservers(update.messageId)
+      AppDependencies.databaseObserver.notifyVerboseConversationListeners(setOf(update.threadId))

      if (messageQualifier == MessageQualifier.STORY) {
-        ApplicationDependencies.getDatabaseObserver().notifyStoryObservers(threads.getRecipientIdForThreadId(update.threadId)!!)
+        AppDependencies.databaseObserver.notifyStoryObservers(threads.getRecipientIdForThreadId(update.threadId)!!)
      }
    }

@@ -4512,7 +4512,7 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
    }

    for (expiringMessage in expiringMessages) {
-      ApplicationDependencies.getExpiringMessageManager().scheduleDeletion(expiringMessage.first(), true, proposedExpireStarted, expiringMessage.second())
+      AppDependencies.expiringMessageManager.scheduleDeletion(expiringMessage.first(), true, proposedExpireStarted, expiringMessage.second())
    }

    for (threadId in updatedThreads) {
@@ -5165,7 +5165,7 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
    private val context: Context

    init {
-      context = ApplicationDependencies.getApplication()
+      context = AppDependencies.application
    }

    override fun getNext(): MessageRecord? {
--- a/app/src/main/java/org/thoughtcrime/securesms/database/NotificationProfileTables.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/NotificationProfileTables.kt
@@ -13,7 +13,7 @@ import org.signal.core.util.requireLong
 import org.signal.core.util.requireString
 import org.signal.core.util.toInt
 import org.thoughtcrime.securesms.conversation.colors.AvatarColor
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.notifications.profiles.NotificationProfile
 import org.thoughtcrime.securesms.notifications.profiles.NotificationProfileSchedule
 import org.thoughtcrime.securesms.recipients.RecipientId
@@ -141,7 +141,7 @@ class NotificationProfileDatabase(context: Context, databaseHelper: SignalDataba
      )
    } finally {
      db.endTransaction()
-      ApplicationDependencies.getDatabaseObserver().notifyNotificationProfileObservers()
+      AppDependencies.databaseObserver.notifyNotificationProfileObservers()
    }
  }

@@ -156,7 +156,7 @@ class NotificationProfileDatabase(context: Context, databaseHelper: SignalDataba
    return try {
      val count = writableDatabase.update(NotificationProfileTable.TABLE_NAME, profileValues, updateQuery.where, updateQuery.whereArgs)
      if (count > 0) {
-        ApplicationDependencies.getDatabaseObserver().notifyNotificationProfileObservers()
+        AppDependencies.databaseObserver.notifyNotificationProfileObservers()
      }

      NotificationProfileChangeResult.Success(getProfile(profileId)!!)
@@ -202,7 +202,7 @@ class NotificationProfileDatabase(context: Context, databaseHelper: SignalDataba
      return NotificationProfileChangeResult.Success(getProfile(profile.id)!!)
    } finally {
      db.endTransaction()
-      ApplicationDependencies.getDatabaseObserver().notifyNotificationProfileObservers()
+      AppDependencies.databaseObserver.notifyNotificationProfileObservers()
    }
  }

@@ -218,7 +218,7 @@ class NotificationProfileDatabase(context: Context, databaseHelper: SignalDataba
    writableDatabase.update(NotificationProfileScheduleTable.TABLE_NAME, scheduleValues, updateQuery.where, updateQuery.whereArgs)

    if (!silent) {
-      ApplicationDependencies.getDatabaseObserver().notifyNotificationProfileObservers()
+      AppDependencies.databaseObserver.notifyNotificationProfileObservers()
    }
  }

@@ -243,7 +243,7 @@ class NotificationProfileDatabase(context: Context, databaseHelper: SignalDataba
    } finally {
      db.endTransaction()

-      ApplicationDependencies.getDatabaseObserver().notifyNotificationProfileObservers()
+      AppDependencies.databaseObserver.notifyNotificationProfileObservers()
    }
  }

@@ -254,7 +254,7 @@ class NotificationProfileDatabase(context: Context, databaseHelper: SignalDataba
    }
    writableDatabase.insert(NotificationProfileAllowedMembersTable.TABLE_NAME, null, allowedValues)

-    ApplicationDependencies.getDatabaseObserver().notifyNotificationProfileObservers()
+    AppDependencies.databaseObserver.notifyNotificationProfileObservers()
    return getProfile(profileId)!!
  }

@@ -265,7 +265,7 @@ class NotificationProfileDatabase(context: Context, databaseHelper: SignalDataba
      SqlUtil.buildArgs(profileId, recipientId)
    )

-    ApplicationDependencies.getDatabaseObserver().notifyNotificationProfileObservers()
+    AppDependencies.databaseObserver.notifyNotificationProfileObservers()
    return getProfile(profileId)!!
  }

@@ -293,7 +293,7 @@ class NotificationProfileDatabase(context: Context, databaseHelper: SignalDataba

  fun deleteProfile(profileId: Long) {
    writableDatabase.delete(NotificationProfileTable.TABLE_NAME, ID_WHERE, SqlUtil.buildArgs(profileId))
-    ApplicationDependencies.getDatabaseObserver().notifyNotificationProfileObservers()
+    AppDependencies.databaseObserver.notifyNotificationProfileObservers()
  }

  override fun remapRecipient(oldId: RecipientId, newId: RecipientId) {
@@ -305,7 +305,7 @@ class NotificationProfileDatabase(context: Context, databaseHelper: SignalDataba

    databaseHelper.signalWritableDatabase.update(NotificationProfileAllowedMembersTable.TABLE_NAME, values, query, args)

-    ApplicationDependencies.getDatabaseObserver().notifyNotificationProfileObservers()
+    AppDependencies.databaseObserver.notifyNotificationProfileObservers()
  }

  private fun getProfile(cursor: Cursor): NotificationProfile {
--- a/app/src/main/java/org/thoughtcrime/securesms/database/PaymentTable.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/PaymentTable.java
@@ -22,7 +22,7 @@ import org.thoughtcrime.securesms.database.model.MmsMessageRecord;
 import org.thoughtcrime.securesms.database.model.MessageId;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.database.model.databaseprotos.CryptoValue;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.payments.CryptoValueUtil;
 import org.thoughtcrime.securesms.payments.Direction;
 import org.thoughtcrime.securesms.payments.FailureReason;
@@ -648,7 +648,7 @@ public final class PaymentTable extends DatabaseTable implements RecipientIdData
   */
  private void notifyChanged() {
    changeSignal.postValue(new Object());
-    ApplicationDependencies.getDatabaseObserver().notifyAllPaymentsListeners();
+    AppDependencies.getDatabaseObserver().notifyAllPaymentsListeners();
  }

  /**
@@ -657,10 +657,10 @@ public final class PaymentTable extends DatabaseTable implements RecipientIdData
   */
  private void notifyUuidChanged(@Nullable UUID uuid) {
    if (uuid != null) {
-      ApplicationDependencies.getDatabaseObserver().notifyPaymentListeners(uuid);
+      AppDependencies.getDatabaseObserver().notifyPaymentListeners(uuid);
      MessageId messageId = SignalDatabase.messages().getPaymentMessage(uuid);
      if (messageId != null) {
-        ApplicationDependencies.getDatabaseObserver().notifyMessageUpdateObservers(messageId);
+        AppDependencies.getDatabaseObserver().notifyMessageUpdateObservers(messageId);
      }
    }
  }
--- a/app/src/main/java/org/thoughtcrime/securesms/database/PendingRetryReceiptTable.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/PendingRetryReceiptTable.java
@@ -9,7 +9,7 @@ import androidx.annotation.NonNull;
 import net.zetetic.database.sqlcipher.SQLiteDatabase;

 import org.thoughtcrime.securesms.database.model.PendingRetryReceiptModel;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.signal.core.util.CursorUtil;
 import org.signal.core.util.SqlUtil;
@@ -89,7 +89,7 @@ public final class PendingRetryReceiptTable extends DatabaseTable implements Rec
    values.put(AUTHOR, toId.serialize());
    getWritableDatabase().update(TABLE_NAME, values, AUTHOR + " = ?", SqlUtil.buildArgs(fromId));
    
-    ApplicationDependencies.getPendingRetryReceiptCache().clear();
+    AppDependencies.getPendingRetryReceiptCache().clear();
  }

  @Override
@@ -98,6 +98,6 @@ public final class PendingRetryReceiptTable extends DatabaseTable implements Rec
    values.put(THREAD_ID, toId);
    getWritableDatabase().update(TABLE_NAME, values, THREAD_ID + " = ?", SqlUtil.buildArgs(fromId));

-    ApplicationDependencies.getPendingRetryReceiptCache().clear();
+    AppDependencies.getPendingRetryReceiptCache().clear();
  }
 }
--- a/app/src/main/java/org/thoughtcrime/securesms/database/ReactionTable.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/ReactionTable.kt
@@ -9,7 +9,7 @@ import org.signal.core.util.delete
 import org.signal.core.util.update
 import org.thoughtcrime.securesms.database.model.MessageId
 import org.thoughtcrime.securesms.database.model.ReactionRecord
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.recipients.RecipientId

 /**
@@ -119,7 +119,7 @@ class ReactionTable(context: Context, databaseHelper: SignalDatabase) : Database
      writableDatabase.endTransaction()
    }

-    ApplicationDependencies.getDatabaseObserver().notifyMessageUpdateObservers(messageId)
+    AppDependencies.databaseObserver.notifyMessageUpdateObservers(messageId)
  }

  fun deleteReaction(messageId: MessageId, recipientId: RecipientId) {
@@ -137,7 +137,7 @@ class ReactionTable(context: Context, databaseHelper: SignalDatabase) : Database
      writableDatabase.endTransaction()
    }

-    ApplicationDependencies.getDatabaseObserver().notifyMessageUpdateObservers(messageId)
+    AppDependencies.databaseObserver.notifyMessageUpdateObservers(messageId)
  }

  fun deleteReactions(messageId: MessageId) {
--- a/app/src/main/java/org/thoughtcrime/securesms/database/RecipientTable.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/RecipientTable.kt
@@ -74,7 +74,7 @@ import org.thoughtcrime.securesms.database.model.databaseprotos.RecipientExtras
 import org.thoughtcrime.securesms.database.model.databaseprotos.SessionSwitchoverEvent
 import org.thoughtcrime.securesms.database.model.databaseprotos.ThreadMergeEvent
 import org.thoughtcrime.securesms.database.model.databaseprotos.Wallpaper
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.groups.BadGroupIdException
 import org.thoughtcrime.securesms.groups.GroupId
 import org.thoughtcrime.securesms.groups.GroupId.V1
@@ -500,14 +500,14 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da

      db.runPostSuccessfulTransaction {
        if (result.affectedIds.isNotEmpty()) {
-          result.affectedIds.forEach { ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(it) }
+          result.affectedIds.forEach { AppDependencies.databaseObserver.notifyRecipientChanged(it) }
          RetrieveProfileJob.enqueue(result.affectedIds)
        }

        if (result.oldIds.isNotEmpty()) {
          result.oldIds.forEach { oldId ->
            Recipient.live(oldId).refresh(result.finalId)
-            ApplicationDependencies.getRecipientCache().remap(oldId, result.finalId)
+            AppDependencies.recipientCache.remap(oldId, result.finalId)
          }
        }

@@ -803,7 +803,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da

  fun markNeedsSync(recipientId: RecipientId) {
    rotateStorageId(recipientId)
-    ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(recipientId)
+    AppDependencies.databaseObserver.notifyRecipientChanged(recipientId)
  }

  fun markAllSystemContactsNeedsSync() {
@@ -838,7 +838,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
    }

    for (id in storageIds.keys) {
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
    }
  }

@@ -876,7 +876,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da

  fun applyStorageSyncContactUpdate(update: StorageRecordUpdate<SignalContactRecord>) {
    val db = writableDatabase
-    val identityStore = ApplicationDependencies.getProtocolStore().aci().identities()
+    val identityStore = AppDependencies.protocolStore.aci().identities()
    val values = getValuesForStorageContact(update.new, false)

    try {
@@ -925,7 +925,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
    }

    threads.applyStorageSyncUpdate(recipientId, update.new)
-    ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(recipientId)
+    AppDependencies.databaseObserver.notifyRecipientChanged(recipientId)
  }

  fun applyStorageSyncGroupV1Insert(insert: SignalGroupV1Record) {
@@ -933,7 +933,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da

    val recipientId = RecipientId.from(id)
    threads.applyStorageSyncUpdate(recipientId, insert)
-    ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(recipientId)
+    AppDependencies.databaseObserver.notifyRecipientChanged(recipientId)
  }

  fun applyStorageSyncGroupV1Update(update: StorageRecordUpdate<SignalGroupV1Record>) {
@@ -977,7 +977,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
    }

    Log.i(TAG, "Scheduling request for latest group info for $groupId")
-    ApplicationDependencies.getJobManager().add(RequestGroupV2InfoJob(groupId))
+    AppDependencies.jobManager.add(RequestGroupV2InfoJob(groupId))
    threads.applyStorageSyncUpdate(recipient.id, insert)
    recipient.live().refresh()
  }
@@ -1282,7 +1282,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
      writableDatabase.update(TABLE_NAME, values, where, args)

      for (recipientId in updated) {
-        ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(recipientId)
+        AppDependencies.databaseObserver.notifyRecipientChanged(recipientId)
      }
    }
  }
@@ -1309,7 +1309,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
      writableDatabase.update(TABLE_NAME, values, where, args)

      for (recipientId in updated) {
-        ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(recipientId)
+        AppDependencies.databaseObserver.notifyRecipientChanged(recipientId)
      }
    }
  }
@@ -1350,7 +1350,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
    database.update(TABLE_NAME, values, where, args)

    for (id in toUpdate) {
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
    }
  }

@@ -1360,7 +1360,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
      put(CUSTOM_CHAT_COLORS_ID, ChatColors.Id.NotSet.longValue)
    }
    if (update(id, values)) {
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
    }
  }

@@ -1370,7 +1370,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
      put(CUSTOM_CHAT_COLORS_ID, color.id.longValue)
    }
    if (update(id, values)) {
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
    }
  }

@@ -1380,7 +1380,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
    }
    if (update(id, values)) {
      rotateStorageId(id)
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
    }
  }

@@ -1389,7 +1389,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
      put(MESSAGE_RINGTONE, notification?.toString())
    }
    if (update(id, values)) {
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
    }
  }

@@ -1398,7 +1398,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
      put(CALL_RINGTONE, ringtone?.toString())
    }
    if (update(id, values)) {
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
    }
  }

@@ -1407,7 +1407,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
      put(MESSAGE_VIBRATE, enabled.id)
    }
    if (update(id, values)) {
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
    }
  }

@@ -1416,7 +1416,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
      put(CALL_VIBRATE, enabled.id)
    }
    if (update(id, values)) {
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
    }
  }

@@ -1427,7 +1427,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da

    if (update(id, values)) {
      rotateStorageId(id)
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
    }

    StorageSyncHelper.scheduleSyncForDataChange()
@@ -1454,7 +1454,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
    }

    for (id in ids) {
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
    }

    StorageSyncHelper.scheduleSyncForDataChange()
@@ -1465,7 +1465,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
      put(MESSAGE_EXPIRATION_TIME, expiration)
    }
    if (update(id, values)) {
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
    }
  }

@@ -1474,7 +1474,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
      put(SEALED_SENDER_MODE, unidentifiedAccessMode.mode)
    }
    if (update(id, values)) {
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
    }
  }

@@ -1513,7 +1513,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
    }

    if (update(id, values)) {
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
    }
  }

@@ -1523,7 +1523,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
    }

    if (update(id, values)) {
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
    }
  }

@@ -1533,7 +1533,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
    }
    if (update(id, values)) {
      rotateStorageId(id)
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
      StorageSyncHelper.scheduleSyncForDataChange()
    }
  }
@@ -1561,7 +1561,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da

    if (update(updateQuery, valuesToSet)) {
      rotateStorageId(id)
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
      StorageSyncHelper.scheduleSyncForDataChange()

      if (id == Recipient.self().id) {
@@ -1591,7 +1591,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da

    if (writableDatabase.update(TABLE_NAME, valuesToSet, selection, args) > 0) {
      rotateStorageId(id)
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
      return true
    } else {
      return false
@@ -1619,7 +1619,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da

    val updated = update(updateQuery, values)
    if (updated) {
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
    }

    return updated
@@ -1629,7 +1629,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
    val values = ContentValues(1)
    values.putNull(EXPIRING_PROFILE_KEY_CREDENTIAL)
    if (update(id, values)) {
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
    }
  }

@@ -1696,7 +1696,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
    }

    if (update(id, values)) {
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
    }
  }

@@ -1748,7 +1748,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
      put(SYSTEM_JOINED_NAME, systemContactName)
    }
    if (update(id, values)) {
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
    }
  }

@@ -1761,7 +1761,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
    )
    if (update(id, contentValues)) {
      rotateStorageId(id)
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
      StorageSyncHelper.scheduleSyncForDataChange()
    }
  }
@@ -1774,7 +1774,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
    }
    if (update(id, contentValues)) {
      rotateStorageId(id)
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
      StorageSyncHelper.scheduleSyncForDataChange()
    }
  }
@@ -1784,7 +1784,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
      put(PROFILE_AVATAR, profileAvatar)
    }
    if (update(id, contentValues)) {
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
      if (id == Recipient.self().id) {
        rotateStorageId(id)
        StorageSyncHelper.scheduleSyncForDataChange()
@@ -1799,7 +1799,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
    }

    if (update(id, contentValues)) {
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
    }
  }

@@ -1822,7 +1822,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
      SignalDatabase.distributionLists.removeMemberFromAllLists(id)
      SignalDatabase.messages.deleteStoriesForRecipient(id)
      rotateStorageId(id)
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
      StorageSyncHelper.scheduleSyncForDataChange()
    } else {
      Log.w(TAG, "Failed to hide recipient $id")
@@ -1849,7 +1849,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da

    if (profiledUpdated) {
      rotateStorageId(id)
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
      StorageSyncHelper.scheduleSyncForDataChange()
    }
  }
@@ -1859,7 +1859,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
      put(NOTIFICATION_CHANNEL, notificationChannel)
    }
    if (update(id, contentValues)) {
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
    }
  }

@@ -1868,7 +1868,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
      PHONE_NUMBER_SHARING to phoneNumberSharing.id
    )
    if (update(id, contentValues)) {
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
    }
  }

@@ -1903,7 +1903,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
      val rowsUpdated = database.update(TABLE_NAME, values, where, null)
      if (rowsUpdated == idWithWallpaper.size) {
        for (pair in idWithWallpaper) {
-          ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(pair.first)
+          AppDependencies.databaseObserver.notifyRecipientChanged(pair.first)
          if (pair.second != null) {
            WallpaperStorage.onWallpaperDeselected(context, Uri.parse(pair.second))
          }
@@ -1933,7 +1933,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
    }

    if (update(id, values)) {
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
    }

    if (existingWallpaperUri != null) {
@@ -2047,7 +2047,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
    }
    if (update(id, contentValues)) {
      rotateStorageId(id)
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
      StorageSyncHelper.scheduleSyncForDataChange()
    }
  }
@@ -2120,7 +2120,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
      }

      if (update(id, contentValuesOf(USERNAME to username))) {
-        ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+        AppDependencies.databaseObserver.notifyRecipientChanged(id)
        rotateStorageId(id)
        StorageSyncHelper.scheduleSyncForDataChange()
      }
@@ -2232,7 +2232,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
    if (update(id, contentValues)) {
      Log.i(TAG, "Newly marked $id as registered.")
      setStorageIdIfNotSet(id)
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
    }
  }

@@ -2263,7 +2263,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
    if (update(id, contentValues)) {
      Log.i(TAG, "[WithSplit] Newly marked $id as unregistered.")
      markNeedsSync(id)
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
    }

    val splitId = getAndPossiblyMerge(null, record.pni, record.e164)
@@ -2282,7 +2282,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
    if (update(id, contentValues)) {
      Log.i(TAG, "[WithoutSplit] Newly marked $id as unregistered.")
      markNeedsSync(id)
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
    }
  }

@@ -2356,7 +2356,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
        if (update(id, registeredValues)) {
          newlyRegistered += id
          setStorageIdIfNotSet(id)
-          ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+          AppDependencies.databaseObserver.notifyRecipientChanged(id)
        }
      }

@@ -2374,7 +2374,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
      for (id in unregistered) {
        if (update(id, unregisteredValues)) {
          newlyUnregistered += id
-          ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+          AppDependencies.databaseObserver.notifyRecipientChanged(id)
        }
      }

@@ -3249,7 +3249,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
    } finally {
      db.setTransactionSuccessful()
      db.endTransaction()
-      updates.entries.forEach { ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(it.key) }
+      updates.entries.forEach { AppDependencies.databaseObserver.notifyRecipientChanged(it.key) }
    }
  }

@@ -3632,7 +3632,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
      db.endTransaction()
    }

-    ApplicationDependencies.getRecipientCache().clear()
+    AppDependencies.recipientCache.clear()
  }

  fun updateStorageId(recipientId: RecipientId, id: ByteArray?) {
@@ -3655,7 +3655,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
    }

    for (id in ids.keys) {
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
    }
  }

@@ -3689,7 +3689,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
      writableDatabase.update(TABLE_NAME, values, query.where, query.whereArgs)

      for (id in idsToUpdate) {
-        ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(RecipientId.from(id))
+        AppDependencies.databaseObserver.notifyRecipientChanged(RecipientId.from(id))
      }
    }
  }
@@ -3737,7 +3737,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
        val count = db.update(TABLE_NAME, values, query.where, query.whereArgs)
        if (count > 0) {
          for (id in idsToUpdate) {
-            ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(RecipientId.from(id))
+            AppDependencies.databaseObserver.notifyRecipientChanged(RecipientId.from(id))
          }
        }
      }
@@ -3800,7 +3800,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
    } finally {
      db.endTransaction()
    }
-    ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(recipientId)
+    AppDependencies.databaseObserver.notifyRecipientChanged(recipientId)
  }

  /**
@@ -3850,7 +3850,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
    if (update(query, values)) {
      val id = getByGroupId(v2Id).get()
      rotateStorageId(id)
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
    }
  }

@@ -3931,7 +3931,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da

    // Clean up any E164-based identities (legacy stuff)
    if (secondaryRecord.e164 != null) {
-      ApplicationDependencies.getProtocolStore().aci().identities().delete(secondaryRecord.e164)
+      AppDependencies.protocolStore.aci().identities().delete(secondaryRecord.e164)
    }

    // Threads
@@ -4169,7 +4169,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
      }
      .run()

-    ApplicationDependencies.getRecipientCache().clear()
+    AppDependencies.recipientCache.clear()
    RecipientId.clearCache()
  }

@@ -4200,7 +4200,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
      }
      .run()

-    ApplicationDependencies.getRecipientCache().clear()
+    AppDependencies.recipientCache.clear()
    RecipientId.clearCache()
  }

@@ -4219,7 +4219,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
      .where(ID_WHERE, recipientId)
      .run()

-    ApplicationDependencies.getRecipientCache().clear()
+    AppDependencies.recipientCache.clear()
    RecipientId.clearCache()
  }

@@ -4239,7 +4239,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
      SqlUtil.buildArgs(recipientId)
    )

-    ApplicationDependencies.getRecipientCache().clear()
+    AppDependencies.recipientCache.clear()
    RecipientId.clearCache()
  }

@@ -4313,7 +4313,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
      clearSystemDataForPendingInfo()
      database.setTransactionSuccessful()
      database.endTransaction()
-      pendingRecipients.forEach { id -> ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id) }
+      pendingRecipients.forEach { id -> AppDependencies.databaseObserver.notifyRecipientChanged(id) }
    }

    private fun markAllRelevantEntriesDirty() {
@@ -4348,7 +4348,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
        null
      ).forEach { cursor ->
        val id = RecipientId.from(cursor.requireLong(ID))
-        ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+        AppDependencies.databaseObserver.notifyRecipientChanged(id)
      }
    }
  }
--- a/app/src/main/java/org/thoughtcrime/securesms/database/RxDatabaseObserver.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/RxDatabaseObserver.kt
@@ -4,7 +4,7 @@ import io.reactivex.rxjava3.core.BackpressureStrategy
 import io.reactivex.rxjava3.core.Emitter
 import io.reactivex.rxjava3.core.Flowable
 import io.reactivex.rxjava3.schedulers.Schedulers
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import java.util.concurrent.TimeUnit

 /**
@@ -18,13 +18,13 @@ object RxDatabaseObserver {

  private fun conversationListFlowable(): Flowable<Unit> {
    return databaseFlowable { listener ->
-      ApplicationDependencies.getDatabaseObserver().registerConversationListObserver(listener)
+      AppDependencies.databaseObserver.registerConversationListObserver(listener)
    }
  }

  fun conversation(threadId: Long): Flowable<Unit> {
    return databaseFlowable { listener ->
-      ApplicationDependencies.getDatabaseObserver().registerVerboseConversationObserver(threadId, listener)
+      AppDependencies.databaseObserver.registerVerboseConversationObserver(threadId, listener)
    }
  }

@@ -32,7 +32,7 @@ object RxDatabaseObserver {
  private fun notificationProfilesFlowable(): Flowable<Unit> {
    return Flowable.combineLatest(
      Flowable.interval(0, 30, TimeUnit.SECONDS),
-      databaseFlowable { ApplicationDependencies.getDatabaseObserver().registerNotificationProfileObserver(it) }
+      databaseFlowable { AppDependencies.databaseObserver.registerNotificationProfileObserver(it) }
    ) { _, _ -> Unit }
  }

@@ -42,7 +42,7 @@ object RxDatabaseObserver {
        val listener = RxObserver(it)

        registerObserver(listener)
-        it.setCancellable { ApplicationDependencies.getDatabaseObserver().unregisterObserver(listener) }
+        it.setCancellable { AppDependencies.databaseObserver.unregisterObserver(listener) }

        listener.prime()
      },
--- a/app/src/main/java/org/thoughtcrime/securesms/database/SqlCipherDeletingErrorHandler.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/SqlCipherDeletingErrorHandler.java
@@ -8,7 +8,7 @@ import net.zetetic.database.DatabaseErrorHandler;
 import net.zetetic.database.sqlcipher.SQLiteDatabase;

 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.signal.core.util.CursorUtil;

 /**
@@ -50,7 +50,7 @@ public final class SqlCipherDeletingErrorHandler implements DatabaseErrorHandler
      }
    } finally {
      Log.w(TAG, "Deleting database " + databaseName);
-      ApplicationDependencies.getApplication().deleteDatabase(databaseName);
+      AppDependencies.getApplication().deleteDatabase(databaseName);
    }
  }
 }
--- a/app/src/main/java/org/thoughtcrime/securesms/database/SqlCipherErrorHandler.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/SqlCipherErrorHandler.kt
@@ -9,7 +9,7 @@ import org.signal.core.util.CursorUtil
 import org.signal.core.util.ExceptionUtil
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.crypto.DatabaseSecretProvider
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import java.util.concurrent.CountDownLatch
 import java.util.concurrent.atomic.AtomicBoolean
 import java.util.concurrent.atomic.AtomicReference
@@ -32,7 +32,7 @@ class SqlCipherErrorHandler(private val databaseName: String) : DatabaseErrorHan
    }

    try {
-      val result: DiagnosticResults = runDiagnostics(ApplicationDependencies.getApplication(), db)
+      val result: DiagnosticResults = runDiagnostics(AppDependencies.application, db)
      var lines: List<String> = result.logs.split("\n")
      lines = listOf("Database '$databaseName' corrupted!", "[sqlite] $message", "Diagnostics results:") + lines

--- a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadTable.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadTable.kt
@@ -47,7 +47,7 @@ import org.thoughtcrime.securesms.database.model.ThreadRecord
 import org.thoughtcrime.securesms.database.model.databaseprotos.BodyRangeList
 import org.thoughtcrime.securesms.database.model.databaseprotos.MessageExtras
 import org.thoughtcrime.securesms.database.model.serialize
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.groups.BadGroupIdException
 import org.thoughtcrime.securesms.groups.GroupId
 import org.thoughtcrime.securesms.jobs.MultiDeviceDeleteSendSyncJob
@@ -1149,7 +1149,7 @@ class ThreadTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTa

    notifyConversationListListeners()
    notifyConversationListeners(threadId)
-    ApplicationDependencies.getDatabaseObserver().notifyConversationDeleteListeners(threadId)
+    AppDependencies.databaseObserver.notifyConversationDeleteListeners(threadId)
    ConversationUtil.clearShortcuts(context, setOf(recipientIdForThreadId))
  }

@@ -1187,7 +1187,7 @@ class ThreadTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTa

    notifyConversationListListeners()
    notifyConversationListeners(selectedConversations)
-    ApplicationDependencies.getDatabaseObserver().notifyConversationDeleteListeners(selectedConversations)
+    AppDependencies.databaseObserver.notifyConversationDeleteListeners(selectedConversations)
    ConversationUtil.clearShortcuts(context, recipientIds)
  }

--- a/app/src/main/java/org/thoughtcrime/securesms/database/documents/IdentityKeyMismatch.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/documents/IdentityKeyMismatch.java
@@ -1,10 +1,7 @@
 package org.thoughtcrime.securesms.database.documents;

-import android.content.Context;
 import android.text.TextUtils;

-import androidx.annotation.NonNull;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.JsonGenerator;
@@ -19,7 +16,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import org.signal.core.util.logging.Log;
 import org.signal.libsignal.protocol.IdentityKey;
 import org.signal.libsignal.protocol.InvalidKeyException;
-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.signal.core.util.Base64;
@@ -56,7 +53,7 @@ public class IdentityKeyMismatch {
    if (!TextUtils.isEmpty(recipientId)) {
      return RecipientId.from(recipientId);
    } else {
-      return Recipient.external(ApplicationDependencies.getApplication(), address).getId();
+      return Recipient.external(AppDependencies.getApplication(), address).getId();
    }
  }

--- a/app/src/main/java/org/thoughtcrime/securesms/database/documents/NetworkFailure.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/documents/NetworkFailure.java
@@ -1,6 +1,5 @@
 package org.thoughtcrime.securesms.database.documents;

-import android.content.Context;
 import android.text.TextUtils;

 import androidx.annotation.NonNull;
@@ -8,8 +7,7 @@ import androidx.annotation.NonNull;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;

-import org.thoughtcrime.securesms.ApplicationContext;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;

@@ -36,7 +34,7 @@ public class NetworkFailure {
    if (!TextUtils.isEmpty(recipientId)) {
      return RecipientId.from(recipientId);
    } else {
-      return Recipient.external(ApplicationDependencies.getApplication(), address).getId();
+      return Recipient.external(AppDependencies.getApplication(), address).getId();
    }
  }

--- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/ClassicOpenHelper.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/ClassicOpenHelper.java
@@ -39,7 +39,7 @@ import org.thoughtcrime.securesms.database.MessageTable;
 import org.thoughtcrime.securesms.database.MessageTypes;
 import org.thoughtcrime.securesms.database.RecipientTable;
 import org.thoughtcrime.securesms.database.ThreadTable;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.groups.GroupId;
 import org.thoughtcrime.securesms.migrations.LegacyMigrationJob;
 import org.thoughtcrime.securesms.permissions.Permissions;
@@ -431,7 +431,7 @@ public class ClassicOpenHelper extends SQLiteOpenHelper {
    db.endTransaction();

 //    DecryptingQueue.schedulePendingDecrypts(context, masterSecret);
-    ApplicationDependencies.getMessageNotifier().updateNotification(context);
+    AppDependencies.getMessageNotifier().updateNotification(context);
  }

  @Override
--- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V185_MessageRecipientsAndEditMessageMigration.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V185_MessageRecipientsAndEditMessageMigration.kt
@@ -14,7 +14,7 @@ import org.signal.core.util.requireLong
 import org.signal.core.util.requireNonNullString
 import org.signal.core.util.requireString
 import org.thoughtcrime.securesms.database.KeyValueDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.whispersystems.signalservice.api.push.ServiceId.ACI

@@ -248,7 +248,7 @@ object V185_MessageRecipientsAndEditMessageMigration : SignalDatabaseMigration {
  }

  private fun getSelfId(db: SQLiteDatabase): RecipientId? {
-    val idByAci: RecipientId? = getLocalAci(ApplicationDependencies.getApplication())?.let { aci ->
+    val idByAci: RecipientId? = getLocalAci(AppDependencies.application)?.let { aci ->
      db.rawQuery("SELECT _id FROM recipient WHERE uuid = ?", SqlUtil.buildArgs(aci))
        .readToSingleObject { RecipientId.from(it.requireLong("_id")) }
    }
@@ -259,7 +259,7 @@ object V185_MessageRecipientsAndEditMessageMigration : SignalDatabaseMigration {

    Log.w(TAG, "Failed to find by ACI! Will try by E164.")

-    val idByE164: RecipientId? = getLocalE164(ApplicationDependencies.getApplication())?.let { e164 ->
+    val idByE164: RecipientId? = getLocalE164(AppDependencies.application)?.let { e164 ->
      db.rawQuery("SELECT _id FROM recipient WHERE phone = ?", SqlUtil.buildArgs(e164))
        .readToSingleObject { RecipientId.from(it.requireLong("_id")) }
    }
--- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V188_FixMessageRecipientsAndEditMessageMigration.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V188_FixMessageRecipientsAndEditMessageMigration.kt
@@ -14,7 +14,7 @@ import org.signal.core.util.requireLong
 import org.signal.core.util.requireNonNullString
 import org.signal.core.util.requireString
 import org.thoughtcrime.securesms.database.KeyValueDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.whispersystems.signalservice.api.push.ServiceId.ACI

@@ -274,7 +274,7 @@ object V188_FixMessageRecipientsAndEditMessageMigration : SignalDatabaseMigratio
  }

  private fun getSelfId(db: SQLiteDatabase): RecipientId? {
-    val idByAci: RecipientId? = getLocalAci(ApplicationDependencies.getApplication())?.let { aci ->
+    val idByAci: RecipientId? = getLocalAci(AppDependencies.application)?.let { aci ->
      db.rawQuery("SELECT _id FROM recipient WHERE uuid = ?", SqlUtil.buildArgs(aci))
        .readToSingleObject { RecipientId.from(it.requireLong("_id")) }
    }
@@ -285,7 +285,7 @@ object V188_FixMessageRecipientsAndEditMessageMigration : SignalDatabaseMigratio

    Log.w(TAG, "Failed to find by ACI! Will try by E164.")

-    val idByE164: RecipientId? = getLocalE164(ApplicationDependencies.getApplication())?.let { e164 ->
+    val idByE164: RecipientId? = getLocalE164(AppDependencies.application)?.let { e164 ->
      db.rawQuery("SELECT _id FROM recipient WHERE phone = ?", SqlUtil.buildArgs(e164))
        .readToSingleObject { RecipientId.from(it.requireLong("_id")) }
    }
--- a/app/src/main/java/org/thoughtcrime/securesms/database/loaders/GroupedThreadMediaLoader.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/loaders/GroupedThreadMediaLoader.java
@@ -12,7 +12,7 @@ import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.database.DatabaseObserver;
 import org.thoughtcrime.securesms.database.MediaTable;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.util.CalendarDateOnly;

 import java.text.SimpleDateFormat;
@@ -59,7 +59,7 @@ public final class GroupedThreadMediaLoader extends AsyncTaskLoader<GroupedThrea

  @Override
  protected void onAbandon() {
-    ApplicationDependencies.getDatabaseObserver().unregisterObserver(observer);
+    AppDependencies.getDatabaseObserver().unregisterObserver(observer);
  }

  @Override
@@ -71,7 +71,7 @@ public final class GroupedThreadMediaLoader extends AsyncTaskLoader<GroupedThrea

    PopulatedGroupedThreadMedia mediaGrouping = new PopulatedGroupedThreadMedia(groupingMethod);

-    ApplicationDependencies.getDatabaseObserver().registerAttachmentObserver(observer);
+    AppDependencies.getDatabaseObserver().registerAttachmentObserver(observer);

    try (Cursor cursor = ThreadMediaLoader.createThreadMediaCursor(context, threadId, mediaType, sorting)) {
      while (cursor != null && cursor.moveToNext()) {
--- a/app/src/main/java/org/thoughtcrime/securesms/database/loaders/PagingMediaLoader.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/loaders/PagingMediaLoader.java
@@ -15,7 +15,7 @@ import org.thoughtcrime.securesms.database.AttachmentTable;
 import org.thoughtcrime.securesms.database.DatabaseObserver;
 import org.thoughtcrime.securesms.database.MediaTable.Sorting;
 import org.thoughtcrime.securesms.database.SignalDatabase;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.mms.PartAuthority;
 import org.thoughtcrime.securesms.util.AsyncLoader;

@@ -43,7 +43,7 @@ public final class PagingMediaLoader extends AsyncLoader<Pair<Cursor, Integer>>

  @Override
  public @Nullable Pair<Cursor, Integer> loadInBackground() {
-    ApplicationDependencies.getDatabaseObserver().registerAttachmentObserver(observer);
+    AppDependencies.getDatabaseObserver().registerAttachmentObserver(observer);

    Cursor cursor = SignalDatabase.media().getGalleryMediaForThread(threadId, sorting);

@@ -61,6 +61,6 @@ public final class PagingMediaLoader extends AsyncLoader<Pair<Cursor, Integer>>

  @Override
  protected void onAbandon() {
-    ApplicationDependencies.getDatabaseObserver().unregisterObserver(observer);
+    AppDependencies.getDatabaseObserver().unregisterObserver(observer);
  }
 }
--- a/app/src/main/java/org/thoughtcrime/securesms/database/model/StoryViewState.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/StoryViewState.kt
@@ -4,7 +4,7 @@ import io.reactivex.rxjava3.core.Observable
 import io.reactivex.rxjava3.schedulers.Schedulers
 import org.thoughtcrime.securesms.database.DatabaseObserver
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId

@@ -52,9 +52,9 @@ enum class StoryViewState {
          refresh()
        }

-        ApplicationDependencies.getDatabaseObserver().registerStoryObserver(recipientId, storyObserver)
+        AppDependencies.databaseObserver.registerStoryObserver(recipientId, storyObserver)
        emitter.setCancellable {
-          ApplicationDependencies.getDatabaseObserver().unregisterObserver(storyObserver)
+          AppDependencies.databaseObserver.unregisterObserver(storyObserver)
        }

        refresh()