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

package/Editor/BuildPostProcessor.cs

@@ -62,7 +62,9 @@ using UnityEditor.Build.Reporting;
 using UnityEditor.iOS.Xcode.Extensions;
 using Debug = UnityEngine.Debug;
 
-namespace OneSignalSDK {
+using UnityEditor.Callbacks;
+
+namespace OneSignalSDK.iOS {
     /// <summary>
     /// Adds required frameworks to the iOS project, and adds the OneSignalNotificationServiceExtension. Also handles
     /// making sure both targets (app and extension service) have the correct dependencies
@@ -70,7 +72,7 @@ namespace OneSignalSDK {
     public class BuildPostProcessor : IPostprocessBuildWithReport {
         private const string ServiceExtensionTargetName = "OneSignalNotificationServiceExtension";
         private const string ServiceExtensionFilename = "NotificationService.swift";
-        private const string DependenciesFilename = "OneSignalIOSDependencies.xml";
+        private const string DependenciesFilename = "OneSignaliOSDependencies.xml";
         private const string PackageName = "com.onesignal.unity.ios";
 
         private static readonly string EditorFilesPath = Path.Combine("Packages", PackageName, "Editor");

package/Editor/OneSignaliOSDependencies.xml

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

package/Editor/OneSignaliOSDependencies.xml.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 033a0fbaaa064a48ad2e72d8e35d5f36
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Editor/PBXProjectExtensions.cs

@@ -28,7 +28,7 @@
 #if UNITY_IOS
 using UnityEditor.iOS.Xcode;
 
-namespace OneSignalSDK {
+namespace OneSignalSDK.iOS {
     public static class PBXProjectExtensions {
     #if UNITY_2019_3_OR_NEWER
         public static string GetMainTargetName(this PBXProject project)

package/Runtime/OneSignaliOS.cs

@@ -0,0 +1,178 @@
+/*
+ * Modified MIT License
+ *
+ * Copyright 2022 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.
+ */
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using UnityEngine;
+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;
+using OneSignalSDK.Debug.Utilities;
+using OneSignalSDK.Location;
+using OneSignalSDK.Session;
+using OneSignalSDK.User;
+
+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);
+        [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;
+        private iOSNotificationsManager _notifications;
+        private iOSLocationManager _location;
+        private iOSInAppMessagesManager _inAppMessages;
+        private iOSDebugManager _debug;
+
+        private static OneSignaliOS _instance;
+
+        /// <summary>
+        /// Used to provide a reference for and sets up the global callbacks
+        /// </summary>
+        public OneSignaliOS() {
+            if (_instance != null)
+                SDKDebug.Error("Additional instance of OneSignaliOS created.");
+
+            _instance = this;
+            _debug = new iOSDebugManager();
+        }
+
+        public override IUserManager User {
+            get => _user;
+        }
+
+        public override ISessionManager Session {
+            get => _session;
+        }
+
+        public override INotificationsManager Notifications {
+            get => _notifications;
+        }
+
+        public override ILocationManager Location {
+            get => _location;
+        }
+
+        public override IInAppMessagesManager InAppMessages {
+            get => _inAppMessages;
+        }
+
+        public override IDebugManager Debug {
+            get => _debug;
+        }
+
+        public override bool PrivacyConsent {
+            get => _getPrivacyConsent();
+            set => _setPrivacyConsent(value);
+        }
+
+        public override bool RequiresPrivacyConsent {
+            get => _getRequiresPrivacyConsent();
+            set => _setRequiresPrivacyConsent(value);
+        }
+
+        public override void SetLaunchURLsInApp(bool launchInApp)
+            => _setLaunchURLsInApp(launchInApp);
+
+        public override void Initialize(string appId) {
+            _initialize(appId);
+
+            if (_inAppMessages == null) {
+                _inAppMessages = new iOSInAppMessagesManager();
+                _inAppMessages.Initialize();
+            }
+
+            if (_notifications == null) {
+                _notifications = new iOSNotificationsManager();
+                _notifications.Initialize();
+            }
+
+            if (_user == null) {
+                _user = new iOSUserManager();
+                _user.Initialize();
+            }
+
+            if (_location == null) {
+                _location = new iOSLocationManager();
+            }
+
+            if (_session == null) {
+                _session = new iOSSessionManager();
+            }
+
+            _completedInit(appId);
+        }
+
+        public override void Login(string externalId, string jwtBearerToken = null) {
+            if (jwtBearerToken == null) {
+                _login(externalId);
+            } else {
+                _loginWithJwtBearerToken(externalId, jwtBearerToken);
+            }
+        }
+
+        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/OneSignaliOS.cs.meta

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

package/Runtime/{OneSignalIOSInit.cs → OneSignaliOSInit.cs}

@@ -28,14 +28,14 @@
 #if UNITY_IOS && !UNITY_EDITOR
 using UnityEngine;
 
-namespace OneSignalSDK {
+namespace OneSignalSDK.iOS {
     /// <summary>
     /// 
     /// </summary>
-    internal static class OneSignalIOSInit {
+    internal static class OneSignaliOSInit {
         [RuntimeInitializeOnLoadMethod] public static void Init() {
             if (!OneSignal.DidInitialize) 
-                OneSignal.Default = new OneSignalIOS();
+                OneSignal.Default = new OneSignaliOS();
         }
     }
 }

package/Runtime/OneSignaliOSInit.cs.meta

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

package/Runtime/Plugins/iOS/NotificationService.swift

@@ -1,5 +1,5 @@
 import UserNotifications
-import OneSignal
+import OneSignalFramework
 
 class NotificationService: UNNotificationServiceExtension {
     var contentHandler: ((UNNotificationContent) -> Void)?

package/Runtime/Plugins/iOS/OneSignalBridgeUtil.h

@@ -0,0 +1,35 @@
+/*
+ * Modified MIT License
+ *
+ * Copyright 2022 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 <UIKit/UIKit.h>
+
+@interface OneSignalBridgeUtil
+
+const char* jsonStringFromDictionary(NSDictionary *dictionary);
+// TObj objFromJsonString(const char* jsonString);
+
+@end

package/Runtime/Plugins/iOS/OneSignalBridgeUtil.h.meta

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

package/Runtime/Plugins/iOS/OneSignalBridgeUtil.mm

@@ -0,0 +1,49 @@
+/*
+ * Modified MIT License
+ *
+ * Copyright 2022 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 "OneSignalBridgeUtil.h"
+
+@implementation OneSignalBridgeUtil
+const char* jsonStringFromDictionary(NSDictionary *dictionary) {
+    NSError *error;
+    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:dictionary options:0 error:&error];
+    NSString *jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
+    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];
+
+//     if (error != nil)
+//         return nil;
+
+//     return arr;
+// }
+@end

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

@@ -0,0 +1,37 @@
+fileFormatVersion: 2
+guid: a151050de45614602a5a8083463e1a4e
+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: