Revert data bundles merge (#4820)

* Revert "added pragma statement to ignore initWithMessageID deprecation warning (#4754)"

This reverts commit e3854995a128c104157a2b1164fcba227d336d11.

* Revert "data bundles for consolidated sdk (#4739)"

This reverts commit 161ef56e0967840ece217ed43617243c8a6149a8.

FirebaseInAppMessaging/Sources/Data/FIRIAMFetchResponseParser.m

@@ -335,20 +335,14 @@
                                                messageName:messageName
                                                contentData:msgData
                                            renderingEffect:renderEffect];
-    NSDictionary *dataBundle = nil;
-    id dataBundleNode = messageNode[@"dataBundle"];
-    if ([dataBundleNode isKindOfClass:[NSDictionary class]]) {
-      dataBundle = dataBundleNode;
-    }
+
     if (isTestMessage) {
       return [[FIRIAMMessageDefinition alloc] initTestMessageWithRenderData:renderData];
     } else {
       return [[FIRIAMMessageDefinition alloc] initWithRenderData:renderData
                                                        startTime:startTimeInSeconds
                                                          endTime:endTimeInSeconds
-                                               triggerDefinition:triggersDefinition
-                                                         appData:dataBundle
-                                                   isTestMessage:NO];
+                                               triggerDefinition:triggersDefinition];
     }
   } @catch (NSException *e) {
     FIRLogWarning(kFIRLoggerInAppMessaging, @"I-IAM900006",

FirebaseInAppMessaging/Sources/Data/FIRIAMMessageDefinition.m

@@ -36,39 +36,23 @@
 - (instancetype)initWithRenderData:(FIRIAMMessageRenderData *)renderData
                          startTime:(NSTimeInterval)startTime
                            endTime:(NSTimeInterval)endTime
-                 triggerDefinition:(NSArray<FIRIAMDisplayTriggerDefinition *> *)renderTriggers
-                           appData:(nullable NSDictionary *)appData
-                     isTestMessage:(BOOL)isTestMessage {
+                 triggerDefinition:(NSArray<FIRIAMDisplayTriggerDefinition *> *)renderTriggers {
   if (self = [super init]) {
     _renderData = renderData;
     _renderTriggers = renderTriggers;
     _startTime = startTime;
     _endTime = endTime;
-    _isTestMessage = isTestMessage;
-    _appData = [appData copy];
+    _isTestMessage = NO;
   }
   return self;
 }
 
-- (instancetype)initWithRenderData:(FIRIAMMessageRenderData *)renderData
-                         startTime:(NSTimeInterval)startTime
-                           endTime:(NSTimeInterval)endTime
-                 triggerDefinition:(NSArray<FIRIAMDisplayTriggerDefinition *> *)renderTriggers {
-  return [self initWithRenderData:renderData
-                        startTime:startTime
-                          endTime:endTime
-                triggerDefinition:renderTriggers
-                          appData:nil
-                    isTestMessage:NO];
-}
-
 - (instancetype)initTestMessageWithRenderData:(FIRIAMMessageRenderData *)renderData {
-  return [self initWithRenderData:renderData
-                        startTime:0
-                          endTime:0
-                triggerDefinition:@[]
-                          appData:nil
-                    isTestMessage:YES];
+  if (self = [super init]) {
+    _renderData = renderData;
+    _isTestMessage = YES;
+  }
+  return self;
 }
 
 - (BOOL)messageHasExpired {

FirebaseInAppMessaging/Sources/Flows/FIRIAMDisplayExecutor.m

@@ -445,8 +445,7 @@
         portraitImageData:portraitImageData
           backgroundColor:renderData.renderingEffectSettings.displayBGColor
       primaryActionButton:primaryActionButton
-         primaryActionURL:definition.renderData.contentData.actionURL
-                  appData:definition.appData];
+         primaryActionURL:definition.renderData.contentData.actionURL];
 
   cardMessage.body = body;
   cardMessage.landscapeImageData = landscapeImageData;
@@ -475,8 +474,7 @@
                 textColor:definition.renderData.renderingEffectSettings.textColor
           backgroundColor:definition.renderData.renderingEffectSettings.displayBGColor
                 imageData:imageData
-                actionURL:definition.renderData.contentData.actionURL
-                  appData:definition.appData];
+                actionURL:definition.renderData.contentData.actionURL];
 #pragma clang diagnostic pop
 
   return bannerMessage;
