Skip to content

Commit 630167b

Browse files
author
rohandandavati
authored
Revert data bundles merge (#4820)
* Revert "added pragma statement to ignore initWithMessageID deprecation warning (#4754)" This reverts commit e385499. * Revert "data bundles for consolidated sdk (#4739)" This reverts commit 161ef56.
1 parent 9d6f198 commit 630167b

10 files changed

+26
-242
lines changed

‎FirebaseInAppMessaging/Sources/Data/FIRIAMFetchResponseParser.m

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -335,20 +335,14 @@ - (FIRIAMMessageDefinition *)convertToMessageDefinitionWithMessageDict:(NSDictio
335335
messageName:messageName
336336
contentData:msgData
337337
renderingEffect:renderEffect];
338-
NSDictionary *dataBundle = nil;
339-
id dataBundleNode = messageNode[@"dataBundle"];
340-
if ([dataBundleNode isKindOfClass:[NSDictionary class]]) {
341-
dataBundle = dataBundleNode;
342-
}
338+
343339
if (isTestMessage) {
344340
return [[FIRIAMMessageDefinition alloc] initTestMessageWithRenderData:renderData];
345341
} else {
346342
return [[FIRIAMMessageDefinition alloc] initWithRenderData:renderData
347343
startTime:startTimeInSeconds
348344
endTime:endTimeInSeconds
349-
triggerDefinition:triggersDefinition
350-
appData:dataBundle
351-
isTestMessage:NO];
345+
triggerDefinition:triggersDefinition];
352346
}
353347
} @catch (NSException *e) {
354348
FIRLogWarning(kFIRLoggerInAppMessaging, @"I-IAM900006",

‎FirebaseInAppMessaging/Sources/Data/FIRIAMMessageDefinition.m

Lines changed: 7 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -36,39 +36,23 @@ @implementation FIRIAMMessageDefinition
3636
- (instancetype)initWithRenderData:(FIRIAMMessageRenderData *)renderData
3737
startTime:(NSTimeInterval)startTime
3838
endTime:(NSTimeInterval)endTime
39-
triggerDefinition:(NSArray<FIRIAMDisplayTriggerDefinition *> *)renderTriggers
40-
appData:(nullable NSDictionary *)appData
41-
isTestMessage:(BOOL)isTestMessage {
39+
triggerDefinition:(NSArray<FIRIAMDisplayTriggerDefinition *> *)renderTriggers {
4240
if (self = [super init]) {
4341
_renderData = renderData;
4442
_renderTriggers = renderTriggers;
4543
_startTime = startTime;
4644
_endTime = endTime;
47-
_isTestMessage = isTestMessage;
48-
_appData = [appData copy];
45+
_isTestMessage = NO;
4946
}
5047
return self;
5148
}
5249

53-
- (instancetype)initWithRenderData:(FIRIAMMessageRenderData *)renderData
54-
startTime:(NSTimeInterval)startTime
55-
endTime:(NSTimeInterval)endTime
56-
triggerDefinition:(NSArray<FIRIAMDisplayTriggerDefinition *> *)renderTriggers {
57-
return [self initWithRenderData:renderData
58-
startTime:startTime
59-
endTime:endTime
60-
triggerDefinition:renderTriggers
61-
appData:nil
62-
isTestMessage:NO];
63-
}
64-
6550
- (instancetype)initTestMessageWithRenderData:(FIRIAMMessageRenderData *)renderData {
66-
return [self initWithRenderData:renderData
67-
startTime:0
68-
endTime:0
69-
triggerDefinition:@[]
70-
appData:nil
71-
isTestMessage:YES];
51+
if (self = [super init]) {
52+
_renderData = renderData;
53+
_isTestMessage = YES;
54+
}
55+
return self;
7256
}
7357

7458
- (BOOL)messageHasExpired {

‎FirebaseInAppMessaging/Sources/Flows/FIRIAMDisplayExecutor.m

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -445,8 +445,7 @@ - (void)checkAndDisplayNextContextualMessageForAnalyticsEvent:(NSString *)eventN
445445
portraitImageData:portraitImageData
446446
backgroundColor:renderData.renderingEffectSettings.displayBGColor
447447
primaryActionButton:primaryActionButton
448-
primaryActionURL:definition.renderData.contentData.actionURL
449-
appData:definition.appData];
448+
primaryActionURL:definition.renderData.contentData.actionURL];
450449

451450
cardMessage.body = body;
452451
cardMessage.landscapeImageData = landscapeImageData;
@@ -475,8 +474,7 @@ - (void)checkAndDisplayNextContextualMessageForAnalyticsEvent:(NSString *)eventN
475474
textColor:definition.renderData.renderingEffectSettings.textColor
476475
backgroundColor:definition.renderData.renderingEffectSettings.displayBGColor
477476
imageData:imageData
478-
actionURL:definition.renderData.contentData.actionURL
479-
appData:definition.appData];
477+
actionURL:definition.renderData.contentData.actionURL];
480478
#pragma clang diagnostic pop
481479

