com.onesignal.unity.ios 5.0.1 → 5.0.3

package/Editor/BuildPostProcessor.cs

@@ -111,6 +111,8 @@ namespace OneSignalSDK.iOS {
             // Add the service extension
             AddNotificationServiceExtension();
 
+            DisableBitcode();
+
             // Save the project back out
             File.WriteAllText(_projectPath, _project.WriteToString());
         }
@@ -191,6 +193,7 @@ namespace OneSignalSDK.iOS {
             _project.SetBuildProperty(extensionGuid, "SWIFT_VERSION", "5.0");
             _project.SetBuildProperty(extensionGuid, "ARCHS", "arm64");
             _project.SetBuildProperty(extensionGuid, "DEVELOPMENT_TEAM", PlayerSettings.iOS.appleDeveloperTeamID);
+            _project.SetBuildProperty(extensionGuid, "ENABLE_BITCODE", "NO");
 
             _project.AddBuildProperty(extensionGuid, "LIBRARY_SEARCH_PATHS",
                 $"$(PROJECT_DIR)/Libraries/{PluginLibrariesPath.Replace("\\", "/")}");
@@ -282,6 +285,20 @@ namespace OneSignalSDK.iOS {
             
             File.WriteAllText(podfilePath, podfile);
         }
+
+        private void DisableBitcode() {
+            // Main
+            var targetGuid = _project.GetMainTargetGuid();
+            _project.SetBuildProperty(targetGuid, "ENABLE_BITCODE", "NO");
+
+            // Unity Tests
+            var unityTests = _project.TargetGuidByName(PBXProject.GetUnityTestTargetName());
+            _project.SetBuildProperty(unityTests, "ENABLE_BITCODE", "NO");
+
+            // Unity Framework
+            var unityFramework = _project.GetUnityFrameworkTargetGuid();
+            _project.SetBuildProperty(unityFramework, "ENABLE_BITCODE", "NO");
+        }
     }
 }
 #endif

package/Editor/OneSignaliOSDependencies.xml

@@ -1,5 +1,5 @@
 <dependencies>
     <iosPods>
-            <iosPod name="OneSignalXCFramework" version="5.0.1" addToAllTargets="true" />
+            <iosPod name="OneSignalXCFramework" version="5.0.2" addToAllTargets="true" />
     </iosPods>
 </dependencies>

package/Runtime/Plugins/iOS/OneSignalUnityBridgeNotifications.mm

