com.onesignal.unity.ios 5.0.6 → 5.1.1

package/Editor/OneSignaliOSDependencies.xml

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

package/Runtime/Plugins/iOS/OneSignalUnityBridgeUser.mm

@@ -31,6 +31,7 @@
 #import "OneSignalBridgeUtil.h"
 
 typedef void (*StateListenerDelegate)(const char* current, const char* previous);
+typedef void (*UserStateListenerDelegate)(const char* current);
 
 /*
  * Helpers
@@ -78,6 +79,45 @@ typedef void (*StateListenerDelegate)(const char* current, const char* previous)
 
 @end
 
+/*
+ * User state observer singleton for global callbacks
+ */
+
+@interface OneSignalUserStateObserver : NSObject <OSUserStateObserver>
+
++ (instancetype) sharedUserObserver;
+@property UserStateListenerDelegate userStateDelegate;
+
+@end
+
+@implementation OneSignalUserStateObserver
+
++ (instancetype) sharedUserObserver {
+    static dispatch_once_t pred = 0;
+    static id _sharedObject = nil;
+    dispatch_once(&pred, ^{
+        _sharedObject = [[self alloc] init];
+    });
+    return _sharedObject;
+}
+
+- (instancetype) init {
+    if (self = [super init]) {
+        [OneSignal.User addObserver:self];
+    }
+
+    return self;
+}
+
+- (void)onUserStateDidChangeWithState:(OSUserChangedState*)state {
+    if (_userStateDelegate != nil) {
+        auto curr = oneSignalJsonStringFromDictionary([[state current] jsonRepresentation]);
+        _userStateDelegate(curr);
+    }
+}
+
+@end
+
 /*
  * Bridge methods
  * We use strdup because Unity attempts to free the memory after we return the value
@@ -160,11 +200,31 @@ extern "C" {
         [OneSignal.User removeTags:tags];
     }
 
+    const char* _oneSignalUserGetOneSignalId(){
+        if (OneSignal.User.onesignalId == NULL) {
+            return NULL;
+        }
+        return strdup([OneSignal.User.onesignalId UTF8String]);
+    }
+
+    const char* _oneSignalUserGetExternalId(){
+        if (OneSignal.User.externalId == NULL) {
+            return NULL;
+        }
+        return strdup([OneSignal.User.externalId UTF8String]);
+    }
+
     const char* _oneSignalPushSubscriptionGetId() {
+        if (OneSignal.User.pushSubscription.id == NULL) {
+            return NULL;
+        }
         return strdup([OneSignal.User.pushSubscription.id UTF8String]);
     }
 
     const char* _oneSignalPushSubscriptionGetToken() {
+        if (OneSignal.User.pushSubscription.token == NULL) {
+            return NULL;
+        }
         return strdup([OneSignal.User.pushSubscription.token UTF8String]);
     }
 
@@ -183,4 +243,8 @@ extern "C" {
     void _oneSignalPushSubscriptionAddStateChangedCallback(StateListenerDelegate callback) {
         [[OneSignalUserObserver sharedUserObserver] setPushSubscriptionDelegate:callback];
     }
+
+    void _oneSignalUserAddStateChangedCallback(UserStateListenerDelegate callback) {
+        [[OneSignalUserStateObserver sharedUserObserver] setUserStateDelegate:callback];
+    }
 }

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

@@ -95,7 +95,7 @@ static bool swizzled = false;
 
 - (BOOL)oneSignalApplication:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
     [OneSignalWrapper setSdkType:@"unity"];
-    [OneSignalWrapper setSdkVersion:@"050006"];
+    [OneSignalWrapper setSdkVersion:@"050101"];
     [OneSignal initialize:nil withLaunchOptions:launchOptions];
 
     if ([self respondsToSelector:@selector(oneSignalApplication:didFinishLaunchingWithOptions:)])

package/Runtime/iOSUserManager.cs

@@ -27,14 +27,18 @@
 
 
 using UnityEngine;
+using System;
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
 using OneSignalSDK.User;
+using OneSignalSDK.User.Internal;
 using OneSignalSDK.User.Models;
 using OneSignalSDK.iOS.User.Models;
 
 namespace OneSignalSDK.iOS.User {
     internal sealed class iOSUserManager : IUserManager {
+        [DllImport("__Internal")] private static extern string _oneSignalUserGetOneSignalId();
+        [DllImport("__Internal")] private static extern string _oneSignalUserGetExternalId();
         [DllImport("__Internal")] private static extern void _oneSignalUserSetLanguage(string languageCode);
         [DllImport("__Internal")] private static extern void _oneSignalUserAddAlias(string aliasLabel, string aliasId);
         [DllImport("__Internal")] private static extern void _oneSignalUserAddAliases(string aliasesJson);
@@ -49,13 +53,29 @@ namespace OneSignalSDK.iOS.User {
         [DllImport("__Internal")] private static extern void _oneSignalUserAddTags(string tagsJson);
         [DllImport("__Internal")] private static extern void _oneSignalUserRemoveTag(string key);
         [DllImport("__Internal")] private static extern void _oneSignalUserRemoveTags(string tagsJson);
+        [DllImport("__Internal")] private static extern void _oneSignalUserAddStateChangedCallback(UserStateListenerDelegate callback);
+
+        public delegate void UserStateListenerDelegate(string current);
+
+        public event EventHandler<UserStateChangedEventArgs> Changed;
 
         private iOSPushSubscription _pushSubscription;
+
+        private static iOSUserManager _instance;
         
         public iOSUserManager() {
+            _instance = this;
             _pushSubscription = new iOSPushSubscription();
         }
 
+        public string OneSignalId {
+            get => _oneSignalUserGetOneSignalId();
+        }
+
+        public string ExternalId {
+            get => _oneSignalUserGetExternalId();
+        }
+
         public IPushSubscription PushSubscription {
             get => _pushSubscription;
         }
@@ -109,6 +129,21 @@ namespace OneSignalSDK.iOS.User {
 
         public void Initialize() {
             _pushSubscription.Initialize();
+            _oneSignalUserAddStateChangedCallback(_onUserStateChanged);
+        }
+
+        [AOT.MonoPInvokeCallback(typeof(UserStateListenerDelegate))]
+        private static void _onUserStateChanged(string current) {
+            var curr = JsonUtility.FromJson<UserState>(current);
+
+            UserChangedState userChangedState = new UserChangedState(curr);
+            UserStateChangedEventArgs args = new UserStateChangedEventArgs(userChangedState);
+
+            EventHandler<UserStateChangedEventArgs> handler = _instance.Changed;
+            if (handler != null)
+            {
+                UnityMainThreadDispatch.Post(state => handler(_instance, args));
+            }
         }
     }
 }

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "com.onesignal.unity.ios",
   "displayName": "OneSignal Unity SDK - iOS",
-  "version": "5.0.6",
+  "version": "5.1.1",
   "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.6"
+    "com.onesignal.unity.core": "5.1.1"
   },
   "keywords": [
     "push-notifications",