Merge pull request #406 from Countly/staging

Staging 25.4.4

Author: turtledreams

.clang-format

@@ -30,4 +30,4 @@ AlignOperands: true
 AlignTrailingComments: true
 
 # Import statements
-SortIncludes: true
+SortIncludes: true

CHANGELOG.md

@@ -1,3 +1,38 @@
+## 25.4.4
+* Improved Health Check metric information.
+* Improved Content display mechanics.
+* Improved CPU architecture detection capabilities.
+
+* Mitigated an issue about app version info in Health Check metrics.
+* Mitigated an SBS issue while in temporary ID mode.
+
+## 25.4.3
+* Mitigated an issue where SDK behavior settings were set to default when fetching for new config.
+* Mitigated an issue where latest fetched behavior settings were replacing the current settings instead of merging.
+
+## 25.4.2
+* Added fullscreen support for feedback widgets.
+* Added "disableSDKBehaviorSettingsUpdates" init config parameter to disable server config updates.
+* Improved request queue handling with a built-in backoff mechanism which is enabled by default.
+* Added "disableBackoffMechanism" init config parameter to disable backoff behavior.
+* Added support for SDK health checks after initialization
+
+## 25.4.1
+* Mitigated an issue that could occur while serializing events to improve stability, performance and memory usage.
+
+## 25.4.0
+* ! Minor breaking change ! Removed UIDevice.currentDevice.identifierForVendor usage in device id generation. The SDK now exclusively uses random UUIDs for device id generation.
+* ! Minor breaking change ! Server Configuration is now enabled by default. Changes made on SDK Manager > SDK Configuration on your server will affect SDK behavior directly.
+
+* Added a Content feature method "refreshContentZone" that does a manual refresh.
+* Extended server configuration capabilities of the SDK.
+* Added a config parameter to provide server config in the initialization "sdkBehaviorSettings: NSString".
+
+* Deprecated the experimental configuration function enableServerConfiguration and it will do nothing.
+
+## 25.1.2
+* Mitigated an issue where the safe area resolution was not correctly calculated for the content zone on certain iOS devices.
+
 ## 25.1.1
 * Mitigated an issue while setting zone timer interval for content.
 

Countly-PL.podspec

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

@@ -92,6 +92,11 @@ - (void)startWithConfig:(CountlyConfig *)config
 
     config = [self checkAndFixInternalLimitsConfig:config];
 
+    if (config.disableSDKBehaviorSettingsUpdates) {
+        [CountlyServerConfig.sharedInstance disableSDKBehaviourSettings];
+    }
+    [CountlyServerConfig.sharedInstance retrieveServerConfigFromStorage:config];
+
     CountlyCommon.sharedInstance.maxKeyLength = config.sdkInternalLimits.getMaxKeyLength;
     CountlyCommon.sharedInstance.maxValueLength = config.sdkInternalLimits.getMaxValueSize;
     CountlyCommon.sharedInstance.maxSegmentationValues = config.sdkInternalLimits.getMaxSegmentationValues;
@@ -165,14 +170,8 @@ - (void)startWithConfig:(CountlyConfig *)config
     CountlyDeviceInfo.sharedInstance.customMetrics = [customMetricsTruncated cly_limited:@"Custom metric"];
 
     [Countly.user save];
-    
-    CountlyCommon.sharedInstance.enableServerConfiguration = config.enableServerConfiguration;
-    
-    // Fetch server configs if 'enableServerConfiguration' is true.
-    if (config.enableServerConfiguration)
-    {
-        [CountlyServerConfig.sharedInstance fetchServerConfig];
-    }
+    // If something added related to server config, make sure to check CountlyServerConfig.notifySdkConfigChange
+    [CountlyServerConfig.sharedInstance fetchServerConfig:config];
 
 #if (TARGET_OS_IOS)
     CountlyFeedbacksInternal.sharedInstance.message = config.starRatingMessage;
