Merge pull request #29 from dominikkrejcik/fix-null-sound-crash

Fix a crash when receiving a push notification with null sound

Author: nlutsenko

Parse/PFPush.m

@@ -415,7 +415,7 @@ + (void)handlePush:(NSDictionary *)userInfo {
 
     NSString *soundName = aps[@"sound"];
 
-    if (soundName.length == 0 || [soundName isEqualToString:@"default"]) {
+    if ((id)soundName == [NSNull null] || soundName.length == 0 || [soundName isEqualToString:@"default"]) {
         [[self pushInternalUtilClass] playVibrate];
     } else {
         [[self pushInternalUtilClass] playAudioWithName:soundName];

Tests/Unit/PushMobileTests.m

@@ -54,4 +54,21 @@ - (void)testHandlePushDictionaryAlert {
     OCMVerifyAll(mockedUtils);
 }
 
+- (void)testHandlePushWithNullSound {
+    id mockedUtils = PFStrictProtocolMock(@protocol(PFPushInternalUtils));
+    OCMExpect([mockedUtils showAlertViewWithTitle:[OCMArg isNil] message:@"hello"]);
+    OCMExpect([mockedUtils playVibrate]);
+
+    // NOTE: Async parse preload step may call this selector.
+    // Don't epxect it because it doesn't ALWAYs get to this point before returning from the method.
+    OCMStub([mockedUtils getDeviceTokenFromKeychain]).andReturn(nil);
+
+    [PFPush setPushInternalUtilClass:mockedUtils];
+    [PFPush handlePush:@{ @"aps" : @{@"alert" : @"hello", @"sound": [NSNull null]} }];
+
+    OCMVerifyAll(mockedUtils);
+
+    [PFPush setPushInternalUtilClass:nil];
+}
+
 @end