@@ -70,7 +70,8 @@ typedef void (*ClickListenerDelegate)(const char* notification, const char* resu
     if (self = [super init]) {
         [OneSignal.Notifications addPermissionObserver:self];
         [OneSignal.Notifications addForegroundLifecycleListener:self];
-        [OneSignal.Notifications addClickListener:self];
+
+        _willDisplayEvents = [NSMutableDictionary new];
     }
 
     return self;
@@ -84,10 +85,10 @@ typedef void (*ClickListenerDelegate)(const char* notification, const char* resu
 
 - (void)onWillDisplayNotification:(OSNotificationWillDisplayEvent *)event {
     if (_willDisplayDelegate != nil) {
+        _willDisplayEvents[event.notification.notificationId] = event;
+
         NSString *stringNotification = [event.notification stringify];
         _willDisplayDelegate([stringNotification UTF8String]);
-
-        _willDisplayEvents[event.notification.notificationId] = event;
     }
 }
 
@@ -159,5 +160,7 @@ extern "C" {
 
     void _notificationsSetClickCallback(ClickListenerDelegate callback) {
         [[OneSignalNotificationsObserver sharedNotificationsObserver] setClickDelegate:callback];
+        
+        [OneSignal.Notifications addClickListener:[OneSignalNotificationsObserver sharedNotificationsObserver]];
     }
 }

package/Runtime/Plugins/iOS/UIApplication+OneSignalUnity.mm

@@ -96,8 +96,8 @@ static bool swizzled = false;
 
 - (BOOL)oneSignalApplication:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
     [OneSignalWrapper setSdkType:@"unity"];
-    [OneSignalWrapper setSdkVersion:@"050001"];
-    [OneSignal setLaunchOptions:launchOptions];
+    [OneSignalWrapper setSdkVersion:@"050003"];
+    [OneSignal initialize:nil withLaunchOptions:launchOptions];
 
     if ([self respondsToSelector:@selector(oneSignalApplication:didFinishLaunchingWithOptions:)])
         return [self oneSignalApplication:application didFinishLaunchingWithOptions:launchOptions];

package/Runtime/iOSNotificationsManager.cs

@@ -48,15 +48,30 @@ namespace OneSignalSDK.iOS.Notifications {
         [DllImport("__Internal")] private static extern void _notificationsWillDisplayEventPreventDefault(string notificationId);
         [DllImport("__Internal")] private static extern void _notificationsSetClickCallback(ClickListenerDelegate callback);
 
-        public delegate void PermissionListenerDelegate(bool permission);
+        private delegate void PermissionListenerDelegate(bool permission);
         private delegate void WillDisplayListenerDelegate(string notification);
         private delegate void ClickListenerDelegate(string notification, string resultActionId, string resultUrl);
         private delegate void BooleanResponseDelegate(int hashCode, bool response);
 
         public event EventHandler<NotificationWillDisplayEventArgs> ForegroundWillDisplay;
-        public event EventHandler<NotificationClickEventArgs> Clicked;
         public event EventHandler<NotificationPermissionChangedEventArgs> PermissionChanged;
 
+        // Only set the native listner once
+        private bool _clickNativeListenerSet;
+
+        private EventHandler<NotificationClickEventArgs> _clicked;
+        public event EventHandler<NotificationClickEventArgs> Clicked {
+            add {
+                _clicked += value;
+
+                if (!_clickNativeListenerSet) {
+                    _clickNativeListenerSet = true;
+                    _notificationsSetClickCallback(_onClicked);
+                }
+            }
+            remove { _clicked -= value; }
+        }
+
         private static iOSNotificationsManager _instance;
 
         public iOSNotificationsManager() {
@@ -88,7 +103,6 @@ namespace OneSignalSDK.iOS.Notifications {
         public void Initialize() {
             _notificationsAddPermissionObserver(_onPermissionStateChanged);
             _notificationsSetForegroundWillDisplayCallback(_onForegroundWillDisplay);
-            _notificationsSetClickCallback(_onClicked);
         }
 
         [AOT.MonoPInvokeCallback(typeof(PermissionListenerDelegate))]
@@ -114,7 +128,7 @@ namespace OneSignalSDK.iOS.Notifications {
             {
                 // We use Send instead of Post because we need to *not* return to our caller until the
                 // event handlers have returned themselves. This allows a handler to call PreventDefault()
-                // which will get passed down to Android in InternalNotificationWillDisplayEventArgs.
+                // which will get passed down to iOS in InternalNotificationWillDisplayEventArgs.
                 UnityMainThreadDispatch.Send(state => handler(_instance, args));
             }
         }
@@ -133,23 +147,10 @@ namespace OneSignalSDK.iOS.Notifications {
             _fillNotifFromObj(ref notif, Json.Deserialize(notification));
 
             var result = new NotificationClickResult(resultActionId, resultUrl);
-
             NotificationClickEventArgs args = new NotificationClickEventArgs(notif, result);
 
-            EventHandler<NotificationClickEventArgs> handler = _instance.Clicked;
-            if (handler != null)
-            {
-                if (OneSignalPlatform.DidInitialize)
-                    UnityMainThreadDispatch.Post(state => handler(_instance, args));
-                else {
-                    void invokeOpened(string appId) {
-                        OneSignalPlatform.OnInitialize -= invokeOpened;
-                        UnityMainThreadDispatch.Post(state => handler(_instance, args));
-                    }
-
-                    OneSignalPlatform.OnInitialize += invokeOpened; 
-                }
-            }
+            EventHandler<NotificationClickEventArgs> handler = _instance._clicked;
+            UnityMainThreadDispatch.Post(state => handler(_instance, args));
         }
 
         private static void _fillNotifFromObj(ref iOSDisplayableNotification notif, object notifObj) {

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "com.onesignal.unity.ios",
   "displayName": "OneSignal Unity SDK - iOS",
-  "version": "5.0.1",
+  "version": "5.0.3",
   "unity": "2018.4",
   "description": "OneSignal is the market leader in customer engagement, powering mobile push, web push, email, and in-app messages.",
   "dependencies": {
-    "com.onesignal.unity.core": "5.0.1"
+    "com.onesignal.unity.core": "5.0.3"
   },
   "keywords": [
     "push-notifications",