@@ -231,15 +230,21 @@ - (void)startWithConfig:(CountlyConfig *)config
     if ([config.features containsObject:CLYCrashReporting])
     {
         CountlyCrashReporter.sharedInstance.isEnabledOnInitialConfig = YES;
+        if (CountlyServerConfig.sharedInstance.crashReportingEnabled)
+        {
         [CountlyCrashReporter.sharedInstance startCrashReporting];
+        }
     }
 
 #if (TARGET_OS_IOS || TARGET_OS_TV )
     if (config.enableAutomaticViewTracking || [config.features containsObject:CLYAutoViewTracking])
     {
         // Print deprecation flag for feature
         CountlyViewTrackingInternal.sharedInstance.isEnabledOnInitialConfig = YES;
-        [CountlyViewTrackingInternal.sharedInstance startAutoViewTracking];
+        if (CountlyServerConfig.sharedInstance.viewTrackingEnabled)
+        {
+            [CountlyViewTrackingInternal.sharedInstance startAutoViewTracking];
+        }
     }
     if (config.automaticViewTrackingExclusionList) {
         [CountlyViewTrackingInternal.sharedInstance addAutoViewTrackingExclutionList:config.automaticViewTrackingExclusionList];
@@ -315,6 +320,8 @@ - (void)startWithConfig:(CountlyConfig *)config
 
     if (config.indirectAttribution)
         [self recordIndirectAttribution:config.indirectAttribution];
+    
+    [CountlyHealthTracker.sharedInstance sendHealthCheck];
 }
 
 - (CountlyConfig *) checkAndFixInternalLimitsConfig:(CountlyConfig *)config
@@ -444,17 +451,20 @@ - (void)resume
 - (void)applicationDidBecomeActive:(NSNotification *)notification
 {
     CLY_LOG_D(@"App enters foreground");
+  [CountlyServerConfig.sharedInstance fetchServerConfigIfTimeIsUp];
     [self resume];
 }
 
 - (void)applicationWillResignActive:(NSNotification *)notification
 {
     CLY_LOG_D(@"App enters background");
+    [CountlyHealthTracker.sharedInstance saveState];
 }
 
 - (void)applicationDidEnterBackground:(NSNotification *)notification
 {
     CLY_LOG_D(@"App did enter background.");
+    [CountlyHealthTracker.sharedInstance saveState];
     [self suspend];
 }
 
@@ -467,6 +477,8 @@ - (void)applicationWillTerminate:(NSNotification *)notification
 {
     CLY_LOG_D(@"App will terminate.");
 
+    [CountlyHealthTracker.sharedInstance saveState];
+    
     CountlyConnectionManager.sharedInstance.isTerminating = YES;
 
     [CountlyViewTrackingInternal.sharedInstance applicationWillTerminate];
@@ -689,12 +701,14 @@ - (void)setIDInternal:(NSString *)deviceID onServer:(BOOL)onServer
         CLY_LOG_I(@"Going out of CLYTemporaryDeviceID mode and switching back to normal mode.");
 
         [CountlyDeviceInfo.sharedInstance initializeDeviceID:deviceID];
-
+        
         [CountlyPersistency.sharedInstance replaceAllTemporaryDeviceIDsInQueueWithDeviceID:deviceID];
 
         [CountlyConnectionManager.sharedInstance proceedOnQueue];
 
         [CountlyRemoteConfigInternal.sharedInstance downloadRemoteConfigAutomatically];
+        
+        [CountlyHealthTracker.sharedInstance sendHealthCheck];
 
         return;
     }
@@ -857,7 +871,12 @@ - (void)recordEvent:(NSString *)key segmentation:(NSDictionary *)segmentation co
         CLY_LOG_W(@"A reserved event detected for key: '%@', event will not be recorded.", key);
         return;
     }
-    
+    if (!CountlyServerConfig.sharedInstance.customEventTrackingEnabled)
+    {
+        CLY_LOG_D(@"'recordEvent' is aborted: Custom Event Tracking is disabled from server config!");
+        return;
+    }
+
     NSDictionary* truncated = [segmentation cly_truncated:@"Event segmentation"];
     segmentation = [truncated cly_limited:@"Event segmentation"];
 

Countly.podspec

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

