Skip to content

Fix crash when displaying UIAlertController for a test on device message that errored #4446

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

Merged
merged 7 commits into from
Dec 9, 2019
Merged

Fix crash when displaying UIAlertController for a test on device message that errored #4446

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
54d67d0
Use application delegate window to show test on device error alert, r…
christibbs Dec 4, 2019
000c93b
Refactor the display of the test on device error alert to use a windo…
christibbs Dec 5, 2019
64060dd
More descriptive variable name for the view controller used to presen…
christibbs Dec 5, 2019
5a72fd1
Import UIKit at the top of FIRIAMDisplayExecutor.m
christibbs Dec 6, 2019
f9d1ee2
Merge branch 'master' into fiam-tod-crash
christibbs Dec 6, 2019
861ce02
Early return in test on device error flow if there's no foregrounded …
christibbs Dec 6, 2019
cbae731
scripts/styles.sh
christibbs Dec 9, 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
34 changes: 30 additions & 4 deletions Firebase/InAppMessaging/Flows/FIRIAMDisplayExecutor.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*/

#import <FirebaseCore/FIRLogger.h>
#import <UIKit/UIKit.h>

#import "FIRCore+InAppMessaging.h"
#import "FIRIAMActivityLogger.h"
Expand All @@ -41,6 +42,8 @@ @interface FIRIAMDisplayExecutor () <FIRInAppMessagingDisplayDelegate>
@property(nonatomic) BOOL impressionRecorded;
@property(nonatomic, nonnull, readonly) id<FIRIAMAnalyticsEventLogger> analyticsEventLogger;
@property(nonatomic, nonnull, readonly) FIRIAMActionURLFollower *actionURLFollower;
// Used for displaying the test on device message error alert.
@property(nonatomic, strong) UIWindow *alertWindow;
@end

@implementation FIRIAMDisplayExecutor {
Expand Down Expand Up @@ -307,14 +310,37 @@ - (void)displayMessageLoadError:(NSError *)error {

UIAlertAction *defaultAction = [UIAlertAction actionWithTitle:@"OK"
style:UIAlertActionStyleDefault
handler:^(UIAlertAction *action){
handler:^(UIAlertAction *action) {
self.alertWindow.hidden = NO;
self.alertWindow = nil;
}];

[alert addAction:defaultAction];

[[UIApplication sharedApplication].keyWindow.rootViewController presentViewController:alert
animated:YES
completion:nil];
dispatch_async(dispatch_get_main_queue(), ^{
#if defined(__IPHONE_13_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000
if (@available(iOS 13.0, *)) {
UIWindowScene *foregroundedScene = nil;
for (UIWindowScene *connectedScene in [UIApplication sharedApplication].connectedScenes) {
if (connectedScene.activationState == UISceneActivationStateForegroundActive) {
foregroundedScene = connectedScene;
break;
}
}

if (foregroundedScene == nil) {
return;
}
self.alertWindow = [[UIWindow alloc] initWithWindowScene:foregroundedScene];
}
#else // defined(__IPHONE_13_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000
self.alertWindow = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
#endif
UIViewController *alertViewController = [[UIViewController alloc] init];
self.alertWindow.rootViewController = alertViewController;
self.alertWindow.hidden = NO;
[alertViewController presentViewController:alert animated:YES completion:nil];
});
}

- (instancetype)initWithInAppMessaging:(FIRInAppMessaging *)inAppMessaging
Expand Down