Merge pull request #19 from phongcao/user-tags

User tags and RN 0.40+.

Author: phongcao

ios/AzureNotificationHubIOS.js

@@ -15,7 +15,7 @@ import {NativeEventEmitter} from 'react-native';
 import {NativeModules} from 'react-native';
 
 const RCTAzureNotificationHubManager = NativeModules.AzureNotificationHubManager;
-const invariant = require('../../react-native/node_modules/fbjs/lib/invariant');
+const invariant = require('fbjs/lib/invariant');
 
 const PushNotificationEmitter = new NativeEventEmitter(RCTAzureNotificationHubManager);
 

ios/RCTAzureNotificationHubManager/RCTAzureNotificationHubManager.h

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#import "RCTEventEmitter.h"
+#import "React/RCTEventEmitter.h"
 
 @interface RCTAzureNotificationHubManager : RCTEventEmitter
 

ios/RCTAzureNotificationHubManager/RCTAzureNotificationHubManager.m

@@ -10,10 +10,10 @@
 #import <WindowsAzureMessaging/WindowsAzureMessaging.h>
 #import "RCTAzureNotificationHubManager.h"
 
-#import "RCTBridge.h"
-#import "RCTConvert.h"
-#import "RCTEventDispatcher.h"
-#import "RCTUtils.h"
+#import "React/RCTBridge.h"
+#import "React/RCTConvert.h"
+#import "React/RCTEventDispatcher.h"
+#import "React/RCTUtils.h"
 
 // The default error code to use as the `code` property for callback error objects
 RCT_EXTERN NSString *const RCTErrorUnspecified;
@@ -35,6 +35,7 @@
 // Keys
 NSString *const RCTConnectionStringKey                          = @"connectionString";
 NSString *const RCTHubNameKey                                   = @"hubName";
+NSString *const RCTTagsKey                                      = @"tags";
 
 @implementation RCTConvert (UILocalNotification)
 
@@ -69,6 +70,9 @@ @implementation RCTAzureNotificationHubManager
 
     // The Notification Hub name
     NSString *_hubName;
+    
+    // The Notification Hub tags
+    NSSet *_tags;
 }
 
 static NSDictionary *RCTFormatLocalNotification(UILocalNotification *notification)
@@ -441,25 +445,26 @@ - (void)handleRegisterUserNotificationSettings:(NSNotification *)notification
                   resolver:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject)
 {
-    // Store the connection string and hub name
+    // Store the connection string, hub name and tags
     _connectionString = [config objectForKey:RCTConnectionStringKey];
     _hubName = [config objectForKey:RCTHubNameKey];
-    
+    _tags = [config objectForKey:RCTTagsKey];
+
     // Check arguments
     if (![self assertArguments:reject])
     {
         return;
     }
 
     // Initialize hub
-    SBNotificationHub* hub = [[SBNotificationHub alloc] initWithConnectionString:_connectionString
+    SBNotificationHub *hub = [[SBNotificationHub alloc] initWithConnectionString:_connectionString
                                                              notificationHubPath:_hubName];
 
     // Register for native notifications
     dispatch_async(dispatch_get_main_queue(), ^
     {
        [hub registerNativeWithDeviceToken:deviceToken
-                                     tags:nil
+                                     tags:_tags
                                completion:^(NSError* error)
         {
             if (error != nil)
@@ -488,13 +493,13 @@ - (void)handleRegisterUserNotificationSettings:(NSNotification *)notification
     }
 
     // Initialize hub
-    SBNotificationHub* hub = [[SBNotificationHub alloc] initWithConnectionString:_connectionString
+    SBNotificationHub *hub = [[SBNotificationHub alloc] initWithConnectionString:_connectionString
                                                              notificationHubPath:_hubName];
 
     // Unregister for native notifications
     dispatch_async(dispatch_get_main_queue(), ^
     {
-       [hub unregisterNativeWithCompletion:^(NSError* error)
+       [hub unregisterNativeWithCompletion:^(NSError *error)
         {
             if (error != nil)
             {