From b69bea289978fe34df7af9c895404dfc226aea55 Mon Sep 17 00:00:00 2001 From: Nan Date: Fri, 24 Mar 2023 22:35:23 -0700 Subject: [PATCH] Revert "Speculative Fix for WorkManager not Initialized Crash" --- .../main/java/com/onesignal/OSFocusHandler.kt | 6 +- .../OSNotificationRestoreWorkManager.java | 3 +- .../onesignal/OSNotificationWorkManager.java | 6 +- .../onesignal/OSReceiveReceiptController.java | 3 +- .../java/com/onesignal/OSWorkManagerHelper.kt | 66 ------------------- 5 files changed, 10 insertions(+), 74 deletions(-) delete mode 100644 OneSignalSDK/onesignal/src/main/java/com/onesignal/OSWorkManagerHelper.kt diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/OSFocusHandler.kt b/OneSignalSDK/onesignal/src/main/java/com/onesignal/OSFocusHandler.kt index b0c4fc4ffa..564d5ec03f 100644 --- a/OneSignalSDK/onesignal/src/main/java/com/onesignal/OSFocusHandler.kt +++ b/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() { diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/OSNotificationRestoreWorkManager.java b/OneSignalSDK/onesignal/src/main/java/com/onesignal/OSNotificationRestoreWorkManager.java index 3539ca9c01..fcc809f0aa 100644 --- a/OneSignalSDK/onesignal/src/main/java/com/onesignal/OSNotificationRestoreWorkManager.java +++ b/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); } diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/OSNotificationWorkManager.java b/OneSignalSDK/onesignal/src/main/java/com/onesignal/OSNotificationWorkManager.java index 199db9faad..3cb4d04423 100644 --- a/OneSignalSDK/onesignal/src/main/java/com/onesignal/OSNotificationWorkManager.java +++ b/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 { diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/OSReceiveReceiptController.java b/OneSignalSDK/onesignal/src/main/java/com/onesignal/OSReceiveReceiptController.java index e6e0e9cae1..a4fdbb1df1 100644 --- a/OneSignalSDK/onesignal/src/main/java/com/onesignal/OSReceiveReceiptController.java +++ b/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); } diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/OSWorkManagerHelper.kt b/OneSignalSDK/onesignal/src/main/java/com/onesignal/OSWorkManagerHelper.kt deleted file mode 100644 index 05c63ddbe4..0000000000 --- a/OneSignalSDK/onesignal/src/main/java/com/onesignal/OSWorkManagerHelper.kt +++ /dev/null @@ -1,66 +0,0 @@ -/** - * Modified MIT License - *

- * Copyright 2023 OneSignal - *

- * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - *

- * 1. The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - *

- * 2. All copies of substantial portions of the Software may only be used in connection - * with services provided by OneSignal. - *

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -package com.onesignal - -import android.annotation.SuppressLint -import android.content.Context -import androidx.work.Configuration -import androidx.work.WorkManager -import androidx.work.impl.WorkManagerImpl - -object OSWorkManagerHelper { - /** - * Helper method to provide a way to check if WorkManager is initialized in this process. - * - * This is effectively the `WorkManager.isInitialized()` public method introduced in androidx.work:work-*:2.8.0-alpha02. - * Please see https://android-review.googlesource.com/c/platform/frameworks/support/+/1941186. - * - * @return `true` if WorkManager has been initialized in this process. - */ - @SuppressWarnings("deprecation") - @SuppressLint("RestrictedApi") - private fun isInitialized(): Boolean { - return WorkManagerImpl.getInstance() != null - } - - /** - * If there is an instance of WorkManager available, use it. Else, in rare cases, initialize it ourselves. - * - * Calling `WorkManager.getInstance(context)` directly can cause an exception if it is null. - * - * @return an instance of WorkManager - */ - @JvmStatic - @Synchronized - fun getInstance(context: Context): WorkManager { - if (!isInitialized()) { - WorkManager.initialize(context, Configuration.Builder().build()) - } - return WorkManager.getInstance(context) - } -}