Merge pull request #292 from Countly/visionos_support

visionOS support

Author: turtledreams

.github/workflows/build.yml

@@ -25,17 +25,17 @@ jobs:
             {os_version: 14, sdk: "iphoneos17.5"},
             {os_version: 14, sdk: "appletvos17.5"},
             {os_version: 14, sdk: "watchos10.5"},
-            {os_version: 14, sdk: "visionos1.2"},
+            {os_version: 14, sdk: "xros1.2"},
             {os_version: 12, sdk: "iphoneos16.2"},
             {os_version: 12, sdk: "macosx13.1"},
             {os_version: 12, sdk: "appletvos16.1"},
-            {os_version: 12, sdk: "visionos1.0"},
             {os_version: 12, sdk: "watchos9.1"},
             {os_version: 13, sdk: "iphoneos17.2"},
             {os_version: 13, sdk: "macosx14.2"},
             {os_version: 13, sdk: "appletvos17.2"},
             {os_version: 13, sdk: "watchos10.2"},
-            {os_version: 13, sdk: "visionos1.1"}
+            {os_version: 13, sdk: "xros1.0"},
+            {os_version: 15, sdk: "xros2.0"}
           ]
     steps:
       # To check the github context

Countly.h

@@ -15,7 +15,7 @@
 #import "CountlyContentBuilder.h"
 #import "CountlyFeedbacks.h"
 #import "Resettable.h"
-#if (TARGET_OS_IOS || TARGET_OS_OSX)
+#if (TARGET_OS_IOS || TARGET_OS_VISION || TARGET_OS_OSX )
 #import <UserNotifications/UserNotifications.h>
 #endif
 
@@ -377,7 +377,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 
 #pragma mark - Push Notification