@@ -82,7 +82,14 @@
 		3B20A9D32245228700E3D7AE /* CountlyPushNotifications.h in Headers */ = {isa = PBXBuildFile; fileRef = 3B20A9AE2245228600E3D7AE /* CountlyPushNotifications.h */; };
 		3B20A9D42245228700E3D7AE /* CountlyPersistency.m in Sources */ = {isa = PBXBuildFile; fileRef = 3B20A9AF2245228600E3D7AE /* CountlyPersistency.m */; };
 		3B20A9D62245228700E3D7AE /* CountlyConsentManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 3B20A9B12245228700E3D7AE /* CountlyConsentManager.h */; };
+		962485BA2D9E971800FA3C20 /* TestUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 962485B92D9E971400FA3C20 /* TestUtils.swift */; };
+		96329DE02D9426F300BFD641 /* CountlyServerConfigTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96329DDF2D9426F300BFD641 /* CountlyServerConfigTests.swift */; };
+		96329DE22D94299D00BFD641 /* ServerConfigBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96329DE12D94299D00BFD641 /* ServerConfigBuilder.swift */; };
+		96329DE42D952F1500BFD641 /* MockURLProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96329DE32D952F1500BFD641 /* MockURLProtocol.swift */; };
+		965A2E9C2DDDCDAC00F28F6A /* CountlyHealthTracker.m in Sources */ = {isa = PBXBuildFile; fileRef = 965A2E9B2DDDCDAC00F28F6A /* CountlyHealthTracker.m */; };
+		965A2E9D2DDDCDAC00F28F6A /* CountlyHealthTracker.h in Headers */ = {isa = PBXBuildFile; fileRef = 965A2E9A2DDDCDAC00F28F6A /* CountlyHealthTracker.h */; };
 		968426812BF2302C007B303E /* CountlyConnectionManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 968426802BF2302C007B303E /* CountlyConnectionManagerTests.swift */; };
+		96DA74BB2D9FB687006FA6FF /* MockFeedbackWidget.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96DA74BA2D9FB687006FA6FF /* MockFeedbackWidget.swift */; };
 		96E680422BFF89AC0091E105 /* CountlyCrashReporterTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96E680412BFF89AC0091E105 /* CountlyCrashReporterTests.swift */; };
 		D219374B248AC71C00E5798B /* CountlyPerformanceMonitoring.h in Headers */ = {isa = PBXBuildFile; fileRef = D2193749248AC71C00E5798B /* CountlyPerformanceMonitoring.h */; };
 		D219374C248AC71C00E5798B /* CountlyPerformanceMonitoring.m in Sources */ = {isa = PBXBuildFile; fileRef = D219374A248AC71C00E5798B /* CountlyPerformanceMonitoring.m */; };