@@ -494,8 +492,7 @@
       renderAsTestMessage:definition.isTestMessage
               triggerType:triggerType
                 imageData:imageData
-                actionURL:definition.renderData.contentData.actionURL
-                  appData:definition.appData];
+                actionURL:definition.renderData.contentData.actionURL];
 #pragma clang diagnostic pop
 
   return imageOnlyMessage;
@@ -536,8 +533,7 @@
           backgroundColor:renderData.renderingEffectSettings.displayBGColor
                 imageData:imageData
              actionButton:actionButton
-                actionURL:definition.renderData.contentData.actionURL
-                  appData:definition.appData];
+                actionURL:definition.renderData.contentData.actionURL];
 #pragma clang diagnostic pop
 
   return modalViewMessage;

FirebaseInAppMessaging/Sources/Private/Data/FIRIAMMessageDefinition.h

@@ -35,21 +35,11 @@ NS_ASSUME_NONNULL_BEGIN
 /// A flag for client-side testing messages
 @property(nonatomic, readonly) BOOL isTestMessage;
 
-/// Additional key-value pairs that can be optionally sent along with the FIAM
-@property(nonatomic, nullable, readonly) NSDictionary *appData;
-
 - (instancetype)init NS_UNAVAILABLE;
 
 /**
  * Create a regular message definition.
  */
-- (instancetype)initWithRenderData:(FIRIAMMessageRenderData *)renderData
-                         startTime:(NSTimeInterval)startTime
-                           endTime:(NSTimeInterval)endTime
-                 triggerDefinition:(NSArray<FIRIAMDisplayTriggerDefinition *> *)renderTriggers
-                           appData:appData
-                     isTestMessage:(BOOL)isTestMessage NS_DESIGNATED_INITIALIZER;
-
 - (instancetype)initWithRenderData:(FIRIAMMessageRenderData *)renderData
                          startTime:(NSTimeInterval)startTime
                            endTime:(NSTimeInterval)endTime

FirebaseInAppMessaging/Sources/Public/FIRInAppMessagingRendering.h

@@ -164,11 +164,6 @@ NS_SWIFT_NAME(InAppMessagingDisplayMessage)
  */
 @property(nonatomic, readonly) FIRInAppMessagingDisplayTriggerType triggerType;
 
-/**
- * Extra key-value dictionary data that can be sent along with the message
- */
-@property(nonatomic, nullable, readonly) NSDictionary *appData;
-
 /// Unavailable.
 - (instancetype)init NS_UNAVAILABLE;
 

FirebaseInAppMessaging/Sources/RenderingObjects/FIRInAppMessagingRenderingDataClasses.m

@@ -20,26 +20,6 @@
 
 @implementation FIRInAppMessagingDisplayMessage
 
-- (instancetype)initWithMessageID:(NSString *)messageID
-                     campaignName:(NSString *)campaignName
-              renderAsTestMessage:(BOOL)renderAsTestMessage
-                      messageType:(FIRInAppMessagingDisplayMessageType)messageType
-                      triggerType:(FIRInAppMessagingDisplayTriggerType)triggerType
-                          appData:(NSDictionary *)appData {
-  if (self = [super init]) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    _campaignInfo = [[FIRInAppMessagingCampaignInfo alloc] initWithMessageID:messageID
-                                                                campaignName:campaignName
-                                                         renderAsTestMessage:renderAsTestMessage];
-#pragma clang diagnostic pop
-    _type = messageType;
-    _triggerType = triggerType;
-    _appData = [appData copy];
-  }
-  return self;
-}
-
 - (instancetype)initWithMessageID:(NSString *)messageID
                      campaignName:(NSString *)campaignName
               renderAsTestMessage:(BOOL)renderAsTestMessage
