Skip to content

Commit e1bf771

Browse files
nan-linan-li
committed
update Common Defines variables
* For clarity, rename `OSUD_PLAYER_ID_TO` to `OSUD_PUSH_SUBSCRIPTION_ID` * And `OSUD_PUSH_TOKEN_TO` to `OSUD_PUSH_TOKEN` * Remove from Common Defines values no longer used
1 parent 4bfb038 commit e1bf771

File tree

8 files changed

+15
-35
lines changed

8 files changed

+15
-35
lines changed

‎iOS_SDK/OneSignalSDK/OneSignalCore/Source/OneSignalCommonDefines.h‎

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -65,27 +65,9 @@
6565
#define OSUD_PERMISSION_EPHEMERAL_FROM @"OSUD_PERMISSION_EPHEMERAL_FROM" // * OSUD_PERMISSION_EPHEMERAL_FROM
6666
#define OSUD_LANGUAGE @"OSUD_LANGUAGE" // * OSUD_LANGUAGE
6767
#define DEFAULT_LANGUAGE @"en" // * OSUD_LANGUAGE
68-
// Player
69-
#define OSUD_EXTERNAL_USER_ID @"OS_EXTERNAL_USER_ID" // * OSUD_EXTERNAL_USER_ID
70-
#define OSUD_PLAYER_ID_TO @"GT_PLAYER_ID" // * OSUD_PLAYER_ID_TO
71-
#define OSUD_PLAYER_ID_FROM @"GT_PLAYER_ID_LAST" // * OSUD_PLAYER_ID_FROM
72-
#define OSUD_PUSH_TOKEN_TO @"GT_DEVICE_TOKEN" // * OSUD_PUSH_TOKEN_TO
73-
#define OSUD_PUSH_TOKEN_FROM @"GT_DEVICE_TOKEN_LAST" // * OSUD_PUSH_TOKEN_FROM
74-
#define OSUD_USER_SUBSCRIPTION_TO @"ONESIGNAL_SUBSCRIPTION" // * OSUD_USER_SUBSCRIPTION_TO
75-
#define OSUD_USER_SUBSCRIPTION_FROM @"ONESIGNAL_SUBSCRIPTION_SETTING" // * OSUD_USER_SUBSCRIPTION_FROM
76-
#define OSUD_EXTERNAL_ID_AUTH_CODE @"OSUD_EXTERNAL_ID_AUTH_CODE"
77-
// Email
78-
#define OSUD_EMAIL_ADDRESS @"EMAIL_ADDRESS" // * OSUD_EMAIL_ADDRESS
79-
#define OSUD_EMAIL_PLAYER_ID @"GT_EMAIL_PLAYER_ID" // * OSUD_EMAIL_PLAYER_ID
80-
#define OSUD_EMAIL_EXTERNAL_USER_ID @"OSUD_EMAIL_EXTERNAL_USER_ID" // OSUD_EMAIL_EXTERNAL_USER_ID
81-
#define OSUD_REQUIRE_EMAIL_AUTH @"GT_REQUIRE_EMAIL_AUTH" // * OSUD_REQUIRE_EMAIL_AUTH
82-
#define OSUD_EMAIL_AUTH_CODE @"GT_EMAIL_AUTH_CODE" // * OSUD_EMAIL_AUTH_CODE
83-
// SMS
84-
#define OSUD_SMS_NUMBER @"OSUD_SMS_NUMBER"
85-
#define OSUD_SMS_PLAYER_ID @"OSUD_SMS_PLAYER_ID"
86-
#define OSUD_SMS_EXTERNAL_USER_ID @"OSUD_SMS_EXTERNAL_USER_ID"
87-
#define OSUD_REQUIRE_SMS_AUTH @"OSUD_REQUIRE_SMS_AUTH"
88-
#define OSUD_SMS_AUTH_CODE @"OSUD_SMS_AUTH_CODE"
68+
// Push Subscription
69+
#define OSUD_PUSH_SUBSCRIPTION_ID @"GT_PLAYER_ID" // * OSUD_PUSH_SUBSCRIPTION_ID
70+
#define OSUD_PUSH_TOKEN @"GT_DEVICE_TOKEN" // * OSUD_PUSH_TOKEN
8971
// Notification
9072
#define OSUD_LAST_MESSAGE_OPENED @"GT_LAST_MESSAGE_OPENED_" // * OSUD_MOST_RECENT_NOTIFICATION_OPENED
9173
#define OSUD_NOTIFICATION_OPEN_LAUNCH_URL @"ONESIGNAL_INAPP_LAUNCH_URL" // * OSUD_NOTIFICATION_OPEN_LAUNCH_URL
@@ -118,8 +100,6 @@
118100
#define OSUD_APP_LAST_CLOSED_TIME @"GT_LAST_CLOSED_TIME" // * OSUD_APP_LAST_CLOSED_TIME
119101
#define OSUD_UNSENT_ACTIVE_TIME @"GT_UNSENT_ACTIVE_TIME" // * OSUD_UNSENT_ACTIVE_TIME
120102
#define OSUD_UNSENT_ACTIVE_TIME_ATTRIBUTED @"GT_UNSENT_ACTIVE_TIME_ATTRIBUTED" // * OSUD_UNSENT_ACTIVE_TIME_ATTRIBUTED
121-
#define OSUD_PLAYER_TAGS @"OSUD_PLAYER_TAGS"
122-
// * OSUD_PLAYER_TAGS
123103

