feat: iOS 25.1.0

Author: arifBurakDemiray

ios/Classes/CountlyiOS/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 25.1.0
+* Added dynamic resizing functionality for the content zone
+* Added a config option to content (setZoneTimerInterval) to set content zone timer. (Experimental!)
+
+* Improved management of content zone size for better responsiveness
+* Fixed an issue where the build UUID and executable name were missing from crash reports
+
 ## 24.7.9
 * Improved view tracking capabilities
 

ios/Classes/CountlyiOS/Countly-PL.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = 'Countly-PL'
-  s.version = '24.7.9'
+  s.version = '25.1.0'
   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'

ios/Classes/CountlyiOS/Countly.m

@@ -275,6 +275,9 @@ - (void)startWithConfig:(CountlyConfig *)config
     if(config.content.getGlobalContentCallback) {
         CountlyContentBuilderInternal.sharedInstance.contentCallback = config.content.getGlobalContentCallback;
     }
+    if(config.content.getZoneTimerInterval){
+        CountlyContentBuilderInternal.sharedInstance.zoneTimerInterval = config.content.getZoneTimerInterval;
+    }
 #endif
 
     [CountlyPerformanceMonitoring.sharedInstance startWithConfig:config.apm];

ios/Classes/CountlyiOS/Countly.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = 'Countly'
-  s.version = '24.7.9'
+  s.version = '25.1.0'
   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'

ios/Classes/CountlyiOS/CountlyCommon.m

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

ios/Classes/CountlyiOS/CountlyContentBuilderInternal.h

@@ -13,7 +13,7 @@ NS_ASSUME_NONNULL_BEGIN
 @interface CountlyContentBuilderInternal: NSObject
 #if (TARGET_OS_IOS)
 @property (nonatomic, strong) NSArray<NSString *> *currentTags;
-@property (nonatomic, assign) NSTimeInterval requestInterval;
+@property (nonatomic, assign) NSTimeInterval zoneTimerInterval;
 @property (nonatomic) ContentCallback contentCallback;
 
 + (instancetype)sharedInstance;

ios/Classes/CountlyiOS/CountlyContentBuilderInternal.m