@@ -51,11 +31,9 @@
                                                          renderAsTestMessage:renderAsTestMessage];
     _type = messageType;
     _triggerType = triggerType;
-    _appData = nil;
   }
   return self;
 }
-
 @end
 
 @implementation FIRInAppMessagingCardDisplay
@@ -76,36 +54,6 @@
   _secondaryActionURL = secondaryActionURL;
 }
 
-- (instancetype)initWithMessageID:(NSString *)messageID
-                     campaignName:(NSString *)campaignName
-              renderAsTestMessage:(BOOL)renderAsTestMessage
-                      triggerType:(FIRInAppMessagingDisplayTriggerType)triggerType
-                        titleText:(NSString *)title
-                        textColor:(UIColor *)textColor
-                portraitImageData:(FIRInAppMessagingImageData *)portraitImageData
-                  backgroundColor:(UIColor *)backgroundColor
-              primaryActionButton:(FIRInAppMessagingActionButton *)primaryActionButton
-                 primaryActionURL:(NSURL *)primaryActionURL
-                          appData:(NSDictionary *)appData {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-  if (self = [super initWithMessageID:messageID
-                         campaignName:campaignName
-                  renderAsTestMessage:renderAsTestMessage
-                          messageType:FIRInAppMessagingDisplayMessageTypeCard
-                          triggerType:triggerType
-                              appData:appData]) {
-#pragma clang diagnostic pop
-    _title = title;
-    _textColor = textColor;
-    _portraitImageData = portraitImageData;
-    _displayBackgroundColor = backgroundColor;
-    _primaryActionButton = primaryActionButton;
-    _primaryActionURL = primaryActionURL;
-  }
-  return self;
-}
-
 - (instancetype)initWithMessageID:(NSString *)messageID
                      campaignName:(NSString *)campaignName
               renderAsTestMessage:(BOOL)renderAsTestMessage
@@ -122,8 +70,7 @@
                          campaignName:campaignName
                   renderAsTestMessage:renderAsTestMessage
                           messageType:FIRInAppMessagingDisplayMessageTypeCard
-                          triggerType:triggerType
-                              appData:nil]) {
+                          triggerType:triggerType]) {
 #pragma clang diagnostic pop
     _title = title;
     _textColor = textColor;
@@ -138,33 +85,6 @@
 @end
 
 @implementation FIRInAppMessagingBannerDisplay
-- (instancetype)initWithMessageID:(NSString *)messageID
-                     campaignName:(NSString *)campaignName
-              renderAsTestMessage:(BOOL)renderAsTestMessage
-                      triggerType:(FIRInAppMessagingDisplayTriggerType)triggerType
-                        titleText:(NSString *)title
-                         bodyText:(NSString *)bodyText
-                        textColor:(UIColor *)textColor
-                  backgroundColor:(UIColor *)backgroundColor
-                        imageData:(nullable FIRInAppMessagingImageData *)imageData
-                        actionURL:(nullable NSURL *)actionURL
-                          appData:(NSDictionary *)appData {
-  if (self = [super initWithMessageID:messageID
-                         campaignName:campaignName
-                  renderAsTestMessage:renderAsTestMessage
-                          messageType:FIRInAppMessagingDisplayMessageTypeBanner
-                          triggerType:triggerType
-                              appData:appData]) {
-    _title = title;
-    _bodyText = bodyText;
-    _textColor = textColor;
-    _displayBackgroundColor = backgroundColor;
-    _imageData = imageData;
-    _actionURL = actionURL;
-  }
-  return self;
-}
-
 - (instancetype)initWithMessageID:(NSString *)messageID
                      campaignName:(NSString *)campaignName
               renderAsTestMessage:(BOOL)renderAsTestMessage
@@ -179,8 +99,7 @@
                          campaignName:campaignName
                   renderAsTestMessage:renderAsTestMessage
                           messageType:FIRInAppMessagingDisplayMessageTypeBanner
-                          triggerType:triggerType
-                              appData:nil]) {
+                          triggerType:triggerType]) {
     _title = title;
     _bodyText = bodyText;
     _textColor = textColor;
@@ -190,40 +109,10 @@
   }
   return self;
 }
