com.onesignal.unity.ios 5.1.5 → 5.1.7

package/Editor/OneSignaliOSDependencies.xml

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

package/Runtime/OneSignaliOS.cs

@@ -69,8 +69,10 @@ namespace OneSignalSDK.iOS {
         /// Used to provide a reference for and sets up the global callbacks
         /// </summary>
         public OneSignaliOS() {
-            if (_instance != null)
+            if (_instance != null) {
                 SDKDebug.Error("Additional instance of OneSignaliOS created.");
+                return;
+            }
 
             _instance = this;
             _debug = new iOSDebugManager();

package/Runtime/Plugins/iOS/OneSignalUnityBridge.mm

@@ -25,6 +25,8 @@
  * THE SOFTWARE.
  */
 
+#import <OneSignalCore/OneSignalCore.h>
+#import <OneSignalOSCore/OneSignalOSCore-Swift.h>
 #import <OneSignalNotifications/OneSignalNotifications.h>
 #import <OneSignalUser/OneSignalUser-Swift.h>
 #import <OneSignalFramework/OneSignalFramework.h>

package/Runtime/Plugins/iOS/OneSignalUnityBridgeDebug.mm

@@ -25,6 +25,8 @@
  * THE SOFTWARE.
  */
 
+#import <OneSignalCore/OneSignalCore.h>
+#import <OneSignalOSCore/OneSignalOSCore-Swift.h>
 #import <OneSignalNotifications/OneSignalNotifications.h>
 #import <OneSignalUser/OneSignalUser-Swift.h>
 #import <OneSignalFramework/OneSignalFramework.h>

package/Runtime/Plugins/iOS/OneSignalUnityBridgeInAppMessages.mm

@@ -25,6 +25,8 @@
  * THE SOFTWARE.
  */
 
+#import <OneSignalCore/OneSignalCore.h>
+#import <OneSignalOSCore/OneSignalOSCore-Swift.h>
 #import <OneSignalNotifications/OneSignalNotifications.h>
 #import <OneSignalUser/OneSignalUser-Swift.h>
 #import <OneSignalFramework/OneSignalFramework.h>

package/Runtime/Plugins/iOS/OneSignalUnityBridgeLiveActivities.mm

@@ -25,9 +25,13 @@
  * THE SOFTWARE.
  */
 
+#import <OneSignalCore/OneSignalCore.h>
+#import <OneSignalOSCore/OneSignalOSCore-Swift.h>
 #import <OneSignalNotifications/OneSignalNotifications.h>
 #import <OneSignalUser/OneSignalUser-Swift.h>
+#import "OneSignalLiveActivities/OneSignalLiveActivities-Swift.h"
 #import <OneSignalFramework/OneSignalFramework.h>
+#import "OneSignalBridgeUtil.h"
 
 typedef void (*BooleanResponseDelegate)(int hashCode, bool response);
 
@@ -55,4 +59,68 @@ extern "C" {
                         withSuccess:^(NSDictionary *result) { CALLBACK(YES); }
                         withFailure:^(NSError *error) { CALLBACK(NO); }];
     }
+
+
+    void _oneSignalSetupDefaultLiveActivity(const char* optionsJson) {
+        #if !TARGET_OS_MACCATALYST
+        LiveActivitySetupOptions *laOptions = nil;
+
+        if (optionsJson) {
+            NSDictionary *optionsDict = oneSignalDictionaryFromJsonString(optionsJson);
+
+            laOptions = [LiveActivitySetupOptions alloc];
+            [laOptions setEnablePushToStart:[optionsDict[@"enablePushToStart"] boolValue]];
+            [laOptions setEnablePushToUpdate:[optionsDict[@"enablePushToUpdate"] boolValue]];
+        }
+
+        if (@available(iOS 16.1, *)) {
+            [OneSignalLiveActivitiesManagerImpl setupDefaultWithOptions:laOptions];
+        } else {
+            [OneSignalLog onesignalLog:ONE_S_LL_ERROR message:[NSString stringWithFormat:@"cannot setupDefault on iOS < 16.1"]];
+        }
+        #endif
+    }
+
+    void _oneSignalStartDefaultLiveActivity(const char* activityId, const char* attributesJson, const char* contentJson) {
+        #if !TARGET_OS_MACCATALYST
+        if (@available(iOS 16.1, *)) {
+            NSDictionary *attributes = oneSignalDictionaryFromJsonString(attributesJson);
+            NSDictionary *content = oneSignalDictionaryFromJsonString(contentJson);
+
+            [OneSignalLiveActivitiesManagerImpl startDefault:TO_NSSTRING(activityId) attributes:attributes content:content];
+        } else {
+            [OneSignalLog onesignalLog:ONE_S_LL_ERROR message:[NSString stringWithFormat:@"cannot startDefault on iOS < 16.1"]];
+        }
+        #endif
+    }
+
+    void _oneSignalSetPushToStartToken(const char* activityType, const char* token) {
+        #if !TARGET_OS_MACCATALYST
+        NSError* err=nil;
+
+        if (@available(iOS 17.2, *)) {
+            [OneSignalLiveActivitiesManagerImpl setPushToStartToken:TO_NSSTRING(activityType) withToken:TO_NSSTRING(token) error:&err];
+            if (err) {
+                [OneSignalLog onesignalLog:ONE_S_LL_ERROR message:[NSString stringWithFormat:@"activityType must be the name of your ActivityAttributes struct"]];
+            }
+        } else {
+            [OneSignalLog onesignalLog:ONE_S_LL_ERROR message:[NSString stringWithFormat:@"cannot setPushToStartToken on iOS < 17.2"]];
+        }
+        #endif
+    }
+
+    void _oneSignalRemovePushToStartToken(const char* activityType) {
+        #if !TARGET_OS_MACCATALYST
+        NSError* err=nil;
+        if (@available(iOS 17.2, *)) {
+            [OneSignalLiveActivitiesManagerImpl removePushToStartToken:TO_NSSTRING(activityType) error:&err];
+
+            if (err) {
+                [OneSignalLog onesignalLog:ONE_S_LL_ERROR message:[NSString stringWithFormat:@"activityType must be the name of your ActivityAttributes struct"]];
+            }
+        } else {
+            [OneSignalLog onesignalLog:ONE_S_LL_ERROR message:[NSString stringWithFormat:@"cannot removePushToStartToken on iOS < 17.2"]];
+        }
+        #endif
+    }
 }

