From 4112dee3020bfc11e351ec5289e9948c2bf160a1 Mon Sep 17 00:00:00 2001
From: jinliu9508 <jinliu9508@gmail.com>
Date: Tue, 16 Jul 2024 13:51:09 -0400
Subject: [PATCH] Add a requestPermission call immediately after
 initWithContext to ensure no crash in the manual test

---
 .../sdktest/application/MainApplication.java   | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/application/MainApplication.java b/Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/application/MainApplication.java
index 7c48f4b070..3050d96fc4 100644
--- a/Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/application/MainApplication.java
+++ b/Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/application/MainApplication.java
@@ -1,12 +1,13 @@
 package com.onesignal.sdktest.application;
 
+import android.annotation.SuppressLint;
 import android.os.StrictMode;
 import android.util.Log;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.multidex.MultiDexApplication;
 
+import com.onesignal.Continue;
 import com.onesignal.OneSignal;
 import com.onesignal.inAppMessages.IInAppMessageClickListener;
 import com.onesignal.inAppMessages.IInAppMessageClickEvent;
@@ -28,8 +29,10 @@
 import com.onesignal.user.state.IUserStateObserver;
 import com.onesignal.user.state.UserChangedState;
 import com.onesignal.user.state.UserState;
-
 import org.json.JSONObject;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 public class MainApplication extends MultiDexApplication {
     private static final int SLEEP_TIME_TO_MIMIC_ASYNC_OPERATION = 2000;
@@ -40,6 +43,7 @@ public MainApplication() {
             StrictMode.enableDefaults();
     }
 
+    @SuppressLint("NewApi")
     @Override
     public void onCreate() {
         super.onCreate();
@@ -54,8 +58,18 @@ public void onCreate() {
         }
 
         OneSignalNotificationSender.setAppId(appId);
+
         OneSignal.initWithContext(this, appId);
 
+        // Ensure calling requestPermission in a thread right after initWithContext does not crash
+        // This will reproduce result similar to Kotlin CouroutineScope.launch{}, which may potentially crash the app
+        ExecutorService executor = Executors.newSingleThreadExecutor();
+        @SuppressLint({"NewApi", "LocalSuppress"}) CompletableFuture<Void> future = CompletableFuture.runAsync(() -> {
+            OneSignal.getNotifications().requestPermission(true, Continue.none());
+        }, executor);
+        future.join(); // Waits for the task to complete
+        executor.shutdown();
+
         OneSignal.getInAppMessages().addLifecycleListener(new IInAppMessageLifecycleListener() {
             @Override
             public void onWillDisplay(@NonNull IInAppMessageWillDisplayEvent event) {