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

Fix deadlock in JobManager initialization.

Browse Source
This commit is contained in:
Cody Henthorne
2023-10-13 12:58:48 -04:00
parent 8e05fe3b0c
commit 58b9cdf28f
2 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobManager.java
View File

@@ -54,7 +54,7 @@ public class JobManager implements ConstraintObserver.Notifier {
@GuardedBy("emptyQueueListeners")
private final Set<EmptyQueueListener> emptyQueueListeners = new CopyOnWriteArraySet<>();
private volatile boolean initialized;
private volatile boolean initialized = false;
public JobManager(@NonNull Application application, @NonNull Configuration configuration) {
this.application = application;
@@ -73,6 +73,7 @@ public class JobManager implements ConstraintObserver.Notifier {
executor.execute(() -> {
synchronized (this) {
Log.d(TAG, "Starting initialization: " + Thread.currentThread());
JobStorage jobStorage = configuration.getJobStorage();
jobStorage.init();
@@ -91,6 +92,10 @@ public class JobManager implements ConstraintObserver.Notifier {
initialized = true;
notifyAll();
jobController.wakeUp();
Log.d(TAG, "Initialized");
}
});
}
@@ -343,6 +348,11 @@ public class JobManager implements ConstraintObserver.Notifier {
@Override
public void onConstraintMet(@NonNull String reason) {
if (!initialized) {
Log.d(TAG, "Ignoring early onConstraintMet(" + reason + ")");
return;
}
Log.i(TAG, "onConstraintMet(" + reason + ")");
wakeUp();
}