Skip to content

Commit 819af41

Browse files
tapashmajumdertapashmajumder
authored
Merge pull request #68 from Iterable/bugfix/mob-261
[ITB-261] - Merge
2 parents 95e6bcf + 4fed6a5 commit 819af41

File tree

3 files changed

+100
-100
lines changed

3 files changed

+100
-100
lines changed

‎swift-sdk/ITBConsts.swift

Lines changed: 93 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -8,147 +8,147 @@ import Foundation
88

99
// Iterable API Endpoints
1010
public extension String {
11-
public static let ITBL_ENDPOINT_API = apiHostname + "/api/"
12-
public static let ITBL_ENDPOINT_LINKS = linksHostname + "/"
11+
static let ITBL_ENDPOINT_API = apiHostname + "/api/"
12+
static let ITBL_ENDPOINT_LINKS = linksHostname + "/"
1313

1414
private static let apiHostname = "https://api.iterable.com"
1515
private static let linksHostname = "https://links.iterable.com"
1616
}
1717

1818
// API Paths (Offset from base)
1919
public extension String {
20-
public static let ITBL_PATH_COMMERCE_TRACK_PURCHASE = "commerce/trackPurchase"
21-
public static let ITBL_PATH_DISABLE_DEVICE = "users/disableDevice"
22-
public static let ITBL_PATH_GET_INAPP_MESSAGES = "inApp/getMessages"
23-
public static let ITBL_PATH_INAPP_CONSUME = "events/inAppConsume"
24-
public static let ITBL_PATH_REGISTER_DEVICE_TOKEN = "users/registerDeviceToken"
25-
public static let ITBL_PATH_TRACK = "events/track"
26-
public static let ITBL_PATH_TRACK_INAPP_CLICK = "events/trackInAppClick"
27-
public static let ITBL_PATH_TRACK_INAPP_OPEN = "events/trackInAppOpen"
28-
public static let ITBL_PATH_TRACK_PUSH_OPEN = "events/trackPushOpen"
29-
public static let ITBL_PATH_UPDATE_USER = "users/update"
30-
public static let ITBL_PATH_UPDATE_EMAIL = "users/updateEmail"
31-
public static let ITBL_PATH_UPDATE_SUBSCRIPTIONS = "users/updateSubscriptions"
32-
public static let ITBL_PATH_DDL_MATCH = "a/matchFp" //DDL = Deferred Deep Linking
20+
static let ITBL_PATH_COMMERCE_TRACK_PURCHASE = "commerce/trackPurchase"
21+
static let ITBL_PATH_DISABLE_DEVICE = "users/disableDevice"
22+
static let ITBL_PATH_GET_INAPP_MESSAGES = "inApp/getMessages"
23+
static let ITBL_PATH_INAPP_CONSUME = "events/inAppConsume"
24+
static let ITBL_PATH_REGISTER_DEVICE_TOKEN = "users/registerDeviceToken"
25+
static let ITBL_PATH_TRACK = "events/track"
26+
static let ITBL_PATH_TRACK_INAPP_CLICK = "events/trackInAppClick"
27+
static let ITBL_PATH_TRACK_INAPP_OPEN = "events/trackInAppOpen"
28+
static let ITBL_PATH_TRACK_PUSH_OPEN = "events/trackPushOpen"
29+
static let ITBL_PATH_UPDATE_USER = "users/update"
30+
static let ITBL_PATH_UPDATE_EMAIL = "users/updateEmail"
31+
static let ITBL_PATH_UPDATE_SUBSCRIPTIONS = "users/updateSubscriptions"
32+
static let ITBL_PATH_DDL_MATCH = "a/matchFp" //DDL = Deferred Deep Linking
3333
}
3434

