Move PushServicePlatform enum to Swift

Author: tapashmajumder

swift-sdk/Internal/IterableAPIInternal.swift

@@ -123,7 +123,7 @@ final class IterableAPIInternal : NSObject, PushTrackerProtocol {
         hexToken = (token as NSData).iteHexadecimalString()
 
         let device = UIDevice.current
-        let psp = IterableAPIInternal.pushServicePlatformToString(pushServicePlatform)
+        let pushServicePlatformString = IterableAPIInternal.pushServicePlatformToString(pushServicePlatform)
 
         var dataFields: [String : Any] = [
             .ITBL_DEVICE_LOCALIZED_MODEL: device.localizedModel,
@@ -151,7 +151,7 @@ final class IterableAPIInternal : NSObject, PushTrackerProtocol {
 
         let deviceDictionary: [String : Any] = [
             AnyHashable.ITBL_KEY_TOKEN: hexToken!,
-            AnyHashable.ITBL_KEY_PLATFORM: psp,
+            AnyHashable.ITBL_KEY_PLATFORM: pushServicePlatformString,
             AnyHashable.ITBL_KEY_APPLICATION_NAME: appName,
             AnyHashable.ITBL_KEY_DATA_FIELDS: dataFields
         ]
@@ -551,11 +551,11 @@ final class IterableAPIInternal : NSObject, PushTrackerProtocol {
     private var pushIntegrationName: String? {
         if let pushIntegrationName = config.pushIntegrationName, let sandboxPushIntegrationName = config.sandboxPushIntegrationName {
             switch(config.pushPlatform) {
-            case .APNS:
+            case .production:
                 return pushIntegrationName
-            case .APNS_SANDBOX:
+            case .sandbox:
                 return sandboxPushIntegrationName
-            case .AUTO:
+            case .auto:
                 return IterableAPNSUtil.isSandboxAPNS() ? sandboxPushIntegrationName : pushIntegrationName
             }
         }
@@ -641,11 +641,11 @@ final class IterableAPIInternal : NSObject, PushTrackerProtocol {
 
     private static func pushServicePlatformToString(_ pushServicePlatform: PushServicePlatform) -> String {
         switch pushServicePlatform {
-        case .APNS:
+        case .production:
             return .ITBL_KEY_APNS
-        case .APNS_SANDBOX:
+        case .sandbox:
             return .ITBL_KEY_APNS_SANDBOX
-        case .AUTO:
+        case .auto:
             return IterableAPNSUtil.isSandboxAPNS() ? .ITBL_KEY_APNS_SANDBOX : .ITBL_KEY_APNS
         }
     }

swift-sdk/IterableAPI.swift

@@ -89,7 +89,7 @@ public final class IterableAPI : NSObject {
 
     /**
      * Register this device's token with Iterable
-     * Push integration name and platform are read from `IterableConfig`. If platform is set to `AUTO`, it will
+     * Push integration name and platform are read from `IterableConfig`. If platform is set to `auto`, it will
      * read APNS environment from the provisioning profile and use an integration name specified in `IterableConfig`.
      - parameters:
      - token:       The token representing this device/application pair, obtained from
@@ -102,7 +102,7 @@ public final class IterableAPI : NSObject {
 
     /**
      * Register this device's token with Iterable
-     * Push integration name and platform are read from `IterableConfig`. If platform is set to `AUTO`, it will
+     * Push integration name and platform are read from `IterableConfig`. If platform is set to `auto`, it will
      * read APNS environment from the provisioning profile and use an integration name specified in `IterableConfig`.
      - parameters:
      - token:       The token representing this device/application pair, obtained from

swift-sdk/IterableConfig.swift

@@ -55,6 +55,18 @@ import Foundation
     @objc(log:Message:) func log(level: LogLevel, message: String)
 }
 
+/**
+ Enum representing push platform; apple push notification service, production vs sandbox
+ */
+@objc public enum PushServicePlatform : Int {
+    /** The sandbox push service */
+    case sandbox
+    /** The production push service */
+    case production
+    /** Detect automatically */
+    case auto
+}
+
 /**
  Iterable Configuration Object. Use this when initializing the API.
  */
@@ -73,11 +85,11 @@ public class IterableConfig : NSObject {
     public var sandboxPushIntegrationName: String?
 
     /**
-     * APNS environment for the current build of the app.
-     * Possible values: `APNS_SANDBOX`, `APNS_SANDBOX`, `AUTO`
-     * Defaults to `AUTO` and detects the APNS environment automatically
+     * APNS (Apple Push Notification Service) environment for the current build of the app.
+     * Possible values: `production`, `sandbox`, `auto`
+     * Defaults to `auto` and detects the APNS environment automatically
      */
-    public var pushPlatform: PushServicePlatform = .AUTO
+    public var pushPlatform: PushServicePlatform = .auto
 
     /// Handles Iterable actions of type 'openUrl'
     public weak var urlDelegate: IterableURLDelegate?

swift-sdk/IterableConstants.h

@@ -53,14 +53,3 @@ typedef void (^OnSuccessHandler)(NSDictionary *data);
  */
 typedef void (^OnFailureHandler)(NSString *reason, NSData *_Nullable data);
 
-/**
- Enum representing push platform; apple push notification service, production vs sandbox
- */
-typedef NS_ENUM(NSInteger, PushServicePlatform) {
-    /** The sandbox push service */
-    APNS_SANDBOX,
-    /** The production push service */
-    APNS,
-    /** Detect automatically */
-    AUTO
-};