Merge pull request #486 from geektimecoil/json_formatting

Json formatting

Author: Nightsd01

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

@@ -33,6 +33,7 @@
 import com.onesignal.OneSignal.EmailUpdateError;
 
 import org.json.JSONObject;
+import org.json.JSONArray;
 import org.json.JSONException;
 
 
@@ -95,6 +96,10 @@ private void sendEvent(String eventName, Object params) {
                .emit(eventName, params);
    }
 
+   private JSONObject jsonFromErrorMessageString(String errorMessage) throws JSONException {
+      return new JSONObject().put("error", errorMessage);
+   }
+
    @ReactMethod 
    public void init(String appId) {
       Activity activity = getCurrentActivity();
@@ -147,8 +152,7 @@ public void onSuccess() {
          @Override
          public void onFailure(EmailUpdateError error) {
                try {
-                  JSONObject errorObject = new JSONObject("{'error' : '" + error.getMessage() + "'}");
-                  callback.invoke(RNUtils.jsonToWritableMap(errorObject));
+                  callback.invoke(RNUtils.jsonToWritableMap(jsonFromErrorMessageString(error.getMessage())));
                } catch (JSONException exception) {
                   exception.printStackTrace();
                }
@@ -167,8 +171,7 @@ public void onSuccess() {
          @Override
          public void onFailure(EmailUpdateError error) {
                try {
-                  JSONObject errorObject = new JSONObject("{'error' : '" + error.getMessage() + "'}");
-                  callback.invoke(RNUtils.jsonToWritableMap(errorObject));
+                  callback.invoke(RNUtils.jsonToWritableMap(jsonFromErrorMessageString(error.getMessage())));
                } catch (JSONException exception) {
                   exception.printStackTrace();
                }
@@ -187,8 +190,7 @@ public void onSuccess() {
          @Override
          public void onFailure(EmailUpdateError error) {
                try {
-                  JSONObject errorObject = new JSONObject("{'error' : '" + error.getMessage() + "'}");
-                  callback.invoke(RNUtils.jsonToWritableMap(errorObject));
+                  callback.invoke(RNUtils.jsonToWritableMap(jsonFromErrorMessageString(error.getMessage())));
                } catch (JSONException exception) {
                   exception.printStackTrace();
                }
@@ -231,15 +233,15 @@ public void getPermissionSubscriptionState(final Callback callback) {
       boolean userSubscriptionEnabled = subscriptionState.getUserSubscriptionSetting();
 
       try {
-         JSONObject result = new JSONObject("{" +
-               "'notificationsEnabled': " + String.valueOf(notificationsEnabled) + "," +
-               "'subscriptionEnabled': " + String.valueOf(subscriptionEnabled) + "," +
-               "'userSubscriptionEnabled': " + String.valueOf(userSubscriptionEnabled) + "," +
-               "'pushToken': " + subscriptionState.getPushToken() + "," +
-               "'userId': " + subscriptionState.getUserId() + "," +
-               "'emailUserId' : " + emailSubscriptionState.getEmailUserId() + "," +
-               "'emailAddress' : " + emailSubscriptionState.getEmailAddress() +
-         "}");
+         JSONObject result = new JSONObject();
+
+         result.put("notificationsEnabled", String.valueOf(notificationsEnabled))
+                 .put("subscriptionEnabled", String.valueOf(subscriptionEnabled))
+                 .put("userSubscriptionEnabled", String.valueOf(userSubscriptionEnabled))
+                 .put("pushToken", subscriptionState.getPushToken())
+                 .put("userId", subscriptionState.getUserId())
+                 .put("emailUserId", emailSubscriptionState.getEmailUserId())
+                 .put("emailAddress", emailSubscriptionState.getEmailAddress());
 
          Log.d("onesignal", "permission subscription state: " + result.toString());
 
@@ -297,7 +299,21 @@ public void setLocationShared(Boolean shared) {
    @ReactMethod
    public void postNotification(String contents, String data, String playerId, String otherParameters) {
       try {
-         JSONObject postNotification = new JSONObject("{'contents': " + contents + ", 'data': {'p2p_notification': " + data + "}, 'include_player_ids': ['" + playerId + "']}");
+         JSONObject postNotification = new JSONObject();
+         postNotification.put("contents", contents);
+
+         if (playerId != null) {
+            JSONArray playerIds = new JSONArray();
+            playerIds.put(playerId);
+            postNotification.put("include_player_ids", playerIds);
+         }
+
+         if (data != null) {
+            JSONObject additionalData = new JSONObject();
+            additionalData.put("p2p_notification", data);
+            postNotification.put("data", additionalData);
+         }
+
          if (otherParameters != null && !otherParameters.trim().isEmpty()) {
                JSONObject parametersJson = new JSONObject(otherParameters.trim());
                Iterator<String> keys = parametersJson.keys();