Added pushTestMode property and discarded isTestDevice property

Author: erkanyildiz

Countly.m

@@ -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;

CountlyConfig.h

@@ -55,6 +55,9 @@ extern NSString* const CLYConsentAttribution;
 extern NSString* const CLYConsentStarRating;
 extern NSString* const CLYConsentAppleWatch;
 
+//NOTE: Push Notification Test Modes
+extern NSString* const CLYPushTestModeDevelopment;
+extern NSString* const CLYPushTestModeTestFlightOrAdHoc;
 
 @interface CountlyConfig : NSObject
 
@@ -102,10 +105,20 @@ extern NSString* const CLYConsentAppleWatch;
 #pragma mark -
 
 /**
- * For manually marking a device as test device for @c CLYPushNotifications feature.
- * @discussion Test push notifications can be sent to test devices by selecting "Development & test users only" on "Create Push Notification" section on Countly Server.
+ * @c isTestDevice property is deprecated. Please use @c pushTestMode property instead.
+ * @discussion Using this property will have no effect.
+ */
+@property (nonatomic) BOOL isTestDevice DEPRECATED_MSG_ATTRIBUTE("Use 'pushTestMode' property instead!");;
+
+/**
+ * For specifying which test mode Countly Server should use for sending push notifications.
+ * @discussion There are 2 test modes:
+ * @discussion - @c CLYPushTestModeDevelopment: For development/debug builds signed with a development provisioning profile. Countly Server will send push notifications to Sandbox APNs.
+ * @discussion - @c CLYPushTestModeTestFlightOrAdHoc: For TestFlight or AdHoc builds signed with a distribution provisioning profile. Countly Server will send push notifications to Production APNs.
+ * @discussion If set, Test Users mark should be selected on Create Push Notification screen of Countly Server to send push notifications.
+ * @discussion If not set, Countly Server will use Production APNs by default.
  */
-@property (nonatomic) BOOL isTestDevice;
+@property (nonatomic) NSString* pushTestMode;
 
 /**
  * For sending push tokens to Countly Server even for users who have not granted permission to display notifications.

CountlyConnectionManager.m

@@ -247,24 +247,17 @@ - (void)sendEvents
 
 - (void)sendPushToken:(NSString *)token
 {
-    typedef enum : NSInteger
-    {
-        CLYPushTokenModeProduction,
-        CLYPushTokenModeDevelopment,
-        CLYPushTokenModeAdHoc,
-    } CLYPushTokenMode;
-
-    int testMode;
-#ifdef DEBUG
-    testMode = CLYPushTokenModeDevelopment;
-#else
-    testMode = CountlyPushNotifications.sharedInstance.isTestDevice ? CLYPushTokenModeAdHoc : CLYPushTokenModeProduction;
-#endif
+    NSInteger testMode = 0; //NOTE: default is 0: Production - not test mode
+
+    if ([CountlyPushNotifications.sharedInstance.pushTestMode isEqualToString:CLYPushTestModeDevelopment])
+        testMode = 1; //NOTE: 1: Developement/Debug builds - standard test mode using Sandbox APNs
+    else if ([CountlyPushNotifications.sharedInstance.pushTestMode isEqualToString:CLYPushTestModeTestFlightOrAdHoc])
+        testMode = 2; //NOTE: 2: TestFlight/AdHoc builds - special test mode using Production APNs
 
-    NSString* queryString = [[self queryEssentials] stringByAppendingFormat:@"&%@=%@&%@=%@&%@=%d",
+    NSString* queryString = [[self queryEssentials] stringByAppendingFormat:@"&%@=%@&%@=%@&%@=%ld",
                              kCountlyQSKeyPushTokenSession, @"1",
                              kCountlyQSKeyPushTokeniOS, token,
-                             kCountlyQSKeyPushTestMode, testMode];
+                             kCountlyQSKeyPushTestMode, (long)testMode];
 
     [CountlyPersistency.sharedInstance addToQueue:queryString];
 

CountlyPushNotifications.h

@@ -9,7 +9,7 @@
 @interface CountlyPushNotifications : NSObject
 
 @property (nonatomic) BOOL isEnabledOnInitialConfig;
-@property (nonatomic) BOOL isTestDevice;
+@property (nonatomic) NSString* pushTestMode;
 @property (nonatomic) BOOL sendPushTokenAlways;
 @property (nonatomic) BOOL doNotShowAlertForNotifications;
 @property (nonatomic) NSNotification* launchNotification;

CountlyPushNotifications.m

@@ -9,6 +9,10 @@
 NSString* const kCountlyReservedEventPushAction = @"[CLY]_push_action";
 NSString* const kCountlyTokenError = @"kCountlyTokenError";
 
+//NOTE: Push Notification Test Modes
+NSString* const CLYPushTestModeDevelopment = @"CLYPushTestModeDevelopment";
+NSString* const CLYPushTestModeTestFlightOrAdHoc = @"CLYPushTestModeTestFlightOrAdHoc";
+
 #if (TARGET_OS_IOS || TARGET_OS_OSX)
 @interface CountlyPushNotifications () <UNUserNotificationCenterDelegate>
 @property (nonatomic) NSString* token;