adding OSInAppMessage public class with the messageId property

Using this new class in our IAM Lifecycle Handler Methods

Author: emawby

iOS_SDK/OneSignalSDK/Source/OSInAppMessageInternal.h

@@ -34,9 +34,8 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface OSInAppMessageInternal : NSObject <NSCoding, OSJSONDecodable, OSJSONEncodable>
+@interface OSInAppMessageInternal : OSInAppMessage <NSCoding, OSJSONDecodable, OSJSONEncodable>
 
-@property (strong, nonatomic, nonnull) NSString *messageId;
 @property (strong, nonatomic, nonnull) NSDictionary<NSString *, NSDictionary <NSString *, NSString *> *> *variants;
 @property (strong, nonatomic, nonnull) NSArray<NSArray <OSTrigger *> *> *triggers;
 

iOS_SDK/OneSignalSDK/Source/OSInAppMessageInternal.m

@@ -205,7 +205,7 @@ - (NSUInteger)hash {
 }
 
 - (void)encodeWithCoder:(NSCoder *)encoder {
-    [encoder encodeObject:_messageId forKey:@"messageId"];
+    [encoder encodeObject:self.messageId forKey:@"messageId"];
     [encoder encodeObject:_variants forKey:@"variants"];
     [encoder encodeObject:_triggers forKey:@"triggers"];
     [encoder encodeObject:_displayStats forKey:@"displayStats"];
@@ -217,7 +217,7 @@ - (void)encodeWithCoder:(NSCoder *)encoder {
 
 - (id)initWithCoder:(NSCoder *)decoder {
     if (self = [super init]) {
-        _messageId = [decoder decodeObjectForKey:@"messageId"];
+        self.messageId = [decoder decodeObjectForKey:@"messageId"];
         _variants = [decoder decodeObjectForKey:@"variants"];
         _triggers = [decoder decodeObjectForKey:@"triggers"];
         _displayStats = [decoder decodeObjectForKey:@"displayStats"];

iOS_SDK/OneSignalSDK/Source/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;
@@ -208,10 +214,10 @@ typedef NS_ENUM(NSUInteger, OSNotificationActionType)  {
 @protocol OSInAppMessageDelegate <NSObject>
 @optional
 - (void)handleMessageAction:(OSInAppMessageAction * _Nonnull)action NS_SWIFT_NAME(handleMessageAction(action:));
-- (void)onWillDisplayInAppMessage:(NSString *)message;
-- (void)onDidDisplayInAppMessage:(NSString *)message;
-- (void)onWillDismissInAppMessage:(NSString *)message;
-- (void)onDidDismissInAppMessage:(NSString *)message;
+- (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