-
 @end
 
 @implementation FIRInAppMessagingModalDisplay
 
-- (instancetype)initWithMessageID:(NSString *)messageID
-                     campaignName:(NSString *)campaignName
-              renderAsTestMessage:(BOOL)renderAsTestMessage
-                      triggerType:(FIRInAppMessagingDisplayTriggerType)triggerType
-                        titleText:(NSString *)title
-                         bodyText:(NSString *)bodyText
-                        textColor:(UIColor *)textColor
-                  backgroundColor:(UIColor *)backgroundColor
-                        imageData:(nullable FIRInAppMessagingImageData *)imageData
-                     actionButton:(nullable FIRInAppMessagingActionButton *)actionButton
-                        actionURL:(nullable NSURL *)actionURL
-                          appData:(nullable NSDictionary *)appData {
-  if (self = [super initWithMessageID:messageID
-                         campaignName:campaignName
-                  renderAsTestMessage:renderAsTestMessage
-                          messageType:FIRInAppMessagingDisplayMessageTypeModal
-                          triggerType:triggerType
-                              appData:appData]) {
-    _title = title;
-    _bodyText = bodyText;
-    _textColor = textColor;
-    _displayBackgroundColor = backgroundColor;
-    _imageData = imageData;
-    _actionButton = actionButton;
-    _actionURL = actionURL;
-  }
-  return self;
-}
-
 - (instancetype)initWithMessageID:(NSString *)messageID
                      campaignName:(NSString *)campaignName
               renderAsTestMessage:(BOOL)renderAsTestMessage
@@ -239,8 +128,7 @@
                          campaignName:campaignName
                   renderAsTestMessage:renderAsTestMessage
                           messageType:FIRInAppMessagingDisplayMessageTypeModal
-                          triggerType:triggerType
-                              appData:nil]) {
+                          triggerType:triggerType]) {
     _title = title;
     _bodyText = bodyText;
     _textColor = textColor;
@@ -255,25 +143,6 @@
 
 @implementation FIRInAppMessagingImageOnlyDisplay
 
-- (instancetype)initWithMessageID:(NSString *)messageID
-                     campaignName:(NSString *)campaignName
-              renderAsTestMessage:(BOOL)renderAsTestMessage
-                      triggerType:(FIRInAppMessagingDisplayTriggerType)triggerType
-                        imageData:(nullable FIRInAppMessagingImageData *)imageData
-                        actionURL:(nullable NSURL *)actionURL
-                          appData:(nullable NSDictionary *)appData {
-  if (self = [super initWithMessageID:messageID
-                         campaignName:campaignName
-                  renderAsTestMessage:renderAsTestMessage
-                          messageType:FIRInAppMessagingDisplayMessageTypeModal
-                          triggerType:triggerType
-                              appData:appData]) {
-    _imageData = imageData;
-    _actionURL = actionURL;
-  }
-  return self;
-}
-
 - (instancetype)initWithMessageID:(NSString *)messageID
                      campaignName:(NSString *)campaignName
               renderAsTestMessage:(BOOL)renderAsTestMessage
@@ -284,8 +153,7 @@
                          campaignName:campaignName
                   renderAsTestMessage:renderAsTestMessage
                           messageType:FIRInAppMessagingDisplayMessageTypeModal
-                          triggerType:triggerType
-                              appData:nil]) {
+                          triggerType:triggerType]) {
     _imageData = imageData;
     _actionURL = actionURL;
   }

FirebaseInAppMessaging/Sources/RenderingObjects/FIRInAppMessagingRenderingPrivate.h

