Reverting "Speculative Fix for WorkManager not Initialized Crash"

OneSignalSDK/onesignal/src/main/java/com/onesignal/OSFocusHandler.kt

@@ -32,6 +32,7 @@ import androidx.work.Constraints
 import androidx.work.ExistingWorkPolicy
 import androidx.work.NetworkType
 import androidx.work.OneTimeWorkRequest
+import androidx.work.WorkManager
 import androidx.work.Worker
 import androidx.work.WorkerParameters
 import java.util.concurrent.TimeUnit
@@ -86,8 +87,7 @@ class OSFocusHandler {
             .setInitialDelay(delay, TimeUnit.MILLISECONDS)
             .addTag(tag)
             .build()
-
-        OSWorkManagerHelper.getInstance(context)
+        WorkManager.getInstance(context)
             .enqueueUniqueWork(
                 tag,
                 ExistingWorkPolicy.KEEP,
@@ -96,7 +96,7 @@ class OSFocusHandler {
     }
 
     fun cancelOnLostFocusWorker(tag: String, context: Context) {
-        OSWorkManagerHelper.getInstance(context).cancelAllWorkByTag(tag)
+        WorkManager.getInstance(context).cancelAllWorkByTag(tag)
     }
 
     private fun resetStopState() {

OneSignalSDK/onesignal/src/main/java/com/onesignal/OSNotificationRestoreWorkManager.java

@@ -9,6 +9,7 @@
 import androidx.annotation.NonNull;
 import androidx.work.ExistingWorkPolicy;
 import androidx.work.OneTimeWorkRequest;
+import androidx.work.WorkManager;
 import androidx.work.Worker;
 import androidx.work.WorkerParameters;
 
@@ -44,7 +45,7 @@ public static void beginEnqueueingWork(Context context, boolean shouldDelay) {
                 .setInitialDelay(restoreDelayInSeconds, TimeUnit.SECONDS)
                 .build();
 
-        OSWorkManagerHelper.getInstance(context)
+        WorkManager.getInstance(context)
                 .enqueueUniqueWork(NOTIFICATION_RESTORE_WORKER_IDENTIFIER, ExistingWorkPolicy.KEEP, workRequest);
     }
 

OneSignalSDK/onesignal/src/main/java/com/onesignal/OSNotificationWorkManager.java

@@ -6,6 +6,7 @@
 import androidx.work.Data;
 import androidx.work.ExistingWorkPolicy;
 import androidx.work.OneTimeWorkRequest;
+import androidx.work.WorkManager;
 import androidx.work.Worker;
 import androidx.work.WorkerParameters;
 
@@ -62,9 +63,8 @@ static void beginEnqueueingWork(Context context, String osNotificationId, int an
                 .build();
 
         OneSignal.Log(OneSignal.LOG_LEVEL.DEBUG, "OSNotificationWorkManager enqueueing notification work with notificationId: " + osNotificationId + " and jsonPayload: " + jsonPayload);
-
-        OSWorkManagerHelper.getInstance(context).
-                enqueueUniqueWork(osNotificationId, ExistingWorkPolicy.KEEP, workRequest);
+        WorkManager.getInstance(context)
+                .enqueueUniqueWork(osNotificationId, ExistingWorkPolicy.KEEP, workRequest);
     }
 
     public static class NotificationWorker extends Worker {

OneSignalSDK/onesignal/src/main/java/com/onesignal/OSReceiveReceiptController.java

@@ -35,6 +35,7 @@
 import androidx.work.ExistingWorkPolicy;
 import androidx.work.NetworkType;
 import androidx.work.OneTimeWorkRequest;
+import androidx.work.WorkManager;
 import androidx.work.Worker;
 import androidx.work.WorkerParameters;
 
@@ -81,7 +82,7 @@ void beginEnqueueingWork(Context context, String osNotificationId) {
 
         OneSignal.Log(OneSignal.LOG_LEVEL.DEBUG, "OSReceiveReceiptController enqueueing send receive receipt work with notificationId: " + osNotificationId + " and delay: " + delay + " seconds");
 
-        OSWorkManagerHelper.getInstance(context)
+        WorkManager.getInstance(context)
                 .enqueueUniqueWork(osNotificationId + "_receive_receipt", ExistingWorkPolicy.KEEP, workRequest);
     }