Skip to content

Commit 7cca962

Browse files
authored
Fix FIAM test on device crash (#7328)
* Revert to previous nil check on experiment JSON * Remove assert in FIRIAMDisplayExecutor * Update CHANGELOG * Change nullability of imageData in displayMessageWithDefinition: * Keep nullability with card initializers, put nil message return back if imageData is nil * Revert back to explicit non-null * Actually shouldn't be nonnull due to other message types w/ optional imageData 😅
1 parent 9349a3c commit 7cca962

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

FirebaseInAppMessaging/CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# 2021-1 -- v7.5.0
2+
- [fixed] Fixed failed assertion causing app to crash during test on device flow (#7299).
3+
14
# 2020-12 -- v7.3.0
25
- [fixed] Fixed default display bug in apps that don't use `UISceneDelegate` (#6803).
36

FirebaseInAppMessaging/Sources/Flows/FIRIAMDisplayExecutor.m

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ - (void)checkAndDisplayNextContextualMessageForAnalyticsEvent:(NSString *)eventN
423423

424424
- (FIRInAppMessagingCardDisplay *)
425425
cardDisplayMessageWithMessageDefinition:(FIRIAMMessageDefinition *)definition
426-
portraitImageData:(nonnull FIRInAppMessagingImageData *)portraitImageData
426+
portraitImageData:(FIRInAppMessagingImageData *)portraitImageData
427427
landscapeImageData:
428428
(nullable FIRInAppMessagingImageData *)landscapeImageData
429429
triggerType:(FIRInAppMessagingDisplayTriggerType)triggerType {
@@ -573,9 +573,8 @@ - (void)checkAndDisplayNextContextualMessageForAnalyticsEvent:(NSString *)eventN
573573
triggerType:(FIRInAppMessagingDisplayTriggerType)triggerType {
574574
switch (definition.renderData.renderingEffectSettings.viewMode) {
575575
case FIRIAMRenderAsCardView:
576-
// Image data should never nil for a valid card message.
577576
if (imageData == nil) {
578-
NSAssert(NO, @"Image data should never nil for a valid card message.");
577+
// Image data should never nil for a valid card message.
579578
return nil;
580579
}
581580
return [self cardDisplayMessageWithMessageDefinition:definition

0 commit comments

Comments
 (0)