@@ -32,8 +32,7 @@ NS_ASSUME_NONNULL_BEGIN
                 portraitImageData:(FIRInAppMessagingImageData *)portraitImageData
                   backgroundColor:(UIColor *)backgroundColor
               primaryActionButton:(FIRInAppMessagingActionButton *)primaryActionButton
-                 primaryActionURL:(nullable NSURL *)primaryActionURL
-                          appData:(NSDictionary *)appData;
+                 primaryActionURL:(nullable NSURL *)primaryActionURL;
 
 @end
 
@@ -71,8 +70,7 @@ NS_ASSUME_NONNULL_BEGIN
                      campaignName:(NSString *)campaignName
               renderAsTestMessage:(BOOL)renderAsTestMessage
                       messageType:(FIRInAppMessagingDisplayMessageType)messageType
-                      triggerType:(FIRInAppMessagingDisplayTriggerType)triggerType
-                          appData:(NSDictionary *)appData;
+                      triggerType:(FIRInAppMessagingDisplayTriggerType)triggerType;
 
 @end
 
@@ -88,8 +86,7 @@ NS_ASSUME_NONNULL_BEGIN
                   backgroundColor:(UIColor *)backgroundColor
                         imageData:(nullable FIRInAppMessagingImageData *)imageData
                      actionButton:(nullable FIRInAppMessagingActionButton *)actionButton
-                        actionURL:(nullable NSURL *)actionURL
-                          appData:(NSDictionary *)appData;
+                        actionURL:(nullable NSURL *)actionURL;
 
 @end
 
@@ -104,8 +101,7 @@ NS_ASSUME_NONNULL_BEGIN
                         textColor:(UIColor *)textColor
                   backgroundColor:(UIColor *)backgroundColor
                         imageData:(nullable FIRInAppMessagingImageData *)imageData
-                        actionURL:(nullable NSURL *)actionURL
-                          appData:(NSDictionary *)appData;
+                        actionURL:(nullable NSURL *)actionURL;
 
 @end
 
@@ -116,8 +112,7 @@ NS_ASSUME_NONNULL_BEGIN
               renderAsTestMessage:(BOOL)renderAsTestMessage
                       triggerType:(FIRInAppMessagingDisplayTriggerType)triggerType
                         imageData:(nullable FIRInAppMessagingImageData *)imageData
-                        actionURL:(nullable NSURL *)actionURL
-                          appData:(NSDictionary *)appData;
+                        actionURL:(nullable NSURL *)actionURL;
 
 @end
 

FirebaseInAppMessaging/Tests/Unit/FIRIAMDisplayExecutorTests.m

@@ -101,7 +101,7 @@ typedef NS_ENUM(NSInteger, FIRInAppMessagingDelegateInteraction) {
 @property FIRInAppMessagingDelegateInteraction delegateInteraction;
 @property(nonatomic, nullable, copy) FIRInAppMessagingAction *action;
 
-// used for interaction verification
+// used for interaction verificatio
 @property FIRInAppMessagingDisplayMessage *message;
 - (instancetype)initWithDelegateInteraction:(FIRInAppMessagingDelegateInteraction)interaction
                                      action:(nullable FIRInAppMessagingAction *)actionURL;
@@ -179,14 +179,6 @@ typedef NS_ENUM(NSInteger, FIRInAppMessagingDelegateInteraction) {
 
 @end
 
-@interface FIRIAMDisplayExecutor (Testing)
-- (FIRInAppMessagingDisplayMessage *)
-    displayMessageWithMessageDefinition:(FIRIAMMessageDefinition *)definition
-                              imageData:(FIRInAppMessagingImageData *)imageData
-                     landscapeImageData:(nullable FIRInAppMessagingImageData *)landscapeImageData
-                            triggerType:(FIRInAppMessagingDisplayTriggerType)triggerType;
-@end
-
 @interface FIRIAMDisplayExecutorTests : XCTestCase
 
 @property(nonatomic) FIRIAMDisplaySetting *displaySetting;
@@ -325,9 +317,7 @@ typedef NS_ENUM(NSInteger, FIRInAppMessagingDelegateInteraction) {
   self.m4 = [[FIRIAMMessageDefinition alloc] initWithRenderData:renderData4
                                                       startTime:activeStartTime
                                                         endTime:activeEndTime
-                                              triggerDefinition:@[ appOpentriggerDefinition ]
-                                                        appData:@{@"a" : @"b", @"up" : @"dog"}
-                                                  isTestMessage:NO];
+                                              triggerDefinition:@[ appOpentriggerDefinition ]];
 }
 
 NSTimeInterval DISPLAY_MIN_INTERVALS = 1;
@@ -462,7 +452,7 @@ NSTimeInterval DISPLAY_MIN_INTERVALS = 1;
   OCMStub([self.mockTimeFetcher currentTimestampInSeconds])
       .andReturn(DISPLAY_MIN_INTERVALS * 60 + 100);
 
-  // This display component only detects a valid impression, but does not end the rendering
+  // This display component only detects a valid impression, but does not end the renderig
   FIRIAMMessageDisplayForTesting *display = [[FIRIAMMessageDisplayForTesting alloc]
       initWithDelegateInteraction:FIRInAppMessagingDelegateInteractionImpressionDetected];
   self.displayExecutor.messageDisplayComponent = display;
@@ -920,24 +910,4 @@ NSTimeInterval DISPLAY_MIN_INTERVALS = 1;
   XCTAssertTrue(delegate.receivedMessageDismissedCallback);
 }
 
