merge #1 and update how person data is set

Author: sbezboro

src/main/java/com/rollbar/android/Notifier.java

@@ -40,6 +40,8 @@ public class Notifier {
     private Context context;
     private String accessToken;
     private String environment;
+
+    private JSONObject personData;
 
     private String endpoint;
     private boolean reportUncaughtExceptions;
@@ -84,6 +86,29 @@ public Notifier(Context context, String accessToken, String environment) {
         scheduleItemFileHandler();
     }
 
+    public void setPersonData(JSONObject personData) {
+        this.personData = personData;
+    }
+
+    public void setPersonData(String id, String username, String email) {
+        JSONObject personData = new JSONObject();
+        
+        try {
+            personData.put("id", id);
+            
+            if (username != null) {
+                personData.put("username", username);
+            }
+            if (email != null) {
+                personData.put("email", email);
+            }
+            
+            this.personData = personData;
+        } catch (JSONException e) {
+            Log.e(Rollbar.TAG, "JSON error creating person data.", e);
+        }
+    }
+
     private JSONObject buildNotifierData() throws JSONException {
         JSONObject notifier = new JSONObject();
         notifier.put("name", "rollbar-android");
@@ -118,6 +143,9 @@ private JSONObject buildData(String level, JSONObject body) throws JSONException
 
         data.put("body", body);
 
+        if (personData != null) {
+            data.put("person", personData);
+        }
         data.put("client", buildClientData());
         data.put("notifier", buildNotifierData());
 

src/main/java/com/rollbar/android/Rollbar.java

@@ -3,6 +3,8 @@
 import android.content.Context;
 import android.util.Log;
 
+import org.json.JSONObject;
+
 public class Rollbar {
     public static final String TAG = "Rollbar";
 
@@ -56,6 +58,14 @@ public void run() {
         });
     }
 
+    public static void setPersonData(JSONObject personData) {
+        notifier.setPersonData(personData);
+    }
+    
+    public static void setPersonData(String id, String username, String email) {
+        notifier.setPersonData(id, username, email);
+    }
+    
     private static void ensureInit(Runnable runnable) {
         if (notifier == null) {
             Log.e(TAG, "Rollbar not initialized with an access token!");