Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion OneSignal.podspec
Original file line number Diff line number Diff line change
@@ -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' }
Expand Down
2 changes: 1 addition & 1 deletion OneSignalDynamic.podspec
Original file line number Diff line number Diff line change
@@ -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' }
Expand Down
4 changes: 2 additions & 2 deletions OneSignalXCFramework.podspec
Original file line number Diff line number Diff line change
@@ -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"}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -210,6 +216,14 @@ typedef NS_ENUM(NSUInteger, OSNotificationActionType) {
- (void)handleMessageAction:(OSInAppMessageAction * _Nonnull)action NS_SWIFT_NAME(handleMessageAction(action:));
@end

@protocol OSInAppMessageLifecycleHandler <NSObject>
@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 */
Expand Down Expand Up @@ -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<OSInAppMessageLifecycleHandler> *_Nullable)delegate;

#pragma mark Post Notification
+ (void)postNotification:(NSDictionary* _Nonnull)jsonData;
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,17 @@
<array>
<dict>
<key>LibraryIdentifier</key>
<string>ios-arm64_x86_64-maccatalyst</string>
<string>ios-arm64_armv7_armv7s</string>
<key>LibraryPath</key>
<string>OneSignal.framework</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>x86_64</string>
<string>armv7</string>
<string>armv7s</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
<key>SupportedPlatformVariant</key>
<string>maccatalyst</string>
</dict>
<dict>
<key>LibraryIdentifier</key>
Expand All @@ -37,17 +36,18 @@
</dict>
<dict>
<key>LibraryIdentifier</key>
<string>ios-arm64_armv7_armv7s</string>
<string>ios-arm64_x86_64-maccatalyst</string>
<key>LibraryPath</key>
<string>OneSignal.framework</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>armv7</string>
<string>armv7s</string>
<string>x86_64</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
<key>SupportedPlatformVariant</key>
<string>maccatalyst</string>
</dict>
</array>
<key>CFBundlePackageType</key>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -210,6 +216,14 @@ typedef NS_ENUM(NSUInteger, OSNotificationActionType) {
- (void)handleMessageAction:(OSInAppMessageAction * _Nonnull)action NS_SWIFT_NAME(handleMessageAction(action:));
@end

@protocol OSInAppMessageLifecycleHandler <NSObject>
@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 */
Expand Down Expand Up @@ -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<OSInAppMessageLifecycleHandler> *_Nullable)delegate;

#pragma mark Post Notification
+ (void)postNotification:(NSDictionary* _Nonnull)jsonData;
Expand Down
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -210,6 +216,14 @@ typedef NS_ENUM(NSUInteger, OSNotificationActionType) {
- (void)handleMessageAction:(OSInAppMessageAction * _Nonnull)action NS_SWIFT_NAME(handleMessageAction(action:));
@end

@protocol OSInAppMessageLifecycleHandler <NSObject>
@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 */
Expand Down Expand Up @@ -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<OSInAppMessageLifecycleHandler> *_Nullable)delegate;

#pragma mark Post Notification
+ (void)postNotification:(NSDictionary* _Nonnull)jsonData;
Expand Down
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
<dict>
<key>Headers/OneSignal.h</key>
<data>
+5RuY6/iQhV7bDrd1Jqm3MA0qtE=
wUODJ2TiiriA6l4LCjoG4u3Fmq8=
</data>
<key>Info.plist</key>
<data>
lleSWDDyV7LxO6eklA9wNMnXLOQ=
Y6uLBrIYgaJIC3RViHz0tm6VXv8=
</data>
<key>Modules/module.modulemap</key>
<data>
Expand All @@ -23,11 +23,11 @@
<dict>
<key>hash</key>
<data>
+5RuY6/iQhV7bDrd1Jqm3MA0qtE=
wUODJ2TiiriA6l4LCjoG4u3Fmq8=
</data>
<key>hash2</key>
<data>
xReNp86WG/EDKkzut25w6kqbAn57pZ7SEKQejDlKV10=
VVenTFRGpn21k6NwqiQoy0atqCtjFjDl23bo88t6r0w=
</data>
</dict>
<key>Modules/module.modulemap</key>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -210,6 +216,14 @@ typedef NS_ENUM(NSUInteger, OSNotificationActionType) {
- (void)handleMessageAction:(OSInAppMessageAction * _Nonnull)action NS_SWIFT_NAME(handleMessageAction(action:));
@end

@protocol OSInAppMessageLifecycleHandler <NSObject>
@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 */
Expand Down Expand Up @@ -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<OSInAppMessageLifecycleHandler> *_Nullable)delegate;

#pragma mark Post Notification
+ (void)postNotification:(NSDictionary* _Nonnull)jsonData;
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,19 @@
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
<string>13A5212g</string>
<string>12E262</string>
<key>DTPlatformName</key>
<string>macosx</string>
<key>DTPlatformVersion</key>
<string>12.0</string>
<string>11.3</string>
<key>DTSDKBuild</key>
<string>21A5304f</string>
<string>20E214</string>
<key>DTSDKName</key>
<string>macosx12.0</string>
<string>macosx11.3</string>
<key>DTXcode</key>
<string>1300</string>
<string>1250</string>
<key>DTXcodeBuild</key>
<string>13A5212g</string>
<string>12E262</string>
<key>LSMinimumSystemVersion</key>
<string>10.15</string>
<key>UIDeviceFamily</key>
Expand Down
2 changes: 1 addition & 1 deletion iOS_SDK/OneSignalSDK/Source/OneSignal.m
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
15 changes: 15 additions & 0 deletions iOS_SDK/OneSignalSDK/SwiftPM/Public/Headers/OneSignal/OneSignal.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -210,6 +216,14 @@ typedef NS_ENUM(NSUInteger, OSNotificationActionType) {
- (void)handleMessageAction:(OSInAppMessageAction * _Nonnull)action NS_SWIFT_NAME(handleMessageAction(action:));
@end

@protocol OSInAppMessageLifecycleHandler <NSObject>
@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 */
Expand Down Expand Up @@ -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<OSInAppMessageLifecycleHandler> *_Nullable)delegate;

#pragma mark Post Notification
+ (void)postNotification:(NSDictionary* _Nonnull)jsonData;
Expand Down