-#if (TARGET_OS_IOS || TARGET_OS_OSX)
+#if (TARGET_OS_IOS || TARGET_OS_VISION || TARGET_OS_OSX )
 #ifndef COUNTLY_EXCLUDE_PUSHNOTIFICATIONS
 /**
  * Shows default system dialog that asks for user's permission to display notifications.
@@ -553,7 +553,7 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (void)recordView:(NSString *)viewName segmentation:(NSDictionary<NSString *, id> *)segmentation DEPRECATED_MSG_ATTRIBUTE("Use '[views startView/startAutoStoppedView:]' method instead!");
 
-#if (TARGET_OS_IOS || TARGET_OS_TV)
+#if (TARGET_OS_IOS || TARGET_OS_VISION || TARGET_OS_TV )
 /**
  * Adds exception for AutoViewTracking.
  * @discussion @c UIViewControllers with specified title or class name will be ignored by AutoViewTracking and their appearances and disappearances will not be recorded.
@@ -594,7 +594,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 
 #pragma mark - Feedbacks
-#if (TARGET_OS_IOS)
+#if (TARGET_OS_IOS || TARGET_OS_VISION )
 /**
  * Shows star-rating dialog manually and executes completion block after user's action.
  * @discussion Completion block has a single NSInteger parameter that indicates 1 to 5 star-rating given by user.

Countly.m

@@ -48,7 +48,7 @@ - (instancetype)init
 {
     if (self = [super init])
     {
-#if (TARGET_OS_IOS  || TARGET_OS_TV)
+#if (TARGET_OS_IOS || TARGET_OS_VISION  || TARGET_OS_TV )
         [NSNotificationCenter.defaultCenter addObserver:self
                                                selector:@selector(applicationDidEnterBackground:)
                                                    name:UIApplicationDidEnterBackgroundNotification
@@ -197,8 +197,8 @@ - (void)startWithConfig:(CountlyConfig *)config
         [CountlyCommon.sharedInstance recordOrientation];
 
     //NOTE: If there is no consent for sessions, location info and attribution should be sent separately, as they cannot be sent with begin_session request.
-   
-#if (TARGET_OS_IOS || TARGET_OS_OSX)
+
+#if (TARGET_OS_IOS || TARGET_OS_VISION || TARGET_OS_OSX )
 #ifndef COUNTLY_EXCLUDE_PUSHNOTIFICATIONS
     if ([config.features containsObject:CLYPushNotifications])
     {
@@ -233,8 +233,8 @@ - (void)startWithConfig:(CountlyConfig *)config
         CountlyCrashReporter.sharedInstance.isEnabledOnInitialConfig = YES;
         [CountlyCrashReporter.sharedInstance startCrashReporting];
     }
-    
-#if (TARGET_OS_IOS || TARGET_OS_TV)
+
+#if (TARGET_OS_IOS || TARGET_OS_TV )
     if (config.enableAutomaticViewTracking || [config.features containsObject:CLYAutoViewTracking])
     {
         // Print deprecation flag for feature
@@ -614,8 +614,8 @@ - (CLYDeviceIDType)deviceIDType
 
     if ([CountlyPersistency.sharedInstance retrieveIsCustomDeviceID])
         return CLYDeviceIDTypeCustom;
-    
-#if (TARGET_OS_IOS || TARGET_OS_TV)
+
+#if (TARGET_OS_IOS || TARGET_OS_VISION || TARGET_OS_TV )
     return CLYDeviceIDTypeIDFV;
 #else
     return CLYDeviceIDTypeNSUUID;
@@ -1035,7 +1035,7 @@ - (void)cancelEvent:(NSString *)key
 
 
 #pragma mark - Push Notifications
-#if (TARGET_OS_IOS || TARGET_OS_OSX)
+#if (TARGET_OS_IOS || TARGET_OS_VISION || TARGET_OS_OSX )
 #ifndef COUNTLY_EXCLUDE_PUSHNOTIFICATIONS
 
 - (void)askForNotificationPermission
@@ -1188,7 +1188,7 @@ - (void)recordView:(NSString *)viewName segmentation:(NSDictionary *)segmentatio
     [CountlyViewTrackingInternal.sharedInstance startAutoStoppedView:viewName segmentation:segmentation];
 }
 
-#if (TARGET_OS_IOS || TARGET_OS_TV)
+#if (TARGET_OS_IOS || TARGET_OS_VISION || TARGET_OS_TV )
 - (void)addExceptionForAutoViewTracking:(NSString *)exception
 {
     CLY_LOG_I(@"%s %@", __FUNCTION__, exception);

CountlyCommon.h

@@ -111,7 +111,7 @@ void CountlyPrint(NSString *stringToPrint);
 - (void)startBackgroundTask;
 - (void)finishBackgroundTask;
 
-#if (TARGET_OS_IOS || TARGET_OS_TV)
+#if (TARGET_OS_IOS || TARGET_OS_VISION || TARGET_OS_TV )
 - (UIViewController *)topViewController;
 - (void)tryPresentingViewController:(UIViewController *)viewController;
 - (void)tryPresentingViewController:(UIViewController *)viewController withCompletion:(void (^ __nullable) (void))completion;

CountlyCommon.m

@@ -20,11 +20,11 @@ @interface CountlyCommon ()
 }
 @property long long lastTimestamp;
 
-#if (TARGET_OS_IOS)
+#if (TARGET_OS_IOS || TARGET_OS_VISION )
 @property (nonatomic) NSString* lastInterfaceOrientation;
 #endif
 
-#if (TARGET_OS_IOS || TARGET_OS_TV)
+#if (TARGET_OS_IOS || TARGET_OS_VISION || TARGET_OS_TV )
 @property (nonatomic) UIBackgroundTaskIdentifier bgTask;
 #endif
 @end
@@ -244,7 +244,7 @@ - (void)recordOrientation
 
 - (void)startBackgroundTask
 {
-#if (TARGET_OS_IOS || TARGET_OS_TV)
+#if (TARGET_OS_IOS || TARGET_OS_VISION || TARGET_OS_TV)
     if (self.bgTask != UIBackgroundTaskInvalid)
         return;
 
@@ -258,7 +258,7 @@ - (void)startBackgroundTask
 
 - (void)finishBackgroundTask
 {
-#if (TARGET_OS_IOS || TARGET_OS_TV)
+#if (TARGET_OS_IOS || TARGET_OS_VISION || TARGET_OS_TV)
     if (self.bgTask != UIBackgroundTaskInvalid && !CountlyConnectionManager.sharedInstance.connection)
     {
         [UIApplication.sharedApplication endBackgroundTask:self.bgTask];

CountlyConfig.h

@@ -13,7 +13,7 @@
 #import "CountlyExperimentalConfig.h"
 #import "CountlyContentConfig.h"
 
-#if (TARGET_OS_IOS || TARGET_OS_TV)
+#if (TARGET_OS_IOS || TARGET_OS_VISION || TARGET_OS_TV )
 #import <UIKit/UIKit.h>
 #endif
 
@@ -30,7 +30,7 @@ typedef void (^WidgetCallback)(WidgetState widgetState);
 
 //NOTE: Countly features
 typedef NSString* CLYFeature NS_EXTENSIBLE_STRING_ENUM;
-#if (TARGET_OS_IOS)
+#if (TARGET_OS_IOS || TARGET_OS_VISION )
 #ifndef COUNTLY_EXCLUDE_PUSHNOTIFICATIONS
 extern CLYFeature const CLYPushNotifications;
 #endif
@@ -226,7 +226,7 @@ typedef enum : NSUInteger
 
 #pragma mark -
 
-#if (TARGET_OS_IOS || TARGET_OS_TV)
+#if (TARGET_OS_IOS || TARGET_OS_VISION || TARGET_OS_TV)
 /**
  * For enabling automatic view tacking.
  * @discussion If set, views will automatically track.

CountlyConfig.m

@@ -17,7 +17,7 @@ - (void)enableAPMInternal:(BOOL)enableAPM;
 @implementation CountlyConfig
 
 //NOTE: Countly features
-#if (TARGET_OS_IOS)
+#if (TARGET_OS_IOS || TARGET_OS_VISION)
 CLYFeature const CLYPushNotifications   = @"CLYPushNotifications";
 CLYFeature const CLYCrashReporting      = @"CLYCrashReporting";
 // CLYAutoViewTracking is deprecated, Use 'config.enableAutomaticViewTracking' instead

CountlyConnectionManager.m

@@ -830,7 +830,7 @@ - (NSString *)attributionQueryString
 
 - (NSMutableData *)pictureUploadDataForQueryString:(NSString *)queryString
 {
-#if (TARGET_OS_IOS)
+#if (TARGET_OS_IOS || TARGET_OS_VISION)
     NSString* localPicturePath = nil;
 
     NSString* userDetails = [queryString cly_valueForQueryStringKey:kCountlyQSKeyUserDetails];

CountlyConsentManager.m

@@ -332,7 +332,7 @@ - (void)setConsentForPushNotifications:(BOOL)consentForPushNotifications
 {
     _consentForPushNotifications = consentForPushNotifications;
 
-#if (TARGET_OS_IOS || TARGET_OS_OSX)
+#if (TARGET_OS_IOS || TARGET_OS_VISION || TARGET_OS_OSX)
     if (consentForPushNotifications)
     {
         CLY_LOG_D(@"Consent for PushNotifications is given.");
@@ -375,7 +375,7 @@ - (void)setConsentForViewTracking:(BOOL)consentForViewTracking
 {
     _consentForViewTracking = consentForViewTracking;
 
-#if (TARGET_OS_IOS || TARGET_OS_TV)
+#if (TARGET_OS_IOS || TARGET_OS_VISION || TARGET_OS_TV)
     if (consentForViewTracking)
     {
         CLY_LOG_D(@"Consent for ViewTracking is given.");
@@ -413,7 +413,7 @@ - (void)setConsentForPerformanceMonitoring:(BOOL)consentForPerformanceMonitoring
 {
     _consentForPerformanceMonitoring = consentForPerformanceMonitoring;
 
-#if (TARGET_OS_IOS)
+#if (TARGET_OS_IOS || TARGET_OS_VISION)
     if (consentForPerformanceMonitoring)
     {
         CLY_LOG_D(@"Consent for PerformanceMonitoring is given.");

CountlyCrashReporter.m

@@ -108,7 +108,7 @@ - (void)startCrashReporting
 
     NSSetUncaughtExceptionHandler(&CountlyUncaughtExceptionHandler);
 
-#if (TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_OSX)
+#if (TARGET_OS_IOS || TARGET_OS_VISION || TARGET_OS_TV || TARGET_OS_OSX)
     signal(SIGABRT, CountlySignalHandler);
     signal(SIGILL, CountlySignalHandler);
     signal(SIGSEGV, CountlySignalHandler);
@@ -127,7 +127,7 @@ - (void)stopCrashReporting
 
     NSSetUncaughtExceptionHandler(NULL);
 
-#if (TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_OSX)
+#if (TARGET_OS_IOS || TARGET_OS_VISION || TARGET_OS_TV || TARGET_OS_OSX)
     signal(SIGABRT, SIG_DFL);
     signal(SIGILL, SIG_DFL);
     signal(SIGSEGV, SIG_DFL);

CountlyDeviceInfo.m

@@ -65,7 +65,7 @@ - (instancetype)init
 #endif
 #endif
 
-#if (TARGET_OS_IOS || TARGET_OS_TV)
+#if (TARGET_OS_IOS || TARGET_OS_VISION || TARGET_OS_TV)
         self.isInBackground = (UIApplication.sharedApplication.applicationState == UIApplicationStateBackground);
 
         [NSNotificationCenter.defaultCenter addObserver:self
@@ -107,7 +107,7 @@ - (NSString *)ensafeDeviceID:(NSString *)deviceID
     if (deviceID.length)
         return deviceID;
 
-#if (TARGET_OS_IOS || TARGET_OS_TV)
+#if (TARGET_OS_IOS || TARGET_OS_VISION || TARGET_OS_TV)
     return UIDevice.currentDevice.identifierForVendor.UUIDString;
 #else
     NSString* UUID = [CountlyPersistency.sharedInstance retrieveNSUUID];
@@ -182,6 +182,8 @@ + (NSString *)deviceType
     return @"smarttv";
 #elif (TARGET_OS_OSX)
     return @"desktop";
+#elif (TARGET_OS_VISION)
+    return @"vr";
 #endif
 
     return nil;
@@ -218,14 +220,16 @@ + (NSString *)osName
     return @"tvOS";
 #elif (TARGET_OS_OSX)
     return @"macOS";
+#elif (TARGET_OS_VISION)
+    return @"visionOS";
 #endif
 
     return nil;
 }
 
 + (NSString *)osVersion
 {
-#if (TARGET_OS_IOS || TARGET_OS_TV)
+#if (TARGET_OS_IOS || TARGET_OS_VISION || TARGET_OS_TV)
     return UIDevice.currentDevice.systemVersion;
 #elif (TARGET_OS_WATCH)
     return WKInterfaceDevice.currentDevice.systemVersion;
@@ -260,34 +264,35 @@ + (NSString *)carrier
 
 + (NSString *)resolution
 {
+    CGRect bounds;
+    CGFloat scale;
 #if (TARGET_OS_IOS || TARGET_OS_TV)
-    CGRect bounds = UIScreen.mainScreen.bounds;
-    CGFloat scale = UIScreen.mainScreen.scale;
+    bounds = UIScreen.mainScreen.bounds;
+    scale = UIScreen.mainScreen.scale;
 #elif (TARGET_OS_WATCH)
-    CGRect bounds = WKInterfaceDevice.currentDevice.screenBounds;
-    CGFloat scale = WKInterfaceDevice.currentDevice.screenScale;
+    bounds = WKInterfaceDevice.currentDevice.screenBounds;
+    scale = WKInterfaceDevice.currentDevice.screenScale;
 #elif (TARGET_OS_OSX)
-    NSRect bounds = NSScreen.mainScreen.frame;
-    CGFloat scale = NSScreen.mainScreen.backingScaleFactor;
+    bounds = NSScreen.mainScreen.frame;
+    scale = NSScreen.mainScreen.backingScaleFactor;
 #else
     return nil;
 #endif
-
     return [NSString stringWithFormat:@"%gx%g", bounds.size.width * scale, bounds.size.height * scale];
 }
 
 + (NSString *)density
 {
+    CGFloat scale;
 #if (TARGET_OS_IOS || TARGET_OS_TV)
-    CGFloat scale = UIScreen.mainScreen.scale;
+    scale = UIScreen.mainScreen.scale;
 #elif (TARGET_OS_WATCH)
-    CGFloat scale = WKInterfaceDevice.currentDevice.screenScale;
+    scale = WKInterfaceDevice.currentDevice.screenScale;
 #elif (TARGET_OS_OSX)
-    CGFloat scale = NSScreen.mainScreen.backingScaleFactor;
+    scale = NSScreen.mainScreen.backingScaleFactor;
 #else
     return nil;
 #endif
-
     return [NSString stringWithFormat:@"@%dx", (int)scale];
 }
 
@@ -409,7 +414,7 @@ + (unsigned long long)totalDisk
 // If it is not possible to retrieve a valid value then it will return a -1.
 + (NSInteger)batteryLevel
 {
-#if (TARGET_OS_IOS)
+#if (TARGET_OS_IOS || TARGET_OS_VISION)
     // If battey state is "unknown" that means that battery monitoring is not enabled.
     // In that case we will not able to retrieve a battery level.
     if (UIDevice.currentDevice.batteryState == UIDeviceBatteryStateUnknown)

CountlyNotificationService.h

@@ -6,7 +6,7 @@
 
 #import <Foundation/Foundation.h>
 
-#if (TARGET_OS_IOS)
+#if (TARGET_OS_IOS || TARGET_OS_VISION)
 #import <UserNotifications/UserNotifications.h>
 #endif
 
@@ -24,7 +24,7 @@ extern NSString* const kCountlyPNKeyActionButtonTitle;
 extern NSString* const kCountlyPNKeyActionButtonURL;
 
 @interface CountlyNotificationService : NSObject
-#if (TARGET_OS_IOS)
+#if (TARGET_OS_IOS || TARGET_OS_VISION)
 + (void)didReceiveNotificationRequest:(UNNotificationRequest *)request withContentHandler:(void (^)(UNNotificationContent *))contentHandler API_AVAILABLE(ios(10.0));
 #endif
 

CountlyNotificationService.m

@@ -25,7 +25,7 @@
 NSString* const kCountlyPNKeyActionButtonURL    = @"l";
 
 @implementation CountlyNotificationService
-#if (TARGET_OS_IOS)
+#if (TARGET_OS_IOS || TARGET_OS_VISION)
 + (void)didReceiveNotificationRequest:(UNNotificationRequest *)request withContentHandler:(void (^)(UNNotificationContent *))contentHandler
 {
     COUNTLY_EXT_LOG(@"didReceiveNotificationRequest:withContentHandler:");

CountlyPerformanceMonitoring.m

@@ -84,7 +84,7 @@ - (void)startPerformanceMonitoring
 #if (TARGET_OS_OSX)
     [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(applicationDidBecomeActive:) name:NSApplicationDidBecomeActiveNotification object:nil];
     [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(applicationWillResignActive:) name:NSApplicationWillResignActiveNotification object:nil];
-#elif (TARGET_OS_IOS  || TARGET_OS_TV)
+#elif (TARGET_OS_IOS || TARGET_OS_VISION  || TARGET_OS_TV)
     [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(applicationDidBecomeActive:) name:UIApplicationDidBecomeActiveNotification object:nil];
     [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(applicationWillResignActive:) name:UIApplicationWillResignActiveNotification object:nil];
 #endif
@@ -100,7 +100,7 @@ - (void)stopPerformanceMonitoring
 #if (TARGET_OS_OSX)
     [NSNotificationCenter.defaultCenter removeObserver:self name:NSApplicationDidBecomeActiveNotification object:nil];
     [NSNotificationCenter.defaultCenter removeObserver:self name:NSApplicationWillResignActiveNotification object:nil];
-#elif (TARGET_OS_IOS  || TARGET_OS_TV)
+#elif (TARGET_OS_IOS || TARGET_OS_VISION  || TARGET_OS_TV)
     [NSNotificationCenter.defaultCenter removeObserver:self name:UIApplicationDidBecomeActiveNotification object:nil];
     [NSNotificationCenter.defaultCenter removeObserver:self name:UIApplicationWillResignActiveNotification object:nil];
 #endif