Fix requests to send (#252)

Author: e7mac

AndroidSDKCore/src/main/java/com/leanplum/internal/Request.java

@@ -529,7 +529,7 @@ private RequestsWithEncoding getRequestsWithEncodedStringForErrors() {
       unsentRequests.add(error);
     }
     requestsToSend = unsentRequests;
-    jsonEncodedRequestsToSend = jsonEncodeUnsentRequests(unsentRequests);
+    jsonEncodedRequestsToSend = jsonEncodeRequests(unsentRequests);
 
     RequestsWithEncoding requestsWithEncoding = new RequestsWithEncoding();
     // for errors, we send all unsent requests so they are identical
@@ -556,7 +556,7 @@ protected RequestsWithEncoding getRequestsWithEncodedStringStoredRequests(double
         requestsToSend = removeIrrelevantBackgroundStartRequests(unsentRequests);
       }
 
-      jsonEncodedRequestsToSend = jsonEncodeUnsentRequests(unsentRequests);
+      jsonEncodedRequestsToSend = jsonEncodeRequests(requestsToSend);
       requestsWithEncoding.unsentRequests = unsentRequests;
       requestsWithEncoding.requestsToSend = requestsToSend;
       requestsWithEncoding.jsonEncodedString = jsonEncodedRequestsToSend;
@@ -750,7 +750,7 @@ private static List<Map<String, Object>> removeIrrelevantBackgroundStartRequests
     return relevantRequests;
   }
 
-  protected static String jsonEncodeUnsentRequests(List<Map<String, Object>> requestData) {
+  protected static String jsonEncodeRequests(List<Map<String, Object>> requestData) {
     Map<String, Object> data = new HashMap<>();
     data.put(Constants.Params.DATA, requestData);
     return JsonConverter.toJson(data);

AndroidSDKTests/src/test/java/com/leanplum/internal/RequestTest.java

@@ -346,7 +346,7 @@ public void testJsonEncodeUnsentRequests() {
   @Test
   public void testGetRequestsWithEncodedStringStoredRequests() {
     List<Map<String, Object>> requests = mockRequests(4);
-    String json = Request.jsonEncodeUnsentRequests(requests);
+    String json = Request.jsonEncodeRequests(requests);
 
     final String expectedJson =  "{\"data\":[{\"0\":\"testData\"},{\"1\":\"testData\"},{\"2\":\"testData\"},{\"3\":\"testData\"}]}";
     assertEquals(json, expectedJson);