set new batch UUID when partial events are sent (#340)

Author: e7mac

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

@@ -727,14 +727,19 @@ public List<Map<String, Object>> getUnsentRequests(double fraction) {
       lastSendTimeMs = System.currentTimeMillis();
       Context context = Leanplum.getContext();
       SharedPreferences preferences = context.getSharedPreferences(
-          LEANPLUM, Context.MODE_PRIVATE);
+              LEANPLUM, Context.MODE_PRIVATE);
       SharedPreferences.Editor editor = preferences.edit();
       int count = (int) (fraction * MAX_EVENTS_PER_API_CALL);
       requestData = LeanplumEventDataManager.getEvents(count);
       editor.remove(Constants.Defaults.UUID_KEY);
       SharedPreferencesUtil.commitChanges(editor);
+      // if we send less than 100% of requests, we need to reset the batch
+      // UUID for the next batch
+      if (fraction < 1) {
+        RequestOldUtil util = new RequestOldUtil();
+        util.setNewBatchUUID(requestData);
+      }
     }
-
     return requestData;
   }
 

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

@@ -0,0 +1,17 @@
+package com.leanplum.internal;
+
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import static com.leanplum.internal.RequestOld.UUID_KEY;
+
+public class RequestOldUtil {
+
+    public void setNewBatchUUID(List<Map<String, Object>> requests) {
+        String uuid = UUID.randomUUID().toString();
+        for (Map<String, Object> request : requests) {
+            request.put(UUID_KEY, uuid);
+        }
+    }
+}

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

@@ -0,0 +1,64 @@
+package com.leanplum.internal;
+
+import android.app.Application;
+
+import com.leanplum.Leanplum;
+import com.leanplum.__setup.LeanplumTestApp;
+import com.leanplum._whitebox.utilities.SynchronousExecutor;
+
+import junit.framework.TestCase;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+import java.util.List;
+import java.util.Map;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(
+        sdk = 16,
+        application = LeanplumTestApp.class
+)
+@PowerMockIgnore({"org.mockito.*", "org.robolectric.*", "org.json.*", "org.powermock.*"})
+public class RequestOldUtilTest extends TestCase {
+    private final String POST = "POST";
+    /**
+     * Runs before every test case.
+     */
+    @Before
+    public void setUp() {
+        Application context = RuntimeEnvironment.application;
+        assertNotNull(context);
+        Leanplum.setApplicationContext(context);
+
+        // Mock this so async things run synchronously
+        ReflectionHelpers.setStaticField(Util.class, "singleThreadExecutor", new SynchronousExecutor());
+    }
+
+    @Test
+    public void testSetNewBatchUUID() {
+        LeanplumEventDataManager.init(Leanplum.getContext());
+
+        RequestOld request1 = new RequestOld(this.POST, Constants.Methods.START, null);
+        request1.sendEventually();
+        RequestOld request2 = new RequestOld(this.POST, Constants.Methods.TRACK, null);
+        request2.sendEventually();
+        List<Map<String, Object>> unsentRequests1 = request1.getUnsentRequests(1.0);
+        String oldUUID1 = (String) unsentRequests1.get(0).get(request1.UUID_KEY);
+
+        List<Map<String, Object>> unsentRequests2 = request1.getUnsentRequests(1.0);
+        String oldUUID2 = (String) unsentRequests2.get(0).get(request1.UUID_KEY);
+
+        List<Map<String, Object>> unsentRequests3 = request1.getUnsentRequests(0.5);
+        String newUUID = (String) unsentRequests3.get(0).get(request1.UUID_KEY);
+
+        assertTrue(oldUUID1.equals(oldUUID2));
+        assertFalse(oldUUID1.equals(newUUID));
+    }
+}