com.onesignal.unity.ios 5.0.0-beta.2 → 5.0.0

package/Editor/BuildPostProcessor.cs

@@ -1,7 +1,7 @@
 /*
  * Modified MIT License
  *
- * Copyright 2022 OneSignal
+ * Copyright 2023 OneSignal
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

package/Editor/OneSignaliOSDependencies.xml

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

package/Editor/PBXProjectExtensions.cs

@@ -1,7 +1,7 @@
 /*
  * Modified MIT License
  *
- * Copyright 2022 OneSignal
+ * Copyright 2023 OneSignal
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

package/LICENSE.md

@@ -1,6 +1,6 @@
 Modified MIT License
 
-Copyright 2020 OneSignal
+Copyright 2023 OneSignal
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/Runtime/AssemblyInfo.cs

@@ -1,7 +1,7 @@
 /*
  * Modified MIT License
  *
- * Copyright 2022 OneSignal
+ * Copyright 2023 OneSignal
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

package/Runtime/OneSignaliOS.cs

@@ -1,7 +1,7 @@
 /*
  * Modified MIT License
  *
- * Copyright 2022 OneSignal
+ * Copyright 2023 OneSignal
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,18 +25,11 @@
  * THE SOFTWARE.
  */
 
-using System.Collections.Generic;
+using UnityEngine;
 using System.Linq;
 using System.Threading.Tasks;
-using UnityEngine;
+using System.Collections.Generic;
 using System.Runtime.InteropServices;
-using OneSignalSDK.iOS.Notifications;
-using OneSignalSDK.iOS.InAppMessages;
-using OneSignalSDK.iOS.Debug;
-using OneSignalSDK.iOS.Location;
-using OneSignalSDK.iOS.Session;
-using OneSignalSDK.iOS.User;
-using OneSignalSDK.iOS.Utilities;
 using OneSignalSDK.Notifications;
 using OneSignalSDK.InAppMessages;
 using OneSignalSDK.Debug;
@@ -44,22 +37,23 @@ using OneSignalSDK.Debug.Utilities;
 using OneSignalSDK.Location;
 using OneSignalSDK.Session;
 using OneSignalSDK.User;
