Cleaned up duplicated apns payload parsing

* Most code paths now use OSNotificaitonPayload for logic instead of parsing the payload directly.
* Added let and var typedefs and started integrating it into the code base.
   - Some syntactic sugar to Swifty Objective-C
* Other misc formatting and test improvements

Author: jkasten2

iOS_SDK/OneSignalSDK/OneSignal.xcodeproj/project.pbxproj

@@ -318,30 +318,30 @@
 		4529DECD1FA81DE000CEAB1D /* Shadows */ = {
 			isa = PBXGroup;
 			children = (
-				4529DED01FA81EA800CEAB1D /* NSObjectOverrider.h */,
-				4529DED11FA81EA800CEAB1D /* NSObjectOverrider.m */,
-				4529DED61FA8253D00CEAB1D /* NSUserDefaultsOverrider.h */,
-				4529DED71FA8253D00CEAB1D /* NSUserDefaultsOverrider.m */,
+				4529DEDF1FA82AB300CEAB1D /* NSBundleOverrider.h */,
+				4529DEE01FA82AB300CEAB1D /* NSBundleOverrider.m */,
 				4529DED91FA8284E00CEAB1D /* NSDataOverrider.h */,
 				4529DEDA1FA8284E00CEAB1D /* NSDataOverrider.m */,
 				4529DEDC1FA828E500CEAB1D /* NSDateOverrider.h */,
 				4529DEDD1FA828E500CEAB1D /* NSDateOverrider.m */,
-				4529DEDF1FA82AB300CEAB1D /* NSBundleOverrider.h */,
-				4529DEE01FA82AB300CEAB1D /* NSBundleOverrider.m */,
+				4529DEEE1FA8433500CEAB1D /* NSLocaleOverrider.h */,
+				4529DEEF1FA8433500CEAB1D /* NSLocaleOverrider.m */,
+				4529DED01FA81EA800CEAB1D /* NSObjectOverrider.h */,
+				4529DED11FA81EA800CEAB1D /* NSObjectOverrider.m */,
 				4529DEE21FA82C6200CEAB1D /* NSURLConnectionOverrider.h */,
 				4529DEE31FA82C6200CEAB1D /* NSURLConnectionOverrider.m */,
-				4529DEE51FA82CDC00CEAB1D /* UNUserNotificationCenterOverrider.h */,
-				4529DEE61FA82CDC00CEAB1D /* UNUserNotificationCenterOverrider.m */,
-				4529DEE81FA8360C00CEAB1D /* UIApplicationOverrider.h */,
-				4529DEE91FA8360C00CEAB1D /* UIApplicationOverrider.m */,
+				4529DED61FA8253D00CEAB1D /* NSUserDefaultsOverrider.h */,
+				4529DED71FA8253D00CEAB1D /* NSUserDefaultsOverrider.m */,
 				4529DEEB1FA83C5D00CEAB1D /* OneSignalHelperOverrider.h */,
 				4529DEEC1FA83C5D00CEAB1D /* OneSignalHelperOverrider.m */,
-				4529DEEE1FA8433500CEAB1D /* NSLocaleOverrider.h */,
-				4529DEEF1FA8433500CEAB1D /* NSLocaleOverrider.m */,
-				4529DEF11FA8440A00CEAB1D /* UIAlertViewOverrider.h */,
-				4529DEF21FA8440A00CEAB1D /* UIAlertViewOverrider.m */,
 				03389F671FB548A0006537F0 /* OneSignalTrackFirebaseAnalyticsOverrider.h */,
 				03389F681FB548A0006537F0 /* OneSignalTrackFirebaseAnalyticsOverrider.m */,
+				4529DEF11FA8440A00CEAB1D /* UIAlertViewOverrider.h */,
+				4529DEF21FA8440A00CEAB1D /* UIAlertViewOverrider.m */,
+				4529DEE81FA8360C00CEAB1D /* UIApplicationOverrider.h */,
+				4529DEE91FA8360C00CEAB1D /* UIApplicationOverrider.m */,
+				4529DEE51FA82CDC00CEAB1D /* UNUserNotificationCenterOverrider.h */,
+				4529DEE61FA82CDC00CEAB1D /* UNUserNotificationCenterOverrider.m */,
 			);
 			path = Shadows;
 			sourceTree = "<group>";

iOS_SDK/OneSignalSDK/OneSignal.xcodeproj/xcshareddata/xcschemes/UnitTests.xcscheme

@@ -27,7 +27,6 @@
       <EnvironmentVariables>
          <EnvironmentVariable
             key = "OS_ACTIVITY_MODE"
-            value = "disable"
             isEnabled = "YES">
          </EnvironmentVariable>
       </EnvironmentVariables>
@@ -50,6 +49,13 @@
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
+      <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "OS_ACTIVITY_MODE"
+            value = ""
+            isEnabled = "YES">
+         </EnvironmentVariable>
+      </EnvironmentVariables>
       <AdditionalOptions>
       </AdditionalOptions>
    </LaunchAction>

iOS_SDK/OneSignalSDK/Source/OSNotificationPayload+Internal.h

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

iOS_SDK/OneSignalSDK/Source/OSNotificationPayload.m

@@ -33,14 +33,17 @@
 
 @implementation OSNotificationPayload
 
-- (id)initWithRawMessage:(NSDictionary*)message {
++(instancetype)parseWithApns:(NSDictionary*)message {
     if (!message)
         return nil;
 
-    self = [super init];
-    if (!self)
-        return nil;
+    OSNotificationPayload *osPayload = [OSNotificationPayload new];
 
+    [osPayload initWithRawMessage:message];
+    return osPayload;
+}
+
+-(void)initWithRawMessage:(NSDictionary*)message {
     _rawPayload = [NSDictionary dictionaryWithDictionary:message];
 
     if ([_rawPayload[@"os_data"] isKindOfClass:[NSDictionary class]])
@@ -49,8 +52,6 @@ - (id)initWithRawMessage:(NSDictionary*)message {
         [self parseOriginalPayload];
 
     [self parseOtherApnsFields];
-    
-    return self;
 }
 
 // Original OneSignal payload format.
@@ -126,7 +127,7 @@ -(void)parseRemoteSlient:(NSDictionary*)payload {
     _badge = [payload[@"b"] intValue];
     _sound = payload[@"s"];
     _attachments = payload[@"at"];
-    [self parseActionButtons:_rawPayload[@"o"]];
+    [self parseActionButtons:payload[@"o"]];
 }
 
 // Parse and convert minified keys for action buttons