Skip to content

Commit 38aabb1

Browse files
authored
[FIAM] Cleanup compilation guards for building on older SDKs (#12937)
1 parent 49858cf commit 38aabb1

11 files changed

+4
-40
lines changed

FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutLogStorage.m

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,14 +95,12 @@ - (instancetype)initWithExpireAfterInSeconds:(NSInteger)expireInSeconds
9595
selector:@selector(appWillBecomeInactive:)
9696
name:UIApplicationWillResignActiveNotification
9797
object:nil];
98-
#if defined(__IPHONE_13_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000
9998
if (@available(iOS 13.0, tvOS 13.0, *)) {
10099
[[NSNotificationCenter defaultCenter] addObserver:self
101100
selector:@selector(appWillBecomeInactive:)
102101
name:UISceneWillDeactivateNotification
103102
object:nil];
104103
}
105-
#endif // defined(__IPHONE_13_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000
106104

107105
@try {
108106
[self loadFromCachePath:cachePath];

FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutUploader.m

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,14 +102,12 @@ - (instancetype)initWithRequestSender:(FIRIAMClearcutHttpRequestSender *)request
102102
selector:@selector(scheduleNextSendFromForeground:)
103103
name:UIApplicationWillEnterForegroundNotification
104104
object:nil];
105-
#if defined(__IPHONE_13_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000
106105
if (@available(iOS 13.0, tvOS 13.0, *)) {
107106
[[NSNotificationCenter defaultCenter] addObserver:self
108107
selector:@selector(scheduleNextSendFromForeground:)
109108
name:UISceneWillEnterForegroundNotification
110109
object:nil];
111110
}
112-
#endif // defined(__IPHONE_13_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000
113111
_userDefaults = userDefaults ? userDefaults : [GULUserDefaults standardUserDefaults];
114112
// it would be 0 if it does not exist, which is equvilent to saying that
115113
// you can send now