+using OneSignalSDK.LiveActivities;
+using OneSignalSDK.iOS.Notifications;
+using OneSignalSDK.iOS.InAppMessages;
+using OneSignalSDK.iOS.Debug;
+using OneSignalSDK.iOS.Location;
+using OneSignalSDK.iOS.Session;
+using OneSignalSDK.iOS.User;
+using OneSignalSDK.iOS.LiveActivities;
 
 namespace OneSignalSDK.iOS {
-    public sealed partial class OneSignaliOS : OneSignal {
-        [DllImport("__Internal")] private static extern bool _getPrivacyConsent();
-        [DllImport("__Internal")] private static extern void _setPrivacyConsent(bool consent);
-        [DllImport("__Internal")] private static extern bool _getRequiresPrivacyConsent();
-        [DllImport("__Internal")] private static extern void _setRequiresPrivacyConsent(bool required);
-        [DllImport("__Internal")] private static extern void _setLaunchURLsInApp(bool launchInApp);
+    public sealed partial class OneSignaliOS : OneSignalPlatform {
+        [DllImport("__Internal")] private static extern void _setConsentGiven(bool consent);
+        [DllImport("__Internal")] private static extern void _setConsentRequired(bool required);
         [DllImport("__Internal")] private static extern void _initialize(string appId);
         [DllImport("__Internal")] private static extern void _login(string externalId);
         [DllImport("__Internal")] private static extern void _loginWithJwtBearerToken(string externalId, string jwtBearerToken);
         [DllImport("__Internal")] private static extern void _logout();
-        [DllImport("__Internal")] private static extern void _enterLiveActivity(string activityId, string token, int hashCode, BooleanResponseDelegate callback);
-        [DllImport("__Internal")] private static extern void _exitLiveActivity(string activityId, int hashCode, BooleanResponseDelegate callback);
-
-        private delegate void BooleanResponseDelegate(int hashCode, bool response);
 
         private iOSUserManager _user;
         private iOSSessionManager _session;
@@ -67,6 +61,7 @@ namespace OneSignalSDK.iOS {
         private iOSLocationManager _location;
         private iOSInAppMessagesManager _inAppMessages;
         private iOSDebugManager _debug;
+        private iOSLiveActivitiesManager _liveActivities;
 
         private static OneSignaliOS _instance;
 
@@ -105,18 +100,17 @@ namespace OneSignalSDK.iOS {
             get => _debug;
         }
 
-        public override bool PrivacyConsent {
-            get => _getPrivacyConsent();
-            set => _setPrivacyConsent(value);
+        public override ILiveActivitiesManager LiveActivities {
+            get => _liveActivities;
         }
 
-        public override bool RequiresPrivacyConsent {
-            get => _getRequiresPrivacyConsent();
-            set => _setRequiresPrivacyConsent(value);
+        public override bool ConsentGiven {
+            set => _setConsentGiven(value);
         }
 
-        public override void SetLaunchURLsInApp(bool launchInApp)
-            => _setLaunchURLsInApp(launchInApp);
+        public override bool ConsentRequired {
+            set => _setConsentRequired(value);
+        }
 
         public override void Initialize(string appId) {
             _initialize(appId);
@@ -144,6 +138,10 @@ namespace OneSignalSDK.iOS {
                 _session = new iOSSessionManager();
             }
 
+            if (_liveActivities == null) {
+                _liveActivities = new iOSLiveActivitiesManager();
+            }
+
             _completedInit(appId);
         }
 
@@ -158,21 +156,5 @@ namespace OneSignalSDK.iOS {
         public override void Logout() {
             _logout();
         }
-
-        public override async Task<bool> EnterLiveActivity(string activityId, string token) {
-            var (proxy, hashCode) = WaitingProxy._setupProxy<bool>();
-            _enterLiveActivity(activityId, token, hashCode, BooleanCallbackProxy);
-            return await proxy;
-        }
-
-        public override async Task<bool> ExitLiveActivity(string activityId) {
-            var (proxy, hashCode) = WaitingProxy._setupProxy<bool>();
-            _exitLiveActivity(activityId, hashCode, BooleanCallbackProxy);
-            return await proxy;
-        }
-
-        [AOT.MonoPInvokeCallback(typeof(BooleanResponseDelegate))]
-        private static void BooleanCallbackProxy(int hashCode, bool response)
-            => WaitingProxy.ResolveCallbackProxy(hashCode, response);
     }
 }

package/Runtime/OneSignaliOSInit.cs

@@ -1,7 +1,7 @@
 /*
  * Modified MIT License
  *
- * Copyright 2022 OneSignal
+ * Copyright 2023 OneSignal
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -34,7 +34,7 @@ namespace OneSignalSDK.iOS {
     /// </summary>
     internal static class OneSignaliOSInit {
         [RuntimeInitializeOnLoadMethod] public static void Init() {
-            if (!OneSignal.DidInitialize) 
+            if (!OneSignalPlatform.DidInitialize)
                 OneSignal.Default = new OneSignaliOS();
         }
     }

package/Runtime/Plugins/iOS/OneSignalBridgeUtil.h

@@ -1,7 +1,7 @@
 /*
  * Modified MIT License
  *
- * Copyright 2022 OneSignal
+ * Copyright 2023 OneSignal
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -27,9 +27,10 @@
 
 #import <UIKit/UIKit.h>
 
-@interface OneSignalBridgeUtil
+@interface OneSignalBridgeUtil : NSObject
 
 const char* jsonStringFromDictionary(NSDictionary *dictionary);
-// TObj objFromJsonString(const char* jsonString);
+NSDictionary* dictionaryFromJsonString(const char* jsonString);
+NSArray* arrayFromJsonString(const char* jsonString);
 
 @end

package/Runtime/Plugins/iOS/OneSignalBridgeUtil.mm

@@ -1,7 +1,7 @@
 /*
  * Modified MIT License
  *
- * Copyright 2022 OneSignal
+ * Copyright 2023 OneSignal
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -28,6 +28,7 @@
 #import "OneSignalBridgeUtil.h"
 
 @implementation OneSignalBridgeUtil
+
 const char* jsonStringFromDictionary(NSDictionary *dictionary) {
     NSError *error;
     NSData *jsonData = [NSJSONSerialization dataWithJSONObject:dictionary options:0 error:&error];
@@ -35,15 +36,24 @@ const char* jsonStringFromDictionary(NSDictionary *dictionary) {
     return [jsonString UTF8String];
 }
 
-// template <typename TObj>
-// TObj objFromJsonString(const char* jsonString) {
-//     NSData* jsonData = [[NSString stringWithUTF8String:jsonString] dataUsingEncoding:NSUTF8StringEncoding];
-//     NSError* error = nil;
-//     TObj arr = [NSJSONSerialization JSONObjectWithData:jsonData options:0 error:&error];
+template <typename TObj>
+TObj objFromJsonString(const char* jsonString) {
+    NSData* jsonData = [[NSString stringWithUTF8String:jsonString] dataUsingEncoding:NSUTF8StringEncoding];
+    NSError* error = nil;
+    TObj arr = [NSJSONSerialization JSONObjectWithData:jsonData options:0 error:&error];
+
+    if (error != nil)
+        return nil;
+
+    return arr;
+}
 
-//     if (error != nil)
-//         return nil;
+NSDictionary* dictionaryFromJsonString(const char* jsonString) {
+    return objFromJsonString<NSDictionary*>(jsonString);
+}
+
+NSArray* arrayFromJsonString(const char* jsonString) {
+    return objFromJsonString<NSArray*>(jsonString);
+}
 
-//     return arr;
-// }
 @end

package/Runtime/Plugins/iOS/OneSignalUnityBridge.mm

@@ -1,7 +1,7 @@
 /*
  * Modified MIT License
  *
- * Copyright 2022 OneSignal
+ * Copyright 2023 OneSignal
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -29,8 +29,6 @@
 #import <OneSignalUser/OneSignalUser-Swift.h>
 #import <OneSignalFramework/OneSignalFramework.h>
 
-typedef void (*BooleanResponseDelegate)(int hashCode, bool response);
-
 /*
  * Helpers
  */
@@ -59,36 +57,11 @@ extern "C" {
         [OneSignal logout];
     }
 
-    bool _getPrivacyConsent() {
-        return OneSignal.getPrivacyConsent;
-    }
-
-    void _setPrivacyConsent(bool consent) {
-        [OneSignal setPrivacyConsent:consent];
-    }
-
-    bool _getRequiresPrivacyConsent() {
-        return [OneSignal requiresPrivacyConsent];
-    }
-
-    void _setRequiresPrivacyConsent(bool required) {
-        [OneSignal setRequiresPrivacyConsent:required];
-    }
-
-    void _setLaunchURLsInApp(bool launchInApp) {
-        [OneSignal setLaunchURLsInApp:launchInApp];
-    }
-
-    void _enterLiveActivity(const char* activityId, const char* token, int hashCode, BooleanResponseDelegate callback) {
-        [OneSignal enterLiveActivity:TO_NSSTRING(activityId)
-                        withToken:TO_NSSTRING(token)
-                        withSuccess:^(NSDictionary *result) { CALLBACK(YES); }
-                        withFailure:^(NSError *error) { CALLBACK(NO); }];
+    void _setConsentGiven(bool consent) {
+        [OneSignal setConsentGiven:consent];
     }
 
-    void _exitLiveActivity(const char* activityId, int hashCode, BooleanResponseDelegate callback) {
-        [OneSignal exitLiveActivity:TO_NSSTRING(activityId)
-                        withSuccess:^(NSDictionary *result) { CALLBACK(YES); }
-                        withFailure:^(NSError *error) { CALLBACK(NO); }];
+    void _setConsentRequired(bool required) {
+        [OneSignal setConsentRequired:required];
     }
 }

package/Runtime/Plugins/iOS/OneSignalUnityBridgeDebug.mm

@@ -1,7 +1,7 @@
 /*
  * Modified MIT License
  *
- * Copyright 2022 OneSignal
+ * Copyright 2023 OneSignal
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

package/Runtime/Plugins/iOS/OneSignalUnityBridgeInAppMessages.mm

@@ -1,7 +1,7 @@
 /*
  * Modified MIT License
  *
- * Copyright 2022 OneSignal
+ * Copyright 2023 OneSignal
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -31,6 +31,7 @@
 #import "OneSignalBridgeUtil.h"
 
 typedef void (*StringListenerDelegate)(const char* response);
+typedef void (*ClickListenerDelegate)(const char* message, const char* result, int urlType);
 
 /*
  * Helpers
@@ -39,29 +40,18 @@ typedef void (*StringListenerDelegate)(const char* response);
 #define CALLBACK(value) callback(hashCode, value)
 #define TO_NSSTRING(cstr) cstr ? [NSString stringWithUTF8String:cstr] : nil
 
-template <typename TObj>
-TObj objFromJsonString(const char* jsonString) {
-    NSData* jsonData = [[NSString stringWithUTF8String:jsonString] dataUsingEncoding:NSUTF8StringEncoding];
-    NSError* error = nil;
-    TObj arr = [NSJSONSerialization JSONObjectWithData:jsonData options:0 error:&error];
-
-    if (error != nil)
-        return nil;
-
-    return arr;
-}
-
 /*
  * Observer singleton for global callbacks
  */
 
-@interface OneSignalInAppMessagesObserver : NSObject <OSInAppMessageLifecycleHandler>
+@interface OneSignalInAppMessagesObserver : NSObject <OSInAppMessageLifecycleListener, OSInAppMessageClickListener>
 
 + (instancetype) sharedInAppMessagesObserver;
 @property StringListenerDelegate willDisplayDelegate;
 @property StringListenerDelegate didDisplayDelegate;
 @property StringListenerDelegate willDismissDelegate;
 @property StringListenerDelegate didDismissDelegate;
+@property ClickListenerDelegate clickDelegate;
 
 @end
 
@@ -78,30 +68,39 @@ TObj objFromJsonString(const char* jsonString) {
 
 - (instancetype) init {
     if (self = [super init]) {
-        [OneSignal.InAppMessages setLifecycleHandler:self];
+        [OneSignal.InAppMessages addLifecycleListener:self];
+        [OneSignal.InAppMessages addClickListener:self];
     }
 
     return self;
 }
 
-- (void)onWillDisplayInAppMessage:(OSInAppMessage *)message {
+- (void)onWillDisplayInAppMessage:(OSInAppMessageWillDisplayEvent *)event {
     if (_willDisplayDelegate != nil)
-        _willDisplayDelegate([message.messageId UTF8String]);
+        _willDisplayDelegate([event.message.messageId UTF8String]);
 }
 
-- (void)onDidDisplayInAppMessage:(OSInAppMessage *)message {
+- (void)onDidDisplayInAppMessage:(OSInAppMessageDidDisplayEvent *)event {
     if (_didDisplayDelegate != nil)
-        _didDisplayDelegate([message.messageId UTF8String]);
+        _didDisplayDelegate([event.message.messageId UTF8String]);
 }
 
-- (void)onWillDismissInAppMessage:(OSInAppMessage *)message {
+- (void)onWillDismissInAppMessage:(OSInAppMessageWillDismissEvent *)event {
     if (_willDismissDelegate != nil)
-        _willDismissDelegate([message.messageId UTF8String]);
+        _willDismissDelegate([event.message.messageId UTF8String]);
 }
 
-- (void)onDidDismissInAppMessage:(OSInAppMessage *)message {
+- (void)onDidDismissInAppMessage:(OSInAppMessageDidDismissEvent *)event {
     if (_didDismissDelegate != nil)
-        _didDismissDelegate([message.messageId UTF8String]);
+        _didDismissDelegate([event.message.messageId UTF8String]);
+}
+
+- (void)onClickInAppMessage:(OSInAppMessageClickEvent * _Nonnull)event {
+    if (_clickDelegate != nil) {
+        auto message = jsonStringFromDictionary([[event message] jsonRepresentation]);
+        auto result = jsonStringFromDictionary([[event result] jsonRepresentation]);
+        _clickDelegate(message, result, event.result.urlTarget);
+    }
 }
 
 @end
@@ -127,10 +126,8 @@ extern "C" {
         [[OneSignalInAppMessagesObserver sharedInAppMessagesObserver] setDidDismissDelegate:callback];
     }
 
-    void _inAppMessagesSetClickedCallback(StringListenerDelegate callback) {
-        [OneSignal.InAppMessages setClickHandler:^(OSInAppMessageAction * _Nonnull action) {
-            callback(jsonStringFromDictionary([action jsonRepresentation]));
-        }];
+    void _inAppMessagesSetClickCallback(ClickListenerDelegate callback) {
+        [[OneSignalInAppMessagesObserver sharedInAppMessagesObserver] setClickDelegate:callback];
     }
 
     void _inAppMessagesSetPaused(bool paused) {
@@ -146,7 +143,7 @@ extern "C" {
     }
 
     void _inAppMessagesAddTriggers(const char* triggersJson) {
-        NSDictionary *triggers = objFromJsonString<NSDictionary*>(triggersJson);
+        NSDictionary *triggers = dictionaryFromJsonString(triggersJson);
 
         [OneSignal.InAppMessages addTriggers:triggers];
     }
@@ -156,7 +153,7 @@ extern "C" {
     }
 
     void _inAppMessagesRemoveTriggers(const char* triggersJson) {
-        NSArray *triggers = objFromJsonString<NSArray*>(triggersJson);
+        NSArray *triggers = arrayFromJsonString(triggersJson);
 
         [OneSignal.InAppMessages removeTriggers:triggers];
     }

package/Runtime/Plugins/iOS/OneSignalUnityBridgeLiveActivities.mm

@@ -0,0 +1,58 @@
+/*
+ * Modified MIT License
+ *
+ * Copyright 2023 OneSignal
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * 1. The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * 2. All copies of substantial portions of the Software may only be used in connection
+ * with services provided by OneSignal.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#import <OneSignalNotifications/OneSignalNotifications.h>
+#import <OneSignalUser/OneSignalUser-Swift.h>
+#import <OneSignalFramework/OneSignalFramework.h>
+
+typedef void (*BooleanResponseDelegate)(int hashCode, bool response);
+
+/*
+ * Helpers
+ */
+
+#define CALLBACK(value) callback(hashCode, value)
+#define TO_NSSTRING(cstr) cstr ? [NSString stringWithUTF8String:cstr] : nil
+
+/*
+ * Bridge methods
+ */
+
+extern "C" {
+    void _enterLiveActivity(const char* activityId, const char* token, int hashCode, BooleanResponseDelegate callback) {
+        [OneSignal.LiveActivities enter:TO_NSSTRING(activityId)
+                        withToken:TO_NSSTRING(token)
+                        withSuccess:^(NSDictionary *result) { CALLBACK(YES); }
+                        withFailure:^(NSError *error) { CALLBACK(NO); }];
+    }
+
+    void _exitLiveActivity(const char* activityId, int hashCode, BooleanResponseDelegate callback) {
+        [OneSignal.LiveActivities exit:TO_NSSTRING(activityId)
+                        withSuccess:^(NSDictionary *result) { CALLBACK(YES); }
+                        withFailure:^(NSError *error) { CALLBACK(NO); }];
+    }
+}

package/Runtime/Plugins/iOS/OneSignalUnityBridgeLiveActivities.mm.meta

@@ -0,0 +1,37 @@
+fileFormatVersion: 2
+guid: af87776925bf8438bba2006c390b5306
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 1
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  - first:
+      iPhone: iOS
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      tvOS: tvOS
+    second:
+      enabled: 1
+      settings: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/Plugins/iOS/OneSignalUnityBridgeLocation.mm

@@ -1,7 +1,7 @@
 /*
  * Modified MIT License
  *
- * Copyright 2022 OneSignal
+ * Copyright 2023 OneSignal
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal