diff --git a/OneSignal.podspec b/OneSignal.podspec index 2bfdd19d9..74c83ea03 100755 --- a/OneSignal.podspec +++ b/OneSignal.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "OneSignal" - s.version = "3.6.2" + s.version = "3.7.0" s.summary = "OneSignal push notification library for mobile apps." s.homepage = "https://onesignal.com" s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/OneSignalDynamic.podspec b/OneSignalDynamic.podspec index 53e67bfda..b90981fd2 100644 --- a/OneSignalDynamic.podspec +++ b/OneSignalDynamic.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "OneSignalDynamic" - s.version = "3.6.2" + s.version = "3.7.0" s.summary = "OneSignal push notification library for mobile apps." s.homepage = "https://onesignal.com" s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/OneSignalXCFramework.podspec b/OneSignalXCFramework.podspec index 20c28e004..04dcc5c06 100644 --- a/OneSignalXCFramework.podspec +++ b/OneSignalXCFramework.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = "OneSignalXCFramework" - s.version = "3.6.2" - s.summary = "OneSignal push notification library for mobile apps." + s.version = "3.7.0" +r s.summary = "OneSignal push notification library for mobile apps." s.homepage = "https://onesignal.com" s.license = { :type => 'MIT', :file => 'LICENSE' } s.author = { "Joseph Kalash" => "joseph@onesignal.com", "Josh Kasten" => "josh@onesignal.com" , "Brad Hesse" => "brad@onesignal.com"} diff --git a/iOS_SDK/OneSignalSDK/Framework/OneSignal.framework/Versions/A/Headers/OneSignal.h b/iOS_SDK/OneSignalSDK/Framework/OneSignal.framework/Versions/A/Headers/OneSignal.h index 8a67642ef..1e81e4d3d 100755 --- a/iOS_SDK/OneSignalSDK/Framework/OneSignal.framework/Versions/A/Headers/OneSignal.h +++ b/iOS_SDK/OneSignalSDK/Framework/OneSignal.framework/Versions/A/Headers/OneSignal.h @@ -156,6 +156,12 @@ typedef NS_ENUM(NSUInteger, OSNotificationActionType) { @end; +@interface OSInAppMessage : NSObject + +@property (strong, nonatomic, nonnull) NSString *messageId; + +@end + @interface OSInAppMessageOutcome : NSObject @property (strong, nonatomic, nonnull) NSString *name; @@ -210,6 +216,14 @@ typedef NS_ENUM(NSUInteger, OSNotificationActionType) { - (void)handleMessageAction:(OSInAppMessageAction * _Nonnull)action NS_SWIFT_NAME(handleMessageAction(action:)); @end +@protocol OSInAppMessageLifecycleHandler +@optional +- (void)onWillDisplayInAppMessage:(OSInAppMessage *)message; +- (void)onDidDisplayInAppMessage:(OSInAppMessage *)message; +- (void)onWillDismissInAppMessage:(OSInAppMessage *)message; +- (void)onDidDismissInAppMessage:(OSInAppMessage *)message; +@end + // Pass in nil means a notification will not display typedef void (^OSNotificationDisplayResponse)(OSNotification* _Nullable notification); /* OneSignal Influence Types */ @@ -472,6 +486,7 @@ typedef void (^OSInAppMessageClickBlock)(OSInAppMessageAction * _Nonnull action) + (void)setNotificationWillShowInForegroundHandler:(OSNotificationWillShowInForegroundBlock _Nullable)block; + (void)setNotificationOpenedHandler:(OSNotificationOpenedBlock _Nullable)block; + (void)setInAppMessageClickHandler:(OSInAppMessageClickBlock _Nullable)block; ++ (void)setInAppMessageLifecycleHandler:(NSObject *_Nullable)delegate; #pragma mark Post Notification + (void)postNotification:(NSDictionary* _Nonnull)jsonData; diff --git a/iOS_SDK/OneSignalSDK/Framework/OneSignal.framework/Versions/A/OneSignal b/iOS_SDK/OneSignalSDK/Framework/OneSignal.framework/Versions/A/OneSignal index 128848ef8..c90d56d9b 100644 Binary files a/iOS_SDK/OneSignalSDK/Framework/OneSignal.framework/Versions/A/OneSignal and b/iOS_SDK/OneSignalSDK/Framework/OneSignal.framework/Versions/A/OneSignal differ diff --git a/iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignal.xcframework/Info.plist b/iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignal.xcframework/Info.plist index f93106650..786244220 100644 --- a/iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignal.xcframework/Info.plist +++ b/iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignal.xcframework/Info.plist @@ -6,18 +6,17 @@ LibraryIdentifier - ios-arm64_x86_64-maccatalyst + ios-arm64_armv7_armv7s LibraryPath OneSignal.framework SupportedArchitectures arm64 - x86_64 + armv7 + armv7s SupportedPlatform ios - SupportedPlatformVariant - maccatalyst LibraryIdentifier @@ -37,17 +36,18 @@ LibraryIdentifier - ios-arm64_armv7_armv7s + ios-arm64_x86_64-maccatalyst LibraryPath OneSignal.framework SupportedArchitectures arm64 - armv7 - armv7s + x86_64 SupportedPlatform ios + SupportedPlatformVariant + maccatalyst CFBundlePackageType diff --git a/iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignal.xcframework/ios-arm64_armv7_armv7s/OneSignal.framework/Headers/OneSignal.h b/iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignal.xcframework/ios-arm64_armv7_armv7s/OneSignal.framework/Headers/OneSignal.h index 8a67642ef..1e81e4d3d 100755 --- a/iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignal.xcframework/ios-arm64_armv7_armv7s/OneSignal.framework/Headers/OneSignal.h +++ b/iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignal.xcframework/ios-arm64_armv7_armv7s/OneSignal.framework/Headers/OneSignal.h @@ -156,6 +156,12 @@ typedef NS_ENUM(NSUInteger, OSNotificationActionType) { @end; +@interface OSInAppMessage : NSObject + +@property (strong, nonatomic, nonnull) NSString *messageId; + +@end + @interface OSInAppMessageOutcome : NSObject @property (strong, nonatomic, nonnull) NSString *name; @@ -210,6 +216,14 @@ typedef NS_ENUM(NSUInteger, OSNotificationActionType) { - (void)handleMessageAction:(OSInAppMessageAction * _Nonnull)action NS_SWIFT_NAME(handleMessageAction(action:)); @end +@protocol OSInAppMessageLifecycleHandler +@optional +- (void)onWillDisplayInAppMessage:(OSInAppMessage *)message; +- (void)onDidDisplayInAppMessage:(OSInAppMessage *)message; +- (void)onWillDismissInAppMessage:(OSInAppMessage *)message; +- (void)onDidDismissInAppMessage:(OSInAppMessage *)message; +@end + // Pass in nil means a notification will not display typedef void (^OSNotificationDisplayResponse)(OSNotification* _Nullable notification); /* OneSignal Influence Types */ @@ -472,6 +486,7 @@ typedef void (^OSInAppMessageClickBlock)(OSInAppMessageAction * _Nonnull action) + (void)setNotificationWillShowInForegroundHandler:(OSNotificationWillShowInForegroundBlock _Nullable)block; + (void)setNotificationOpenedHandler:(OSNotificationOpenedBlock _Nullable)block; + (void)setInAppMessageClickHandler:(OSInAppMessageClickBlock _Nullable)block; ++ (void)setInAppMessageLifecycleHandler:(NSObject *_Nullable)delegate; #pragma mark Post Notification + (void)postNotification:(NSDictionary* _Nonnull)jsonData; diff --git a/iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignal.xcframework/ios-arm64_armv7_armv7s/OneSignal.framework/Info.plist b/iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignal.xcframework/ios-arm64_armv7_armv7s/OneSignal.framework/Info.plist index 173fd9112..7ac439539 100644 Binary files a/iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignal.xcframework/ios-arm64_armv7_armv7s/OneSignal.framework/Info.plist and b/iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignal.xcframework/ios-arm64_armv7_armv7s/OneSignal.framework/Info.plist differ diff --git a/iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignal.xcframework/ios-arm64_armv7_armv7s/OneSignal.framework/OneSignal b/iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignal.xcframework/ios-arm64_armv7_armv7s/OneSignal.framework/OneSignal index 39eb159a1..f28ce41bd 100755 Binary files a/iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignal.xcframework/ios-arm64_armv7_armv7s/OneSignal.framework/OneSignal and b/iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignal.xcframework/ios-arm64_armv7_armv7s/OneSignal.framework/OneSignal differ diff --git a/iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignal.xcframework/ios-arm64_i386_x86_64-simulator/OneSignal.framework/Headers/OneSignal.h b/iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignal.xcframework/ios-arm64_i386_x86_64-simulator/OneSignal.framework/Headers/OneSignal.h index 8a67642ef..1e81e4d3d 100755 --- a/iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignal.xcframework/ios-arm64_i386_x86_64-simulator/OneSignal.framework/Headers/OneSignal.h +++ b/iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignal.xcframework/ios-arm64_i386_x86_64-simulator/OneSignal.framework/Headers/OneSignal.h @@ -156,6 +156,12 @@ typedef NS_ENUM(NSUInteger, OSNotificationActionType) { @end; +@interface OSInAppMessage : NSObject + +@property (strong, nonatomic, nonnull) NSString *messageId; + +@end + @interface OSInAppMessageOutcome : NSObject @property (strong, nonatomic, nonnull) NSString *name; @@ -210,6 +216,14 @@ typedef NS_ENUM(NSUInteger, OSNotificationActionType) { - (void)handleMessageAction:(OSInAppMessageAction * _Nonnull)action NS_SWIFT_NAME(handleMessageAction(action:)); @end +@protocol OSInAppMessageLifecycleHandler +@optional +- (void)onWillDisplayInAppMessage:(OSInAppMessage *)message; +- (void)onDidDisplayInAppMessage:(OSInAppMessage *)message; +- (void)onWillDismissInAppMessage:(OSInAppMessage *)message; +- (void)onDidDismissInAppMessage:(OSInAppMessage *)message; +@end + // Pass in nil means a notification will not display typedef void (^OSNotificationDisplayResponse)(OSNotification* _Nullable notification); /* OneSignal Influence Types */ @@ -472,6 +486,7 @@ typedef void (^OSInAppMessageClickBlock)(OSInAppMessageAction * _Nonnull action) + (void)setNotificationWillShowInForegroundHandler:(OSNotificationWillShowInForegroundBlock _Nullable)block; + (void)setNotificationOpenedHandler:(OSNotificationOpenedBlock _Nullable)block; + (void)setInAppMessageClickHandler:(OSInAppMessageClickBlock _Nullable)block; ++ (void)setInAppMessageLifecycleHandler:(NSObject *_Nullable)delegate; #pragma mark Post Notification + (void)postNotification:(NSDictionary* _Nonnull)jsonData; diff --git a/iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignal.xcframework/ios-arm64_i386_x86_64-simulator/OneSignal.framework/Info.plist b/iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignal.xcframework/ios-arm64_i386_x86_64-simulator/OneSignal.framework/Info.plist index 1c5b24ad7..cb841befd 100644 Binary files a/iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignal.xcframework/ios-arm64_i386_x86_64-simulator/OneSignal.framework/Info.plist and b/iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignal.xcframework/ios-arm64_i386_x86_64-simulator/OneSignal.framework/Info.plist differ diff --git a/iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignal.xcframework/ios-arm64_i386_x86_64-simulator/OneSignal.framework/OneSignal b/iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignal.xcframework/ios-arm64_i386_x86_64-simulator/OneSignal.framework/OneSignal index 8f34e3121..3b7034fe0 100755 Binary files a/iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignal.xcframework/ios-arm64_i386_x86_64-simulator/OneSignal.framework/OneSignal and b/iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignal.xcframework/ios-arm64_i386_x86_64-simulator/OneSignal.framework/OneSignal differ diff --git a/iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignal.xcframework/ios-arm64_i386_x86_64-simulator/OneSignal.framework/_CodeSignature/CodeResources b/iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignal.xcframework/ios-arm64_i386_x86_64-simulator/OneSignal.framework/_CodeSignature/CodeResources index 880e23467..05b4efa59 100644 --- a/iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignal.xcframework/ios-arm64_i386_x86_64-simulator/OneSignal.framework/_CodeSignature/CodeResources +++ b/iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignal.xcframework/ios-arm64_i386_x86_64-simulator/OneSignal.framework/_CodeSignature/CodeResources @@ -6,11 +6,11 @@ Headers/OneSignal.h - +5RuY6/iQhV7bDrd1Jqm3MA0qtE= + wUODJ2TiiriA6l4LCjoG4u3Fmq8= Info.plist - lleSWDDyV7LxO6eklA9wNMnXLOQ= + Y6uLBrIYgaJIC3RViHz0tm6VXv8= Modules/module.modulemap @@ -23,11 +23,11 @@ hash - +5RuY6/iQhV7bDrd1Jqm3MA0qtE= + wUODJ2TiiriA6l4LCjoG4u3Fmq8= hash2 - xReNp86WG/EDKkzut25w6kqbAn57pZ7SEKQejDlKV10= + VVenTFRGpn21k6NwqiQoy0atqCtjFjDl23bo88t6r0w= Modules/module.modulemap diff --git a/iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignal.xcframework/ios-arm64_x86_64-maccatalyst/OneSignal.framework/Versions/A/Headers/OneSignal.h b/iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignal.xcframework/ios-arm64_x86_64-maccatalyst/OneSignal.framework/Versions/A/Headers/OneSignal.h index 8a67642ef..1e81e4d3d 100755 --- a/iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignal.xcframework/ios-arm64_x86_64-maccatalyst/OneSignal.framework/Versions/A/Headers/OneSignal.h +++ b/iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignal.xcframework/ios-arm64_x86_64-maccatalyst/OneSignal.framework/Versions/A/Headers/OneSignal.h @@ -156,6 +156,12 @@ typedef NS_ENUM(NSUInteger, OSNotificationActionType) { @end; +@interface OSInAppMessage : NSObject + +@property (strong, nonatomic, nonnull) NSString *messageId; + +@end + @interface OSInAppMessageOutcome : NSObject @property (strong, nonatomic, nonnull) NSString *name; @@ -210,6 +216,14 @@ typedef NS_ENUM(NSUInteger, OSNotificationActionType) { - (void)handleMessageAction:(OSInAppMessageAction * _Nonnull)action NS_SWIFT_NAME(handleMessageAction(action:)); @end +@protocol OSInAppMessageLifecycleHandler +@optional +- (void)onWillDisplayInAppMessage:(OSInAppMessage *)message; +- (void)onDidDisplayInAppMessage:(OSInAppMessage *)message; +- (void)onWillDismissInAppMessage:(OSInAppMessage *)message; +- (void)onDidDismissInAppMessage:(OSInAppMessage *)message; +@end + // Pass in nil means a notification will not display typedef void (^OSNotificationDisplayResponse)(OSNotification* _Nullable notification); /* OneSignal Influence Types */ @@ -472,6 +486,7 @@ typedef void (^OSInAppMessageClickBlock)(OSInAppMessageAction * _Nonnull action) + (void)setNotificationWillShowInForegroundHandler:(OSNotificationWillShowInForegroundBlock _Nullable)block; + (void)setNotificationOpenedHandler:(OSNotificationOpenedBlock _Nullable)block; + (void)setInAppMessageClickHandler:(OSInAppMessageClickBlock _Nullable)block; ++ (void)setInAppMessageLifecycleHandler:(NSObject *_Nullable)delegate; #pragma mark Post Notification + (void)postNotification:(NSDictionary* _Nonnull)jsonData; diff --git a/iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignal.xcframework/ios-arm64_x86_64-maccatalyst/OneSignal.framework/Versions/A/OneSignal b/iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignal.xcframework/ios-arm64_x86_64-maccatalyst/OneSignal.framework/Versions/A/OneSignal index e0a9b9a9f..eced3c007 100755 Binary files a/iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignal.xcframework/ios-arm64_x86_64-maccatalyst/OneSignal.framework/Versions/A/OneSignal and b/iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignal.xcframework/ios-arm64_x86_64-maccatalyst/OneSignal.framework/Versions/A/OneSignal differ diff --git a/iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignal.xcframework/ios-arm64_x86_64-maccatalyst/OneSignal.framework/Versions/A/Resources/Info.plist b/iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignal.xcframework/ios-arm64_x86_64-maccatalyst/OneSignal.framework/Versions/A/Resources/Info.plist index 1dfc2283d..0a4ad06bf 100644 --- a/iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignal.xcframework/ios-arm64_x86_64-maccatalyst/OneSignal.framework/Versions/A/Resources/Info.plist +++ b/iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignal.xcframework/ios-arm64_x86_64-maccatalyst/OneSignal.framework/Versions/A/Resources/Info.plist @@ -27,19 +27,19 @@ DTCompiler com.apple.compilers.llvm.clang.1_0 DTPlatformBuild - 13A5212g + 12E262 DTPlatformName macosx DTPlatformVersion - 12.0 + 11.3 DTSDKBuild - 21A5304f + 20E214 DTSDKName - macosx12.0 + macosx11.3 DTXcode - 1300 + 1250 DTXcodeBuild - 13A5212g + 12E262 LSMinimumSystemVersion 10.15 UIDeviceFamily diff --git a/iOS_SDK/OneSignalSDK/Source/OneSignal.m b/iOS_SDK/OneSignalSDK/Source/OneSignal.m index 4fe58d5fd..7835a7d0c 100755 --- a/iOS_SDK/OneSignalSDK/Source/OneSignal.m +++ b/iOS_SDK/OneSignalSDK/Source/OneSignal.m @@ -130,7 +130,7 @@ @interface OneSignal (SessionStatusDelegate) @implementation OneSignal -NSString* const ONESIGNAL_VERSION = @"030602"; +NSString* const ONESIGNAL_VERSION = @"030700"; static NSString* mSDKType = @"native"; static BOOL coldStartFromTapOnNotification = NO; static BOOL shouldDelaySubscriptionUpdate = false; diff --git a/iOS_SDK/OneSignalSDK/SwiftPM/Public/Headers/OneSignal/OneSignal.h b/iOS_SDK/OneSignalSDK/SwiftPM/Public/Headers/OneSignal/OneSignal.h index 8a67642ef..1e81e4d3d 100755 --- a/iOS_SDK/OneSignalSDK/SwiftPM/Public/Headers/OneSignal/OneSignal.h +++ b/iOS_SDK/OneSignalSDK/SwiftPM/Public/Headers/OneSignal/OneSignal.h @@ -156,6 +156,12 @@ typedef NS_ENUM(NSUInteger, OSNotificationActionType) { @end; +@interface OSInAppMessage : NSObject + +@property (strong, nonatomic, nonnull) NSString *messageId; + +@end + @interface OSInAppMessageOutcome : NSObject @property (strong, nonatomic, nonnull) NSString *name; @@ -210,6 +216,14 @@ typedef NS_ENUM(NSUInteger, OSNotificationActionType) { - (void)handleMessageAction:(OSInAppMessageAction * _Nonnull)action NS_SWIFT_NAME(handleMessageAction(action:)); @end +@protocol OSInAppMessageLifecycleHandler +@optional +- (void)onWillDisplayInAppMessage:(OSInAppMessage *)message; +- (void)onDidDisplayInAppMessage:(OSInAppMessage *)message; +- (void)onWillDismissInAppMessage:(OSInAppMessage *)message; +- (void)onDidDismissInAppMessage:(OSInAppMessage *)message; +@end + // Pass in nil means a notification will not display typedef void (^OSNotificationDisplayResponse)(OSNotification* _Nullable notification); /* OneSignal Influence Types */ @@ -472,6 +486,7 @@ typedef void (^OSInAppMessageClickBlock)(OSInAppMessageAction * _Nonnull action) + (void)setNotificationWillShowInForegroundHandler:(OSNotificationWillShowInForegroundBlock _Nullable)block; + (void)setNotificationOpenedHandler:(OSNotificationOpenedBlock _Nullable)block; + (void)setInAppMessageClickHandler:(OSInAppMessageClickBlock _Nullable)block; ++ (void)setInAppMessageLifecycleHandler:(NSObject *_Nullable)delegate; #pragma mark Post Notification + (void)postNotification:(NSDictionary* _Nonnull)jsonData;