Merge branch 'staging' into events

arifBurakDemiray · web-flow · commit fc4541720fad · 2025-01-31T08:34:12.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,19 @@
   * 'startEvent(key)', instead use 'events.startEvent(key)'
   * 'endEvent(options)', instead use 'events.endEvent(key, [segmentation, count, sum])'
 
+## 25.1.0
+* Improved content size management for better adaptability across devices.
+* Resolved an issue where the action bar overlapped with the content display.
+* Added dynamic resizing functionality for the content zone for enhanced responsiveness.
+* Introduced a configuration option (setZoneTimerInterval) to customize the content zone timer interval.
+
+* Enhanced CertificateTrustManager to support domain-specific configurations with hostname-aware checkServerTrusted calls (Android).
+
+* Fixed an issue where the build UUID and executable name were missing from crash reports (iOS).
+
+* Updated underlying Android SDK version to 25.1.0
+* Updated underlying iOS SDK version to 25.1.0
+
 ## 24.11.2
 * Improved view tracking capabilities in iOS.
 
diff --git a/android/build.gradle b/android/build.gradle
@@ -38,6 +38,6 @@ android {
 }
 
 dependencies {
-    implementation 'ly.count.android:sdk:24.7.7'
+    implementation 'ly.count.android:sdk:25.1.0'
     implementation 'com.google.firebase:firebase-messaging:24.0.3'
 }
diff --git a/android/src/main/java/ly/count/dart/countly_flutter/CountlyFlutterPlugin.java b/android/src/main/java/ly/count/dart/countly_flutter/CountlyFlutterPlugin.java
@@ -1763,10 +1763,15 @@ public void callback(String error) {
         if (_config.has("visibilityTracking")) {
             this.config.experimental.enableVisibilityTracking();
         }
+
         if (_config.has("previousNameRecording")) {
             this.config.experimental.enablePreviousNameRecording();
         }
 
+        if (_config.has("zoneTimerInterval")) {
+            this.config.content.setZoneTimerInterval(_config.getInt("zoneTimerInterval"));
+        }
+
         this.config.content.setGlobalContentCallback(new ContentCallback() {
             @Override 
             public void onContentCallback(ContentStatus contentStatus, Map<String, Object> contentData) {
diff --git a/example/ios/Flutter/Flutter.podspec b/example/ios/Flutter/Flutter.podspec
diff --git a/ios/Classes/CountlyFlutterPlugin.m b/ios/Classes/CountlyFlutterPlugin.m
@@ -1773,6 +1773,11 @@ - (void)populateConfig:(NSDictionary *)_config {
 
             [_channel invokeMethod:@"contentCallback" arguments:contentCallbackData];
         }];
+
+        NSNumber *zoneTimerInterval = _config[@"zoneTimerInterval"];
+        if (zoneTimerInterval) {
+            [config.content setZoneTimerInterval:[zoneTimerInterval unsignedIntValue]];
+        }
        
     } @catch (NSException *exception) {
         COUNTLY_FLUTTER_LOG(@"[populateConfig], Unable to parse Config object: %@", exception);
diff --git a/ios/Classes/CountlyiOS/CHANGELOG.md b/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
 
diff --git a/ios/Classes/CountlyiOS/Countly-PL.podspec b/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'
diff --git a/ios/Classes/CountlyiOS/Countly.m b/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];
diff --git a/ios/Classes/CountlyiOS/Countly.podspec b/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'
diff --git a/ios/Classes/CountlyiOS/CountlyCommon.m b/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";
diff --git a/ios/Classes/CountlyiOS/CountlyContentBuilderInternal.h b/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;
diff --git a/ios/Classes/CountlyiOS/CountlyContentBuilderInternal.m b/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];
diff --git a/ios/Classes/CountlyiOS/CountlyContentConfig.h b/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
diff --git a/ios/Classes/CountlyiOS/CountlyContentConfig.m b/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) {
+        _zoneTimerInterval = zoneTimerIntervalSeconds;
+    }
+}
+
+- (NSUInteger) getZoneTimerInterval
+{
+    return _zoneTimerInterval;
+}
 #endif
 
 @end
diff --git a/ios/Classes/CountlyiOS/CountlyCrashReporter.m b/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);
diff --git a/ios/Classes/CountlyiOS/CountlyWebViewManager.m b/ios/Classes/CountlyiOS/CountlyWebViewManager.m
@@ -21,15 +21,6 @@ - (void)createWebViewWithURL:(NSURL *)url
     UIViewController *rootViewController = UIApplication.sharedApplication.keyWindow.rootViewController;
     CGRect backgroundFrame = rootViewController.view.bounds;
     
-    if (@available(iOS 11.0, *)) {
-        CGFloat top = UIApplication.sharedApplication.keyWindow.safeAreaInsets.top;
-        backgroundFrame.origin.y += top ? top + 5 : 20.0;
-        backgroundFrame.size.height -= top ? top + 5 : 20.0;
-    } else {
-        backgroundFrame.origin.y += 20.0;
-        backgroundFrame.size.height -= 20.0;
-    }
-    
     self.backgroundView = [[PassThroughBackgroundView alloc] initWithFrame:backgroundFrame];
     self.backgroundView.backgroundColor = [UIColor clearColor];
     [rootViewController.view addSubview:self.backgroundView];
@@ -297,8 +288,6 @@ - (void)resizeWebViewWithJSONString:(NSString *)jsonString {
     }];
 }
 
-
-
 - (void)closeWebView {
     dispatch_async(dispatch_get_main_queue(), ^{
         if (self.dismissBlock) {
diff --git a/ios/Classes/CountlyiOS/PassThroughBackgroundView.m b/ios/Classes/CountlyiOS/PassThroughBackgroundView.m
diff --git a/lib/src/configuration_interfaces/countly_config_content.dart b/lib/src/configuration_interfaces/countly_config_content.dart
diff --git a/lib/src/countly_flutter.dart b/lib/src/countly_flutter.dart
diff --git a/scripts/no-push-files/build.gradle b/scripts/no-push-files/build.gradle

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,6 @@ android {`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`dependencies {`
`41`		`- implementation 'ly.count.android:sdk:24.7.7'`
	`41`	`+ implementation 'ly.count.android:sdk:25.1.0'`
`42`	`42`	`implementation 'com.google.firebase:firebase-messaging:24.0.3'`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -275,6 +275,9 @@ - (void)startWithConfig:(CountlyConfig *)config`
`275`	`275`	`if(config.content.getGlobalContentCallback) {`
`276`	`276`	`CountlyContentBuilderInternal.sharedInstance.contentCallback = config.content.getGlobalContentCallback;`
`277`	`277`	`}`
	`278`	`+ if(config.content.getZoneTimerInterval){`
	`279`	`+ CountlyContentBuilderInternal.sharedInstance.zoneTimerInterval = config.content.getZoneTimerInterval;`
	`280`	`+ }`
`278`	`281`	`#endif`
`279`	`282`
`280`	`283`	`[CountlyPerformanceMonitoring.sharedInstance startWithConfig:config.apm];`