Merge pull request #147 from erkanyildiz/master

For 19.08

Author: erkanyildiz

.gitignore

@@ -0,0 +1,12 @@
+# OS generated files #
+######################
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+Thumbs.db
+.LSOverride
+Countly.xcodeproj/project.xcworkspace/
+Countly.xcodeproj/xcuserdata/

CHANGELOG.md

@@ -1,3 +1,42 @@
+## 19.08
+- Added temporary device ID mode
+- Added support for Carthage
+- Added custom URL session configuration support
+- Added custom segmentation support on view tracking
+- Added ability to change app key on the run
+- Added ability to flush queues
+- Added `pushTestMode` property and discarded `isTestDevice` property
+- Fixed `WCSessionDelegate` interception
+- Fixed title and message check in push notification payloads
+- Fixed binary image name extraction for crash reports
+- Fixed missing delegate forwarding for `userNotificationCenter:openSettingsForNotification:` method
+- Fixed in-app alerts on iOS10+ devices when a silent notification with alert key arrives
+- Discarded device ID persistency on Keychain
+- Discarded OpenUDID device ID option
+- Discarded IDFA device ID option
+- Discarded zero IDFA fix
+- Updated default device ID on tvOS as `identifierForVendor` 
+
+- Other various improvements
+    - Renamed `forceDeviceIDInitialization` flag as `resetStoredDeviceID`
+    - Added lightweight generics for segmentation parameters
+    - Added dSYM upload script to preserved paths in Podspec
+    - Updated dSYM upload script to support paths with spaces     
+    - Changed request cache policy to `NSURLRequestReloadIgnoringLocalCacheData`
+    - Added battery level for watchOS 4.0+
+    - Added JSON validity check before converting objects
+    - Deleted unused `kCountlyCRKeyLoadAddress` constant
+    - Improved internal logging in binary images processing for crash reports
+    - Added persistency for generated `NSUUID`
+    - Added precaution to prevent invalid requests from being added to queue
+    - Discarded null check on request queue
+    - Discarded all APM related files
+    - Added length check for view tracking view name
+    - Added length check for view tracking exceptions
+    - Updated HeaderDocs, internal logs, inline notes and pragma marks 
+
+
+
 ## 19.02
 - Added push notification support for macOS
 - Added provisional push notification permission support for iOS12

Countly.h

@@ -72,7 +72,7 @@ - (void)startWithConfig:(CountlyConfig *)config
 
     COUNTLY_LOG(@"Initializing with %@ SDK v%@", kCountlySDKName, kCountlySDKVersion);
 
-    if (!CountlyDeviceInfo.sharedInstance.deviceID || config.forceDeviceIDInitialization)
+    if (!CountlyDeviceInfo.sharedInstance.deviceID || config.resetStoredDeviceID)
         [CountlyDeviceInfo.sharedInstance initializeDeviceID:config.deviceID];
 
     CountlyConnectionManager.sharedInstance.appKey = config.appKey;
@@ -83,7 +83,7 @@ - (void)startWithConfig:(CountlyConfig *)config
     CountlyConnectionManager.sharedInstance.customHeaderFieldName = config.customHeaderFieldName;
     CountlyConnectionManager.sharedInstance.customHeaderFieldValue = config.customHeaderFieldValue;
     CountlyConnectionManager.sharedInstance.secretSalt = config.secretSalt;
-    CountlyConnectionManager.sharedInstance.applyZeroIDFAFix = config.applyZeroIDFAFix;
+    CountlyConnectionManager.sharedInstance.URLSessionConfiguration = config.URLSessionConfiguration;
 
     CountlyPersistency.sharedInstance.eventSendThreshold = config.eventSendThreshold;
     CountlyPersistency.sharedInstance.storedRequestsLimit = MAX(1, config.storedRequestsLimit);
@@ -121,7 +121,7 @@ - (void)startWithConfig:(CountlyConfig *)config
     if ([config.features containsObject:CLYPushNotifications])
     {
         CountlyPushNotifications.sharedInstance.isEnabledOnInitialConfig = YES;
-        CountlyPushNotifications.sharedInstance.isTestDevice = config.isTestDevice;
+        CountlyPushNotifications.sharedInstance.pushTestMode = config.pushTestMode;
         CountlyPushNotifications.sharedInstance.sendPushTokenAlways = config.sendPushTokenAlways;
         CountlyPushNotifications.sharedInstance.doNotShowAlertForNotifications = config.doNotShowAlertForNotifications;
         CountlyPushNotifications.sharedInstance.launchNotification = config.launchNotification;
@@ -137,10 +137,6 @@ - (void)startWithConfig:(CountlyConfig *)config
     }
 #endif
 
-//NOTE: Disable APM feature until server completely supports it
-//    if ([config.features containsObject:CLYAPM])
-//        [CountlyAPM.sharedInstance startAPM];
-
     timer = [NSTimer scheduledTimerWithTimeInterval:config.updateSessionPeriod target:self selector:@selector(onTimer:) userInfo:nil repeats:YES];
     [NSRunLoop.mainRunLoop addTimer:timer forMode:NSRunLoopCommonModes];
 
@@ -163,25 +159,34 @@ - (void)setNewDeviceID:(NSString *)deviceID onServer:(BOOL)onServer
     if (!CountlyConsentManager.sharedInstance.hasAnyConsent)
         return;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+    deviceID = [CountlyDeviceInfo.sharedInstance ensafeDeviceID:deviceID];
 
