Merge pull request #7 from urbanairship/MB-2216

[MB-2216] React Native Sample, bindings improvements

Author: rlepinski

ios/UARCTModule/UrbanAirshipReactModule.m

@@ -55,18 +55,29 @@ - (RCTBridge *)bridge {
 }
 
 RCT_EXPORT_METHOD(setNamedUser:(NSString *)namedUser) {
-    namedUser = [namedUser stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
-    [UAirship namedUser].identifier = namedUser;
+  namedUser = [namedUser stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
+  [UAirship namedUser].identifier = namedUser.length ? namedUser : nil;
 }
 
+RCT_REMAP_METHOD(getNamedUser,
+                 getNamedUser_resolver:(RCTPromiseResolveBlock)resolve
+                 rejecter:(RCTPromiseRejectBlock)reject) {
+    resolve([UAirship namedUser].identifier);
+}
+
+
 RCT_EXPORT_METHOD(addTag:(NSString *)tag) {
-    [[UAirship push] addTag:tag];
-    [[UAirship push] updateRegistration];
+    if (tag) {
+        [[UAirship push] addTag:tag];
+        [[UAirship push] updateRegistration];
+    }
 }
 
 RCT_EXPORT_METHOD(removeTag:(NSString *)tag) {
-    [[UAirship push] removeTag:tag];
-    [[UAirship push] updateRegistration];
+    if (tag) {
+        [[UAirship push] removeTag:tag];
+        [[UAirship push] updateRegistration];
+    }
 }
 
 RCT_REMAP_METHOD(getTags,
@@ -75,16 +86,6 @@ - (RCTBridge *)bridge {
     resolve([UAirship push].tags ?: [NSArray array]);
 }
 
-RCT_EXPORT_METHOD(addTag:(NSArray *)tags group:(NSString *)group) {
-    [[UAirship push] addTags:tags group:group];
-    [[UAirship push] updateRegistration];
-}
-
-RCT_EXPORT_METHOD(removeTag:(NSArray *)tags group:(NSString *)group) {
-    [[UAirship push] removeTags:tags group:group];
-    [[UAirship push] updateRegistration];
-}
-
 RCT_EXPORT_METHOD(setAnalyticsEnabled:(BOOL)enabled) {
     [UAirship shared].analytics.enabled = enabled;
 }
@@ -191,7 +192,7 @@ - (RCTBridge *)bridge {
                     }];
 }
 
-RCT_EXPORT_METHOD(editNamedUserGroups:(NSArray *)operations) {
+RCT_EXPORT_METHOD(editNamedUserTagGroups:(NSArray *)operations) {
     UANamedUser *namedUser = [UAirship namedUser];
     for (NSDictionary *operation in [operations objectAtIndex:0]) {
         NSString *group = operation[@"group"];
@@ -205,7 +206,7 @@ - (RCTBridge *)bridge {
     [namedUser updateTags];
 }
 
-RCT_EXPORT_METHOD(editChannelGroups:(NSArray *)operations) {
+RCT_EXPORT_METHOD(editChannelTagGroups:(NSArray *)operations) {
     for (NSDictionary *operation in [operations objectAtIndex:0]) {
         NSString *group = operation[@"group"];
         if ([operation[@"operationType"] isEqualToString:@"add"]) {