Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix FIAM --analyze nullability issues #4435

Merged
merged 3 commits into from
Dec 5, 2019
Merged

Fix FIAM --analyze nullability issues #4435

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dc66c86
Fix card message nullability warnings with non-nil assertions
christibbs Dec 3, 2019
ce634eb
Get rid of asserts, still pass --analyze
christibbs Dec 4, 2019
7eeba89
Remove --no-analyze for FIAM in travis.yml
christibbs Dec 4, 2019
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
19 changes: 11 additions & 8 deletions Firebase/InAppMessaging/Flows/FIRIAMDisplayExecutor.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ - (void)checkAndDisplayNextContextualMessageForAnalyticsEvent:(NSString *)eventN

- (FIRInAppMessagingCardDisplay *)
cardDisplayMessageWithMessageDefinition:(FIRIAMMessageDefinition *)definition
portraitImageData:(FIRInAppMessagingImageData *)portraitImageData
portraitImageData:(nonnull FIRInAppMessagingImageData *)portraitImageData
landscapeImageData:
(nullable FIRInAppMessagingImageData *)landscapeImageData
triggerType:(FIRInAppMessagingDisplayTriggerType)triggerType {
Expand All @@ -388,16 +388,15 @@ - (void)checkAndDisplayNextContextualMessageForAnalyticsEvent:(NSString *)eventN
NSString *title = renderData.contentData.titleText;
NSString *body = renderData.contentData.bodyText;

FIRInAppMessagingActionButton *primaryActionButton = nil;
if (definition.renderData.contentData.actionButtonText) {
// Action button data is never nil for a card message.
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
primaryActionButton = [[FIRInAppMessagingActionButton alloc]
initWithButtonText:renderData.contentData.actionButtonText
buttonTextColor:renderData.renderingEffectSettings.btnTextColor
backgroundColor:renderData.renderingEffectSettings.btnBGColor];
FIRInAppMessagingActionButton *primaryActionButton = [[FIRInAppMessagingActionButton alloc]
initWithButtonText:renderData.contentData.actionButtonText
buttonTextColor:renderData.renderingEffectSettings.btnTextColor
backgroundColor:renderData.renderingEffectSettings.btnBGColor];

#pragma clang diagnostic pop
}

FIRInAppMessagingActionButton *secondaryActionButton = nil;
if (definition.renderData.contentData.secondaryActionButtonText) {
Expand Down Expand Up @@ -521,6 +520,10 @@ - (void)checkAndDisplayNextContextualMessageForAnalyticsEvent:(NSString *)eventN
triggerType:(FIRInAppMessagingDisplayTriggerType)triggerType {
switch (definition.renderData.renderingEffectSettings.viewMode) {
case FIRIAMRenderAsCardView:
// Image data should never nil for a valid card message.
if (imageData == nil) {
return nil;
}
return [self cardDisplayMessageWithMessageDefinition:definition
portraitImageData:imageData
landscapeImageData:landscapeImageData
Expand Down