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

Make the foreground delay configurable. Remove short initial delay.

Browse Source
This commit is contained in:
Alan Evans
2021-03-11 14:54:39 -04:00
committed by Greyson Parrelli
parent 75aab4c031
commit a64430c65f
2 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/src/main/java/org/thoughtcrime/securesms/messageprocessingalarm/MessageProcessReceiver.java
View File

@@ -20,7 +20,7 @@ import org.thoughtcrime.securesms.jobs.PushNotificationReceiveJob;
import org.thoughtcrime.securesms.util.FeatureFlags;
import org.whispersystems.libsignal.util.guava.Optional;
import java.util.concurrent.TimeUnit;
import java.util.Locale;
/**
* On received message, runs a job to poll for messages.
@@ -29,10 +29,6 @@ public final class MessageProcessReceiver extends BroadcastReceiver {
private static final String TAG = Log.tag(MessageProcessReceiver.class);
private static final long FIRST_RUN_DELAY = TimeUnit.MINUTES.toMillis(3);
private static final long FOREGROUND_DELAY = 300;
private static final long JOB_TIMEOUT = FOREGROUND_DELAY + 200;
public static final String BROADCAST_ACTION = "org.thoughtcrime.securesms.action.PROCESS_MESSAGES";
@Override
@@ -44,15 +40,26 @@ public final class MessageProcessReceiver extends BroadcastReceiver {
Log.i(TAG, "Starting Alarm because of boot receiver");
startOrUpdateAlarm(context);
} else if (BROADCAST_ACTION.equals(intent.getAction())) {
if (ApplicationDependencies.getAppForegroundObserver().isForegrounded()) {
Log.i(TAG, "App is foregrounded");
return;
}
long foregroundDelayMs = FeatureFlags.getBackgroundMessageProcessForegroundDelay();
long jobTimeout = foregroundDelayMs + 200;
Log.i(TAG, String.format(Locale.US, "Starting PushNotificationReceiveJob asynchronously with %d delay before foreground shown", foregroundDelayMs));
PendingResult pendingResult = goAsync();
new Handler(Looper.getMainLooper()).postDelayed(pendingResult::finish, JOB_TIMEOUT);
new Handler(Looper.getMainLooper()).postDelayed(pendingResult::finish, jobTimeout);
SignalExecutors.BOUNDED.submit(() -> {
Log.i(TAG, "Running PushNotificationReceiveJob");
Optional<JobTracker.JobState> jobState = ApplicationDependencies.getJobManager()
.runSynchronously(PushNotificationReceiveJob.withDelayedForegroundService(FOREGROUND_DELAY), JOB_TIMEOUT);
.runSynchronously(PushNotificationReceiveJob.withDelayedForegroundService(foregroundDelayMs), jobTimeout);
Log.i(TAG, "PushNotificationReceiveJob ended: " + (jobState.isPresent() ? jobState.get().toString() : "Job did not complete"));
});
@@ -67,14 +74,14 @@ public final class MessageProcessReceiver extends BroadcastReceiver {
PendingIntent pendingIntent = PendingIntent.getBroadcast(context, 123, alarmIntent, PendingIntent.FLAG_UPDATE_CURRENT);
AlarmManager alarmManager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
long interval = FeatureFlags.getBackgroundMessageProcessDelay();
long interval = FeatureFlags.getBackgroundMessageProcessInterval();
if (interval < 0) {
alarmManager.cancel(pendingIntent);
Log.i(TAG, "Alarm cancelled");
} else {
alarmManager.setRepeating(AlarmManager.ELAPSED_REALTIME_WAKEUP,
SystemClock.elapsedRealtime() + FIRST_RUN_DELAY,
SystemClock.elapsedRealtime() + interval,
interval,
pendingIntent);
Log.i(TAG, "Alarm scheduled to repeat at interval " + interval);