Merge pull request #932 from OneSignal/fix/include_player_ids_android_ios_array_issue

Fixed an issue with the 'include_player_ids' param in postNotification

Author: mikechoch

android/src/main/java/com/geektime/rnonesignalandroid/RNOneSignal.java

@@ -323,8 +323,7 @@ public void postNotification(String contents, String data, String playerId, Stri
          postNotification.put("contents", new JSONObject(contents));
 
          if (playerId != null) {
-            JSONArray playerIds = new JSONArray();
-            playerIds.put(playerId);
+            JSONArray playerIds = new JSONArray(playerId);
             postNotification.put("include_player_ids", playerIds);
          }
 

examples/RNOneSignal/App.js

@@ -31,6 +31,7 @@ export default class App extends Component {
     let requiresConsent = false;
 
     this.state = {
+      userId: '',
       emailEnabled: false,
       animatingEmailButton: false,
       initialOpenFromPush: 'Did NOT open from push',
@@ -52,10 +53,10 @@ export default class App extends Component {
     OneSignal.setLogLevel(6, 0);
 
     // Examples for using native IAM public methods
-    // this.oneSignalInAppMessagingExamples();
+//    this.oneSignalInAppMessagingExamples();
 
     // Examples for using native Outcome Event public methods
-    // this.oneSignalOutcomeEventsExamples();
+//    this.oneSignalOutcomeEventsExamples();
 
   }
 
@@ -185,6 +186,9 @@ export default class App extends Component {
 
   onIds(device) {
     console.log('Device info: ', device);
+    this.setState({
+        userId: device.userId
+    });
   }
 
   onInAppMessageClicked(actionResult) {
@@ -334,6 +338,21 @@ export default class App extends Component {
               color={this.state.buttonColor}
             />
           </View>
+          <View style={styles.buttonContainer}>
+            <Button
+              style={styles.button}
+              onPress={() => {
+                var contents = {'en': 'You got notification from user'};
+                var data = {};
+                // Make sure to send an String Array of playerIds
+                var playerIds = [this.state.userId];
+                var other = {};
+                OneSignal.postNotification(contents, data, playerIds, other);
+              }}
+              title="Post Notification"
+              color={this.state.buttonColor}
+            />
+          </View>
           <View style={styles.buttonContainer}>
             <Button
               style={styles.button}

index.js

@@ -351,11 +351,7 @@ export default class OneSignal {
     static postNotification(contents, data, player_id, otherParameters) {
         if (!checkIfInitialized()) return;
 
-        if (Platform.OS === 'android') {
-            RNOneSignal.postNotification(JSON.stringify(contents), JSON.stringify(data), player_id, JSON.stringify(otherParameters));
-        } else {
-            RNOneSignal.postNotification(contents, data, player_id, otherParameters);
-        }
+        RNOneSignal.postNotification(contents, data, player_id, otherParameters);
     }
 
     static clearOneSignalNotifications() {

ios/RCTOneSignal/RCTOneSignalEventEmitter.m

@@ -310,7 +310,7 @@ + (void)sendEventWithName:(NSString *)name withBody:(NSDictionary *)body {
 }
 
 // The post notification endpoint accepts four parameters.
-RCT_EXPORT_METHOD(postNotification:(NSDictionary *)contents data:(NSDictionary *)data player_id:(id)player_ids other_parameters:(NSDictionary *)other_parameters) {
+RCT_EXPORT_METHOD(postNotification:(NSDictionary *)contents data:(NSDictionary *)data player_id:(NSArray *)player_ids other_parameters:(NSDictionary *)other_parameters) {
     NSDictionary * additionalData = data ? @{@"p2p_notification": data} : @{};
 
     NSMutableDictionary * extendedData = [additionalData mutableCopy];
@@ -323,12 +323,9 @@ + (void)sendEventWithName:(NSString *)name withBody:(NSDictionary *)body {
     notification[@"contents"] = contents;
     notification[@"data"] = extendedData;
 
-    if (player_ids && [player_ids isKindOfClass:[NSArray class]]) {
-        //array of player ids
-        notification[@"include_player_ids"] = (NSArray<NSString *> *)player_ids;
-    } else if (player_ids && [player_ids isKindOfClass:[NSString class]]) {
-        //individual player id
-        notification[@"include_player_ids"] = @[(NSString *)player_ids];
+    if (player_ids) {
+        // Array of player ids
+        notification[@"include_player_ids"] = player_ids;
     }
 
     if (other_parameters) {