124104
// Deprecated Selectors
125105
#define DEPRECATED_SELECTORS @[ @"application:didReceiveLocalNotification:", \

‎iOS_SDK/OneSignalSDK/OneSignalExtension/OneSignalNotificationServiceExtensionHandler.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ + (void)onNotificationReceived:(NSString *)receivedNotificationId withBlockingTa
139139

140140
// Track confirmed delivery
141141
let sharedUserDefaults = OneSignalUserDefaults.initShared;
142-
let playerId = [sharedUserDefaults getSavedStringForKey:OSUD_PLAYER_ID_TO defaultValue:nil];
142+
let playerId = [sharedUserDefaults getSavedStringForKey:OSUD_PUSH_SUBSCRIPTION_ID defaultValue:nil];
143143
let appId = [sharedUserDefaults getSavedStringForKey:OSUD_APP_ID defaultValue:nil];
144144
// Randomize send of confirmed deliveries to lessen traffic for high recipient notifications
145145
int randomDelay = semaphore != nil ? arc4random_uniform(MAX_CONF_DELIVERY_DELAY) : 0;

‎iOS_SDK/OneSignalSDK/OneSignalExtension/OneSignalReceiveReceiptsController.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ - (BOOL)isReceiveReceiptsEnabled {
3838

3939
- (void)sendReceiveReceiptWithNotificationId:(NSString *)notificationId {
4040
let sharedUserDefaults = OneSignalUserDefaults.initShared;
41-
let playerId = [sharedUserDefaults getSavedStringForKey:OSUD_PLAYER_ID_TO defaultValue:nil];
41+
let playerId = [sharedUserDefaults getSavedStringForKey:OSUD_PUSH_SUBSCRIPTION_ID defaultValue:nil];
4242
let appId = [sharedUserDefaults getSavedStringForKey:OSUD_APP_ID defaultValue:nil];
4343

4444
[self sendReceiveReceiptWithPlayerId:playerId

‎iOS_SDK/OneSignalSDK/OneSignalNotifications/OSNotificationsManager.m‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -182,15 +182,15 @@ + (OSPermissionStateInternal*)lastPermissionState {
182182
static NSString *_pushToken;
183183
+ (NSString*)pushToken {
184184
if (!_pushToken) {
185-
_pushToken = [OneSignalUserDefaults.initShared getSavedStringForKey:OSUD_PUSH_TOKEN_TO defaultValue:nil];
185+
_pushToken = [OneSignalUserDefaults.initShared getSavedStringForKey:OSUD_PUSH_TOKEN defaultValue:nil];
186186
}
187187
return _pushToken;
188188
}
189189

190190
static NSString *_pushSubscriptionId;
191191
+ (NSString*)pushSubscriptionId {
192192
if (!_pushSubscriptionId) {
193-
_pushSubscriptionId = [OneSignalUserDefaults.initShared getSavedStringForKey:OSUD_PLAYER_ID_TO defaultValue:nil];
193+
_pushSubscriptionId = [OneSignalUserDefaults.initShared getSavedStringForKey:OSUD_PUSH_SUBSCRIPTION_ID defaultValue:nil];
194194
}
195195
return _pushSubscriptionId;
196196
}
@@ -393,7 +393,7 @@ + (void)didRegisterForRemoteNotifications:(UIApplication *)app
393393
_pushToken = parsedDeviceToken;
394394

395395
// Cache push token
396-
[OneSignalUserDefaults.initShared saveStringForKey:OSUD_PUSH_TOKEN_TO withValue:_pushToken];
396+
[OneSignalUserDefaults.initShared saveStringForKey:OSUD_PUSH_TOKEN withValue:_pushToken];
397397

398398
[self sendPushTokenToDelegate];
399399
}

‎iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSSubscriptionModel.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ class OSSubscriptionModel: OSModel {
118118
}
119119

120120
// Cache the subscriptionId as it persists across users on the device??
121-
OneSignalUserDefaults.initShared().saveString(forKey: OSUD_PLAYER_ID_TO, withValue: subscriptionId)
121+
OneSignalUserDefaults.initShared().saveString(forKey: OSUD_PUSH_SUBSCRIPTION_ID, withValue: subscriptionId)
122122

123123
firePushSubscriptionChanged(.subscriptionId(oldValue))
124124
}

‎iOS_SDK/OneSignalSDK/OneSignalUser/Source/OneSignalUserManagerImpl.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -349,8 +349,8 @@ public class OneSignalUserManagerImpl: NSObject, OneSignalUserManager {
349349
func createDefaultPushSubscription() -> OSSubscriptionModel {
350350
let sharedUserDefaults = OneSignalUserDefaults.initShared()
351351
let accepted = OSNotificationsManager.currentPermissionState.accepted
352-
let token = sharedUserDefaults.getSavedString(forKey: OSUD_PUSH_TOKEN_TO, defaultValue: nil)
353-
let subscriptionId = sharedUserDefaults.getSavedString(forKey: OSUD_PLAYER_ID_TO, defaultValue: nil)
352+
let token = sharedUserDefaults.getSavedString(forKey: OSUD_PUSH_TOKEN, defaultValue: nil)
353+
let subscriptionId = sharedUserDefaults.getSavedString(forKey: OSUD_PUSH_SUBSCRIPTION_ID, defaultValue: nil)
354354

355355
return OSSubscriptionModel(type: .push,
356356
address: token,

‎iOS_SDK/OneSignalSDK/Source/OneSignal.m‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -578,8 +578,8 @@ + (void)handleAppIdChange:(NSString*)appId {
578578
[standardUserDefaults saveStringForKey:OSUD_APP_ID withValue:appId];
579579

580580
// Remove player_id from both standard and shared NSUserDefaults
581-
[standardUserDefaults removeValueForKey:OSUD_PLAYER_ID_TO];
582-
[sharedUserDefaults removeValueForKey:OSUD_PLAYER_ID_TO];
581+
[standardUserDefaults removeValueForKey:OSUD_PUSH_SUBSCRIPTION_ID];
582+
[sharedUserDefaults removeValueForKey:OSUD_PUSH_SUBSCRIPTION_ID];
583583

584584
// Clear all cached data, does not start User Module nor call logout.
585585
[OneSignalUserManagerImpl.sharedInstance clearAllModelsFromStores];

‎iOS_SDK/OneSignalSDK/UnitTests/UnitTests.m‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1852,7 +1852,7 @@ - (void)testAddingSharedKeysIfMissing {
18521852

18531853
// 2. Remove shared keys to simulate the state of coming from a pre-2.12.1 version
18541854
[OneSignalUserDefaults.initShared removeValueForKey:OSUD_APP_ID];
1855-
[OneSignalUserDefaults.initShared removeValueForKey:OSUD_PLAYER_ID_TO];
1855+
[OneSignalUserDefaults.initShared removeValueForKey:OSUD_PUSH_SUBSCRIPTION_ID];
18561856

18571857
// 3. Restart app
18581858
[UnitTestCommonMethods backgroundApp];
@@ -1861,7 +1861,7 @@ - (void)testAddingSharedKeysIfMissing {
18611861

18621862
// 4. Ensure values are present again
18631863
XCTAssertNotNil([OneSignalUserDefaults.initShared getSavedSetForKey:OSUD_APP_ID defaultValue:nil]);
1864-
XCTAssertNotNil([OneSignalUserDefaults.initShared getSavedSetForKey:OSUD_PLAYER_ID_TO defaultValue:nil]);
1864+
XCTAssertNotNil([OneSignalUserDefaults.initShared getSavedSetForKey:OSUD_PUSH_SUBSCRIPTION_ID defaultValue:nil]);
18651865
}
18661866

18671867
// iOS 10 - Notification Service Extension test - local file

0 commit comments

Comments
 (0)