Merge pull request #602 from OneSignal/fix/anrs_callbacks_and_background_app

[Fix] ANRs for callbacks and when backgrounding app

Author: jkasten2

OneSignalExample/Assets/OneSignal/CHANGELOG.md

@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Fixed
+- Fixed rare Android ANRs on callbacks firing and also when backgrounding the app.
 ## [3.0.10]
 ### Changed
 - Updated included Android SDK to [4.8.5](https://github.com/OneSignal/OneSignal-Android-SDK/releases/tag/4.8.5)

com.onesignal.unity.android/Editor/OneSignalAndroidDependencies.xml

@@ -3,6 +3,6 @@
     <repositories>
       <repository>https://repo.maven.apache.org/maven2</repository>
     </repositories>
-    <androidPackage spec="com.onesignal:OneSignal:[4.8.5]" />
+    <androidPackage spec="com.onesignal:OneSignal:[4.8.6]" />
   </androidPackages>
 </dependencies>

com.onesignal.unity.android/Runtime/OneSignalAndroid.cs

@@ -111,6 +111,8 @@ public override void SetLaunchURLsInApp(bool launchInApp)
             => SDKDebug.Warn("This feature is only available for iOS.");
 
         public override void Initialize(string appId) {
+            SetOneSignalCallbacksToBackgroundThread();
+
             var unityPlayer = new AndroidJavaClass("com.unity3d.player.UnityPlayer");
             var activity    = unityPlayer.GetStatic<AndroidJavaObject>("currentActivity");
 
@@ -137,6 +139,19 @@ public override void Initialize(string appId) {
             _completedInit(appId);
         }
 
+        // Change all OneSignal callbacks, observers, and events to fire on a background thread.
+        // This prevents cases where the main thread could hang waiting on Unity to bridge from Java back to C#.
+        private void SetOneSignalCallbacksToBackgroundThread() {
+            var callbackThreadManagerStr = SDKPackage + "." + "CallbackThreadManager";
+            var callbackThreadManagerClass = new AndroidJavaClass(callbackThreadManagerStr);
+            var callbackThreadManagerCompanionClass = callbackThreadManagerClass.GetStatic<AndroidJavaObject>("Companion");
+
+            var useThreadClass = new AndroidJavaClass(callbackThreadManagerStr + "$UseThread");
+            var useThreadBackgroundEnumValue = useThreadClass.GetStatic<AndroidJavaObject>("Background");
+
+            callbackThreadManagerCompanionClass.Call("setPreference", useThreadBackgroundEnumValue);
+        }
+
         public override async Task<NotificationPermission> PromptForPushNotificationsWithUserResponse() {
             var proxy = new PromptForPushNotificationPermissionResponseHandler();
             _sdkClass.CallStatic("promptForPushNotifications", true, proxy);