3535
// Keys
3636
public extension AnyHashable {
37-
public static let ITBL_KEY_API_KEY = "api_key"
38-
public static let ITBL_KEY_APPLICATION_NAME = "applicationName"
39-
public static let ITBL_KEY_CAMPAIGN_ID = "campaignId"
40-
public static let ITBL_KEY_COUNT = "count"
41-
public static let ITBL_KEY_CURRENT_EMAIL = "currentEmail"
42-
public static let ITBL_KEY_DATA_FIELDS = "dataFields"
43-
public static let ITBL_KEY_DEVICE = "device"
44-
public static let ITBL_KEY_EMAIL = "email"
45-
public static let ITBL_KEY_EMAIL_LIST_IDS = "emailListIds"
46-
public static let ITBL_KEY_EVENT_NAME = "eventName"
47-
public static let ITBL_KEY_ITEMS = "items"
48-
public static let ITBL_KEY_MERGE_NESTED = "mergeNestedObjects"
49-
public static let ITBL_KEY_MESSAGE_ID = "messageId"
50-
public static let ITBL_KEY_NEW_EMAIL = "newEmail"
51-
public static let ITBL_KEY_PLATFORM = "platform"
52-
public static let ITBL_KEY_SDK_VERSION = "SDKVersion"
53-
public static let ITBL_KEY_TOKEN = "token"
54-
public static let ITBL_KEY_TEMPLATE_ID = "templateId"
55-
public static let ITBL_KEY_TOTAL = "total"
56-
public static let ITBL_KEY_UNSUB_CHANNEL = "unsubscribedChannelIds"
57-
public static let ITBL_KEY_UNSUB_MESSAGE = "unsubscribedMessageTypeIds"
58-
public static let ITBL_KEY_USER = "user"
59-
public static let ITBL_KEY_USER_ID = "userId"
60-
public static let ITBL_KEY_ACTION_IDENTIFIER = "actionIdentifier"
61-
public static let ITBL_KEY_USER_TEXT = "userText"
62-
public static let ITBL_KEY_PREFER_USER_ID = "preferUserId"
37+
static let ITBL_KEY_API_KEY = "api_key"
38+
static let ITBL_KEY_APPLICATION_NAME = "applicationName"
39+
static let ITBL_KEY_CAMPAIGN_ID = "campaignId"
40+
static let ITBL_KEY_COUNT = "count"
41+
static let ITBL_KEY_CURRENT_EMAIL = "currentEmail"
42+
static let ITBL_KEY_DATA_FIELDS = "dataFields"
43+
static let ITBL_KEY_DEVICE = "device"
44+
static let ITBL_KEY_EMAIL = "email"
45+
static let ITBL_KEY_EMAIL_LIST_IDS = "emailListIds"
46+
static let ITBL_KEY_EVENT_NAME = "eventName"
47+
static let ITBL_KEY_ITEMS = "items"
48+
static let ITBL_KEY_MERGE_NESTED = "mergeNestedObjects"
49+
static let ITBL_KEY_MESSAGE_ID = "messageId"
50+
static let ITBL_KEY_NEW_EMAIL = "newEmail"
51+
static let ITBL_KEY_PLATFORM = "platform"
52+
static let ITBL_KEY_SDK_VERSION = "SDKVersion"
53+
static let ITBL_KEY_TOKEN = "token"
54+
static let ITBL_KEY_TEMPLATE_ID = "templateId"
55+
static let ITBL_KEY_TOTAL = "total"
56+
static let ITBL_KEY_UNSUB_CHANNEL = "unsubscribedChannelIds"
57+
static let ITBL_KEY_UNSUB_MESSAGE = "unsubscribedMessageTypeIds"
58+
static let ITBL_KEY_USER = "user"
59+
static let ITBL_KEY_USER_ID = "userId"
60+
static let ITBL_KEY_ACTION_IDENTIFIER = "actionIdentifier"
61+
static let ITBL_KEY_USER_TEXT = "userText"
62+
static let ITBL_KEY_PREFER_USER_ID = "preferUserId"
6363
}
6464

6565
// More Keys
6666
public extension String {
67-
public static let ITBL_KEY_GET = "GET"
68-
public static let ITBL_KEY_POST = "POST"
67+
static let ITBL_KEY_GET = "GET"
68+
static let ITBL_KEY_POST = "POST"
6969

70-
public static let ITBL_KEY_APNS = "APNS"
71-
public static let ITBL_KEY_APNS_SANDBOX = "APNS_SANDBOX"
72-
public static let ITBL_KEY_PAD = "Pad"
73-
public static let ITBL_KEY_PHONE = "Phone"
74-
public static let ITBL_KEY_UNSPECIFIED = "Unspecified"
70+
static let ITBL_KEY_APNS = "APNS"
71+
static let ITBL_KEY_APNS_SANDBOX = "APNS_SANDBOX"
72+
static let ITBL_KEY_PAD = "Pad"
73+
static let ITBL_KEY_PHONE = "Phone"
74+
static let ITBL_KEY_UNSPECIFIED = "Unspecified"
7575
}
7676

7777
// Misc Values
7878
public extension String {
79-
public static let ITBL_VALUE_DEFAULT_PUSH_OPEN_ACTION_ID = "default"
80-
public static let ITBL_PLATFORM_IOS = "iOS"
81-
public static let ITBL_DEEPLINK_IDENTIFIER = "/a/[a-zA-Z0-9]+"
79+
static let ITBL_VALUE_DEFAULT_PUSH_OPEN_ACTION_ID = "default"
80+
static let ITBL_PLATFORM_IOS = "iOS"
81+
static let ITBL_DEEPLINK_IDENTIFIER = "/a/[a-zA-Z0-9]+"
8282
}
8383

