Merge pull request #511 from OneSignal/payload_parse_clean_up

Cleaned up payload conversion implementation

Author: jkasten2

iOS_SDK/OneSignalSDK/Framework/Dynamic/OneSignal.framework/OneSignal

@@ -0,0 +1 @@
+Versions/A/OneSignal

iOS_SDK/OneSignalSDK/Framework/Dynamic/OneSignal.framework/OneSignal

@@ -18,7 +18,7 @@
 - (NSString *)supportedFileExtension;
 
 // returns a lower case hex representation of the data
-+ (NSString *)hexStringFromData:(NSData *)data;
++ (nullable NSString *)hexStringFromData:(nonnull NSData *)data;
 
 @end
 #endif

iOS_SDK/OneSignalSDK/Source/NSString+OneSignal.h

@@ -7,6 +7,7 @@
 
 #import "NSString+OneSignal.h"
 #import "OneSignalCommonDefines.h"
+#import "OneSignalHelper.h"
 
 #define MIME_MAP @{@"audio/aiff" : @"aiff", @"audio/x-wav" : @"wav", @"audio/mpeg" : @"mp3", @"video/mp4" : @"mp4", @"image/jpeg" : @"jpeg", @"image/jpg" : @"jpg", @"image/png" : @"png", @"image/gif" : @"gif", @"video/mpeg" : @"mpeg", @"video/mpg" : @"mpg", @"video/avi" : @"avi", @"sound/m4a" : @"m4a", @"video/m4v" : @"m4v"}
 
@@ -59,15 +60,19 @@ - (NSString *)fileExtensionForMimeType {
     return MIME_MAP[self];
 }
 
-+ (NSString *)hexStringFromData:(NSData *)data
-{
-    NSMutableString *parsedDeviceToken = [NSMutableString new];
-    const char *byteArray = (char *)data.bytes;
-
-    for (int i = 0; i < data.length; i++)
-        [parsedDeviceToken appendFormat:@"%02.2hhx", byteArray[i]];
-
-    return [parsedDeviceToken copy];
+// Converts a nonnull NSData into a NSString in a lower case hex format.
++ (nullable NSString *)hexStringFromData:(nonnull NSData *)data {
+    let dataLength = data.length;
+    if (dataLength == 0)
+        return nil;
+    
+    let dataBtyes = (unsigned char *)data.bytes;
+    let hexString  = [NSMutableString stringWithCapacity:dataLength * 2];
+    for (var i = 0; i < dataLength; i++)
+        [hexString appendFormat:@"%02x", dataBtyes[i]];
+    
+    // Copy to make immutable
+    return hexString.copy;
 }
 
 @end

iOS_SDK/OneSignalSDK/Source/NSString+OneSignal.m

@@ -31,7 +31,7 @@
 #define OSNotificationPayload_Internal_h
 
 @interface OSNotificationPayload (Internal)
-+(instancetype)parseWithApns:(NSDictionary*)message;
++(instancetype)parseWithApns:(nonnull NSDictionary*)message;
 @end
 
 #endif /* OSNotificationPayload_Internal_h */

iOS_SDK/OneSignalSDK/Source/OSNotificationPayload+Internal.h

@@ -33,7 +33,7 @@
 
 @implementation OSNotificationPayload
 
-+(instancetype)parseWithApns:(NSDictionary*)message {
++(instancetype)parseWithApns:(nonnull NSDictionary*)message {
     if (!message)
         return nil;
 

iOS_SDK/OneSignalSDK/Source/OSNotificationPayload.m

@@ -151,7 +151,11 @@ typedef NS_ENUM(NSUInteger, OSNotificationDisplayType) {
 
 /* iOS 10+ : Groups notifications into threads */
 @property(readonly)NSString *threadId;
-+(instancetype)parseWithApns:(NSDictionary*)message;
+
+/* Parses an APS push payload into a OSNotificationPayload object.
+   Useful to call from your NotificationServiceExtension when the
+      didReceiveNotificationRequest:withContentHandler: method fires. */
++(instancetype)parseWithApns:(nonnull NSDictionary*)message;
 
 @end
 

iOS_SDK/OneSignalSDK/Source/OneSignal.h

@@ -2089,7 +2089,7 @@ + (void)didRegisterForRemoteNotifications:(UIApplication *)app
     if ([OneSignal shouldLogMissingPrivacyConsentErrorWithMethodName:nil])
         return;
 
-    NSString *parsedDeviceToken = [NSString hexStringFromData:inDeviceToken];
+    let parsedDeviceToken = [NSString hexStringFromData:inDeviceToken];
 
     [OneSignal onesignal_Log:ONE_S_LL_INFO message: [NSString stringWithFormat:@"Device Registered with Apple: %@", parsedDeviceToken]];