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

Rewrite the AppDependencies system.

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

4
app/src/main/java/org/thoughtcrime/securesms/gcm/FcmFetchManager.kt
View File

@@ -12,7 +12,7 @@ import org.signal.core.util.concurrent.SignalExecutors
import org.signal.core.util.logging.Log
import org.thoughtcrime.securesms.MainActivity
import org.thoughtcrime.securesms.R
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
import org.thoughtcrime.securesms.dependencies.AppDependencies
import org.thoughtcrime.securesms.jobs.MessageFetchJob
import org.thoughtcrime.securesms.messages.WebSocketDrainer
import org.thoughtcrime.securesms.notifications.NotificationChannels
@@ -152,7 +152,7 @@ object FcmFetchManager {
FcmJobService.schedule(context)
} else {
Log.w(TAG, "[API ${Build.VERSION.SDK_INT}] Failed to retrieve messages. Scheduling on JobManager (API " + Build.VERSION.SDK_INT + ").")
ApplicationDependencies.getJobManager().add(MessageFetchJob())
AppDependencies.jobManager.add(MessageFetchJob())
}
}

4
app/src/main/java/org/thoughtcrime/securesms/gcm/FcmJobService.java
View File

@@ -11,7 +11,7 @@ import androidx.annotation.RequiresApi;
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.messages.WebSocketDrainer;
import org.thoughtcrime.securesms.util.ServiceUtil;
@@ -39,7 +39,7 @@ public class FcmJobService extends JobService {
public boolean onStartJob(JobParameters params) {
Log.d(TAG, "onStartJob()");
if (ApplicationDependencies.getAppForegroundObserver().isForegrounded()) {
if (AppDependencies.getAppForegroundObserver().isForegrounded()) {
Log.i(TAG, "App is foregrounded. No need to run.");
return false;
}

10
app/src/main/java/org/thoughtcrime/securesms/gcm/FcmReceiveService.java
View File

@@ -10,7 +10,7 @@ import com.google.firebase.messaging.FirebaseMessagingService;
import com.google.firebase.messaging.RemoteMessage;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.dependencies.AppDependencies;
import org.thoughtcrime.securesms.jobs.FcmRefreshJob;
import org.thoughtcrime.securesms.jobs.SubmitRateLimitPushChallengeJob;
import org.thoughtcrime.securesms.keyvalue.SignalStore;
@@ -43,14 +43,14 @@ public class FcmReceiveService extends FirebaseMessagingService {
} else if (rateLimitChallenge != null) {
handleRateLimitPushChallenge(rateLimitChallenge);
} else {
handleReceivedNotification(ApplicationDependencies.getApplication(), remoteMessage);
handleReceivedNotification(AppDependencies.getApplication(), remoteMessage);
}
}
@Override
public void onDeletedMessages() {
Log.w(TAG, "onDeleteMessages() -- Messages may have been dropped. Doing a normal message fetch.");
handleReceivedNotification(ApplicationDependencies.getApplication(), null);
handleReceivedNotification(AppDependencies.getApplication(), null);
}
@Override
@@ -62,7 +62,7 @@ public class FcmReceiveService extends FirebaseMessagingService {
return;
}
ApplicationDependencies.getJobManager().add(new FcmRefreshJob());
AppDependencies.getJobManager().add(new FcmRefreshJob());
}
@Override
@@ -100,6 +100,6 @@ public class FcmReceiveService extends FirebaseMessagingService {
private static void handleRateLimitPushChallenge(@NonNull String challenge) {
Log.d(TAG, "Got a rate limit push challenge.");
ApplicationDependencies.getJobManager().add(new SubmitRateLimitPushChallengeJob(challenge));
AppDependencies.getJobManager().add(new SubmitRateLimitPushChallengeJob(challenge));
}
}