8484
// Decvice Dictionary
8585
public extension String {
86-
public static let ITBL_DEVICE_LOCALIZED_MODEL = "localizedModel"
87-
public static let ITBL_DEVICE_ID_VENDOR = "identifierForVendor"
88-
public static let ITBL_DEVICE_MODEL = "model"
89-
public static let ITBL_DEVICE_SYSTEM_NAME = "systemName"
90-
public static let ITBL_DEVICE_SYSTEM_VERSION = "systemVersion"
91-
public static let ITBL_DEVICE_USER_INTERFACE = "userInterfaceIdiom"
86+
static let ITBL_DEVICE_LOCALIZED_MODEL = "localizedModel"
87+
static let ITBL_DEVICE_ID_VENDOR = "identifierForVendor"
88+
static let ITBL_DEVICE_MODEL = "model"
89+
static let ITBL_DEVICE_SYSTEM_NAME = "systemName"
90+
static let ITBL_DEVICE_SYSTEM_VERSION = "systemVersion"
91+
static let ITBL_DEVICE_USER_INTERFACE = "userInterfaceIdiom"
9292

93-
public static let ITBL_DEVICE_DEVICE_ID = "deviceId"
94-
public static let ITBL_DEVICE_APP_PACKAGE_NAME = "appPackageName"
95-
public static let ITBL_DEVICE_APP_VERSION = "appVersion"
96-
public static let ITBL_DEVICE_APP_BUILD = "appBuild"
97-
public static let ITBL_DEVICE_ITERABLE_SDK_VERSION = "iterableSdkVersion"
93+
static let ITBL_DEVICE_DEVICE_ID = "deviceId"
94+
static let ITBL_DEVICE_APP_PACKAGE_NAME = "appPackageName"
95+
static let ITBL_DEVICE_APP_VERSION = "appVersion"
96+
static let ITBL_DEVICE_APP_BUILD = "appBuild"
97+
static let ITBL_DEVICE_ITERABLE_SDK_VERSION = "iterableSdkVersion"
9898
}
9999

100100
// Push Payload
101101
public extension AnyHashable {
102-
public static let ITBL_PAYLOAD_METADATA = "itbl"
103-
public static let ITBL_PAYLOAD_MESSAGE_ID = "messageId"
104-
public static let ITBL_PAYLOAD_DEEP_LINK_URL = "url"
105-
public static let ITBL_PAYLOAD_ATTACHMENT_URL = "attachment-url"
106-
public static let ITBL_PAYLOAD_ACTION_BUTTONS = "actionButtons"
107-
public static let ITBL_PAYLOAD_DEFAULT_ACTION = "defaultAction"
102+
static let ITBL_PAYLOAD_METADATA = "itbl"
103+
static let ITBL_PAYLOAD_MESSAGE_ID = "messageId"
104+
static let ITBL_PAYLOAD_DEEP_LINK_URL = "url"
105+
static let ITBL_PAYLOAD_ATTACHMENT_URL = "attachment-url"
106+
static let ITBL_PAYLOAD_ACTION_BUTTONS = "actionButtons"
107+
static let ITBL_PAYLOAD_DEFAULT_ACTION = "defaultAction"
108108
}
109109

110110
// UserDefaults String Consts
111111
public extension String {
112-
public static let ITBL_USER_DEFAULTS_PAYLOAD_KEY = "itbl_payload_key"
113-
public static let ITBL_USER_DEFAULTS_ATTRIBUTION_INFO_KEY = "itbl_attribution_info_key"
114-
public static let ITBL_USER_DEFAULTS_EMAIL_KEY = "itbl_email"
115-
public static let ITBL_USER_DEFAULTS_USERID_KEY = "itbl_userid"
116-
public static let ITBL_USER_DEFAULTS_DDL_CHECKED = "itbl_ddl_checked"
117-
public static let ITBL_USER_DEFAULTS_DEVICE_ID = "itbl_device_id"
118-
public static let ITBL_USER_DEFAULTS_SDK_VERSION = "itbl_sdk_version"
112+
static let ITBL_USER_DEFAULTS_PAYLOAD_KEY = "itbl_payload_key"
113+
static let ITBL_USER_DEFAULTS_ATTRIBUTION_INFO_KEY = "itbl_attribution_info_key"
114+
static let ITBL_USER_DEFAULTS_EMAIL_KEY = "itbl_email"
115+
static let ITBL_USER_DEFAULTS_USERID_KEY = "itbl_userid"
116+
static let ITBL_USER_DEFAULTS_DDL_CHECKED = "itbl_ddl_checked"
117+
static let ITBL_USER_DEFAULTS_DEVICE_ID = "itbl_device_id"
118+
static let ITBL_USER_DEFAULTS_SDK_VERSION = "itbl_sdk_version"
119119
}
120120