-- (void)testMessageWithDataBundle {
-  FIRInAppMessagingDisplayMessage *displayMessage = [self.displayExecutor
-      displayMessageWithMessageDefinition:self.m4
-                                imageData:nil
-                       landscapeImageData:nil
-                              triggerType:FIRInAppMessagingDisplayTriggerTypeOnAppForeground];
-
-  XCTAssertEqual(displayMessage.appData.count, 2);
-  XCTAssertEqualObjects(displayMessage.appData[@"a"], @"b");
-  XCTAssertEqualObjects(displayMessage.appData[@"up"], @"dog");
-}
-
-- (void)testMessageWithoutDataBundle {
-  FIRInAppMessagingDisplayMessage *displayMessage = [self.displayExecutor
-      displayMessageWithMessageDefinition:self.m3
-                                imageData:nil
-                       landscapeImageData:nil
-                              triggerType:FIRInAppMessagingDisplayTriggerTypeOnAppForeground];
-  XCTAssertNil(displayMessage.appData);
-}
 @end

FirebaseInAppMessaging/Tests/Unit/FIRIAMFetchResponseParserTests.m

@@ -92,16 +92,12 @@
   XCTAssertEqualObjects(first.renderData.contentData.actionURL.absoluteString,
                         @"https://www.google.com");
   XCTAssertEqual(FIRIAMRenderTriggerOnAppForeground, first.renderTriggers[0].triggerType);
-  XCTAssertEqual(first.appData.count, 2);
-  XCTAssertEqualObjects(first.appData[@"a"], @"b");
-  XCTAssertEqualObjects(first.appData[@"c"], @"d");
 
   FIRIAMMessageDefinition *second = results[1];
   XCTAssertEqualObjects(@"9350598726327992320", second.renderData.messageID);
   XCTAssertEqualObjects(@"Inception1", second.renderData.name);
   XCTAssertEqualObjects(@"Test 2", second.renderData.contentData.titleText);
   XCTAssertNil(second.renderData.contentData.bodyText);
-  XCTAssertNil(second.appData);
   XCTAssertEqual(FIRIAMRenderAsModalView, second.renderData.renderingEffectSettings.viewMode);
   XCTAssertEqual(2, second.renderTriggers.count);
 

FirebaseInAppMessaging/Tests/Unit/TestJsonDataFromFetch.txt

@@ -43,11 +43,7 @@
             "name": "jackpot"
           }
         }
-      ],
-      "dataBundle": {
-        "a":"b",
-        "c":"d"
-      }
+      ]
     },
     {
       "vanillaPayload": {