Rewrite the AppDependencies system.

app/src/main/java/org/thoughtcrime/securesms/service/AnalyzeDatabaseAlarmListener.kt

@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.service
 
 import android.content.Context
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobs.AnalyzeDatabaseJob
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.util.toMillis
@@ -35,7 +35,7 @@ class AnalyzeDatabaseAlarmListener : PersistentAlarmManagerListener() {
   }
 
   override fun onAlarm(context: Context, scheduledTime: Long): Long {
-    ApplicationDependencies.getJobManager().add(AnalyzeDatabaseJob())
+    AppDependencies.jobManager.add(AnalyzeDatabaseJob())
 
     val nextTime = getNextTime()
     SignalStore.misc().nextDatabaseAnalysisTime = nextTime

app/src/main/java/org/thoughtcrime/securesms/service/BootReceiver.java

@@ -4,13 +4,13 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobs.MessageFetchJob;
 
 public class BootReceiver extends BroadcastReceiver {
 
   @Override
   public void onReceive(Context context, Intent intent) {
-    ApplicationDependencies.getJobManager().add(new MessageFetchJob());
+    AppDependencies.getJobManager().add(new MessageFetchJob());
   }
 }

app/src/main/java/org/thoughtcrime/securesms/service/DeletedCallEventManager.kt

@@ -7,7 +7,7 @@ import android.content.Intent
 import androidx.annotation.WorkerThread
 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 java.util.concurrent.TimeUnit
 
 /**
@@ -64,7 +64,7 @@ class DeletedCallEventManager(
 
     override fun onReceive(context: Context?, intent: Intent?) {
       Log.d(TAG, "onReceive()")
-      ApplicationDependencies.getDeletedCallEventManager().scheduleIfNecessary()
+      AppDependencies.deletedCallEventManager.scheduleIfNecessary()
     }
   }
 }

app/src/main/java/org/thoughtcrime/securesms/service/DirectoryRefreshListener.java

@@ -2,9 +2,8 @@ package org.thoughtcrime.securesms.service;
 
 
 import android.content.Context;
-import android.content.Intent;
 
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobs.DirectoryRefreshJob;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.util.FeatureFlags;
@@ -22,7 +21,7 @@ public class DirectoryRefreshListener extends PersistentAlarmManagerListener {
   @Override
   protected long onAlarm(Context context, long scheduledTime) {
     if (scheduledTime != 0 && SignalStore.account().isRegistered()) {
-      ApplicationDependencies.getJobManager().add(new DirectoryRefreshJob(true));
+      AppDependencies.getJobManager().add(new DirectoryRefreshJob(true));
     }
 
     long newTime;

app/src/main/java/org/thoughtcrime/securesms/service/ExpirationListener.java

@@ -7,13 +7,13 @@ import android.content.Context;
 import android.content.Intent;
 
 import org.signal.core.util.PendingIntentFlags;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 
 public class ExpirationListener extends BroadcastReceiver {
 
   @Override
   public void onReceive(Context context, Intent intent) {
-    ApplicationDependencies.getExpiringMessageManager().checkSchedule();
+    AppDependencies.getExpiringMessageManager().checkSchedule();
   }
 
   public static void setAlarm(Context context, long waitTimeMillis) {

app/src/main/java/org/thoughtcrime/securesms/service/ExpiringStoriesManager.kt

@@ -7,7 +7,7 @@ import android.content.Intent
 import androidx.annotation.WorkerThread
 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.keyvalue.SignalStore
 import java.util.concurrent.TimeUnit
 
@@ -66,7 +66,7 @@ class ExpiringStoriesManager(
 
     override fun onReceive(context: Context?, intent: Intent?) {
       Log.d(TAG, "onReceive()")
-      ApplicationDependencies.getExpireStoriesManager().scheduleIfNecessary()
+      AppDependencies.expireStoriesManager.scheduleIfNecessary()
     }
   }
 }

app/src/main/java/org/thoughtcrime/securesms/service/KeyCachingService.java

@@ -41,7 +41,7 @@ import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.crypto.InvalidPassphraseException;
 import org.thoughtcrime.securesms.crypto.MasterSecret;
 import org.thoughtcrime.securesms.crypto.MasterSecretUtil;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.migrations.ApplicationMigrations;
 import org.thoughtcrime.securesms.notifications.NotificationChannels;
 import org.thoughtcrime.securesms.util.DynamicLanguage;
@@ -124,7 +124,7 @@ public class KeyCachingService extends Service {
         @Override
         protected Void doInBackground(Void... params) {
           if (!ApplicationMigrations.isUpdate(KeyCachingService.this)) {
-            ApplicationDependencies.getMessageNotifier().updateNotification(KeyCachingService.this);
+            AppDependencies.getMessageNotifier().updateNotification(KeyCachingService.this);
           }
           return null;
         }
@@ -197,7 +197,7 @@ public class KeyCachingService extends Service {
     new AsyncTask<Void, Void, Void>() {
       @Override
       protected Void doInBackground(Void... params) {
-        ApplicationDependencies.getMessageNotifier().updateNotification(KeyCachingService.this);
+        AppDependencies.getMessageNotifier().updateNotification(KeyCachingService.this);
         return null;
       }
     }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
@@ -228,7 +228,7 @@ public class KeyCachingService extends Service {
   }
 
   private static void startTimeoutIfAppropriate(@NonNull Context context) {
-    boolean appVisible       = ApplicationDependencies.getAppForegroundObserver().isForegrounded();
+    boolean appVisible       = AppDependencies.getAppForegroundObserver().isForegrounded();
     boolean secretSet        = KeyCachingService.masterSecret != null;
 
     boolean timeoutEnabled   = TextSecurePreferences.isPassphraseTimeoutEnabled(context);

app/src/main/java/org/thoughtcrime/securesms/service/PendingRetryReceiptManager.java

@@ -15,7 +15,7 @@ import org.thoughtcrime.securesms.database.MessageTable;
 import org.thoughtcrime.securesms.database.PendingRetryReceiptCache;
 import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.model.PendingRetryReceiptModel;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 
 import java.util.concurrent.TimeUnit;
 
@@ -35,7 +35,7 @@ public final class PendingRetryReceiptManager extends TimedEventManager<PendingR
   public PendingRetryReceiptManager(@NonNull Application application) {
     super(application, "PendingRetryReceiptManager");
 
-    this.pendingCache    = ApplicationDependencies.getPendingRetryReceiptCache();
+    this.pendingCache    = AppDependencies.getPendingRetryReceiptCache();
     this.messageDatabase = SignalDatabase.messages();
 
     scheduleIfNecessary();
@@ -94,7 +94,7 @@ public final class PendingRetryReceiptManager extends TimedEventManager<PendingR
     @Override
     public void onReceive(Context context, Intent intent) {
       Log.d(TAG, "onReceive()");
-      ApplicationDependencies.getPendingRetryReceiptManager().scheduleIfNecessary();
+      AppDependencies.getPendingRetryReceiptManager().scheduleIfNecessary();
     }
   }
 }

app/src/main/java/org/thoughtcrime/securesms/service/RotateSenderCertificateListener.java

@@ -2,9 +2,8 @@ package org.thoughtcrime.securesms.service;
 
 
 import android.content.Context;
-import android.content.Intent;
 
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobs.RotateCertificateJob;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
@@ -21,7 +20,7 @@ public class RotateSenderCertificateListener extends PersistentAlarmManagerListe
 
   @Override
   protected long onAlarm(Context context, long scheduledTime) {
-    ApplicationDependencies.getJobManager().add(new RotateCertificateJob());
+    AppDependencies.getJobManager().add(new RotateCertificateJob());
 
     long nextTime = System.currentTimeMillis() + INTERVAL;
     TextSecurePreferences.setUnidentifiedAccessCertificateRotationTime(context, nextTime);

app/src/main/java/org/thoughtcrime/securesms/service/RotateSignedPreKeyListener.java

@@ -2,15 +2,11 @@ package org.thoughtcrime.securesms.service;
 
 
 import android.content.Context;
-import android.content.Intent;
 
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.jobs.PreKeysSyncJob;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
-import java.util.concurrent.TimeUnit;
-
 public class RotateSignedPreKeyListener extends PersistentAlarmManagerListener {
 
   @Override

app/src/main/java/org/thoughtcrime/securesms/service/ScheduledMessageManager.kt

@@ -11,7 +11,7 @@ import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.conversation.ConversationIntents
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobs.IndividualSendJob
 import org.thoughtcrime.securesms.jobs.PushGroupSendJob
 import org.thoughtcrime.securesms.recipients.RecipientId
@@ -57,9 +57,9 @@ class ScheduledMessageManager(
       val expiresIn = SignalDatabase.recipients.getExpiresInSeconds(record.toRecipient.id)
       if (messagesTable.clearScheduledStatus(record.threadId, record.id, expiresIn.seconds.inWholeMilliseconds)) {
         if (record.toRecipient.isPushGroup) {
-          PushGroupSendJob.enqueue(application, ApplicationDependencies.getJobManager(), record.id, record.toRecipient.id, emptySet(), true)
+          PushGroupSendJob.enqueue(application, AppDependencies.jobManager, record.id, record.toRecipient.id, emptySet(), true)
         } else {
-          IndividualSendJob.enqueue(application, ApplicationDependencies.getJobManager(), record.id, record.toRecipient, true)
+          IndividualSendJob.enqueue(application, AppDependencies.jobManager, record.id, record.toRecipient, true)
         }
       } else {
         Log.i(TAG, "messageId=${record.id} was not a scheduled message, ignoring")
@@ -92,7 +92,7 @@ class ScheduledMessageManager(
 
     override fun onReceive(context: Context?, intent: Intent?) {
       Log.d(TAG, "onReceive()")
-      ApplicationDependencies.getScheduledMessageManager().scheduleIfNecessary()
+      AppDependencies.scheduledMessageManager.scheduleIfNecessary()
     }
   }
 }

app/src/main/java/org/thoughtcrime/securesms/service/TrimThreadsByDateManager.java

@@ -12,7 +12,7 @@ import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.database.MessageTable;
 import org.thoughtcrime.securesms.database.SignalDatabase;
 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;
 
@@ -86,7 +86,7 @@ public class TrimThreadsByDateManager extends TimedEventManager<TrimThreadsByDat
     @Override
     public void onReceive(@NonNull Context context, @NonNull Intent intent) {
       Log.d(TAG, "onReceive()");
-      ApplicationDependencies.getTrimThreadsByDateManager().scheduleIfNecessary();
+      AppDependencies.getTrimThreadsByDateManager().scheduleIfNecessary();
     }
   }
 

app/src/main/java/org/thoughtcrime/securesms/service/webrtc/ActiveCallActionProcessorDelegate.java

@@ -10,7 +10,7 @@ import org.signal.core.util.logging.Log;
 import org.signal.ringrtc.CallException;
 import org.signal.ringrtc.CallId;
 import org.signal.ringrtc.CallManager.CallEvent;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.events.CallParticipant;
 import org.thoughtcrime.securesms.events.WebRtcViewModel;
 import org.thoughtcrime.securesms.ringrtc.CallState;
@@ -95,8 +95,8 @@ public class ActiveCallActionProcessorDelegate extends WebRtcActionProcessor {
       Log.i(tag, "handleLocalHangup(): call_id: " + remotePeer.getCallId());
     }
 
-    ApplicationDependencies.getSignalServiceAccountManager().cancelInFlightRequests();
-    ApplicationDependencies.getSignalServiceMessageSender().cancelInFlightRequests();
+    AppDependencies.getSignalServiceAccountManager().cancelInFlightRequests();
+    AppDependencies.getSignalServiceMessageSender().cancelInFlightRequests();
 
     try {
       webRtcInteractor.getCallManager().hangup();

app/src/main/java/org/thoughtcrime/securesms/service/webrtc/ActiveCallManager.kt

@@ -28,7 +28,7 @@ import io.reactivex.rxjava3.schedulers.Schedulers
 import org.signal.core.util.PendingIntentFlags
 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.UnableToStartException
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
@@ -81,12 +81,12 @@ class ActiveCallManager(
 
     @JvmStatic
     fun denyCall() {
-      ApplicationDependencies.getSignalCallManager().denyCall()
+      AppDependencies.signalCallManager.denyCall()
     }
 
     @JvmStatic
     fun hangup() {
-      ApplicationDependencies.getSignalCallManager().localHangup()
+      AppDependencies.signalCallManager.localHangup()
     }
 
     @JvmStatic
@@ -132,7 +132,7 @@ class ActiveCallManager(
     }
   }
 
-  private val callManager = ApplicationDependencies.getSignalCallManager()
+  private val callManager = AppDependencies.signalCallManager
 
   private var networkReceiver: NetworkReceiver? = null
   private var powerButtonReceiver: PowerButtonReceiver? = null
@@ -357,7 +357,7 @@ class ActiveCallManager(
       }
 
       private fun hangup() {
-        ApplicationDependencies.getSignalCallManager().localHangup()
+        AppDependencies.signalCallManager.localHangup()
       }
     }
   }
@@ -372,8 +372,8 @@ class ActiveCallManager(
     override fun onReceive(context: Context?, intent: Intent?) {
       Log.d(TAG, "action: ${intent?.action}")
       when (intent?.action) {
-        ACTION_DENY -> ApplicationDependencies.getSignalCallManager().denyCall()
-        ACTION_HANGUP -> ApplicationDependencies.getSignalCallManager().localHangup()
+        ACTION_DENY -> AppDependencies.signalCallManager.denyCall()
+        ACTION_HANGUP -> AppDependencies.signalCallManager.localHangup()
       }
     }
   }
@@ -402,13 +402,13 @@ class ActiveCallManager(
     fun stop() {
       keepRunning = false
       ThreadUtil.cancelRunnableOnMain(this)
-      ApplicationDependencies.getIncomingMessageObserver().removeKeepAliveToken(WEBSOCKET_KEEP_ALIVE_TOKEN)
+      AppDependencies.incomingMessageObserver.removeKeepAliveToken(WEBSOCKET_KEEP_ALIVE_TOKEN)
     }
 
     @MainThread
     override fun run() {
       if (keepRunning) {
-        ApplicationDependencies.getIncomingMessageObserver().registerKeepAliveToken(WEBSOCKET_KEEP_ALIVE_TOKEN)
+        AppDependencies.incomingMessageObserver.registerKeepAliveToken(WEBSOCKET_KEEP_ALIVE_TOKEN)
         ThreadUtil.runOnMainDelayed(this, REQUEST_WEBSOCKET_STAY_OPEN_DELAY.inWholeMilliseconds)
       }
     }
@@ -419,7 +419,7 @@ class ActiveCallManager(
       val connectivityManager = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
       val activeNetworkInfo = connectivityManager.activeNetworkInfo
 
-      ApplicationDependencies.getSignalCallManager().apply {
+      AppDependencies.signalCallManager.apply {
         networkChange(activeNetworkInfo != null && activeNetworkInfo.isConnected)
         dataModeUpdate()
       }
@@ -429,7 +429,7 @@ class ActiveCallManager(
   private class PowerButtonReceiver : BroadcastReceiver() {
     override fun onReceive(context: Context, intent: Intent) {
       if (Intent.ACTION_SCREEN_OFF == intent.action) {
-        ApplicationDependencies.getSignalCallManager().screenOff()
+        AppDependencies.signalCallManager.screenOff()
       }
     }
   }

app/src/main/java/org/thoughtcrime/securesms/service/webrtc/AndroidCallConnection.kt

@@ -7,7 +7,7 @@ import android.telecom.Connection
 import androidx.annotation.RequiresApi
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.WebRtcCallActivity
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.permissions.Permissions
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.webrtc.CallNotificationBuilder
@@ -48,7 +48,7 @@ class AndroidCallConnection(
     val activeDevice = state.route.toDevices().firstOrNull() ?: SignalAudioManager.AudioDevice.EARPIECE
     val availableDevices = state.supportedRouteMask.toDevices()
 
-    ApplicationDependencies.getSignalCallManager().onAudioDeviceChanged(activeDevice, availableDevices)
+    AppDependencies.signalCallManager.onAudioDeviceChanged(activeDevice, availableDevices)
 
     if (needToResetAudioRoute) {
       if (initialAudioRoute == null) {
@@ -64,7 +64,7 @@ class AndroidCallConnection(
   override fun onAnswer(videoState: Int) {
     Log.i(TAG, "onAnswer($videoState)")
     if (Permissions.hasAll(context, android.Manifest.permission.RECORD_AUDIO)) {
-      ApplicationDependencies.getSignalCallManager().acceptCall(false)
+      AppDependencies.signalCallManager.acceptCall(false)
     } else {
       val intent = Intent(context, WebRtcCallActivity::class.java)
       intent.action = if (isVideoCall) WebRtcCallActivity.ANSWER_VIDEO_ACTION else WebRtcCallActivity.ANSWER_ACTION

app/src/main/java/org/thoughtcrime/securesms/service/webrtc/AndroidCallConnectionService.kt

@@ -9,7 +9,7 @@ import android.telecom.PhoneAccountHandle
 import android.telecom.TelecomManager
 import androidx.annotation.RequiresApi
 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.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
@@ -47,7 +47,7 @@ class AndroidCallConnectionService : ConnectionService() {
       setRinging()
     }
     AndroidTelecomUtil.connections[recipientId] = connection
-    ApplicationDependencies.getSignalCallManager().setTelecomApproved(callId, recipientId)
+    AppDependencies.signalCallManager.setTelecomApproved(callId, recipientId)
 
     return connection
   }
@@ -59,7 +59,7 @@ class AndroidCallConnectionService : ConnectionService() {
     val (recipientId: RecipientId, callId: Long) = request.getOurExtras()
 
     Log.i(TAG, "onCreateIncomingConnectionFailed($recipientId)")
-    ApplicationDependencies.getSignalCallManager().dropCall(callId)
+    AppDependencies.signalCallManager.dropCall(callId)
   }
 
   override fun onCreateOutgoingConnection(
@@ -80,7 +80,7 @@ class AndroidCallConnectionService : ConnectionService() {
       setDialing()
     }
     AndroidTelecomUtil.connections[recipientId] = connection
-    ApplicationDependencies.getSignalCallManager().setTelecomApproved(callId, recipientId)
+    AppDependencies.signalCallManager.setTelecomApproved(callId, recipientId)
 
     return connection
   }
@@ -92,7 +92,7 @@ class AndroidCallConnectionService : ConnectionService() {
     val (recipientId: RecipientId, callId: Long) = request.getOurExtras()
 
     Log.i(TAG, "onCreateOutgoingConnectionFailed($recipientId)")
-    ApplicationDependencies.getSignalCallManager().dropCall(callId)
+    AppDependencies.signalCallManager.dropCall(callId)
   }
 
   companion object {

app/src/main/java/org/thoughtcrime/securesms/service/webrtc/AndroidTelecomUtil.kt

@@ -18,7 +18,7 @@ import androidx.annotation.RequiresApi
 import androidx.core.content.ContextCompat
 import androidx.core.os.bundleOf
 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.recipients.RecipientId
 import org.thoughtcrime.securesms.util.FeatureFlags
@@ -34,7 +34,7 @@ import org.thoughtcrime.securesms.webrtc.audio.SignalAudioManager
 object AndroidTelecomUtil {
 
   private val TAG = Log.tag(AndroidTelecomUtil::class.java)
-  private val context = ApplicationDependencies.getApplication()
+  private val context = AppDependencies.application
   private var systemRejected = false
   private var accountRegistered = false
 

app/src/main/java/org/thoughtcrime/securesms/service/webrtc/CallLinkPreJoinActionProcessor.kt

@@ -13,7 +13,7 @@ import org.signal.libsignal.zkgroup.calllinks.CallLinkSecretParams
 import org.signal.ringrtc.CallException
 import org.signal.ringrtc.CallLinkRootKey
 import org.thoughtcrime.securesms.database.SignalDatabase.Companion.callLinks
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.events.WebRtcViewModel
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.ringrtc.RemotePeer
@@ -46,13 +46,13 @@ class CallLinkPreJoinActionProcessor(
       val callLinkRootKey = CallLinkRootKey(callLink.credentials.linkKeyBytes)
       val callLinkSecretParams = CallLinkSecretParams.deriveFromRootKey(callLink.credentials.linkKeyBytes)
       val genericServerPublicParams = GenericServerPublicParams(
-        ApplicationDependencies.getSignalServiceNetworkAccess()
+        AppDependencies.signalServiceNetworkAccess
           .getConfiguration()
           .genericServerPublicParams
       )
 
-      val callLinkAuthCredentialPresentation = ApplicationDependencies
-        .getGroupsV2Authorization()
+      val callLinkAuthCredentialPresentation = AppDependencies
+        .groupsV2Authorization
         .getCallLinkAuthorizationForToday(genericServerPublicParams, callLinkSecretParams)
 
       webRtcInteractor.callManager.createCallLinkCall(

app/src/main/java/org/thoughtcrime/securesms/service/webrtc/CallSetupActionProcessorDelegate.java

@@ -5,7 +5,7 @@ import androidx.annotation.NonNull;
 import org.signal.core.util.logging.Log;
 import org.signal.ringrtc.CallException;
 import org.signal.ringrtc.CallManager;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.events.WebRtcViewModel;
 import org.thoughtcrime.securesms.ringrtc.Camera;
 import org.thoughtcrime.securesms.ringrtc.RemotePeer;
@@ -43,7 +43,7 @@ public class CallSetupActionProcessorDelegate extends WebRtcActionProcessor {
       currentState.getCallSetupState(activePeer).isAcceptWithVideo() || currentState.getLocalDeviceState().getCameraState().isEnabled()
     );
 
-    ApplicationDependencies.getAppForegroundObserver().removeListener(webRtcInteractor.getForegroundListener());
+    AppDependencies.getAppForegroundObserver().removeListener(webRtcInteractor.getForegroundListener());
     webRtcInteractor.startAudioCommunication();
     webRtcInteractor.activateCall(activePeer.getId());
 

app/src/main/java/org/thoughtcrime/securesms/service/webrtc/IncomingCallActionProcessor.java

@@ -13,7 +13,7 @@ import org.signal.ringrtc.CallManager;
 import org.thoughtcrime.securesms.database.CallTable;
 import org.thoughtcrime.securesms.database.RecipientTable;
 import org.thoughtcrime.securesms.database.SignalDatabase;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.events.CallParticipant;
 import org.thoughtcrime.securesms.events.WebRtcViewModel;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
@@ -190,7 +190,7 @@ public class IncomingCallActionProcessor extends DeviceAwareActionProcessor {
       boolean started = webRtcInteractor.startWebRtcCallActivityIfPossible();
       if (!started) {
         Log.i(TAG, "Unable to start call activity due to OS version or not being in the foreground");
-        ApplicationDependencies.getAppForegroundObserver().addListener(webRtcInteractor.getForegroundListener());
+        AppDependencies.getAppForegroundObserver().addListener(webRtcInteractor.getForegroundListener());
       }
     }
 

app/src/main/java/org/thoughtcrime/securesms/service/webrtc/IncomingGroupCallActionProcessor.java

@@ -13,7 +13,7 @@ import org.thoughtcrime.securesms.components.webrtc.BroadcastVideoSink;
 import org.thoughtcrime.securesms.components.webrtc.EglBaseWrapper;
 import org.thoughtcrime.securesms.database.RecipientTable;
 import org.thoughtcrime.securesms.database.SignalDatabase;
-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;
@@ -128,7 +128,7 @@ public final class IncomingGroupCallActionProcessor extends DeviceAwareActionPro
       boolean started = webRtcInteractor.startWebRtcCallActivityIfPossible();
       if (!started) {
         Log.i(TAG, "Unable to start call activity due to OS version or not being in the foreground");
-        ApplicationDependencies.getAppForegroundObserver().addListener(webRtcInteractor.getForegroundListener());
+        AppDependencies.getAppForegroundObserver().addListener(webRtcInteractor.getForegroundListener());
       }
     }
 

app/src/main/java/org/thoughtcrime/securesms/service/webrtc/SignalCallManager.java

@@ -42,7 +42,7 @@ import org.thoughtcrime.securesms.database.CallTable;
 import org.thoughtcrime.securesms.database.GroupTable;
 import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.model.GroupRecord;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.events.CallParticipant;
 import org.thoughtcrime.securesms.events.GroupCallPeekEvent;
 import org.thoughtcrime.securesms.events.WebRtcViewModel;
@@ -406,13 +406,13 @@ public final class SignalCallManager implements CallManager.Observer, GroupCall.
         }
 
         CallLinkRootKey           callLinkRootKey           = new CallLinkRootKey(callLink.getCredentials().getLinkKeyBytes());
-        GenericServerPublicParams genericServerPublicParams = new GenericServerPublicParams(ApplicationDependencies.getSignalServiceNetworkAccess()
-                                                                                                                   .getConfiguration()
-                                                                                                                   .getGenericServerPublicParams());
+        GenericServerPublicParams genericServerPublicParams = new GenericServerPublicParams(AppDependencies.getSignalServiceNetworkAccess()
+                                                                                                           .getConfiguration()
+                                                                                                           .getGenericServerPublicParams());
 
 
-        CallLinkAuthCredentialPresentation callLinkAuthCredentialPresentation = ApplicationDependencies.getGroupsV2Authorization()
-                                                                                                       .getCallLinkAuthorizationForToday(
+        CallLinkAuthCredentialPresentation callLinkAuthCredentialPresentation = AppDependencies.getGroupsV2Authorization()
+                                                                                               .getCallLinkAuthorizationForToday(
                                                                                                            genericServerPublicParams,
                                                                                                            CallLinkSecretParams.deriveFromRootKey(callLinkRootKey.getKeyBytes())
                                                                                                        );
@@ -461,7 +461,7 @@ public final class SignalCallManager implements CallManager.Observer, GroupCall.
                                                    peekInfo.getJoinedMembers(),
                                                    WebRtcUtil.isCallFull(peekInfo));
 
-            ApplicationDependencies.getMessageNotifier().updateNotification(context, ConversationId.forConversation(threadId));
+            AppDependencies.getMessageNotifier().updateNotification(context, ConversationId.forConversation(threadId));
 
             EventBus.getDefault().postSticky(new GroupCallPeekEvent(id, peekInfo.getEraId(), peekInfo.getDeviceCount(), peekInfo.getMaxDevices()));
           }
@@ -770,8 +770,8 @@ public final class SignalCallManager implements CallManager.Observer, GroupCall.
         return;
       }
       try {
-        ApplicationDependencies.getSignalServiceMessageSender()
-                               .sendCallMessage(RecipientUtil.toSignalServiceAddress(context, recipient),
+        AppDependencies.getSignalServiceMessageSender()
+                       .sendCallMessage(RecipientUtil.toSignalServiceAddress(context, recipient),
                                                 recipient.isSelf() ? Optional.empty() : UnidentifiedAccessUtil.getAccessFor(context, recipient),
                                                 callMessage);
       } catch (UntrustedIdentityException e) {
@@ -850,8 +850,8 @@ public final class SignalCallManager implements CallManager.Observer, GroupCall.
         headerPairs = Collections.emptyList();
       }
 
-      CallingResponse response = ApplicationDependencies.getSignalServiceMessageSender()
-                                                        .makeCallingRequest(requestId, url, httpMethod.name(), headerPairs, body);
+      CallingResponse response = AppDependencies.getSignalServiceMessageSender()
+                                                .makeCallingRequest(requestId, url, httpMethod.name(), headerPairs, body);
 
       try {
         if (response instanceof CallingResponse.Success) {
@@ -968,7 +968,7 @@ public final class SignalCallManager implements CallManager.Observer, GroupCall.
         Log.i(TAG, "Starting call activity from foreground listener");
         startCallCardActivityIfPossible();
       }
-      ApplicationDependencies.getAppForegroundObserver().removeListener(this);
+      AppDependencies.getAppForegroundObserver().removeListener(this);
       return s;
     });
   }
@@ -1000,7 +1000,7 @@ public final class SignalCallManager implements CallManager.Observer, GroupCall.
   public void retrieveTurnServers(@NonNull RemotePeer remotePeer) {
     networkExecutor.execute(() -> {
       try {
-        TurnServerInfo turnServerInfo = ApplicationDependencies.getSignalServiceAccountManager().getTurnServerInfo();
+        TurnServerInfo turnServerInfo = AppDependencies.getSignalServiceAccountManager().getTurnServerInfo();
 
         List<PeerConnection.IceServer> iceServers = new LinkedList<>();
         for (String url : ListUtil.emptyIfNull(turnServerInfo.getUrlsWithIps())) {
@@ -1056,7 +1056,7 @@ public final class SignalCallManager implements CallManager.Observer, GroupCall.
           }
 
           if (callIdLocal != null) {
-            ApplicationDependencies.getJobManager().add(
+            AppDependencies.getJobManager().add(
                 CallSyncEventJob.createForJoin(
                     recipient.getId(),
                     callIdLocal.longValue(),
@@ -1073,7 +1073,7 @@ public final class SignalCallManager implements CallManager.Observer, GroupCall.
 
     SignalExecutors.BOUNDED.execute(() -> {
       GroupCallUpdateSendJob updateSendJob = GroupCallUpdateSendJob.create(recipient.getId(), groupCallEraId);
-      JobManager.Chain       chain         = ApplicationDependencies.getJobManager().startChain(updateSendJob);
+      JobManager.Chain       chain         = AppDependencies.getJobManager().startChain(updateSendJob);
       CallId                 callIdLocal   = callId;
 
       if (callIdLocal == null && groupCallEraId != null) {
@@ -1121,8 +1121,8 @@ public final class SignalCallManager implements CallManager.Observer, GroupCall.
       }
 
       try {
-        ApplicationDependencies.getSignalServiceMessageSender()
-                               .sendCallMessage(RecipientUtil.toSignalServiceAddress(context, recipient),
+        AppDependencies.getSignalServiceMessageSender()
+                       .sendCallMessage(RecipientUtil.toSignalServiceAddress(context, recipient),
                                                 UnidentifiedAccessUtil.getAccessFor(context, recipient),
                                                 callMessage);
         process((s, p) -> p.handleMessageSentSuccess(s, remotePeer.getCallId()));
@@ -1152,7 +1152,7 @@ public final class SignalCallManager implements CallManager.Observer, GroupCall.
       networkExecutor.execute(() -> {
         try {
           SyncMessage.CallEvent callEvent = CallEventSyncMessageUtil.createAcceptedSyncMessage(remotePeer, System.currentTimeMillis(), isOutgoing, isVideoCall);
-          ApplicationDependencies.getSignalServiceMessageSender().sendSyncMessage(SignalServiceSyncMessage.forCallEvent(callEvent), Optional.empty());
+          AppDependencies.getSignalServiceMessageSender().sendSyncMessage(SignalServiceSyncMessage.forCallEvent(callEvent), Optional.empty());
         } catch (IOException | UntrustedIdentityException e) {
           Log.w(TAG, "Unable to send call event sync message for " + remotePeer.getCallId().longValue(), e);
         }
@@ -1169,7 +1169,7 @@ public final class SignalCallManager implements CallManager.Observer, GroupCall.
       networkExecutor.execute(() -> {
         try {
           SyncMessage.CallEvent callEvent = CallEventSyncMessageUtil.createNotAcceptedSyncMessage(remotePeer, System.currentTimeMillis(), isOutgoing, isVideoCall);
-          ApplicationDependencies.getSignalServiceMessageSender().sendSyncMessage(SignalServiceSyncMessage.forCallEvent(callEvent), Optional.empty());
+          AppDependencies.getSignalServiceMessageSender().sendSyncMessage(SignalServiceSyncMessage.forCallEvent(callEvent), Optional.empty());
         } catch (IOException | UntrustedIdentityException e) {
           Log.w(TAG, "Unable to send call event sync message for " + remotePeer.getCallId().longValue(), e);
         }
@@ -1182,7 +1182,7 @@ public final class SignalCallManager implements CallManager.Observer, GroupCall.
       networkExecutor.execute(() -> {
         try {
           SyncMessage.CallEvent callEvent = CallEventSyncMessageUtil.createNotAcceptedSyncMessage(remotePeer, System.currentTimeMillis(), isOutgoing, true);
-          ApplicationDependencies.getSignalServiceMessageSender().sendSyncMessage(SignalServiceSyncMessage.forCallEvent(callEvent), Optional.empty());
+          AppDependencies.getSignalServiceMessageSender().sendSyncMessage(SignalServiceSyncMessage.forCallEvent(callEvent), Optional.empty());
         } catch (IOException | UntrustedIdentityException e) {
           Log.w(TAG, "Unable to send call event sync message for " + remotePeer.getCallId().longValue(), e);
         }
@@ -1195,7 +1195,7 @@ public final class SignalCallManager implements CallManager.Observer, GroupCall.
   }
 
   public void relaunchPipOnForeground() {
-    ApplicationDependencies.getAppForegroundObserver().addListener(new RelaunchListener(ApplicationDependencies.getAppForegroundObserver().isForegrounded()));
+    AppDependencies.getAppForegroundObserver().addListener(new RelaunchListener(AppDependencies.getAppForegroundObserver().isForegrounded()));
   }
 
   private void processSendMessageFailureWithChangeDetection(@NonNull RemotePeer remotePeer,
@@ -1240,7 +1240,7 @@ public final class SignalCallManager implements CallManager.Observer, GroupCall.
             return s;
           });
         }
-        ApplicationDependencies.getAppForegroundObserver().removeListener(this);
+        AppDependencies.getAppForegroundObserver().removeListener(this);
       }
     }
 

app/src/main/java/org/thoughtcrime/securesms/service/webrtc/WebRtcActionProcessor.java

@@ -24,7 +24,7 @@ import org.thoughtcrime.securesms.components.webrtc.EglBaseWrapper;
 import org.thoughtcrime.securesms.components.webrtc.GroupCallSafetyNumberChangeNotificationUtil;
 import org.thoughtcrime.securesms.database.CallTable;
 import org.thoughtcrime.securesms.database.SignalDatabase;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.events.CallParticipant;
 import org.thoughtcrime.securesms.events.WebRtcViewModel;
 import org.thoughtcrime.securesms.groups.GroupId;
@@ -692,7 +692,7 @@ public abstract class WebRtcActionProcessor {
       activePeer = remotePeer;
     }
 
-    ApplicationDependencies.getAppForegroundObserver().removeListener(webRtcInteractor.getForegroundListener());
+    AppDependencies.getAppForegroundObserver().removeListener(webRtcInteractor.getForegroundListener());
 
     if (activePeer.getState() != CallState.IDLE) {
       webRtcInteractor.updatePhoneState(LockManager.PhoneState.PROCESSING);

app/src/main/java/org/thoughtcrime/securesms/service/webrtc/WebRtcCallService.java

@@ -23,7 +23,7 @@ import org.signal.core.util.PendingIntentFlags;
 import org.signal.core.util.ThreadUtil;
 import org.signal.core.util.concurrent.SignalExecutors;
 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobs.ForegroundServiceUtil;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
@@ -178,7 +178,7 @@ public final class WebRtcCallService extends Service implements SignalAudioManag
   public void onCreate() {
     Log.v(TAG, "onCreate");
     super.onCreate();
-    this.callManager                   = ApplicationDependencies.getSignalCallManager();
+    this.callManager                   = AppDependencies.getSignalCallManager();
     this.hangUpRtcOnDeviceCallAnswered = new HangUpRtcOnPstnCallAnsweredListener();
     this.lastNotificationId            = INVALID_NOTIFICATION_ID;
 
@@ -418,14 +418,14 @@ public final class WebRtcCallService extends Service implements SignalAudioManag
     public void stop() {
       keepRunning = false;
       ThreadUtil.cancelRunnableOnMain(webSocketKeepAliveTask);
-      ApplicationDependencies.getIncomingMessageObserver().removeKeepAliveToken(WEBSOCKET_KEEP_ALIVE_TOKEN);
+      AppDependencies.getIncomingMessageObserver().removeKeepAliveToken(WEBSOCKET_KEEP_ALIVE_TOKEN);
     }
 
     @MainThread
     @Override
     public void run() {
       if (keepRunning) {
-        ApplicationDependencies.getIncomingMessageObserver().registerKeepAliveToken(WEBSOCKET_KEEP_ALIVE_TOKEN);
+        AppDependencies.getIncomingMessageObserver().registerKeepAliveToken(WEBSOCKET_KEEP_ALIVE_TOKEN);
         ThreadUtil.runOnMainDelayed(this, REQUEST_WEBSOCKET_STAY_OPEN_DELAY);
       }
     }
@@ -437,8 +437,8 @@ public final class WebRtcCallService extends Service implements SignalAudioManag
       ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
       NetworkInfo         activeNetworkInfo   = connectivityManager.getActiveNetworkInfo();
 
-      ApplicationDependencies.getSignalCallManager().networkChange(activeNetworkInfo != null && activeNetworkInfo.isConnected());
-      ApplicationDependencies.getSignalCallManager().dataModeUpdate();
+      AppDependencies.getSignalCallManager().networkChange(activeNetworkInfo != null && activeNetworkInfo.isConnected());
+      AppDependencies.getSignalCallManager().dataModeUpdate();
     }
   }
 
@@ -446,7 +446,7 @@ public final class WebRtcCallService extends Service implements SignalAudioManag
     @Override
     public void onReceive(@NonNull Context context, @NonNull Intent intent) {
       if (Intent.ACTION_SCREEN_OFF.equals(intent.getAction())) {
-        ApplicationDependencies.getSignalCallManager().screenOff();
+        AppDependencies.getSignalCallManager().screenOff();
       }
     }
   }

app/src/main/java/org/thoughtcrime/securesms/service/webrtc/WebRtcUtil.java

@@ -11,7 +11,7 @@ import org.signal.libsignal.protocol.ecc.ECPublicKey;
 import org.signal.ringrtc.CallManager;
 import org.signal.ringrtc.GroupCall;
 import org.signal.ringrtc.PeekInfo;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.events.WebRtcViewModel;
 import org.thoughtcrime.securesms.service.webrtc.state.WebRtcServiceState;
 import org.thoughtcrime.securesms.webrtc.audio.AudioManagerCompat;
@@ -34,7 +34,7 @@ public final class WebRtcUtil {
   }
 
   public static @NonNull LockManager.PhoneState getInCallPhoneState(@NonNull Context context) {
-    AudioManagerCompat audioManager = ApplicationDependencies.getAndroidCallAudioManager();
+    AudioManagerCompat audioManager = AppDependencies.getAndroidCallAudioManager();
     if (audioManager.isSpeakerphoneOn() || audioManager.isBluetoothConnected() || audioManager.isWiredHeadsetOn()) {
       return LockManager.PhoneState.IN_HANDS_FREE_CALL;
     } else {

app/src/main/java/org/thoughtcrime/securesms/service/webrtc/links/SignalCallLinkManager.kt

@@ -20,7 +20,7 @@ import org.signal.ringrtc.CallLinkRootKey
 import org.signal.ringrtc.CallLinkState
 import org.signal.ringrtc.CallLinkState.Restrictions
 import org.signal.ringrtc.CallManager
-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.whispersystems.signalservice.internal.ServiceResponse
@@ -36,7 +36,7 @@ class SignalCallLinkManager(
 ) {
 
   private val genericServerPublicParams: GenericServerPublicParams = GenericServerPublicParams(
-    ApplicationDependencies.getSignalServiceNetworkAccess()
+    AppDependencies.signalServiceNetworkAccess
       .getConfiguration()
       .genericServerPublicParams
   )
@@ -51,7 +51,7 @@ class SignalCallLinkManager(
 
     Log.d(TAG, "Requesting call link credential response.")
 
-    val serviceResponse: ServiceResponse<CreateCallLinkCredentialResponse> = ApplicationDependencies.getCallLinksService().getCreateCallLinkAuthCredential(request)
+    val serviceResponse: ServiceResponse<CreateCallLinkCredentialResponse> = AppDependencies.callLinksService.getCreateCallLinkAuthCredential(request)
     if (serviceResponse.result.isAbsent()) {
       throw IOException("Failed to create credential response", serviceResponse.applicationError.or(serviceResponse.executionError).get())
     }
@@ -77,7 +77,7 @@ class SignalCallLinkManager(
   private fun requestCallLinkAuthCredentialPresentation(
     linkRootKey: ByteArray
   ): CallLinkAuthCredentialPresentation {
-    return ApplicationDependencies.getGroupsV2Authorization().getCallLinkAuthorizationForToday(
+    return AppDependencies.groupsV2Authorization.getCallLinkAuthorizationForToday(
       genericServerPublicParams,
       CallLinkSecretParams.deriveFromRootKey(linkRootKey)
     )