Fix access to UIWindow when delegate doesn't implement that property

StanfordBDHG · Mar 5, 2024 · 3829e9b · 3829e9b
1 parent 15f06cf
commit 3829e9b
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/ResearchKit/ActiveTasks/ORKNormalizedReactionTimeContentView.m b/ResearchKit/ActiveTasks/ORKNormalizedReactionTimeContentView.m
@@ -78,7 +78,12 @@ - (void)resetAfterDelay:(NSTimeInterval)delay completion:(nullable void (^)(void
 }
 
 -(void)resizeConstraints {
-    ORKScreenType screenType = ORKGetVerticalScreenTypeForWindow([[[UIApplication sharedApplication] delegate] window]);
+    ORKScreenType screenType;
+    if ([[UIApplication sharedApplication].delegate respondsToSelector:@selector(window)]) {
+        screenType = ORKGetVerticalScreenTypeForWindow([[[UIApplication sharedApplication] delegate] window]);
+    } else {
+        screenType = ORKGetVerticalScreenTypeForWindow(NULL);
+    }
     if (screenType == ORKScreenTypeiPhone5 ) {
         NormalizeButtonSize = 70.0;
         BackgroundViewSpaceMultiplier = 1.75;

diff --git a/ResearchKit/ActiveTasks/ORKStroopContentView.m b/ResearchKit/ActiveTasks/ORKStroopContentView.m
@@ -62,8 +62,13 @@ - (instancetype)initWithFrame:(CGRect)frame {
         [_colorLabel setFont:[UIFont systemFontOfSize:60]];
         [_colorLabel setAdjustsFontSizeToFitWidth:YES];
 
-        ORKScreenType screenType = ORKGetVerticalScreenTypeForWindow([[[UIApplication sharedApplication] delegate] window]);
-
+        ORKScreenType screenType;
+        if ([[UIApplication sharedApplication].delegate respondsToSelector:@selector(window)]) {
+            screenType = ORKGetVerticalScreenTypeForWindow([[[UIApplication sharedApplication] delegate] window]);
+        } else {
+            screenType = ORKGetVerticalScreenTypeForWindow(NULL);
+        }
+
         if (screenType == ORKScreenTypeiPhone5 ) {
             labelWidth = 200.0;
             labelHeight = 200.0;
@@ -145,8 +150,13 @@ -(void)setupGridButtons {
 
         _buttonStackView.axis = UILayoutConstraintAxisVertical;
 
-        ORKScreenType screenType = ORKGetVerticalScreenTypeForWindow([[[UIApplication sharedApplication] delegate] window]);
-
+        ORKScreenType screenType;
+        if ([[UIApplication sharedApplication].delegate respondsToSelector:@selector(window)]) {
+            screenType = ORKGetVerticalScreenTypeForWindow([[[UIApplication sharedApplication] delegate] window]);
+        } else {
+            screenType = ORKGetVerticalScreenTypeForWindow(NULL);
+        }
+
         if (screenType == ORKScreenTypeiPhone6) {
             minimumButtonHeight = 150.0;
         } else if (screenType == ORKScreenTypeiPhone5 ) {