Merge pull request #437 from Countly/fix_bad_access_to_key_window

fix: unresponsive while returning from external link

Author: turtledreams

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 25.4.10
+* Mitigated an issue when returning from the external content link.
+
 ## 25.4.9
 * Added a new config option disableViewRestartForManualRecording to disable auto close/restart behavior of manual views on app background/foreground actions.
 * Added a new config option "setWebviewDisplayOption: WebViewDisplayOption" to control how Content and Feedback Widgets are presented.

Countly-PL.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = 'Countly-PL'
-  s.version = '25.4.9'
+  s.version = '25.4.10'
   s.license = { :type => 'MIT', :file => 'LICENSE' }
   s.summary  = 'Countly is an innovative, real-time, open source mobile analytics platform.'
   s.homepage = 'https://github.com/Countly/countly-sdk-ios'

Countly.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = 'Countly'
-  s.version = '25.4.9'
+  s.version = '25.4.10'
   s.license = { :type => 'MIT', :file => 'LICENSE' }
   s.summary  = 'Countly is an innovative, real-time, open source mobile analytics platform.'
   s.homepage = 'https://github.com/Countly/countly-sdk-ios'

Countly.xcodeproj/project.pbxproj

@@ -808,7 +808,7 @@
 					"@loader_path/Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = 25.4.9;
+				MARKETING_VERSION = 25.4.10;
 				PRODUCT_BUNDLE_IDENTIFIER = ly.count.CountlyiOSSDK;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -840,7 +840,7 @@
 					"@loader_path/Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = 25.4.9;
+				MARKETING_VERSION = 25.4.10;
 				PRODUCT_BUNDLE_IDENTIFIER = ly.count.CountlyiOSSDK;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

CountlyCommon.m

@@ -29,7 +29,7 @@ @interface CountlyCommon ()
 #endif
 @end
 
-NSString* const kCountlySDKVersion = @"25.4.9";
+NSString* const kCountlySDKVersion = @"25.4.10";
 NSString* const kCountlySDKName = @"objc-native-ios";
 
 NSString* const kCountlyErrorDomain = @"ly.count.ErrorDomain";

CountlyTests/TestUtils.swift

@@ -13,7 +13,7 @@ class TestUtils {
     static let commonDeviceId: String = "deviceId"
     static let commonAppKey: String = "appkey"
     static let host: String = "https://testing.count.ly/"
-    static let SDK_VERSION = "25.4.9"
+    static let SDK_VERSION = "25.4.10"
     static let SDK_NAME = "objc-native-ios"
 
     static func cleanup() -> Void {

CountlyWebViewController.m

@@ -10,6 +10,10 @@
 
 #if (TARGET_OS_IOS)
 @implementation CountlyWebViewController
+{
+    UIStatusBarStyle _cachedStatusBarStyle;
+    BOOL _hasCachedStatusBarStyle;
+}
 - (BOOL)prefersStatusBarHidden
 {
   return CountlyContentBuilderInternal.sharedInstance.webViewDisplayOption == IMMERSIVE ? YES : NO;
@@ -22,33 +26,88 @@ - (BOOL)prefersHomeIndicatorAutoHidden
 
 - (UIStatusBarStyle)preferredStatusBarStyle
 {
-  return UIApplication.sharedApplication.keyWindow.rootViewController.preferredStatusBarStyle;
+    if (_hasCachedStatusBarStyle) {
+        return _cachedStatusBarStyle;
+    }
+    
+    UIWindow *keyWindow = [self getKeyWindow];
+
+    if (keyWindow && keyWindow.rootViewController) {
+        _cachedStatusBarStyle = keyWindow.rootViewController.preferredStatusBarStyle;
+        _hasCachedStatusBarStyle = YES;
+        return _cachedStatusBarStyle;
+    }
+    
+    return UIStatusBarStyleLightContent;
 }
 
 - (UIInterfaceOrientationMask)supportedInterfaceOrientations
 {
     return UIInterfaceOrientationMaskAll;
 }
 
+- (UIWindow *)getKeyWindow {
+    if (@available(iOS 13.0, *)) {
+        for (UIScene *scene in UIApplication.sharedApplication.connectedScenes) {
+            if (![scene isKindOfClass:[UIWindowScene class]]) {
+                continue;
+            }
+            
+            UIWindowScene *windowScene = (UIWindowScene *)scene;
+            
+            if (windowScene.activationState == UISceneActivationStateForegroundActive) {
+                for (UIWindow *window in windowScene.windows) {
+                    if (window.isKeyWindow) {
+                        return window;
+                    }
+                }
+            }
+        }
+    } else {
+        return UIApplication.sharedApplication.keyWindow;
+    }
+    
+    return nil;
+}
+
 - (BOOL)shouldAutorotate
 {
     return YES;
 }
 
 - (void)loadView
 {
-  self.view = [[TouchDelegatingView alloc] initWithFrame:UIApplication.sharedApplication.keyWindow.rootViewController.view.bounds];
+    UIWindow *keyWindow = [self getKeyWindow];
+    CGRect bounds = keyWindow.rootViewController.view.bounds;
+    
+    if (CGRectIsEmpty(bounds)) {
+        bounds = UIScreen.mainScreen.bounds;
+    }
+    
+    self.view = [[TouchDelegatingView alloc] initWithFrame:bounds];
 }
 
 - (void)viewDidLoad
 {
   [super viewDidLoad];
+    
+    UIWindow *keyWindow = [self getKeyWindow];
+    
+    if (!_hasCachedStatusBarStyle) {
+        if (keyWindow && keyWindow.rootViewController) {
+            _cachedStatusBarStyle = keyWindow.rootViewController.preferredStatusBarStyle;
+            _hasCachedStatusBarStyle = YES;
+        }
+    }
 
-  if ([self.view isKindOfClass:[TouchDelegatingView class]])
-  {
-    TouchDelegatingView *delegatingView = (TouchDelegatingView *)self.view;
-    delegatingView.touchDelegate        = UIApplication.sharedApplication.keyWindow.rootViewController.view;
-  }
+
+    if ([self.view isKindOfClass:[TouchDelegatingView class]])
+    {
+        TouchDelegatingView *delegatingView = (TouchDelegatingView *)self.view;
+        if (keyWindow && keyWindow.rootViewController) {
+            delegatingView.touchDelegate = keyWindow.rootViewController.view;
+        }
+    }
 
   // Fully transparent controller background
   self.view.backgroundColor = [UIColor clearColor];