482480
return bannerMessage;
@@ -494,8 +492,7 @@ - (void)checkAndDisplayNextContextualMessageForAnalyticsEvent:(NSString *)eventN
494492
renderAsTestMessage:definition.isTestMessage
495493
triggerType:triggerType
496494
imageData:imageData
497-
actionURL:definition.renderData.contentData.actionURL
498-
appData:definition.appData];
495+
actionURL:definition.renderData.contentData.actionURL];
499496
#pragma clang diagnostic pop
500497

501498
return imageOnlyMessage;
@@ -536,8 +533,7 @@ - (void)checkAndDisplayNextContextualMessageForAnalyticsEvent:(NSString *)eventN
536533
backgroundColor:renderData.renderingEffectSettings.displayBGColor
537534
imageData:imageData
538535
actionButton:actionButton
539-
actionURL:definition.renderData.contentData.actionURL
540-
appData:definition.appData];
536+
actionURL:definition.renderData.contentData.actionURL];
541537
#pragma clang diagnostic pop
542538

543539
return modalViewMessage;

‎FirebaseInAppMessaging/Sources/Private/Data/FIRIAMMessageDefinition.h

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,21 +35,11 @@ NS_ASSUME_NONNULL_BEGIN
3535
/// A flag for client-side testing messages
3636
@property(nonatomic, readonly) BOOL isTestMessage;
3737

38-
/// Additional key-value pairs that can be optionally sent along with the FIAM
39-
@property(nonatomic, nullable, readonly) NSDictionary *appData;
40-
4138
- (instancetype)init NS_UNAVAILABLE;
4239

4340
/**
4441
* Create a regular message definition.
4542
*/
46-
- (instancetype)initWithRenderData:(FIRIAMMessageRenderData *)renderData
47-
startTime:(NSTimeInterval)startTime
48-
endTime:(NSTimeInterval)endTime
49-
triggerDefinition:(NSArray<FIRIAMDisplayTriggerDefinition *> *)renderTriggers
50-
appData:appData
51-
isTestMessage:(BOOL)isTestMessage NS_DESIGNATED_INITIALIZER;
52-
5343
- (instancetype)initWithRenderData:(FIRIAMMessageRenderData *)renderData
5444
startTime:(NSTimeInterval)startTime
5545
endTime:(NSTimeInterval)endTime

‎FirebaseInAppMessaging/Sources/Public/FIRInAppMessagingRendering.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -164,11 +164,6 @@ NS_SWIFT_NAME(InAppMessagingDisplayMessage)
164164
*/
165165
@property(nonatomic, readonly) FIRInAppMessagingDisplayTriggerType triggerType;
166166

167-
/**
168-
* Extra key-value dictionary data that can be sent along with the message
169-
*/
170-
@property(nonatomic, nullable, readonly) NSDictionary *appData;
171-
172167
/// Unavailable.
173168
- (instancetype)init NS_UNAVAILABLE;
174169

‎FirebaseInAppMessaging/Sources/RenderingObjects/FIRInAppMessagingRenderingDataClasses.m

Lines changed: 4 additions & 136 deletions
Original file line numberDiff line numberDiff line change
@@ -20,26 +20,6 @@
2020

2121
@implementation FIRInAppMessagingDisplayMessage
2222

23-
- (instancetype)initWithMessageID:(NSString *)messageID
24-
campaignName:(NSString *)campaignName
25-
renderAsTestMessage:(BOOL)renderAsTestMessage
26-
messageType:(FIRInAppMessagingDisplayMessageType)messageType
27-
triggerType:(FIRInAppMessagingDisplayTriggerType)triggerType
28-
appData:(NSDictionary *)appData {
29-
if (self = [super init]) {
30-
#pragma clang diagnostic push
31-
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
32-
_campaignInfo = [[FIRInAppMessagingCampaignInfo alloc] initWithMessageID:messageID
33-
campaignName:campaignName
34-
renderAsTestMessage:renderAsTestMessage];
35-
#pragma clang diagnostic pop
36-
_type = messageType;
37-
_triggerType = triggerType;
38-
_appData = [appData copy];
39-
}
40-
return self;
41-
}
42-
4323
- (instancetype)initWithMessageID:(NSString *)messageID
4424
campaignName:(NSString *)campaignName
4525
renderAsTestMessage:(BOOL)renderAsTestMessage
@@ -51,11 +31,9 @@ - (instancetype)initWithMessageID:(NSString *)messageID
5131
renderAsTestMessage:renderAsTestMessage];
5232
_type = messageType;
5333
_triggerType = triggerType;
54-
_appData = nil;
5534
}
5635
return self;
5736
}
58-
5937
@end
6038

6139
@implementation FIRInAppMessagingCardDisplay
@@ -76,36 +54,6 @@ - (void)setSecondaryActionURL:(NSURL *_Nullable)secondaryActionURL {
7654
_secondaryActionURL = secondaryActionURL;
7755
}
7856

79-
- (instancetype)initWithMessageID:(NSString *)messageID
80-
campaignName:(NSString *)campaignName
81-
renderAsTestMessage:(BOOL)renderAsTestMessage
82-
triggerType:(FIRInAppMessagingDisplayTriggerType)triggerType
83-
titleText:(NSString *)title
84-
textColor:(UIColor *)textColor
85-
portraitImageData:(FIRInAppMessagingImageData *)portraitImageData
86-
backgroundColor:(UIColor *)backgroundColor
87-
primaryActionButton:(FIRInAppMessagingActionButton *)primaryActionButton
88-
primaryActionURL:(NSURL *)primaryActionURL
89-
appData:(NSDictionary *)appData {
90-
#pragma clang diagnostic push
91-
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
92-
if (self = [super initWithMessageID:messageID
93-
campaignName:campaignName
94-
renderAsTestMessage:renderAsTestMessage
95-
messageType:FIRInAppMessagingDisplayMessageTypeCard
96-
triggerType:triggerType
97-
appData:appData]) {
98-
#pragma clang diagnostic pop
99-
_title = title;
100-
_textColor = textColor;
101-
_portraitImageData = portraitImageData;
102-
_displayBackgroundColor = backgroundColor;
103-
_primaryActionButton = primaryActionButton;
104-
_primaryActionURL = primaryActionURL;
105-
}
106-
return self;
107-
}
108-
10957
- (instancetype)initWithMessageID:(NSString *)messageID
11058
campaignName:(NSString *)campaignName
11159
renderAsTestMessage:(BOOL)renderAsTestMessage
@@ -122,8 +70,7 @@ - (instancetype)initWithMessageID:(NSString *)messageID
12270
campaignName:campaignName
12371
renderAsTestMessage:renderAsTestMessage
12472
messageType:FIRInAppMessagingDisplayMessageTypeCard
125-
triggerType:triggerType
126-
appData:nil]) {
73+
triggerType:triggerType]) {
12774
#pragma clang diagnostic pop
12875
_title = title;
12976
_textColor = textColor;
@@ -138,33 +85,6 @@ - (instancetype)initWithMessageID:(NSString *)messageID
13885
@end
13986

14087
@implementation FIRInAppMessagingBannerDisplay
141-
- (instancetype)initWithMessageID:(NSString *)messageID
142-
campaignName:(NSString *)campaignName
143-
renderAsTestMessage:(BOOL)renderAsTestMessage
144-
triggerType:(FIRInAppMessagingDisplayTriggerType)triggerType
145-
titleText:(NSString *)title
146-
bodyText:(NSString *)bodyText
147-
textColor:(UIColor *)textColor
148-
backgroundColor:(UIColor *)backgroundColor
149-
imageData:(nullable FIRInAppMessagingImageData *)imageData
150-
actionURL:(nullable NSURL *)actionURL
151-
appData:(NSDictionary *)appData {
152-
if (self = [super initWithMessageID:messageID
153-
campaignName:campaignName
154-
renderAsTestMessage:renderAsTestMessage
155-
messageType:FIRInAppMessagingDisplayMessageTypeBanner
156-
triggerType:triggerType
157-
appData:appData]) {
158-
_title = title;
159-
_bodyText = bodyText;
160-
_textColor = textColor;
161-
_displayBackgroundColor = backgroundColor;
162-
_imageData = imageData;
163-
_actionURL = actionURL;
164-
}
165-
return self;
166-
}
167-
16888
- (instancetype)initWithMessageID:(NSString *)messageID
16989
campaignName:(NSString *)campaignName
17090
renderAsTestMessage:(BOOL)renderAsTestMessage
@@ -179,8 +99,7 @@ - (instancetype)initWithMessageID:(NSString *)messageID
17999
campaignName:campaignName
180100
renderAsTestMessage:renderAsTestMessage
181101
messageType:FIRInAppMessagingDisplayMessageTypeBanner
182-
triggerType:triggerType
183-
appData:nil]) {
102+
triggerType:triggerType]) {
184103
_title = title;
185104
_bodyText = bodyText;
186105
_textColor = textColor;
@@ -190,40 +109,10 @@ - (instancetype)initWithMessageID:(NSString *)messageID
190109
}
191110
return self;
192111
}
193-
194112
@end
195113