@@ -29,7 +29,7 @@ - (instancetype)init
 {
     if (self = [super init])
     {
-        self.requestInterval = 30.0;
+        self.zoneTimerInterval = 30.0;
         _requestTimer = nil;
     }
 
@@ -55,7 +55,7 @@ - (void)enterContentZone:(NSArray<NSString *> *)tags {
     self.currentTags = tags;
 
     [self fetchContents];;
-    _requestTimer = [NSTimer scheduledTimerWithTimeInterval:self.requestInterval
+    _requestTimer = [NSTimer scheduledTimerWithTimeInterval:self.zoneTimerInterval
                                                      target:self
                                                    selector:@selector(fetchContents)
                                                    userInfo:nil
@@ -151,30 +151,49 @@ - (NSURLRequest *)fetchContentsRequest
     return request;
 }
 
-- (NSString *)resolutionJson {
-    //TODO: check why area is not clickable and safearea things
-    CGRect screenBounds = [UIScreen mainScreen].bounds;
-    if (@available(iOS 11.0, *)) {
-        CGFloat top = UIApplication.sharedApplication.keyWindow.safeAreaInsets.top;
-        
-        if (top) {
-            screenBounds.origin.y += top + 5;
-            screenBounds.size.height -= top + 5;
-        } else {
-            screenBounds.origin.y += 20.0;
-            screenBounds.size.height -= 20.0;
+- (CGSize)getWindowSize {
+    CGSize size = CGSizeZero;
+
+    // Attempt to retrieve the size from the connected scenes (for modern apps)
+    if (@available(iOS 13.0, *)) {
+        NSSet<UIScene *> *scenes = [[UIApplication sharedApplication] connectedScenes];
+        for (UIScene *scene in scenes) {
+            if ([scene isKindOfClass:[UIWindowScene class]]) {
+                UIWindowScene *windowScene = (UIWindowScene *)scene;
+                UIWindow *window = windowScene.windows.firstObject;
+                if (window) {
+                    size = window.bounds.size;
+                    return size; // Return immediately if we find a valid size
+                }
+            }
+        }
+    }
+
+    // Fallback for legacy apps using AppDelegate
+    id<UIApplicationDelegate> appDelegate = [[UIApplication sharedApplication] delegate];
+    if ([appDelegate respondsToSelector:@selector(window)]) {
+        UIWindow *legacyWindow = [appDelegate performSelector:@selector(window)];
+        if (legacyWindow) {
+            size = legacyWindow.bounds.size;
         }
-    } else {
-        screenBounds.origin.y += 20.0;
-        screenBounds.size.height -= 20.0;
     }
+
+    return size;
+}
+
+- (NSString *)resolutionJson {
+    //TODO: check why area is not clickable and safearea things
+    CGSize size = [self getWindowSize];
 
-    CGFloat width = screenBounds.size.width;
-    CGFloat height = screenBounds.size.height;
+    UIInterfaceOrientation orientation = [UIApplication sharedApplication].statusBarOrientation;
+    BOOL isLandscape = UIInterfaceOrientationIsLandscape(orientation);
+
+    CGFloat lHpW = isLandscape ? size.height : size.width;
+    CGFloat lWpH =  isLandscape ? size.width : size.height;
 
     NSDictionary *resolutionDict = @{
-        @"portrait": @{@"height": @(height), @"width": @(width)},
-        @"landscape": @{@"height": @(width), @"width": @(height)}
+        @"portrait": @{@"height": @(lWpH), @"width": @(lHpW)},
+        @"landscape": @{@"height": @(lHpW), @"width": @(lWpH)}
     };
 
     NSData *jsonData = [NSJSONSerialization dataWithJSONObject:resolutionDict options:0 error:nil];

ios/Classes/CountlyiOS/CountlyContentConfig.h

@@ -32,6 +32,20 @@ typedef void (^ContentCallback)(ContentStatus contentStatus, NSDictionary<NSStri
  * Get content callback
  */
 - (ContentCallback) getGlobalContentCallback;
+
+/**
+ * This is an experimental feature and it can have breaking changes
+ * Set the interval for the automatic content update calls
+ * @param zoneTimerIntervalSeconds in seconds
+ *
+ */
+-(void)setZoneTimerInterval:(NSUInteger)zoneTimerIntervalSeconds;
+
+/**
+ * This is an experimental feature and it can have breaking changes
+ * Get zone timer interval
+ */
+- (NSUInteger) getZoneTimerInterval;
 #endif
 
 NS_ASSUME_NONNULL_END

ios/Classes/CountlyiOS/CountlyContentConfig.m

@@ -9,6 +9,7 @@
 @interface CountlyContentConfig ()
 #if (TARGET_OS_IOS)
 @property (nonatomic) ContentCallback contentCallback;
+@property (nonatomic) NSUInteger zoneTimerInterval;
 #endif
 @end
 
@@ -33,6 +34,19 @@ - (ContentCallback) getGlobalContentCallback
 {
     return self.contentCallback;
 }
+
+
+-(void)setZoneTimerInterval:(NSUInteger)zoneTimerIntervalSeconds
+{
+    if (zoneTimerIntervalSeconds > 15) {
+        self.zoneTimerInterval = zoneTimerIntervalSeconds;
+    }
+}
+
+- (NSUInteger) getZoneTimerInterval
+{
+    return self.zoneTimerInterval;
+}
 #endif
 
 @end

ios/Classes/CountlyiOS/CountlyCrashReporter.m

@@ -288,6 +288,8 @@ void CountlyExceptionHandler(NSException *exception, bool isFatal, bool isAutoDe
         NSMutableDictionary* crashReport = [crashData.crashMetrics mutableCopy];
         crashReport[kCountlyCRKeyError] = crashData.stackTrace;
         crashReport[kCountlyCRKeyBinaryImages] = [CountlyCrashReporter.sharedInstance binaryImagesForStackTrace:stackTrace];
+        crashReport[kCountlyCRKeyBuildUUID] = CountlyCrashReporter.sharedInstance.buildUUID ?: @"";
+        crashReport[kCountlyCRKeyExecutableName] = CountlyCrashReporter.sharedInstance.executableName ?: @"";
         crashReport[kCountlyCRKeyName] = crashData.crashDescription;
         crashReport[kCountlyCRKeyType] = crashData.name;
         crashReport[kCountlyCRKeyNonfatal] = @(!crashData.fatal);
@@ -498,8 +500,6 @@ - (NSMutableDictionary*)getCrashMetrics
     crashReport[kCountlyCRKeyResolution] = CountlyDeviceInfo.resolution;
     crashReport[kCountlyCRKeyAppVersion] = CountlyDeviceInfo.appVersion;
     crashReport[kCountlyCRKeyAppBuild] = CountlyDeviceInfo.appBuild;
-    crashReport[kCountlyCRKeyBuildUUID] = CountlyCrashReporter.sharedInstance.buildUUID ?: @"";
-    crashReport[kCountlyCRKeyExecutableName] = CountlyCrashReporter.sharedInstance.executableName ?: @"";
 
     crashReport[kCountlyCRKeyRAMCurrent] = @((CountlyDeviceInfo.totalRAM - CountlyDeviceInfo.freeRAM) / kCLYMebibit);
     crashReport[kCountlyCRKeyRAMTotal] = @(CountlyDeviceInfo.totalRAM / kCLYMebibit);