com.onesignal.unity.ios 3.0.0-beta.6 → 3.0.2

package/Editor/BuildPostProcessor.cs

@@ -138,7 +138,7 @@ namespace OneSignalSDK {
             _project.AddFile(relativeDestination, entitlementFileName);
             _project.SetBuildProperty(targetGuid, "CODE_SIGN_ENTITLEMENTS", relativeDestination);
 
-            return entitlementsPath;
+            return relativeDestination;
         }
         
         /// <summary>
@@ -163,13 +163,17 @@ namespace OneSignalSDK {
         /// </summary>
         private void AddNotificationServiceExtension() {
 #if !UNITY_CLOUD_BUILD
-            // If file exists then the below has been completed before from another build
-            // The below will not be updated on Append builds
-            // Changes would most likely need to be made to support Append builds
-            if (ExtensionCreatePlist(_outputPath))
+            // refresh plist and podfile on appends
+            ExtensionCreatePlist(_outputPath);
+            ExtensionAddPodsToTarget();
+
+            var extensionGuid = _project.TargetGuidByName(ServiceExtensionTargetName);
+
+            // skip target setup if already present
+            if (!string.IsNullOrEmpty(extensionGuid))
                 return;
 
-            var extensionGuid = _project.AddAppExtension(_project.GetMainTargetGuid(),
+            extensionGuid = _project.AddAppExtension(_project.GetMainTargetGuid(),
                 ServiceExtensionTargetName,
                 PlayerSettings.GetApplicationIdentifier(BuildTargetGroup.iOS) + "." + ServiceExtensionTargetName,
                 ServiceExtensionTargetName + "/" + "Info.plist" // Unix path as it's used by Xcode
@@ -196,8 +200,6 @@ namespace OneSignalSDK {
             projCapability.AddAppGroups(new[] { _appGroupName });
             
             projCapability.WriteToFile();
-            
-            ExtensionAddPodsToTarget();
 #endif
         }
 
@@ -232,7 +234,7 @@ namespace OneSignalSDK {
             notificationServicePlist.ReadFromFile(Path.Combine(PluginFilesPath, "Info.plist"));
             notificationServicePlist.root.SetString("CFBundleShortVersionString", PlayerSettings.bundleVersion);
             notificationServicePlist.root.SetString("CFBundleVersion", PlayerSettings.iOS.buildNumber);
-            
+
             notificationServicePlist.WriteToFile(plistPath);
             
             return alreadyExists;
@@ -246,13 +248,6 @@ namespace OneSignalSDK {
                 return;
             }
 
-            var podfile = File.ReadAllText(podfilePath);
-
-            var extensionEntryRegex = new Regex($@"target '{ServiceExtensionTargetName}' do\n(.+)\nend");
-            if (extensionEntryRegex.IsMatch(podfile))
-                return;
-
-            var versionRegex = new Regex("(?<=<iosPod name=\"OneSignalXCFramework\" version=\").+(?=\" addToAllTargets=\"true\" />)");
             var dependenciesFilePath = Path.Combine(EditorFilesPath, DependenciesFilename);
 
             if (!File.Exists(dependenciesFilePath)) {
@@ -261,16 +256,26 @@ namespace OneSignalSDK {
             }
             
             var dependenciesFile = File.ReadAllText(dependenciesFilePath);
+            var dependenciesRegex = new Regex("(?<=<iosPod name=\"OneSignalXCFramework\" version=\").+(?=\" addToAllTargets=\"true\" />)");
 
-            if (!versionRegex.IsMatch(dependenciesFile)) {
+            if (!dependenciesRegex.IsMatch(dependenciesFile)) {
                 Debug.LogError($"Could not read current iOS framework dependency version from {DependenciesFilename}");
                 return;
             }
 
-            var version = versionRegex.Match(dependenciesFile)
-                .ToString();
+            var podfile = File.ReadAllText(podfilePath);
+            var podfileRegex = new Regex($@"target '{ServiceExtensionTargetName}' do\n  pod 'OneSignalXCFramework', '(.+)'\nend\n");
+            
+            var requiredVersion = dependenciesRegex.Match(dependenciesFile).ToString();
+            var requiredTarget = $"target '{ServiceExtensionTargetName}' do\n  pod 'OneSignalXCFramework', '{requiredVersion}'\nend\n";
+
+            if (!podfileRegex.IsMatch(podfile))
+                podfile += requiredTarget;
+            else {
+                var podfileTarget = podfileRegex.Match(podfile).ToString();
+                podfile = podfile.Replace(podfileTarget, requiredTarget);
+            }
             
-            podfile += $"target '{ServiceExtensionTargetName}' do\n  pod 'OneSignalXCFramework', '{version}'\nend\n";
             File.WriteAllText(podfilePath, podfile);
         }
     }

package/Editor/PBXProjectExtensions.cs

@@ -35,18 +35,12 @@ namespace OneSignalSDK {
 
         public static string GetMainTargetGuid(this PBXProject project)
             => project.GetUnityMainTargetGuid();
-
-        public static string GetFrameworkGuid(this PBXProject project)
-            => project.GetUnityFrameworkTargetGuid();
     #else
         public static string GetMainTargetName(this PBXProject project) 
             => PBXProject.GetUnityTargetName();
          
         public static string GetMainTargetGuid(this PBXProject project)
              => project.TargetGuidByName(PBXProject.GetUnityTargetName());
-
-        public static string GetFrameworkGuid(this PBXProject project)
-             => GetPBXProjectTargetGuid(project);
     #endif
     }
 }

package/Runtime/OneSignalIOS.Callbacks.cs

@@ -97,24 +97,38 @@ namespace OneSignalSDK {
             _instance = this;
         }
 
+        /// <param name="response">OSNotification</param>
         [AOT.MonoPInvokeCallback(typeof(NotificationWillShowInForegroundDelegate))]
         private static bool _onNotificationReceived(string response) {
             if (_instance.NotificationWillShow == null)
                 return true;
 
             var notification = JsonUtility.FromJson<Notification>(response);
-
-            if (Json.Deserialize(response) is Dictionary<string, object> notifDict && notifDict.ContainsKey("additionalData"))
-                notification.additionalData = notifDict["additionalData"] as Dictionary<string, object>;
+            _fillNotifFromObj(ref notification, Json.Deserialize(response));
             
             var resultNotif = _instance.NotificationWillShow(notification);
-            
             return resultNotif != null;
         }
 
+        /// <param name="response">OSNotificationOpenedResult</param>
         [AOT.MonoPInvokeCallback(typeof(StringListenerDelegate))]
-        private static void _onNotificationOpened(string response)
-            => _instance.NotificationOpened?.Invoke(JsonUtility.FromJson<NotificationOpenedResult>(response));
+        private static void _onNotificationOpened(string response) {
+            var notifOpenResult = JsonUtility.FromJson<NotificationOpenedResult>(response);
+
+            if (Json.Deserialize(response) is Dictionary<string, object> resultDict && resultDict.ContainsKey("notification"))
+                _fillNotifFromObj(ref notifOpenResult.notification, resultDict["notification"]);
+
+            if (DidInitialize)
+                _instance.NotificationOpened?.Invoke(notifOpenResult);
+            else {
+                void invokeOpened(string appId) {
+                    OnInitialize -= invokeOpened;
+                    _instance.NotificationOpened?.Invoke(notifOpenResult);
+                }
+                
+                OnInitialize += invokeOpened; 
+            }
+        }
         
         [AOT.MonoPInvokeCallback(typeof(StringListenerDelegate))]
         private static void _onInAppMessageWillDisplay(string response)

package/Runtime/OneSignalIOS.Interface.cs

@@ -58,8 +58,10 @@ namespace OneSignalSDK {
         [DllImport("__Internal")] private static extern bool _getPrivacyConsent();
         [DllImport("__Internal")] private static extern void _setRequiresPrivacyConsent(bool required);
         [DllImport("__Internal")] private static extern bool _getRequiresPrivacyConsent();
+        [DllImport("__Internal")] private static extern void _setLaunchURLsInApp(bool launchInApp);
         [DllImport("__Internal")] private static extern void _initialize(string appId);
         [DllImport("__Internal")] private static extern void _promptForPushNotificationsWithUserResponse(int hashCode, BooleanResponseDelegate callback);
+        [DllImport("__Internal")] private static extern void _disablePush(bool disable);
         [DllImport("__Internal")] private static extern void _postNotification(string optionsJson, int hashCode, StringResponseDelegate callback);
         [DllImport("__Internal")] private static extern void _setTrigger(string key, string value);
         [DllImport("__Internal")] private static extern void _setTriggers(string triggersJson);
@@ -80,6 +82,7 @@ namespace OneSignalSDK {
         [DllImport("__Internal")] private static extern void _setEmail(string email, string authHash, int hashCode, BooleanResponseDelegate callback);
         [DllImport("__Internal")] private static extern void _setSMSNumber(string smsNumber, string authHash, int hashCode, BooleanResponseDelegate callback);
 
+        [DllImport("__Internal")] private static extern void _removeExternalUserId(int hashCode, BooleanResponseDelegate callback);
         [DllImport("__Internal")] private static extern void _logoutEmail(int hashCode, BooleanResponseDelegate callback);
         [DllImport("__Internal")] private static extern void _logoutSMSNumber(int hashCode, BooleanResponseDelegate callback);
         

package/Runtime/OneSignalIOS.Mappings.cs

@@ -26,6 +26,8 @@
  */
 
 using System;
+using System.Collections.Generic;
+using UnityEngine;
 
 namespace OneSignalSDK {
     public sealed partial class OneSignalIOS : OneSignal {
@@ -76,5 +78,19 @@ namespace OneSignalSDK {
             public static implicit operator NotificationPermission(NotificationPermissionState source)
                 => (NotificationPermission)source.status;
         }
+
+        private static void _fillNotifFromObj(ref Notification notif, object notifObj) {
+            if (!(notifObj is Dictionary<string, object> notifDict)) 
+                return;
+            
+            if (notifDict.ContainsKey("additionalData"))
+                notif.additionalData = notifDict["additionalData"] as Dictionary<string, object>;
+            
+            if (notifDict.ContainsKey("attachments"))
+                notif.attachments = notifDict["attachments"] as Dictionary<string, object>;
+
+            if (notifDict.ContainsKey("rawPayload") && notifDict["rawPayload"] is Dictionary<string, object> payloadDict)
+                notif.rawPayload = Json.Serialize(payloadDict);
+        }
     }
 }

package/Runtime/OneSignalIOS.cs

@@ -86,6 +86,9 @@ namespace OneSignalSDK {
             set => _setRequiresPrivacyConsent(value);
         }
 
+        public override void SetLaunchURLsInApp(bool launchInApp)
+            => _setLaunchURLsInApp(launchInApp);
+
         public override void Initialize(string appId) {
             _initialize(appId);
             _completedInit(appId);
@@ -100,6 +103,14 @@ namespace OneSignalSDK {
         public override void ClearOneSignalNotifications()
             => SDKDebug.Info("ClearOneSignalNotifications invoked on iOS, does nothing");
 
+        public override bool PushEnabled {
+            get {
+                var deviceState = JsonUtility.FromJson<DeviceState>(_getDeviceState());
+                return !deviceState.isPushDisabled;
+            }
+            set => _disablePush(!value);
+        }
+
         public override async Task<Dictionary<string, object>> PostNotification(Dictionary<string, object> options) {
             var (proxy, hashCode) = _setupProxy<string>();
             _postNotification(Json.Serialize(options), hashCode, StringCallbackProxy);
@@ -181,6 +192,12 @@ namespace OneSignalSDK {
             return await proxy;
         }
 
+        public override async Task<bool> RemoveExternalUserId() {
+            var (proxy, hashCode) = _setupProxy<bool>();
+            _removeExternalUserId(hashCode, BooleanCallbackProxy);
+            return await proxy;
+        }
+
         public override async Task<bool> LogOutEmail() {
             var (proxy, hashCode) = _setupProxy<bool>();
             _logoutEmail(hashCode, BooleanCallbackProxy);

package/Runtime/Plugins/iOS/Info.plist

@@ -25,7 +25,7 @@
 		<key>NSExtensionPointIdentifier</key>
 		<string>com.apple.usernotifications.service</string>
 		<key>NSExtensionPrincipalClass</key>
-		<string>NotificationService</string>
+		<string>$(PRODUCT_MODULE_NAME).NotificationService</string>
 	</dict>
 </dict>
 </plist>

package/Runtime/Plugins/iOS/NotificationService.swift.meta

@@ -12,7 +12,7 @@ PluginImporter:
   validateReferences: 1
   platformData:
   - first:
-      Any: 
+      Any:
     second:
       enabled: 0
       settings: {}
@@ -25,13 +25,13 @@ PluginImporter:
   - first:
       iPhone: iOS
     second:
-      enabled: 1
+      enabled: 0
       settings: {}
   - first:
       tvOS: tvOS
     second:
-      enabled: 1
+      enabled: 0
       settings: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  userData:
+  assetBundleName:
+  assetBundleVariant:

package/Runtime/Plugins/iOS/OneSignalUnityBridge.mm

@@ -216,15 +216,15 @@ void _setEmailSubscriptionStateChangedCallback(StateListenerDelegate callback) {
     [[OneSignalObserver sharedObserver] setEmailDelegate:callback];
 }
 
-    void _setSMSSubscriptionStateChangedCallback(StateListenerDelegate callback) {
-        [[OneSignalObserver sharedObserver] setSmsDelegate:callback];
-    }
-    
-    const char* _getDeviceState() {
-        auto deviceState = [OneSignal getDeviceState];
-        auto stateStr = jsonStringFromDictionary([deviceState jsonRepresentation]);
-        return strdup(stateStr);
-    }
+void _setSMSSubscriptionStateChangedCallback(StateListenerDelegate callback) {
+    [[OneSignalObserver sharedObserver] setSmsDelegate:callback];
+}
+
+const char* _getDeviceState() {
+    auto deviceState = [OneSignal getDeviceState];
+    auto stateStr = jsonStringFromDictionary([deviceState jsonRepresentation]);
+    return strdup(stateStr);
+}
 
 void _setLogLevel(int logLevel, int alertLevel) {
     [OneSignal setLogLevel:(ONE_S_LOG_LEVEL) logLevel
@@ -247,6 +247,10 @@ bool _getRequiresPrivacyConsent() {
     return [OneSignal requiresUserPrivacyConsent];
 }
 
+void _setLaunchURLsInApp(bool launchInApp) {
+    [OneSignal setLaunchURLsInApp: launchInApp];
+}
+
 void _initialize(const char* appId) {
     [OneSignal setAppId:TO_NSSTRING(appId)];
     [OneSignal initWithLaunchOptions:nil];
@@ -258,6 +262,10 @@ void _promptForPushNotificationsWithUserResponse(int hashCode, BooleanResponseDe
     }];
 }
 
+void _disablePush(bool disable) {
+    [OneSignal disablePush:disable];
+}
+
 void _postNotification(const char* optionsJson, int hashCode, StringResponseDelegate callback) {
     NSDictionary *options = objFromJsonString<NSDictionary*>(optionsJson);
 
@@ -369,6 +377,11 @@ void _setSMSNumber(const char* smsNumber, const char* authHash, int hashCode, Bo
                 withFailure:^(NSError *error) { CALLBACK(NO); }];
 }
 
+void _removeExternalUserId(int hashCode, BooleanResponseDelegate callback) {
+    [OneSignal removeExternalUserId:^(NSDictionary *results) { CALLBACK(YES); }
+                        withFailure:^(NSError *error) { CALLBACK(NO); }];
+}
+
 void _logoutEmail(int hashCode, BooleanResponseDelegate callback) {
     [OneSignal logoutEmailWithSuccess:^{ CALLBACK(YES); }
                           withFailure:^(NSError *error) { CALLBACK(NO); }];
@@ -376,18 +389,18 @@ void _logoutEmail(int hashCode, BooleanResponseDelegate callback) {
 
 void _logoutSMSNumber(int hashCode, BooleanResponseDelegate callback) {
     [OneSignal logoutSMSNumberWithSuccess:^(NSDictionary *results) { CALLBACK(YES); }
-                                  withFailure:^(NSError *error) { CALLBACK(NO); }];
-    }
+                              withFailure:^(NSError *error) { CALLBACK(NO); }];
+}
     
-    void _setLanguage(const char* languageCode, int hashCode, BooleanResponseDelegate callback) {
-        [OneSignal setLanguage:TO_NSSTRING(languageCode)
-                   withSuccess:^{ CALLBACK(YES); }
-                   withFailure:^(NSError *error) { CALLBACK(NO); }];
-    }
+void _setLanguage(const char* languageCode, int hashCode, BooleanResponseDelegate callback) {
+    [OneSignal setLanguage:TO_NSSTRING(languageCode)
+               withSuccess:^{ CALLBACK(YES); }
+               withFailure:^(NSError *error) { CALLBACK(NO); }];
+}
 
-    void _promptLocation() {
-        [OneSignal promptLocation];
-    }
+void _promptLocation() {
+    [OneSignal promptLocation];
+}
 
 void _setShareLocation(bool share) {
     [OneSignal setLocationShared:share];

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

@@ -0,0 +1,32 @@
+/*
+ * 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 UIApplication (OneSignalUnity)
+@end
+

package/Runtime/Plugins/iOS/UIApplication+OneSignalUnity.h.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: a4a2cda353724bccbd11343516cb4c27
+timeCreated: 1649879476

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

@@ -0,0 +1,105 @@
+/*
+ * 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 "UIApplication+OneSignalUnity.h"
+#import <OneSignal/OneSignal.h>
+#import <objc/runtime.h>
+
+// from OneSignalSelectorHelpers.m
+static Class getClassWithProtocolInHierarchy(Class searchClass, Protocol *protocolToFind) {
+    if (!class_conformsToProtocol(searchClass, protocolToFind)) {
+        if ([searchClass superclass] == [NSObject class])
+            return nil;
+        Class foundClass = getClassWithProtocolInHierarchy([searchClass superclass], protocolToFind);
+        if (foundClass)
+            return foundClass;
+        return searchClass;
+    }
+    return searchClass;
+}
+
+// from OneSignalSelectorHelpers.m
+BOOL injectSelector(Class newClass, SEL newSel, Class addToClass, SEL makeLikeSel) {
+    Method newMeth = class_getInstanceMethod(newClass, newSel);
+    IMP imp = method_getImplementation(newMeth);
+
+    const char* methodTypeEncoding = method_getTypeEncoding(newMeth);
+    BOOL existing = class_getInstanceMethod(addToClass, makeLikeSel) != NULL;
+
+    if (existing) {
+        class_addMethod(addToClass, newSel, imp, methodTypeEncoding);
+        newMeth = class_getInstanceMethod(addToClass, newSel);
+        Method orgMeth = class_getInstanceMethod(addToClass, makeLikeSel);
+        method_exchangeImplementations(orgMeth, newMeth);
+    }
+    else {
+        class_addMethod(addToClass, makeLikeSel, imp, methodTypeEncoding);
+    }
+
+    return existing;
+}
+
+static bool swizzled = false;
+
+@implementation UIApplication (OneSignalUnity)
+
++ (void)load {
+    method_exchangeImplementations(
+        class_getInstanceMethod(self, @selector(setDelegate:)),
+        class_getInstanceMethod(self, @selector(setOneSignalUnityDelegate:))
+    );
+}
+
+- (void)setOneSignalUnityDelegate:(id <UIApplicationDelegate>)delegate {
+    if (swizzled) {
+        [self setOneSignalUnityDelegate:delegate];
+        return;
+    }
+
+    Class delegateClass = getClassWithProtocolInHierarchy([delegate class], @protocol(UIApplicationDelegate));
+
+    injectSelector(
+        self.class, @selector(oneSignalApplication:didFinishLaunchingWithOptions:),
+        delegateClass, @selector(application:didFinishLaunchingWithOptions:)
+    );
+
+    swizzled = true;
+
+    [self setOneSignalUnityDelegate:delegate];
+}
+
+- (BOOL)oneSignalApplication:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
+    [OneSignal setMSDKType:@"unity"];
+    [OneSignal initWithLaunchOptions:launchOptions];
+
+    if ([self respondsToSelector:@selector(oneSignalApplication:didFinishLaunchingWithOptions:)])
+        return [self oneSignalApplication:application didFinishLaunchingWithOptions:launchOptions];
+
+    return YES;
+}
+
+@end

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

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: a8e9b06e260e4c0ca80d5e51137d89d3
+timeCreated: 1649879476

package/package.json

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