package/Runtime/Plugins/iOS/OneSignalUnityBridgeLocation.mm

@@ -25,6 +25,8 @@
  * THE SOFTWARE.
  */
 
+#import <OneSignalCore/OneSignalCore.h>
+#import <OneSignalOSCore/OneSignalOSCore-Swift.h>
 #import <OneSignalNotifications/OneSignalNotifications.h>
 #import <OneSignalUser/OneSignalUser-Swift.h>
 #import <OneSignalFramework/OneSignalFramework.h>

package/Runtime/Plugins/iOS/OneSignalUnityBridgeNotifications.mm

@@ -25,6 +25,8 @@
  * THE SOFTWARE.
  */
 
+#import <OneSignalCore/OneSignalCore.h>
+#import <OneSignalOSCore/OneSignalOSCore-Swift.h>
 #import <OneSignalNotifications/OneSignalNotifications.h>
 #import <OneSignalUser/OneSignalUser-Swift.h>
 #import <OneSignalFramework/OneSignalFramework.h>

package/Runtime/Plugins/iOS/OneSignalUnityBridgeSession.mm

@@ -25,6 +25,8 @@
  * THE SOFTWARE.
  */
 
+#import <OneSignalCore/OneSignalCore.h>
+#import <OneSignalOSCore/OneSignalOSCore-Swift.h>
 #import <OneSignalNotifications/OneSignalNotifications.h>
 #import <OneSignalUser/OneSignalUser-Swift.h>
 #import <OneSignalFramework/OneSignalFramework.h>

package/Runtime/Plugins/iOS/OneSignalUnityBridgeUser.mm

@@ -25,6 +25,8 @@
  * THE SOFTWARE.
  */
 
+#import <OneSignalCore/OneSignalCore.h>
+#import <OneSignalOSCore/OneSignalOSCore-Swift.h>
 #import <OneSignalNotifications/OneSignalNotifications.h>
 #import <OneSignalUser/OneSignalUser-Swift.h>
 #import <OneSignalFramework/OneSignalFramework.h>

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

@@ -25,6 +25,8 @@
  * THE SOFTWARE.
  */
 
+#import <OneSignalCore/OneSignalCore.h>
+#import <OneSignalOSCore/OneSignalOSCore-Swift.h>
 #import <OneSignalNotifications/OneSignalNotifications.h>
 #import <OneSignalUser/OneSignalUser-Swift.h>
 #import <OneSignalFramework/OneSignalFramework.h>
@@ -95,7 +97,7 @@ static bool swizzled = false;
 
 - (BOOL)oneSignalApplication:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
     [OneSignalWrapper setSdkType:@"unity"];
-    [OneSignalWrapper setSdkVersion:@"050105"];
+    [OneSignalWrapper setSdkVersion:@"050107"];
     [OneSignal initialize:nil withLaunchOptions:launchOptions];
 
     if ([self respondsToSelector:@selector(oneSignalApplication:didFinishLaunchingWithOptions:)])

package/Runtime/iOSLiveActivitiesManager.cs

@@ -25,6 +25,7 @@
  * THE SOFTWARE.
  */
 
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using System.Runtime.InteropServices;
 using OneSignalSDK.LiveActivities;
@@ -32,9 +33,14 @@ using OneSignalSDK.iOS.Utilities;
 
 namespace OneSignalSDK.iOS.LiveActivities {
     internal sealed class iOSLiveActivitiesManager : ILiveActivitiesManager {
+        [DllImport("__Internal")] private static extern void _oneSignalSetupDefaultLiveActivity(string optionsJson);
+        [DllImport("__Internal")] private static extern void _oneSignalStartDefaultLiveActivity(string activityId, string attributesJson, string contentJson);
         [DllImport("__Internal")] private static extern void _oneSignalEnterLiveActivity(string activityId, string token, int hashCode, BooleanResponseDelegate callback);
         [DllImport("__Internal")] private static extern void _oneSignalExitLiveActivity(string activityId, int hashCode, BooleanResponseDelegate callback);
 
+        [DllImport("__Internal")] private static extern void _oneSignalSetPushToStartToken(string activityType, string token);
+        [DllImport("__Internal")] private static extern void _oneSignalRemovePushToStartToken(string activityType);
+
         private delegate void BooleanResponseDelegate(int hashCode, bool response);
 
         public async Task<bool> EnterAsync(string activityId, string token) {
@@ -49,6 +55,36 @@ namespace OneSignalSDK.iOS.LiveActivities {
             return await proxy;
         }
 
+        public void RemovePushToStartToken(string activityType)
+        {
+           _oneSignalRemovePushToStartToken(activityType);
+        }
+
+        public void SetPushToStartToken(string activityType, string token)
+        {
+            _oneSignalSetPushToStartToken(activityType, token);
+        }
+
+        public void SetupDefault(LiveActivitySetupOptions options = null)
+        {
+            string optionsJson = null;
+            if (options != null)
+            {
+                optionsJson = Json.Serialize(new Dictionary<string, object>
+                {
+                    { "enablePushToStart", options.EnablePushToStart },
+                    { "enablePushToUpdate", options.EnablePushToUpdate }
+                });
+            }
+
+            _oneSignalSetupDefaultLiveActivity(optionsJson);
+        }
+
+        public void StartDefault(string activityId, IDictionary<string, object> attributes, IDictionary<string, object> content)
+        {
+            _oneSignalStartDefaultLiveActivity(activityId, Json.Serialize(attributes), Json.Serialize(content));
+        }
+
         [AOT.MonoPInvokeCallback(typeof(BooleanResponseDelegate))]
         private static void BooleanCallbackProxy(int hashCode, bool response)
             => WaitingProxy.ResolveCallbackProxy(hashCode, response);

package/package.json

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

package/Runtime/OneSignaliOSInit.cs

@@ -1,42 +0,0 @@
-/*
- * 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.
- */
-
-#if UNITY_IOS && !UNITY_EDITOR
-using UnityEngine;
-
-namespace OneSignalSDK.iOS {
-    /// <summary>
-    /// 
-    /// </summary>
-    internal static class OneSignaliOSInit {
-        [RuntimeInitializeOnLoadMethod] public static void Init() {
-            if (!OneSignalPlatform.DidInitialize)
-                OneSignal.Default = new OneSignaliOS();
-        }
-    }
-}
-#endif

package/Runtime/OneSignaliOSInit.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 2275cf034d2448b2953ee0863a6e7548
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: