Merge pull request #1280 from OneSignal/rel/5.0.0-beta-05

Release 5.0.0-beta-05

OneSignal.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "OneSignal"
-  s.version          = "5.0.0-beta-04"
+  s.version          = "5.0.0-beta-05"
   s.summary          = "OneSignal push notification library for mobile apps."
   s.homepage         = "https://onesignal.com"
   s.license          = { :type => 'MIT', :file => 'LICENSE' }

OneSignalXCFramework.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     s.name             = "OneSignalXCFramework"
-    s.version          = "5.0.0-beta-04"
+    s.version          = "5.0.0-beta-05"
     s.summary          = "OneSignal push notification library for mobile apps."
     s.homepage         = "https://onesignal.com"
     s.license          = { :type => 'MIT', :file => 'LICENSE' }

Package.swift

@@ -105,48 +105,48 @@ let package = Package(
         ),
         .binaryTarget(
           name: "OneSignalFramework",
-          url: "https://github.com/OneSignal/OneSignal-iOS-SDK/releases/download/5.0.0-beta-04/OneSignalFramework.xcframework.zip",
-          checksum: "c1a9a6d372fa8a2e4dfa077e74c6a5cdc523ce1005e58a05d888aec742f80d52"
+          url: "https://github.com/OneSignal/OneSignal-iOS-SDK/releases/download/5.0.0-beta-05/OneSignalFramework.xcframework.zip",
+          checksum: "671086520e15751ae5fb5ac0b7721cb2c6f317c8701e94d90f049c054ba1ad8e"
         ),
         .binaryTarget(
           name: "OneSignalInAppMessages",
-          url: "https://github.com/OneSignal/OneSignal-iOS-SDK/releases/download/5.0.0-beta-04/OneSignalInAppMessages.xcframework.zip",
-          checksum: "needschecksum"
+          url: "https://github.com/OneSignal/OneSignal-iOS-SDK/releases/download/5.0.0-beta-05/OneSignalInAppMessages.xcframework.zip",
+          checksum: "267a1d2f4a2d20d5db460318b4ede69f9c9e307718d7ad3f421fe608ec0f9b58"
         ),
         .binaryTarget(
           name: "OneSignalLocation",
-          url: "https://github.com/OneSignal/OneSignal-iOS-SDK/releases/download/5.0.0-beta-04/OneSignalLocation.xcframework.zip",
-          checksum: "needschecksum"
+          url: "https://github.com/OneSignal/OneSignal-iOS-SDK/releases/download/5.0.0-beta-05/OneSignalLocation.xcframework.zip",
+          checksum: "6be5d1ffc7adda9859b94f8a12eda014b6331367183947313793d0ed114498f2"
         ),
         .binaryTarget(
           name: "OneSignalUser",
-          url: "https://github.com/OneSignal/OneSignal-iOS-SDK/releases/download/5.0.0-beta-04/OneSignalUser.xcframework.zip",
-          checksum: "ca63ac5255a5a3cc7cd8b70e7ede241a1355783776a8a9c841e0c45f179622f0"
+          url: "https://github.com/OneSignal/OneSignal-iOS-SDK/releases/download/5.0.0-beta-05/OneSignalUser.xcframework.zip",
+          checksum: "c4a2e83ca7c0e83ece1657dd0888b8c187975f0045ac4ad47126cfc5caa7fa4d"
         ),
         .binaryTarget(
           name: "OneSignalNotifications",
-          url: "https://github.com/OneSignal/OneSignal-iOS-SDK/releases/download/5.0.0-beta-04/OneSignalNotifications.xcframework.zip",
-          checksum: "17cb0cdf119d16f83e7cb8dffec0de4b063eae2e46b4edde4e6f2976abd7e98d"
+          url: "https://github.com/OneSignal/OneSignal-iOS-SDK/releases/download/5.0.0-beta-05/OneSignalNotifications.xcframework.zip",
+          checksum: "e270c4f564a0f7287c0dca68a76fd27ad4c97026df6a887240242a0d239350bd"
         ),
         .binaryTarget(
           name: "OneSignalExtension",
-          url: "https://github.com/OneSignal/OneSignal-iOS-SDK/releases/download/5.0.0-beta-04/OneSignalExtension.xcframework.zip",
-          checksum: "4a42a7ddf3174dbd168313623f188a2dfdbd7f3f2114cf52e9806567937161fc"
+          url: "https://github.com/OneSignal/OneSignal-iOS-SDK/releases/download/5.0.0-beta-05/OneSignalExtension.xcframework.zip",
+          checksum: "b9be2f25732eed4cdfec5c9724210b88b621fe15900055e1559074f9cdaa6173"
         ),
         .binaryTarget(
           name: "OneSignalOutcomes",
-          url: "https://github.com/OneSignal/OneSignal-iOS-SDK/releases/download/5.0.0-beta-04/OneSignalOutcomes.xcframework.zip",
-          checksum: "376671a3357973dd8dde03052ad8488f5340ab53d864c8a7e926017878a0085b"
+          url: "https://github.com/OneSignal/OneSignal-iOS-SDK/releases/download/5.0.0-beta-05/OneSignalOutcomes.xcframework.zip",
+          checksum: "32e56bf8ed1ff0fcde63225cd640e402c5290b212f96d77fab0cabbb12f44a52"
         ),
         .binaryTarget(
           name: "OneSignalOSCore",
-          url: "https://github.com/OneSignal/OneSignal-iOS-SDK/releases/download/5.0.0-beta-04/OneSignalOSCore.xcframework.zip",
-          checksum: "6b6655ef9c14e52fe883c008cff23dcc9d51e72f9ffe52317ad496762a3aac76"
+          url: "https://github.com/OneSignal/OneSignal-iOS-SDK/releases/download/5.0.0-beta-05/OneSignalOSCore.xcframework.zip",
+          checksum: "d3d6a036f6bd3659d698ffd8ff1b1a80963b7b45eb1ae17a530466bd567820f3"
         ),
         .binaryTarget(
           name: "OneSignalCore",
-          url: "https://github.com/OneSignal/OneSignal-iOS-SDK/releases/download/5.0.0-beta-04/OneSignalCore.xcframework.zip",
-          checksum: "f1fb011382a317d1cd790fd47cdc097d4b279c716418ed535d7966922c04b1f9"
+          url: "https://github.com/OneSignal/OneSignal-iOS-SDK/releases/download/5.0.0-beta-05/OneSignalCore.xcframework.zip",
+          checksum: "d92bc22675985f85f24ef5e6f3e4ad433f67abe5e985aa3e23d6784e56c04584"
         )
     ]
 )

iOS_SDK/OneSignalSDK/OneSignalCore/Source/OneSignalCommonDefines.h

@@ -46,7 +46,7 @@
 // "*" in comment line ending comment means the string value has not been changed
 // App
 
-#define ONESIGNAL_VERSION                                                   @"050000-beta-04"
+#define ONESIGNAL_VERSION                                                   @"050000-beta-05"
 
 #define OSUD_APP_ID                                                         @"GT_APP_ID"                                                        // * OSUD_APP_ID
 #define OSUD_REGISTERED_WITH_APPLE                                          @"GT_REGISTERED_WITH_APPLE"                                         // * OSUD_REGISTERED_WITH_APPLE

iOS_SDK/OneSignalSDK/OneSignal_Core/OneSignalCore.xcframework/Info.plist

@@ -6,22 +6,19 @@
 	<array>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-maccatalyst</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>OneSignalCore.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>maccatalyst</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64_x86_64-maccatalyst</string>
 			<key>LibraryPath</key>
 			<string>OneSignalCore.framework</string>
 			<key>SupportedArchitectures</key>
@@ -32,19 +29,22 @@
 			<key>SupportedPlatform</key>
 			<string>ios</string>
 			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
+			<string>maccatalyst</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>OneSignalCore.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

iOS_SDK/OneSignalSDK/OneSignal_Core/OneSignalCore.xcframework/ios-arm64/OneSignalCore.framework/Headers/OSDialogInstanceManager.h

@@ -1,10 +1,29 @@
-//
-//  OSDialogPresenter.h
-//  OneSignal
-//
-//  Created by Elliot Mawby on 11/2/22.
-//  Copyright © 2022 Hiptic. All rights reserved.
-//
+/*
+ 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 <Foundation/Foundation.h>
 

iOS_SDK/OneSignalSDK/OneSignal_Core/OneSignalCore.xcframework/ios-arm64/OneSignalCore.framework/Headers/OSInAppMessages.h

@@ -33,7 +33,7 @@
 
 @property (strong, nonatomic, nonnull) NSString *messageId;
 
-// Convert the object into a NSDictionary
+// Dictionary of properties available on OSInAppMessage only
 - (NSDictionary *_Nonnull)jsonRepresentation;
 
 @end
@@ -78,18 +78,22 @@ typedef NS_ENUM(NSUInteger, OSInAppMessageActionUrlType) {
 
 @interface OSInAppMessageWillDisplayEvent : NSObject
 @property (nonatomic, readonly, nonnull) OSInAppMessage *message;
+- (NSDictionary *_Nonnull)jsonRepresentation;
 @end
 
 @interface OSInAppMessageDidDisplayEvent : NSObject
 @property (nonatomic, readonly, nonnull) OSInAppMessage *message;
+- (NSDictionary *_Nonnull)jsonRepresentation;
 @end
 
 @interface OSInAppMessageWillDismissEvent : NSObject
 @property (nonatomic, readonly, nonnull) OSInAppMessage *message;
+- (NSDictionary *_Nonnull)jsonRepresentation;
 @end
 
 @interface OSInAppMessageDidDismissEvent : NSObject
 @property (nonatomic, readonly, nonnull) OSInAppMessage *message;
+- (NSDictionary *_Nonnull)jsonRepresentation;
 @end
 
 @interface OSInAppMessageClickEvent : NSObject

iOS_SDK/OneSignalSDK/OneSignal_Core/OneSignalCore.xcframework/ios-arm64/OneSignalCore.framework/Headers/OSNetworkingUtils.h

@@ -29,9 +29,18 @@
 
 // NS_ASSUME_NONNULL_BEGIN
 
+typedef NS_ENUM(NSInteger, OSResponseStatusType) {
+    OSResponseStatusInvalid = 0,
+    OSResponseStatusRetryable,
+    OSResponseStatusUnauthorized,
+    OSResponseStatusMissing,
+    OSResponseStatusConflict
+};
+
 @interface OSNetworkingUtils : NSObject
 
 + (NSNumber*)getNetType;
++ (OSResponseStatusType)getResponseStatusType:(NSInteger)statusCode;
 
 @end
 

iOS_SDK/OneSignalSDK/OneSignal_Core/OneSignalCore.xcframework/ios-arm64/OneSignalCore.framework/Headers/OneSignalCommonDefines.h

@@ -46,7 +46,7 @@
 // "*" in comment line ending comment means the string value has not been changed
 // App
 
-#define ONESIGNAL_VERSION                                                   @"050000-beta-04"
+#define ONESIGNAL_VERSION                                                   @"050000-beta-05"
 
 #define OSUD_APP_ID                                                         @"GT_APP_ID"                                                        // * OSUD_APP_ID
 #define OSUD_REGISTERED_WITH_APPLE                                          @"GT_REGISTERED_WITH_APPLE"                                         // * OSUD_REGISTERED_WITH_APPLE
@@ -73,7 +73,6 @@
 
 // Notification
 #define OSUD_LAST_MESSAGE_OPENED                                            @"GT_LAST_MESSAGE_OPENED_"                                          // * OSUD_MOST_RECENT_NOTIFICATION_OPENED
-#define OSUD_NOTIFICATION_OPEN_LAUNCH_URL                                   @"ONESIGNAL_INAPP_LAUNCH_URL"                                       // * OSUD_NOTIFICATION_OPEN_LAUNCH_URL
 #define OSUD_TEMP_CACHED_NOTIFICATION_MEDIA                                 @"OSUD_TEMP_CACHED_NOTIFICATION_MEDIA"                              // OSUD_TEMP_CACHED_NOTIFICATION_MEDIA
 // Remote Params
 #define OSUD_LOCATION_ENABLED                                               @"OSUD_LOCATION_ENABLED"

iOS_SDK/OneSignalSDK/OneSignal_Core/OneSignalCore.xcframework/ios-arm64/OneSignalCore.framework/_CodeSignature/CodeResources

@@ -22,11 +22,11 @@
 		</data>
 		<key>Headers/OSDialogInstanceManager.h</key>
 		<data>
-		PnoiGb2/H8T+q91po5vPVhJMXnA=
+		e5mWq3a0PQfTjU5ei4329nYUfwc=
 		</data>
 		<key>Headers/OSInAppMessages.h</key>
 		<data>
-		kLOYPt+CCWi1xnLW2MlfLbW5zTs=
+		IR0wqr+0bgd4ZnDqeU0WgCPaQTo=
 		</data>
 		<key>Headers/OSJSONHandling.h</key>
 		<data>
@@ -42,7 +42,7 @@
 		</data>
 		<key>Headers/OSNetworkingUtils.h</key>
 		<data>
-		LwlsUTJlqWyOXjg5jrd2MiXaYUI=
+		x0y2o36axCWvOHRlZxY5hsZ4jmw=
 		</data>
 		<key>Headers/OSNotification+Internal.h</key>
 		<data>
@@ -78,7 +78,7 @@
 		</data>
 		<key>Headers/OneSignalCommonDefines.h</key>
 		<data>
-		+N7k2jIA3ZaBhEztcix73b02a20=
+		uHYlD8bJiNKR8QzLmqwEWAI97aI=
 		</data>
 		<key>Headers/OneSignalConfigManager.h</key>
 		<data>
@@ -126,7 +126,7 @@
 		</data>
 		<key>Info.plist</key>
 		<data>
-		L6p44oaeRTfpPlKUSAeu5FAg51s=
+		Lyjp8I+wDo/kAOMMY6qAvVZwsYE=
 		</data>
 		<key>Modules/module.modulemap</key>
 		<data>
@@ -167,14 +167,14 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			VHQRipAjzHtXPkUXXH4YvMFBZS9BgNyDe0llpuFstT8=
+			TZyL4I0k2RDNt3IPxABcOPcjrjywMJ0x1SZXMXeiqxA=
 			</data>
 		</dict>
 		<key>Headers/OSInAppMessages.h</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			VVEqvqs8Gzc3GkvFEX3QgAqaIgKK/CuLd3DzILUGY10=
+			bqHvuK40s5I7ykwwB/ucIDu8LyZcKLMOGagHfuOpUKY=
 			</data>
 		</dict>
 		<key>Headers/OSJSONHandling.h</key>
@@ -202,7 +202,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			ItFeaL2odYTkJOQJKL87zSdrc69fJx36bv6/fi0gBDQ=
+			ZGA1WvJrfJUvBvSHYQC2gW9v2qpNNy33Dm9rbTNxWPM=
 			</data>
 		</dict>
 		<key>Headers/OSNotification+Internal.h</key>
@@ -265,7 +265,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			ENsLsP7gO776lLDSfWvmQHzU0aItDxEwA1eqaGh2aXM=
+			dmtJ19jPyMhNxQvmD+4cxNgXxOVOEX8vJm2u/G1oF30=
 			</data>
 		</dict>
 		<key>Headers/OneSignalConfigManager.h</key>

iOS_SDK/OneSignalSDK/OneSignal_Core/OneSignalCore.xcframework/ios-arm64_x86_64-maccatalyst/OneSignalCore.framework/Versions/A/Headers/OSDialogInstanceManager.h

@@ -1,10 +1,29 @@
-//
-//  OSDialogPresenter.h
-//  OneSignal
-//
-//  Created by Elliot Mawby on 11/2/22.
-//  Copyright © 2022 Hiptic. All rights reserved.
-//
+/*
+ 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 <Foundation/Foundation.h>
 

iOS_SDK/OneSignalSDK/OneSignal_Core/OneSignalCore.xcframework/ios-arm64_x86_64-maccatalyst/OneSignalCore.framework/Versions/A/Headers/OSInAppMessages.h

@@ -33,7 +33,7 @@
 
 @property (strong, nonatomic, nonnull) NSString *messageId;
 
-// Convert the object into a NSDictionary
+// Dictionary of properties available on OSInAppMessage only
 - (NSDictionary *_Nonnull)jsonRepresentation;
 
 @end
@@ -78,18 +78,22 @@ typedef NS_ENUM(NSUInteger, OSInAppMessageActionUrlType) {
 
 @interface OSInAppMessageWillDisplayEvent : NSObject
 @property (nonatomic, readonly, nonnull) OSInAppMessage *message;
+- (NSDictionary *_Nonnull)jsonRepresentation;
 @end
 
 @interface OSInAppMessageDidDisplayEvent : NSObject
 @property (nonatomic, readonly, nonnull) OSInAppMessage *message;
+- (NSDictionary *_Nonnull)jsonRepresentation;
 @end
 
 @interface OSInAppMessageWillDismissEvent : NSObject
 @property (nonatomic, readonly, nonnull) OSInAppMessage *message;
+- (NSDictionary *_Nonnull)jsonRepresentation;
 @end
 
 @interface OSInAppMessageDidDismissEvent : NSObject
 @property (nonatomic, readonly, nonnull) OSInAppMessage *message;
+- (NSDictionary *_Nonnull)jsonRepresentation;
 @end
 
 @interface OSInAppMessageClickEvent : NSObject