Fixed inner callback not firing when they are nested

* Example calling deleteTag from getTags is now fixed.
* Added app_id to getTags.

Author: jkasten2

iOS_SDK/OneSignalSDK/Source/OneSignal.m

@@ -628,7 +628,7 @@ + (void)sendTags:(NSDictionary*)keyValuePair onSuccess:(OSResultSuccessBlock)suc
     // Can't send tags yet as their isn't a player_id.
     //   tagsToSend will be sent with the POST create player call later in this case.
     if (self.currentSubscriptionState.userId)
-        [self performSelector:@selector(sendTagsToServer) withObject:nil afterDelay:5];
+       [OneSignalHelper performSelector:@selector(sendTagsToServer) onMainThreadOnObject:self withObject:nil afterDelay:5];
 }
 
 // Called only with a delay to batch network calls.
@@ -686,11 +686,11 @@ + (void)getTags:(OSResultSuccessBlock)successBlock onFailure:(OSFailureBlock)fai
         return;
 
     NSMutableURLRequest* request;
-    request = [self.httpClient requestWithMethod:@"GET" path:[NSString stringWithFormat:@"players/%@", self.currentSubscriptionState.userId]];
+    NSString* path = [NSString stringWithFormat:@"players/%@?app_id=%@", self.currentSubscriptionState.userId, self.app_id];
+    request = [self.httpClient requestWithMethod:@"GET" path:path];
 
     [OneSignalHelper enqueueRequest:request onSuccess:^(NSDictionary* results) {
-        if ([results objectForKey:@"tags"] != nil)
-            successBlock([results objectForKey:@"tags"]);
+        successBlock([results objectForKey:@"tags"]);
     } onFailure:failureBlock];
 }
 

iOS_SDK/OneSignalSDK/UnitTests/UnitTests.m

@@ -133,7 +133,9 @@ - (void)overridePerformSelector:(SEL)aSelector withObject:(nullable id)anArgumen
         selectorToRun.runOn = self;
         selectorToRun.selector = aSelector;
         selectorToRun.withObject = anArgument;
-        [selectorsToRun addObject:selectorToRun];
+        @synchronized(selectorsToRun) {
+            [selectorsToRun addObject:selectorToRun];
+        }
     }
 }
 
@@ -142,10 +144,12 @@ - (id)overridePerformSelector:(SEL)aSelector withObject:(id)anArgument {
 }
 
 + (void)runPendingSelectors {
-    for(SelectorToRun* selectorToRun in selectorsToRun)
-        [selectorToRun.runOn performSelector:selectorToRun.selector withObject:selectorToRun.withObject];
-    
-    [selectorsToRun removeAllObjects];
+    @synchronized(selectorsToRun) {
+        for(SelectorToRun* selectorToRun in selectorsToRun)
+            [selectorToRun.runOn performSelector:selectorToRun.selector withObject:selectorToRun.withObject];
+        
+        [selectorsToRun removeAllObjects];
+    }
 }
 
 @end
@@ -532,7 +536,21 @@ + (NSString*) overrideGetAppName {
 
 + (void)overrideEnqueueRequest:(NSURLRequest*)request onSuccess:(OSResultSuccessBlock)successBlock onFailure:(OSFailureBlock)failureBlock isSynchronous:(BOOL)isSynchronous {
     NSError *error = nil;
-    NSDictionary *parameters = [NSJSONSerialization JSONObjectWithData:[request HTTPBody] options:0 error:&error];
+    
+    NSLog(@"request.URL: %@", request.URL);
+    
+    NSMutableDictionary *parameters;
+    
+    NSData* httpData = [request HTTPBody];
+    if (httpData)
+         parameters = [NSJSONSerialization JSONObjectWithData:[request HTTPBody] options:0 error:&error];
+    else {
+        NSURLComponents *components = [NSURLComponents componentsWithString:request.URL.absoluteString];
+        parameters = [NSMutableDictionary new];
+        for(NSURLQueryItem *item in components.queryItems) {
+            parameters[item.name] = item.value;
+        }
+    }
 
     // We should always send an app_id with every request.
     if (!parameters[@"app_id"])
@@ -1917,6 +1935,9 @@ - (void)testSendTags {
 
     // Make sure all 3 sets of tags where send in 1 network call.
     [NSObjectOverrider runPendingSelectors];
+    [self runBackgroundThreads];
+    [NSObjectOverrider runPendingSelectors];
+    
     XCTAssertEqualObjects(lastHTTPRequset[@"tags"][@"key"], @"value");
     XCTAssertEqualObjects(lastHTTPRequset[@"tags"][@"key1"], @"value1");
     XCTAssertEqualObjects(lastHTTPRequset[@"tags"][@"key2"], @"value2");
@@ -1938,6 +1959,7 @@ - (void)testSendTags {
     } onFailure:^(NSError *error) {}];
 
     [NSObjectOverrider runPendingSelectors];
+    [self runBackgroundThreads];
 
     XCTAssertEqualObjects(lastHTTPRequset[@"tags"][@"key10"], @"value10");
     XCTAssertEqualObjects(lastHTTPRequset[@"tags"][@"key11"], @"value11");
@@ -1971,6 +1993,50 @@ - (void)testDeleteTags {
     [OneSignal deleteTag:@"someKey"];
 }
 
+- (void)testGetTags {
+    [self initOneSignal];
+    [self runBackgroundThreads];
+    XCTAssertEqual(networkRequestCount, 1);
+    
+    __block BOOL fireGetTags = false;
+    
+    [OneSignal getTags:^(NSDictionary *result) {
+        NSLog(@"getTags success HERE");
+        fireGetTags = true;
+    } onFailure:^(NSError *error) {
+        NSLog(@"getTags onFailure HERE");
+    }];
+    
+    [self runBackgroundThreads];
+    
+    XCTAssertTrue(fireGetTags);
+}
+
+- (void)testGetTagsWithNestedDelete {
+    [self initOneSignal];
+    [self runBackgroundThreads];
+    XCTAssertEqual(networkRequestCount, 1);
+    
+    __block BOOL fireDeleteTags = false;
+    
+    [OneSignal getTags:^(NSDictionary *result) {
+        NSLog(@"getTags success HERE");
+        [OneSignal deleteTag:@"tag" onSuccess:^(NSDictionary *result) {
+            fireDeleteTags = true;
+            NSLog(@"deleteTag onSuccess HERE");
+        } onFailure:^(NSError *error) {
+            NSLog(@"deleteTag onFailure HERE");
+        }];
+    } onFailure:^(NSError *error) {
+        NSLog(@"getTags onFailure HERE");
+    }];
+    
+    [self runBackgroundThreads];
+    [NSObjectOverrider runPendingSelectors];
+    
+    XCTAssertTrue(fireDeleteTags);
+}
+
 - (void)testSendTagsBeforeRegisterComplete {
     [self setCurrentNotificationPermissionAsUnanswered];