@@ -181,7 +188,15 @@
 		3B20A9AE2245228600E3D7AE /* CountlyPushNotifications.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CountlyPushNotifications.h; sourceTree = "<group>"; };
 		3B20A9AF2245228600E3D7AE /* CountlyPersistency.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CountlyPersistency.m; sourceTree = "<group>"; };
 		3B20A9B12245228700E3D7AE /* CountlyConsentManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CountlyConsentManager.h; sourceTree = "<group>"; };
+		962485B92D9E971400FA3C20 /* TestUtils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestUtils.swift; sourceTree = "<group>"; };
+		96329DDF2D9426F300BFD641 /* CountlyServerConfigTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CountlyServerConfigTests.swift; sourceTree = "<group>"; };
+		96329DE12D94299D00BFD641 /* ServerConfigBuilder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ServerConfigBuilder.swift; sourceTree = "<group>"; };
+		96329DE32D952F1500BFD641 /* MockURLProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockURLProtocol.swift; sourceTree = "<group>"; };
+		965A2E9A2DDDCDAC00F28F6A /* CountlyHealthTracker.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CountlyHealthTracker.h; sourceTree = "<group>"; };
+		965A2E9B2DDDCDAC00F28F6A /* CountlyHealthTracker.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CountlyHealthTracker.m; sourceTree = "<group>"; };
+		96681A9B2D97D9B300A4845A /* CountlyTests.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = CountlyTests.xctestplan; sourceTree = "<group>"; };
 		968426802BF2302C007B303E /* CountlyConnectionManagerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CountlyConnectionManagerTests.swift; sourceTree = "<group>"; };
+		96DA74BA2D9FB687006FA6FF /* MockFeedbackWidget.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockFeedbackWidget.swift; sourceTree = "<group>"; };
 		96E680412BFF89AC0091E105 /* CountlyCrashReporterTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CountlyCrashReporterTests.swift; sourceTree = "<group>"; };
 		D2193749248AC71C00E5798B /* CountlyPerformanceMonitoring.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CountlyPerformanceMonitoring.h; sourceTree = "<group>"; };
 		D219374A248AC71C00E5798B /* CountlyPerformanceMonitoring.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CountlyPerformanceMonitoring.m; sourceTree = "<group>"; };
@@ -213,6 +228,11 @@
 		1A5C4C952B35B0850032EE1F /* CountlyTests */ = {
 			isa = PBXGroup;
 			children = (
+				96DA74BA2D9FB687006FA6FF /* MockFeedbackWidget.swift */,
+				962485B92D9E971400FA3C20 /* TestUtils.swift */,
+				96329DE32D952F1500BFD641 /* MockURLProtocol.swift */,
+				96329DE12D94299D00BFD641 /* ServerConfigBuilder.swift */,
+				96329DDF2D9426F300BFD641 /* CountlyServerConfigTests.swift */,
 				1A5C4C962B35B0850032EE1F /* CountlyTests.swift */,
 				1A50D7042B3C5AA3009C6938 /* CountlyBaseTestCase.swift */,
 				1AFD79012B3EF82C00772FBD /* CountlyTests-Bridging-Header.h */,
@@ -231,6 +251,7 @@
 		3B20A9782245225A00E3D7AE = {
 			isa = PBXGroup;
 			children = (
+				96681A9B2D97D9B300A4845A /* CountlyTests.xctestplan */,
 				39BDF7562CC7CA870066DE7C /* CountlyFeedbacks.h */,
 				39BDF7582CC7CA920066DE7C /* CountlyFeedbacks.m */,
 				39002D092C8B2E450049394F /* CountlyContentConfig.h */,
@@ -303,6 +324,8 @@
 				3B20A9A42245228500E3D7AE /* CountlyUserDetails.m */,
 				3B20A9A72245228500E3D7AE /* CountlyViewTrackingInternal.h */,
 				3B20A9A32245228500E3D7AE /* CountlyViewTrackingInternal.m */,
+				965A2E9A2DDDCDAC00F28F6A /* CountlyHealthTracker.h */,
+				965A2E9B2DDDCDAC00F28F6A /* CountlyHealthTracker.m */,
 				3B20A9862245225A00E3D7AE /* Info.plist */,
 				1A5C4C952B35B0850032EE1F /* CountlyTests */,
 				3B20A9832245225A00E3D7AE /* Products */,
@@ -338,6 +361,7 @@
 				39BDF7572CC7CA870066DE7C /* CountlyFeedbacks.h in Headers */,
 				3B20A9D32245228700E3D7AE /* CountlyPushNotifications.h in Headers */,
 				3B20A9C42245228700E3D7AE /* CountlyUserDetails.h in Headers */,
+				965A2E9D2DDDCDAC00F28F6A /* CountlyHealthTracker.h in Headers */,
 				3961C6B72C6633C000DD38BA /* PassThroughBackgroundView.h in Headers */,
 				3B20A9CA2245228700E3D7AE /* CountlyConfig.h in Headers */,
 				3B20A9872245225A00E3D7AE /* Countly.h in Headers */,
@@ -472,14 +496,19 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				96329DE22D94299D00BFD641 /* ServerConfigBuilder.swift in Sources */,
 				1A5C4C972B35B0850032EE1F /* CountlyTests.swift in Sources */,
 				3969D0232CB80848000F8A32 /* CountlyViewTests.swift in Sources */,
 				399B46502C52813700AD384E /* CountlyLocationTests.swift in Sources */,
 				1A50D7052B3C5AA3009C6938 /* CountlyBaseTestCase.swift in Sources */,
 				3979E47D2C0760E900FA1CA4 /* CountlyUserProfileTests.swift in Sources */,
 				968426812BF2302C007B303E /* CountlyConnectionManagerTests.swift in Sources */,
+				96329DE42D952F1500BFD641 /* MockURLProtocol.swift in Sources */,
+				96329DE02D9426F300BFD641 /* CountlyServerConfigTests.swift in Sources */,
 				3966DBCF2C11EE270002ED97 /* CountlyDeviceIDTests.swift in Sources */,
 				3964A3E72C2AF8E90091E677 /* CountlySegmentationTests.swift in Sources */,
+				96DA74BB2D9FB687006FA6FF /* MockFeedbackWidget.swift in Sources */,
+				962485BA2D9E971800FA3C20 /* TestUtils.swift in Sources */,
 				3972EDDB2C08A38D00EB9D3E /* CountlyEventStruct.swift in Sources */,
 				96E680422BFF89AC0091E105 /* CountlyCrashReporterTests.swift in Sources */,
 			);
@@ -514,6 +543,7 @@
 				1A3110712A7141AF001CB507 /* CountlyViewTracking.m in Sources */,
 				3903429D2C8051C700238C96 /* CountlyExperimentalConfig.m in Sources */,
 				1A3A576329ED47A20041B7BE /* CountlyServerConfig.m in Sources */,
+				965A2E9C2DDDCDAC00F28F6A /* CountlyHealthTracker.m in Sources */,
 				D219374C248AC71C00E5798B /* CountlyPerformanceMonitoring.m in Sources */,
 				3B20A9B42245228700E3D7AE /* CountlyPushNotifications.m in Sources */,
 				3B20A9C92245228700E3D7AE /* CountlyUserDetails.m in Sources */,
@@ -738,7 +768,7 @@
 					"@loader_path/Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = 25.1.1;
+				MARKETING_VERSION = 25.4.4;
 				PRODUCT_BUNDLE_IDENTIFIER = ly.count.CountlyiOSSDK;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -770,7 +800,7 @@
 					"@loader_path/Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = 25.1.1;
+				MARKETING_VERSION = 25.4.4;
 				PRODUCT_BUNDLE_IDENTIFIER = ly.count.CountlyiOSSDK;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

Countly.xcodeproj/xcshareddata/xcschemes/CountlyTests.xcscheme

@@ -8,14 +8,19 @@
    </BuildAction>
    <TestAction
       buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      shouldAutocreateTestPlan = "YES">
+      selectedDebuggerIdentifier = ""
+      selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <TestPlans>
+         <TestPlanReference
+            reference = "container:CountlyTests.xctestplan"
+            default = "YES">
+         </TestPlanReference>
+      </TestPlans>
       <Testables>
          <TestableReference
             skipped = "NO"
-            parallelizable = "YES">
+            parallelizable = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "1A5C4C932B35B0850032EE1F"

CountlyCommon.h

@@ -31,6 +31,7 @@
 #import "CountlyCrashData.h"
 #import "CountlyContentBuilderInternal.h"
 #import "CountlyExperimentalConfig.h"
+#import "CountlyHealthTracker.h"
 
 #define CLY_LOG_E(fmt, ...) CountlyInternalLog(CLYInternalLogLevelError, fmt, ##__VA_ARGS__)
 #define CLY_LOG_W(fmt, ...) CountlyInternalLog(CLYInternalLogLevelWarning, fmt, ##__VA_ARGS__)
@@ -88,7 +89,6 @@ extern NSString* const kCountlySDKName;
 @property (nonatomic) BOOL manualSessionHandling;
 @property (nonatomic) BOOL enableManualSessionControlHybridMode;
 @property (nonatomic) BOOL enableOrientationTracking;
-@property (nonatomic) BOOL enableServerConfiguration;
 
 @property (nonatomic) BOOL enableVisibiltyTracking;
 
@@ -124,6 +124,8 @@ void CountlyPrint(NSString *stringToPrint);
 - (BOOL)hasStarted_;
 
 - (NSURLSession *)URLSession;
+
+- (CGSize)getWindowSize;
 @end