From 07d7af6e75da45936a4dd1eb9aa055f74a358cd9 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Thu, 4 Oct 2018 09:09:04 -0700
Subject: [PATCH] Initialize WorkManager ourself.

This gives us more control over when it happens, as well as lets us set
things like the debug level. Also let's us get rid of the synchronized
block we had in Application#onCreate().
---
 AndroidManifest.xml                           |  6 +++
 .../securesms/ApplicationContext.java         | 47 ++++++++-----------
 .../securesms/jobmanager/Job.java             |  1 -
 3 files changed, 25 insertions(+), 29 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 146151eee4..15cab4f9f9 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -572,6 +572,12 @@
               android:authorities="org.thoughtcrime.securesms.database.attachment"
               android:exported="false" />
 
+    <provider
+              android:name="androidx.work.impl.WorkManagerInitializer"
+              android:authorities="${applicationId}.workmanager-init"
+              android:exported="false"
+              tools:node="remove" />
+
     <receiver android:name=".service.BootReceiver">
         <intent-filter>
             <action android:name="android.intent.action.BOOT_COMPLETED"/>
diff --git a/src/org/thoughtcrime/securesms/ApplicationContext.java b/src/org/thoughtcrime/securesms/ApplicationContext.java
index 6c7a0c76cc..7561771a55 100644
--- a/src/org/thoughtcrime/securesms/ApplicationContext.java
+++ b/src/org/thoughtcrime/securesms/ApplicationContext.java
@@ -61,6 +61,7 @@ import java.util.HashSet;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
+import androidx.work.Configuration;
 import androidx.work.WorkManager;
 import dagger.ObjectGraph;
 
@@ -80,7 +81,6 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
   private JobManager             jobManager;
   private ObjectGraph            objectGraph;
   private PersistentLogger       persistentLogger;
-  private boolean                initialized;
 
   private volatile boolean isAppVisible;
 
@@ -90,33 +90,20 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
 
   @Override
   public void onCreate() {
-    synchronized (this) {
-      super.onCreate();
-      initializeRandomNumberFix();
-      initializeLogging();
-      initializeCrashHandling();
-      initializeDependencyInjection();
-      initializeJobManager();
-      initializeExpiringMessageManager();
-      initializeGcmCheck();
-      initializeSignedPreKeyCheck();
-      initializePeriodicTasks();
-      initializeCircumvention();
-      initializeWebRtc();
-      NotificationChannels.create(this);
-      ProcessLifecycleOwner.get().getLifecycle().addObserver(this);
-
-      initialized = true;
-      notifyAll();
-    }
-  }
-
-  public void ensureInitialized() {
-    synchronized (this) {
-      while (!initialized) {
-        Util.wait(this, 0);
-      }
-    }
+    super.onCreate();
+    initializeRandomNumberFix();
+    initializeLogging();
+    initializeCrashHandling();
+    initializeDependencyInjection();
+    initializeJobManager();
+    initializeExpiringMessageManager();
+    initializeGcmCheck();
+    initializeSignedPreKeyCheck();
+    initializePeriodicTasks();
+    initializeCircumvention();
+    initializeWebRtc();
+    NotificationChannels.create(this);
+    ProcessLifecycleOwner.get().getLifecycle().addObserver(this);
   }
 
   @Override
@@ -172,6 +159,10 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
   }
 
   private void initializeJobManager() {
+    WorkManager.initialize(this, new Configuration.Builder()
+                                                  .setMinimumLoggingLevel(android.util.Log.DEBUG)
+                                                  .build());
+
     this.jobManager = new JobManager(WorkManager.getInstance());
   }
 
diff --git a/src/org/thoughtcrime/securesms/jobmanager/Job.java b/src/org/thoughtcrime/securesms/jobmanager/Job.java
index 179d3f28a1..d56c02b6f7 100644
--- a/src/org/thoughtcrime/securesms/jobmanager/Job.java
+++ b/src/org/thoughtcrime/securesms/jobmanager/Job.java
@@ -53,7 +53,6 @@ public abstract class Job extends Worker implements Serializable {
 
     log("doWork()" + logSuffix());
 
-    ApplicationContext.getInstance(getApplicationContext()).ensureInitialized();
     ApplicationContext.getInstance(getApplicationContext()).injectDependencies(this);
 
     if (this instanceof ContextDependent) {