-#if TARGET_OS_IOS
-    if ([deviceID isEqualToString:CLYIDFA])
-        deviceID = [CountlyDeviceInfo.sharedInstance zeroSafeIDFA];
-    else if ([deviceID isEqualToString:CLYIDFV])
-        deviceID = UIDevice.currentDevice.identifierForVendor.UUIDString;
-    else if ([deviceID isEqualToString:CLYOpenUDID])
-        deviceID = [Countly_OpenUDID value];
-#elif TARGET_OS_OSX
-    if ([deviceID isEqualToString:CLYOpenUDID])
-        deviceID = [Countly_OpenUDID value];
-#endif
+    if ([deviceID isEqualToString:CountlyDeviceInfo.sharedInstance.deviceID])
+    {
+        COUNTLY_LOG(@"Attempted to set the same device ID again. So, setting new device ID is aborted.");
+        return;
+    }
 
-#pragma GCC diagnostic pop
+    if (CountlyDeviceInfo.sharedInstance.isDeviceIDTemporary)
+    {
+        COUNTLY_LOG(@"Going out of CLYTemporaryDeviceID mode and switching back to normal mode.");
+
+        [CountlyDeviceInfo.sharedInstance initializeDeviceID:deviceID];
+
+        [CountlyPersistency.sharedInstance replaceAllTemporaryDeviceIDsInQueueWithDeviceID:deviceID];
+
+        [CountlyConnectionManager.sharedInstance proceedOnQueue];
+
+        [CountlyRemoteConfig.sharedInstance startRemoteConfig];
 
-    if ([deviceID isEqualToString:CountlyDeviceInfo.sharedInstance.deviceID])
         return;
+    }
+
+    if ([deviceID isEqualToString:CLYTemporaryDeviceID] && onServer)
+    {
+        COUNTLY_LOG(@"Attempted to set device ID as CLYTemporaryDeviceID with onServer option. So, onServer value is overridden as NO.");
+        onServer = NO;
+    }
 
     if (onServer)
     {
@@ -206,12 +211,30 @@ - (void)setNewDeviceID:(NSString *)deviceID onServer:(BOOL)onServer
     [CountlyRemoteConfig.sharedInstance startRemoteConfig];
 }
 
+- (void)setNewAppKey:(NSString *)newAppKey
+{
+    if (!newAppKey.length)
+        return;
+
+    [self suspend];
+
+    CountlyConnectionManager.sharedInstance.appKey = newAppKey;
+
+    [self resume];
+}
+
 - (void)setCustomHeaderFieldValue:(NSString *)customHeaderFieldValue
 {
     CountlyConnectionManager.sharedInstance.customHeaderFieldValue = customHeaderFieldValue.copy;
     [CountlyConnectionManager.sharedInstance proceedOnQueue];
 }
 
+- (void)flushQueues
+{
+    [CountlyPersistency.sharedInstance flushEvents];
+    [CountlyPersistency.sharedInstance flushQueue];
+}
+
 #pragma mark ---
 
 - (void)beginSession
@@ -593,35 +616,20 @@ - (void)crashLog:(NSString *)format, ...
 {
 
 }
-
 #endif
 
 
 
-#pragma mark - APM
-
-- (void)addExceptionForAPM:(NSString *)exceptionURL
-{
-    [CountlyAPM.sharedInstance addExceptionForAPM:exceptionURL];
-}
-
-- (void)removeExceptionForAPM:(NSString *)exceptionURL
-{
-    [CountlyAPM.sharedInstance removeExceptionForAPM:exceptionURL];
-}
-
-
-
 #pragma mark - View Tracking
 
 - (void)recordView:(NSString *)viewName;
 {
-    [CountlyViewTracking.sharedInstance startView:viewName];
+    [CountlyViewTracking.sharedInstance startView:viewName customSegmentation:nil];
 }
 
-- (void)reportView:(NSString *)viewName
+- (void)recordView:(NSString *)viewName segmentation:(NSDictionary *)segmentation
 {
-
+    [CountlyViewTracking.sharedInstance startView:viewName customSegmentation:segmentation];
 }
 
 #if TARGET_OS_IOS
@@ -693,17 +701,17 @@ - (id)remoteConfigValueForKey:(NSString *)key
 
 - (void)updateRemoteConfigWithCompletionHandler:(void (^)(NSError * error))completionHandler
 {
-    [CountlyRemoteConfig.sharedInstance updateRemoteConfigForForKeys:nil omitKeys:nil completionHandler:completionHandler];
+    [CountlyRemoteConfig.sharedInstance updateRemoteConfigForKeys:nil omitKeys:nil completionHandler:completionHandler];
 }
 
 - (void)updateRemoteConfigOnlyForKeys:(NSArray *)keys completionHandler:(void (^)(NSError * error))completionHandler
 {
-    [CountlyRemoteConfig.sharedInstance updateRemoteConfigForForKeys:keys omitKeys:nil completionHandler:completionHandler];
+    [CountlyRemoteConfig.sharedInstance updateRemoteConfigForKeys:keys omitKeys:nil completionHandler:completionHandler];
 }
 
 - (void)updateRemoteConfigExceptForKeys:(NSArray *)omitKeys completionHandler:(void (^)(NSError * error))completionHandler
 {
-    [CountlyRemoteConfig.sharedInstance updateRemoteConfigForForKeys:nil omitKeys:omitKeys completionHandler:completionHandler];
+    [CountlyRemoteConfig.sharedInstance updateRemoteConfigForKeys:nil omitKeys:omitKeys completionHandler:completionHandler];
 }
 
 

Countly.m

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = 'Countly'
-  s.version = '19.02'
+  s.version = '19.08'
   s.license = {
     :type => 'COMMUNITY',
     :text => <<-LICENSE