Pass callbacks to Unity Main Thread

Author: shepherd-l

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

@@ -83,20 +83,20 @@ public IInAppMessageLifecycleHandler(AndroidInAppMessagesManager inAppMessagesMa
             }
 
             /// <param name="message">IInAppMessage</param>
-            public void onWillDisplayInAppMessage(AndroidJavaObject message) {
-                _parent.WillDisplay?.Invoke(message.ToSerializable<InAppMessage>());
-            }
+            public void onWillDisplayInAppMessage(AndroidJavaObject message)
+                => UnityMainThreadDispatch.Post(state => _parent.WillDisplay?.Invoke(message.ToSerializable<InAppMessage>()));
+
             /// <param name="message">IInAppMessage</param>
             public void onDidDisplayInAppMessage(AndroidJavaObject message)
-                => _parent.DidDisplay?.Invoke(message.ToSerializable<InAppMessage>());
+                => UnityMainThreadDispatch.Post(state => _parent.DidDisplay?.Invoke(message.ToSerializable<InAppMessage>()));
 
             /// <param name="message">IInAppMessage</param>
             public void onWillDismissInAppMessage(AndroidJavaObject message)
-                => _parent.WillDismiss?.Invoke(message.ToSerializable<InAppMessage>());
+                => UnityMainThreadDispatch.Post(state => _parent.WillDismiss?.Invoke(message.ToSerializable<InAppMessage>()));
 
             /// <param name="message">IInAppMessage</param>
             public void onDidDismissInAppMessage(AndroidJavaObject message)
-                => _parent.DidDismiss?.Invoke(message.ToSerializable<InAppMessage>());
+                => UnityMainThreadDispatch.Post(state => _parent.DidDismiss?.Invoke(message.ToSerializable<InAppMessage>()));
         }
 
         private sealed class IInAppMessageClickHandler : OneSignalAndroidJavaProxy {
@@ -107,9 +107,8 @@ public IInAppMessageClickHandler(AndroidInAppMessagesManager inAppMessagesManage
             }
 
             /// <param name="result">IInAppMessageClickResult</param>
-            public void inAppMessageClicked(AndroidJavaObject result) {
-                _parent.Clicked?.Invoke(result.ToSerializable<InAppMessageClickedResult>());
-            }
+            public void inAppMessageClicked(AndroidJavaObject result)
+                => UnityMainThreadDispatch.Post(state => _parent.Clicked?.Invoke(result.ToSerializable<InAppMessageClickedResult>()));
         }
     }
 }

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

@@ -59,7 +59,7 @@ public async Task ClearAllNotificationsAsync() {
         }
 
         public void Initialize() {
-            _notifications.Call("addPermissionChangedHandler", new IPermissionChangedHandler(this)); // Notifications.PermissionChanged
+            _notifications.Call("addPermissionChangedHandler", new IPermissionChangedHandler(this));
             _notifications.Call("setNotificationWillShowInForegroundHandler", new INotificationWillShowInForegroundHandler(this));
             _notifications.Call("setNotificationClickHandler", new INotificationClickHandler(this));
         }
@@ -73,7 +73,7 @@ public IPermissionChangedHandler(AndroidNotificationsManager notificationsManage
 
             /// <param name="permission">boolean</param>
             public void onPermissionChanged(bool permission) {
-                _parent.PermissionChanged?.Invoke(permission);
+                UnityMainThreadDispatch.Post(state => _parent.PermissionChanged?.Invoke(permission));
             }
         }
 
@@ -94,9 +94,8 @@ public void notificationWillShowInForeground(AndroidJavaObject notificationRecei
                 }
 
                 var notification = _getNotification(notifJO);
-                var resultNotif = _parent.WillShow(notification);
 
-                notificationReceivedEvent.Call("complete", resultNotif != null ? notifJO : null);
+                UnityMainThreadDispatch.Post(state => notificationReceivedEvent.Call("complete", _parent.WillShow(notification) != null ? notifJO : null));
             }
         }
 
@@ -120,7 +119,7 @@ public void notificationClicked(AndroidJavaObject result) {
                     action = action
                 };
 
-                _parent.Clicked?.Invoke(notifClickResult);
+                UnityMainThreadDispatch.Post(state => _parent.Clicked?.Invoke(notifClickResult));
             }
         }
 
@@ -144,7 +143,7 @@ private static Notification _getNotification(AndroidJavaObject notifJO) {
 
         private static NotificationAction _getAction(AndroidJavaObject actionJO) {
             var action = actionJO.ToSerializable<NotificationAction>();
-            action.actionID = actionJO.Call<string>("getActionId");
+            //action.actionID = actionJO.Call<string>("getActionId");
 
             return action;
         }