diff --git a/iOS_SDK/OneSignalSDK/OneSignalNotifications/OSPermission.h b/iOS_SDK/OneSignalSDK/OneSignalNotifications/OSPermission.h index 10c7c04f4..aa6e90020 100644 --- a/iOS_SDK/OneSignalSDK/OneSignalNotifications/OSPermission.h +++ b/iOS_SDK/OneSignalSDK/OneSignalNotifications/OSPermission.h @@ -54,7 +54,7 @@ typedef NS_ENUM(NSInteger, OSNotificationPermission) { @property (readonly, nonatomic) BOOL provisional; @property (readonly, nonatomic) BOOL providesAppNotificationSettings; @property (readonly, nonatomic) OSNotificationPermission status; -- (NSDictionary* _Nonnull)toDictionary; +- (NSDictionary * _Nonnull)jsonRepresentation; - (instancetype _Nonnull )initWithStatus:(OSNotificationPermission)status reachable:(BOOL)reachable hasPrompted:(BOOL)hasPrompted provisional:(BOOL)provisional providesAppNotificationSettings:(BOOL)providesAppNotificationSettings; @end @@ -96,7 +96,7 @@ typedef OSObservable*, OSPermissionState*> O @property (readonly, nonnull) OSPermissionState* to; @property (readonly, nonnull) OSPermissionState* from; -- (NSDictionary* _Nonnull)toDictionary; +- (NSDictionary * _Nonnull)jsonRepresentation; - (instancetype _Nonnull)initAsTo:(OSPermissionState * _Nonnull)to from:(OSPermissionState * _Nonnull)from; @end diff --git a/iOS_SDK/OneSignalSDK/OneSignalNotifications/OSPermission.m b/iOS_SDK/OneSignalSDK/OneSignalNotifications/OSPermission.m index a586dbda9..931b33424 100644 --- a/iOS_SDK/OneSignalSDK/OneSignalNotifications/OSPermission.m +++ b/iOS_SDK/OneSignalSDK/OneSignalNotifications/OSPermission.m @@ -211,7 +211,7 @@ - (NSString*)description { return [NSString stringWithFormat:format, self.hasPrompted, self.statusAsString, self.provisional]; } -- (NSDictionary*)toDictionary { +- (NSDictionary*)jsonRepresentation { return @{@"hasPrompted": @(self.hasPrompted), @"status": @(self.status), @"provisional" : @(self.provisional)}; @@ -250,8 +250,8 @@ - (NSString*)description { return [NSString stringWithFormat:format, _from, _to]; } -- (NSDictionary*)toDictionary { - return @{@"from": [_from toDictionary], @"to": [_to toDictionary]}; +- (NSDictionary*)jsonRepresentation { + return @{@"from": [_from jsonRepresentation], @"to": [_to jsonRepresentation]}; } - (instancetype)initAsTo:(OSPermissionState *)to from:(OSPermissionState *)from { diff --git a/iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSPropertiesModel.swift b/iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSPropertiesModel.swift index 4a6fd4555..d2f42eef5 100644 --- a/iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSPropertiesModel.swift +++ b/iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSPropertiesModel.swift @@ -35,7 +35,7 @@ struct OSPropertiesDeltas { let amountSpent: NSNumber? let purchases: [[String: AnyObject]]? - func toDictionary() -> [String: Any] { + func jsonRepresentation() -> [String: Any] { var deltas = [String: Any]() deltas["session_count"] = sessionCount deltas["session_time"] = sessionTime?.intValue // server expects an int diff --git a/iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSPropertyOperationExecutor.swift b/iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSPropertyOperationExecutor.swift index c182dbd7c..b68079f07 100644 --- a/iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSPropertyOperationExecutor.swift +++ b/iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSPropertyOperationExecutor.swift @@ -144,7 +144,7 @@ extension OSPropertyOperationExecutor { let request = OSRequestUpdateProperties( properties: [:], - deltas: propertiesDeltas.toDictionary(), + deltas: propertiesDeltas.jsonRepresentation(), refreshDeviceMetadata: refreshDeviceMetadata, modelToUpdate: propertiesModel, identityModel: identityModel) diff --git a/iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSSubscriptionModel.swift b/iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSSubscriptionModel.swift index 8551ba7a3..5f7ef1a5a 100644 --- a/iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSSubscriptionModel.swift +++ b/iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSSubscriptionModel.swift @@ -52,7 +52,7 @@ public class OSPushSubscriptionState: NSObject { self.optedIn = optedIn } - @objc public func toDictionary() -> NSDictionary { + @objc public func jsonRepresentation() -> NSDictionary { let id = self.id ?? "nil" let token = self.token ?? "nil" return [ @@ -77,8 +77,8 @@ public class OSPushSubscriptionStateChanges: NSObject { self.from = from } - @objc public func toDictionary() -> NSDictionary { - return ["from": from.toDictionary(), "to": to.toDictionary()] + @objc public func jsonRepresentation() -> NSDictionary { + return ["from": from.jsonRepresentation(), "to": to.jsonRepresentation()] } } @@ -353,7 +353,7 @@ extension OSSubscriptionModel { let stateChanges = OSPushSubscriptionStateChanges(to: newSubscriptionState, from: prevSubscriptionState) // TODO: Don't fire observer until server is udated - OneSignalLog.onesignalLog(.LL_VERBOSE, message: "firePushSubscriptionChanged from \(prevSubscriptionState.toDictionary()) to \(newSubscriptionState.toDictionary())") + OneSignalLog.onesignalLog(.LL_VERBOSE, message: "firePushSubscriptionChanged from \(prevSubscriptionState.jsonRepresentation()) to \(newSubscriptionState.jsonRepresentation())") OneSignalUserManagerImpl.sharedInstance.pushSubscriptionStateChangesObserver.notifyChange(stateChanges) } }