Merge pull request #921 from OneSignal/fix/saving_null_tags

Fix saving NSNull in tags to userDefaults

Author: emawby

iOS_SDK/OneSignalSDK/Source/OSPlayerTags.m

@@ -101,7 +101,18 @@ - (void)loadTagsFromUserDefaults {
     _tags = [standardUserDefaults getSavedDictionaryForKey:OSUD_PLAYER_TAGS defaultValue:nil];
 }
 
+- (void)removeNSNullFromTags {
+    NSMutableDictionary *tagsDict = [NSMutableDictionary dictionaryWithDictionary:_tags];
+    for (id key in tagsDict.allKeys) {
+        if ([tagsDict[key] isKindOfClass:[NSNull class]]) {
+            tagsDict[key] = nil;
+        }
+    }
+    _tags = tagsDict;
+}
+
 - (void)saveTagsToUserDefaults {
+    [self removeNSNullFromTags];
     let standardUserDefaults = OneSignalUserDefaults.initStandard;
     [standardUserDefaults saveDictionaryForKey:OSUD_PLAYER_TAGS withValue:_tags];
 }

iOS_SDK/OneSignalSDK/UnitTests/UnitTests.m

@@ -1364,6 +1364,38 @@ - (void)testSendTagsOnBackground {
     XCTAssertEqual(OneSignalClientOverrider.networkRequestCount, 4);
 }
 
+- (void)testSendNSNullInTags {
+    [UnitTestCommonMethods initOneSignal_andThreadWait];
+    
+    XCTAssertEqual(OneSignalClientOverrider.networkRequestCount, 2);
+    
+    [OneSignal sendTags:@{@"key1": @"value1", @"key2": [NSNull new]}];
+    
+    // Make sure all tags where send in 1 network call.
+    [NSObjectOverrider runPendingSelectors];
+    [UnitTestCommonMethods runBackgroundThreads];
+    [NSObjectOverrider runPendingSelectors];
+    
+    XCTAssertEqualObjects(OneSignalClientOverrider.lastHTTPRequest[@"tags"][@"key1"], @"value1");
+    XCTAssertEqualObjects(OneSignalClientOverrider.lastHTTPRequest[@"tags"][@"key2"], [NSNull new]);
+    XCTAssertEqual(OneSignalClientOverrider.networkRequestCount, 3);
+}
+
+- (void)testSendBadObjectInTags {
+    [UnitTestCommonMethods initOneSignal_andThreadWait];
+    
+    XCTAssertEqual(OneSignalClientOverrider.networkRequestCount, 2);
+    //The OneSignal class is not a valid json object
+    [OneSignal sendTags:@{@"key1": @"value1", @"key2": [OneSignal new]}];
+    
+    // Make sure the tags were not sent.
+    [NSObjectOverrider runPendingSelectors];
+    [UnitTestCommonMethods runBackgroundThreads];
+    [NSObjectOverrider runPendingSelectors];
+    
+    XCTAssertEqual(OneSignalClientOverrider.networkRequestCount, 2);
+}
+
 - (void)testDeleteTags {
     [UnitTestCommonMethods initOneSignal_andThreadWait];
     XCTAssertEqual(OneSignalClientOverrider.networkRequestCount, 2);