121121
// UserDefaults Int Consts
122122
public extension Int {
123-
public static let ITBL_USER_DEFAULTS_PAYLOAD_EXPIRATION_HOURS = 24
124-
public static let ITBL_USER_DEFAULTS_ATTRIBUTION_INFO_EXPIRATION_HOURS = 24
123+
static let ITBL_USER_DEFAULTS_PAYLOAD_EXPIRATION_HOURS = 24
124+
static let ITBL_USER_DEFAULTS_ATTRIBUTION_INFO_EXPIRATION_HOURS = 24
125125
}
126126

127127
//Action Buttons
128128
public extension AnyHashable {
129-
public static let ITBL_BUTTON_IDENTIFIER = "identifier"
130-
public static let ITBL_BUTTON_TYPE = "buttonType"
131-
public static let ITBL_BUTTON_TITLE = "title"
132-
public static let ITBL_BUTTON_OPEN_APP = "openApp"
133-
public static let ITBL_BUTTON_REQUIRES_UNLOCK = "requiresUnlock"
134-
public static let ITBL_BUTTON_INPUT_TITLE = "inputTitle"
135-
public static let ITBL_BUTTON_INPUT_PLACEHOLDER = "inputPlaceholder"
136-
public static let ITBL_BUTTON_ACTION = "action"
129+
static let ITBL_BUTTON_IDENTIFIER = "identifier"
130+
static let ITBL_BUTTON_TYPE = "buttonType"
131+
static let ITBL_BUTTON_TITLE = "title"
132+
static let ITBL_BUTTON_OPEN_APP = "openApp"
133+
static let ITBL_BUTTON_REQUIRES_UNLOCK = "requiresUnlock"
134+
static let ITBL_BUTTON_INPUT_TITLE = "inputTitle"
135+
static let ITBL_BUTTON_INPUT_PLACEHOLDER = "inputPlaceholder"
136+
static let ITBL_BUTTON_ACTION = "action"
137137
}
138138

139139
//In-App Constants
140140
public extension AnyHashable {
141-
public static let ITBL_IN_APP_CLICKED_URL = "clickedUrl"
141+
static let ITBL_IN_APP_CLICKED_URL = "clickedUrl"
142142

143-
public static let ITBL_IN_APP_BUTTON_INDEX = "buttonIndex"
144-
public static let ITBL_IN_APP_MESSAGE = "inAppMessages"
143+
static let ITBL_IN_APP_BUTTON_INDEX = "buttonIndex"
144+
static let ITBL_IN_APP_MESSAGE = "inAppMessages"
145145

146-
public static let ITBL_IN_APP_CONTENT = "content"
146+
static let ITBL_IN_APP_CONTENT = "content"
147147

148148
//In-App HTML Constants
149-
public static let ITBL_IN_APP_BACKGROUND_ALPHA = "backgroundAlpha"
150-
public static let ITBL_IN_APP_HTML = "html"
151-
public static let ITBL_IN_APP_HREF = "href"
152-
public static let ITBL_IN_APP_DISPLAY_SETTINGS = "inAppDisplaySettings"
149+
static let ITBL_IN_APP_BACKGROUND_ALPHA = "backgroundAlpha"
150+
static let ITBL_IN_APP_HTML = "html"
151+
static let ITBL_IN_APP_HREF = "href"
152+
static let ITBL_IN_APP_DISPLAY_SETTINGS = "inAppDisplaySettings"
153153
}
154154

‎swift-sdk/Internal/ClassExtensions.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@
77
import Foundation
88

99
public extension Bundle {
10-
public var appPackageName : String? {
10+
var appPackageName : String? {
1111
return bundleIdentifier
1212
}
1313

14-
public var appVersion : String? {
14+
var appVersion : String? {
1515
guard let infoDictionary = self.infoDictionary else {
1616
return nil
1717
}
1818
return infoDictionary["CFBundleShortVersionString"] as? String
1919
}
2020

21-
public var appBuild : String? {
21+
var appBuild : String? {
2222
guard let infoDictionary = self.infoDictionary else {
2323
return nil
2424
}

‎swift-sdk/IterableConstants.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@
99

1010
@end
1111

12-
typedef void (^ITEActionBlock)(NSString *);
12+
typedef void (^ITEActionBlock)(NSString *_Nullable);
1313

14-
typedef void (^ITBURLCallback)(NSURL *);
14+
typedef void (^ITBURLCallback)(NSURL *_Nullable);
1515

1616
/**
1717
The prototype for the completion handler block that gets called when an Iterable call is successful
1818
*/
19-
typedef void (^OnSuccessHandler)(NSDictionary *data);
19+
typedef void (^OnSuccessHandler)(NSDictionary * _Nullable data);
2020

2121
/**
2222
The prototype for the completion handler block that gets called when an Iterable call fails
2323
*/
24-
typedef void (^OnFailureHandler)(NSString *reason, NSData *_Nullable data);
24+
typedef void (^OnFailureHandler)(NSString * _Nullable reason, NSData *_Nullable data);

0 commit comments

Comments
 (0)