FirebaseInAppMessaging/Sources/DefaultUI/Banner/FIRIAMBannerViewController.m

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -161,18 +161,14 @@ - (void)viewDidLoad {
161161

162162
// Calculate status bar height.
163163
CGFloat statusBarHeight = 0;
164-
#if defined(__IPHONE_13_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000
165164
if (@available(iOS 13.0, tvOS 13.0, *)) {
166165
UIStatusBarManager *manager =
167166
[UIApplication sharedApplication].keyWindow.windowScene.statusBarManager;
168167

169168
statusBarHeight = manager.statusBarFrame.size.height;
170169
} else {
171-
#endif
172170
statusBarHeight = [[UIApplication sharedApplication] statusBarFrame].size.height;
173-
#if defined(__IPHONE_13_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000
174171
}
175-
#endif
176172

177173
// Pin title label below status bar with cushion.
178174
[[self.titleLabel.topAnchor constraintEqualToAnchor:self.view.topAnchor

FirebaseInAppMessaging/Sources/DefaultUI/FIRIAMBaseRenderingViewController.m

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ - (void)viewDidLoad {
5555
selector:@selector(appDidBecomeActive:)
5656
name:UIApplicationDidBecomeActiveNotification
5757
object:nil];
58-
#if defined(__IPHONE_13_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000
5958
if (@available(iOS 13.0, tvOS 13.0, *)) {
6059
[[NSNotificationCenter defaultCenter] addObserver:self
6160
selector:@selector(appWillBecomeInactive:)
@@ -67,7 +66,6 @@ - (void)viewDidLoad {
6766
name:UISceneDidActivateNotification
6867
object:nil];
6968
}
70-
#endif // defined(__IPHONE_13_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000
7169
self.aggregateImpressionTimeInSeconds = 0;
7270
}
7371

FirebaseInAppMessaging/Sources/DefaultUI/FIRIAMRenderingWindowHelper.m

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,11 @@ + (UIWindow *)windowForBlockingView {
2828
static dispatch_once_t onceToken;
2929

3030
dispatch_once(&onceToken, ^{
31-
#if defined(__IPHONE_13_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000
3231
if (@available(iOS 13.0, tvOS 13.0, *)) {
3332
UIWindowForModal = [[self class] iOS13PlusWindow];
3433
} else {
35-
#endif // defined(__IPHONE_13_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000
3634
UIWindowForModal = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
37-
#if defined(__IPHONE_13_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000
3835
}
39-
#endif // defined(__IPHONE_13_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000
4036
UIWindowForModal.windowLevel = UIWindowLevelNormal;
4137
});
4238
return UIWindowForModal;
@@ -47,23 +43,18 @@ + (UIWindow *)windowForNonBlockingView {
4743
static dispatch_once_t onceToken;
4844

4945
dispatch_once(&onceToken, ^{
50-
#if defined(__IPHONE_13_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000
5146
if (@available(iOS 13.0, tvOS 13.0, *)) {
5247
UIWindowForBanner = [[self class] iOS13PlusBannerWindow];
5348
} else {
54-
#endif // defined(__IPHONE_13_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000
5549
UIWindowForBanner =
5650
[[FIRIAMBannerViewUIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
57-
#if defined(__IPHONE_13_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000
5851
}
59-
#endif
6052
UIWindowForBanner.windowLevel = UIWindowLevelNormal;
6153
});
6254

6355
return UIWindowForBanner;
6456
}
6557

66-
#if defined(__IPHONE_13_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000
6758
+ (UIWindow *)iOS13PlusWindow API_AVAILABLE(ios(13.0)) {
6859
UIWindowScene *foregroundedScene = [[UIApplication sharedApplication] fir_foregroundWindowScene];
6960
if (foregroundedScene.delegate) {
@@ -82,7 +73,6 @@ + (FIRIAMBannerViewUIWindow *)iOS13PlusBannerWindow API_AVAILABLE(ios(13.0)) {
8273
}
8374
}
8475

85-
#endif
8676
@end
8777

8878
#endif // TARGET_OS_IOS

FirebaseInAppMessaging/Sources/DefaultUI/ImageOnly/FIRIAMImageOnlyViewController.m

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -124,11 +124,7 @@ - (void)viewDidLayoutSubviews {
124124
CGFloat maxImageViewHeight = self.view.window.frame.size.height - minimalMargine * 2;
125125

126126
// Factor in space for the top notch on iPhone X*.
127-
#if defined(__IPHONE_11_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000
128-
if (@available(iOS 11.0, *)) {
129-
maxImageViewHeight -= self.view.safeAreaInsets.top;
130-
}
131-
#endif // defined(__IPHONE_11_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000
127+
maxImageViewHeight -= self.view.safeAreaInsets.top;
132128

133129
CGFloat adjustedImageViewHeight = self.imageOriginalSize.height;
134130
CGFloat adjustedImageViewWidth = self.imageOriginalSize.width;

FirebaseInAppMessaging/Sources/DefaultUI/Modal/FIRIAMModalViewController.m

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -288,11 +288,7 @@ - (void)layoutFineTuneInPortraitMode {
288288
TopBottomPaddingAroundMsgCard * 2;
289289

290290
// Factor in space for the top notch on iPhone X*.
291-
#if defined(__IPHONE_11_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000
292-
if (@available(iOS 11.0, *)) {
293-
heightCalcReference -= self.view.safeAreaInsets.top;
294-
}
295-
#endif // defined(__IPHONE_11_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000
291+
heightCalcReference -= self.view.safeAreaInsets.top;
296292
}
297293

298294
FIRLogDebug(kFIRLoggerInAppMessagingDisplay, @"I-FID300004",

FirebaseInAppMessaging/Sources/Flows/FIRIAMActivityLogger.m

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,14 +113,12 @@ - (instancetype)initWithMaxCountBeforeReduce:(NSInteger)maxBeforeReduce
113113
selector:@selector(appWillBecomeInactive:)
114114
name:UIApplicationWillResignActiveNotification
115115
object:nil];
116-
#if defined(__IPHONE_13_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000
117116
if (@available(iOS 13.0, tvOS 13.0, *)) {
118117
[[NSNotificationCenter defaultCenter] addObserver:self
119118
selector:@selector(appWillBecomeInactive:)
120119
name:UISceneWillDeactivateNotification
121120
object:nil];
122121
}
123-
#endif // defined(__IPHONE_13_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000
124122
if (loadFromCache) {
125123
@try {
126124
[self loadFromCachePath:nil];

FirebaseInAppMessaging/Sources/Flows/FIRIAMDisplayCheckOnAppForegroundFlow.m

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,13 @@ - (void)start {
3333
selector:@selector(checkAndDisplayNextAppForegroundMessageFromForeground:)
3434
name:UIApplicationWillEnterForegroundNotification
3535
object:nil];
36-
#if defined(__IPHONE_13_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000
3736
if (@available(iOS 13.0, tvOS 13.0, *)) {
3837
[[NSNotificationCenter defaultCenter]
3938
addObserver:self
4039
selector:@selector(checkAndDisplayNextAppForegroundMessageFromForeground:)
4140
name:UISceneWillEnterForegroundNotification
4241
object:nil];
4342
}
44-
#endif // defined(__IPHONE_13_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000
4543
}
4644

4745
- (void)checkAndDisplayNextAppForegroundMessageFromForeground:(NSNotification *)notification {

FirebaseInAppMessaging/Sources/Flows/FIRIAMDisplayExecutor.m

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,6 @@ - (void)displayMessageLoadError:(NSError *)error {
355355
[alert addAction:defaultAction];
356356

357357
dispatch_async(dispatch_get_main_queue(), ^{
358-
#if defined(__IPHONE_13_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000
359358
if (@available(iOS 13.0, tvOS 13.0, *)) {
360359
UIWindowScene *foregroundedScene =
361360
[[UIApplication sharedApplication] fir_foregroundWindowScene];
@@ -364,10 +363,9 @@ - (void)displayMessageLoadError:(NSError *)error {
364363
return;
365364
}
366365
self.alertWindow = [[UIWindow alloc] initWithWindowScene:foregroundedScene];
366+
} else {
367+
self.alertWindow = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
367368
}
368-
#else // defined(__IPHONE_13_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000
369-
self.alertWindow = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
370-
#endif
371369
UIViewController *alertViewController = [[UIViewController alloc] init];
372370
self.alertWindow.rootViewController = alertViewController;
373371
self.alertWindow.hidden = NO;

0 commit comments

Comments
 (0)