Merge pull request #2062 from OneSignal/fix/android-12-concurrentlinkedqueue-workaround

[Player Model] Fix OSTaskController crashing on LinkedBlockingQueue.poll() on Android 12

Author: jkasten2

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

@@ -2,11 +2,10 @@
 
 import androidx.annotation.NonNull;
 
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.Queue;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.RejectedExecutionException;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.atomic.AtomicLong;
@@ -15,8 +14,8 @@ class OSTaskController {
 
     static final String OS_PENDING_EXECUTOR = "OS_PENDING_EXECUTOR_";
 
-    // The concurrent queue in which we pin pending tasks upon finishing initialization
-    private final ConcurrentLinkedQueue<Runnable> taskQueueWaitingForInit = new ConcurrentLinkedQueue<>();
+    // The queue in which we pin pending tasks upon finishing initialization
+    private final Queue<Runnable> taskQueueWaitingForInit = new LinkedBlockingQueue<>();
     private final AtomicLong lastTaskId = new AtomicLong();
     private ExecutorService pendingTaskExecutor;
 
@@ -105,7 +104,7 @@ private void onTaskRan(long taskId) {
         }
     }
 
-    ConcurrentLinkedQueue<Runnable> getTaskQueueWaitingForInit() {
+    Queue<Runnable> getTaskQueueWaitingForInit() {
         synchronized (taskQueueWaitingForInit) {
             return taskQueueWaitingForInit;
         }

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

@@ -18,7 +18,7 @@
 import java.util.HashMap;
 import java.util.Queue;
 import java.util.Set;
-import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import static com.onesignal.OSInAppMessageController.IN_APP_MESSAGES_JSON_KEY;
@@ -93,9 +93,9 @@ String getRegistrationId() {
 
     // Maintain a list of handlers so that if the user calls
     //    sendTags() multiple times it will call each callback
-    final private Queue<ChangeTagsUpdateHandler> sendTagsHandlers = new ConcurrentLinkedQueue<>();
-    final private Queue<OneSignal.OSInternalExternalUserIdUpdateCompletionHandler> externalUserIdUpdateHandlers = new ConcurrentLinkedQueue<>();
-    final private Queue<OSDeviceInfoCompletionHandler> deviceInfoCompletionHandler = new ConcurrentLinkedQueue<>();
+    final private Queue<ChangeTagsUpdateHandler> sendTagsHandlers = new LinkedBlockingQueue<>();
+    final private Queue<OneSignal.OSInternalExternalUserIdUpdateCompletionHandler> externalUserIdUpdateHandlers = new LinkedBlockingQueue<>();
+    final private Queue<OSDeviceInfoCompletionHandler> deviceInfoCompletionHandler = new LinkedBlockingQueue<>();
 
     boolean hasQueuedHandlers() {
         return externalUserIdUpdateHandlers.size() > 0;

OneSignalSDK/unittest/src/test/java/com/onesignal/OneSignalPackagePrivateHelper.java

@@ -22,8 +22,8 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Queue;
 import java.util.Set;
-import java.util.concurrent.ConcurrentLinkedQueue;
 
 import static com.test.onesignal.TestHelpers.threadAndTaskWait;
 import static org.robolectric.Shadows.shadowOf;
@@ -295,7 +295,7 @@ public static DelayedConsentInitializationParameters OneSignal_delayedInitParams
       return OneSignal.getDelayedInitParams();
    }
 
-   public static ConcurrentLinkedQueue<Runnable> OneSignal_taskQueueWaitingForInit() {
+   public static Queue<Runnable> OneSignal_taskQueueWaitingForInit() {
       return OneSignal.getTaskRemoteController().getTaskQueueWaitingForInit();
    }