196114
@implementation FIRInAppMessagingModalDisplay
197115

198-
- (instancetype)initWithMessageID:(NSString *)messageID
199-
campaignName:(NSString *)campaignName
200-
renderAsTestMessage:(BOOL)renderAsTestMessage
201-
triggerType:(FIRInAppMessagingDisplayTriggerType)triggerType
202-
titleText:(NSString *)title
203-
bodyText:(NSString *)bodyText
204-
textColor:(UIColor *)textColor
205-
backgroundColor:(UIColor *)backgroundColor
206-
imageData:(nullable FIRInAppMessagingImageData *)imageData
207-
actionButton:(nullable FIRInAppMessagingActionButton *)actionButton
208-
actionURL:(nullable NSURL *)actionURL
209-
appData:(nullable NSDictionary *)appData {
210-
if (self = [super initWithMessageID:messageID
211-
campaignName:campaignName
212-
renderAsTestMessage:renderAsTestMessage
213-
messageType:FIRInAppMessagingDisplayMessageTypeModal
214-
triggerType:triggerType
215-
appData:appData]) {
216-
_title = title;
217-
_bodyText = bodyText;
218-
_textColor = textColor;
219-
_displayBackgroundColor = backgroundColor;
220-
_imageData = imageData;
221-
_actionButton = actionButton;
222-
_actionURL = actionURL;
223-
}
224-
return self;
225-
}
226-
227116
- (instancetype)initWithMessageID:(NSString *)messageID
228117
campaignName:(NSString *)campaignName
229118
renderAsTestMessage:(BOOL)renderAsTestMessage
@@ -239,8 +128,7 @@ - (instancetype)initWithMessageID:(NSString *)messageID
239128
campaignName:campaignName
240129
renderAsTestMessage:renderAsTestMessage
241130
messageType:FIRInAppMessagingDisplayMessageTypeModal
242-
triggerType:triggerType
243-
appData:nil]) {
131+
triggerType:triggerType]) {
244132
_title = title;
245133
_bodyText = bodyText;
246134
_textColor = textColor;
@@ -255,25 +143,6 @@ - (instancetype)initWithMessageID:(NSString *)messageID
255143

256144
@implementation FIRInAppMessagingImageOnlyDisplay
257145

258-
- (instancetype)initWithMessageID:(NSString *)messageID
259-
campaignName:(NSString *)campaignName
260-
renderAsTestMessage:(BOOL)renderAsTestMessage
261-
triggerType:(FIRInAppMessagingDisplayTriggerType)triggerType
262-
imageData:(nullable FIRInAppMessagingImageData *)imageData
263-
actionURL:(nullable NSURL *)actionURL
264-
appData:(nullable NSDictionary *)appData {
265-
if (self = [super initWithMessageID:messageID
266-
campaignName:campaignName
267-
renderAsTestMessage:renderAsTestMessage
268-
messageType:FIRInAppMessagingDisplayMessageTypeModal
269-
triggerType:triggerType
270-
appData:appData]) {
271-
_imageData = imageData;
272-
_actionURL = actionURL;
273-
}
274-
return self;
275-
}
276-
277146
- (instancetype)initWithMessageID:(NSString *)messageID
278147
campaignName:(NSString *)campaignName
279148
renderAsTestMessage:(BOOL)renderAsTestMessage
@@ -284,8 +153,7 @@ - (instancetype)initWithMessageID:(NSString *)messageID
284153
campaignName:campaignName
285154
renderAsTestMessage:renderAsTestMessage
286155
messageType:FIRInAppMessagingDisplayMessageTypeModal
287-
triggerType:triggerType
288-
appData:nil]) {
156+
triggerType:triggerType]) {
289157
_imageData = imageData;
290158
_actionURL = actionURL;
291159
}

0 commit comments

Comments
 (0)