Add api key to error report payload

example/src/androidTest/java/com/bugsnag/android/CrashReportTest.java

@@ -54,7 +54,7 @@ public void beforeNotify(Report report) {
         assertNotNull(report);
         JSONObject json = getJson(report);
 
-        assertEquals(2, json.length());
+        assertEquals(3, json.length());
 
         JSONObject event = json.getJSONArray("events").getJSONObject(0);
         assertNotNull(event);

sdk/src/androidTest/java/com/bugsnag/android/ErrorStoreTest.java

@@ -108,8 +108,8 @@ private static void checkFileMatchesErrorReport(File file, Error error) throws E
         assertFalse(file.length() <= 0);
 
         // ensure the file can be serialised into JSON report
-        JSONObject memory = getJsonObjectFromReport(new Report(file));
-        JSONObject disk = getJsonObjectFromReport(new Report(error));
+        JSONObject memory = getJsonObjectFromReport(new Report("api-key", file));
+        JSONObject disk = getJsonObjectFromReport(new Report("api-key", error));
 
         // validate info
         validateReportPayload(memory);
@@ -118,7 +118,7 @@ private static void checkFileMatchesErrorReport(File file, Error error) throws E
 
     static void validateReportPayload(JSONObject payload) throws JSONException {
         assertNotNull(payload);
-        assertEquals(2, payload.length());
+        assertEquals(3, payload.length());
 
         JSONArray events = payload.getJSONArray("events");
         assertNotNull(events);

sdk/src/androidTest/java/com/bugsnag/android/ReportTest.java

@@ -26,7 +26,7 @@ public class ReportTest {
     public void setUp() throws Exception {
         config = new Configuration("example-api-key");
         Error error = new Error.Builder(config, new RuntimeException("Something broke"), null).build();
-        report = new Report(error);
+        report = new Report("api-key", error);
     }
 
     @Test

sdk/src/main/java/com/bugsnag/android/Client.java

@@ -950,7 +950,7 @@ void notify(@NonNull Error error, @NonNull DeliveryStyle style, @Nullable Callba
         }
 
         // Build the report
-        Report report = new Report(error);
+        Report report = new Report(config.getApiKey(), error);
 
         if (callback != null) {
             callback.beforeNotify(report);

sdk/src/main/java/com/bugsnag/android/ErrorStore.java

@@ -91,7 +91,7 @@ public void run() { // Look up all saved error files
 
     private void flushErrorReport(File errorFile, ErrorReportApiClient errorReportApiClient) {
         try {
-            Report report = new Report(errorFile);
+            Report report = new Report(config.getApiKey(), errorFile);
             errorReportApiClient.postReport(config.getEndpoint(), report, config.getErrorApiHeaders());
 
             Logger.info("Deleting sent error file " + errorFile.getName());

sdk/src/main/java/com/bugsnag/android/Report.java

@@ -18,24 +18,29 @@ public class Report implements JsonStream.Streamable {
     @Nullable
     private Error error;
     private Notifier notifier;
+    private String apiKey;
 
-    Report(@Nullable File errorFile) {
+    Report(@NonNull String apiKey, @Nullable File errorFile) {
         this.error = null;
         this.errorFile = errorFile;
         this.notifier = Notifier.getInstance();
+        this.apiKey = apiKey;
     }
 
-    Report(@Nullable Error error) {
+    Report(@NonNull String apiKey, @Nullable Error error) {
         this.error = error;
         this.errorFile = null;
         this.notifier = Notifier.getInstance();
+        this.apiKey = apiKey;
     }
 
     @Override
     public void toStream(@NonNull JsonStream writer) throws IOException {
         // Create a JSON stream and top-level object
         writer.beginObject();
 
+        writer.name("apiKey").value(apiKey);
+
         // Write the notifier info
         writer.name("notifier").value(notifier);
 
@@ -64,8 +69,8 @@ public Error getError() {
         return error;
     }
 
-    @Deprecated
     public void setApiKey(@NonNull String apiKey) {
+        this.apiKey = apiKey;
     }
 
     public void setNotifierVersion(@NonNull String version) {