Merge pull request #62 from Parsely/issue/60-fix-duplicated-timestamp…

…s-on-engagement-sessions
Parsely · Sep 8, 2023 · 370edb6 · 370edb6
2 parents 8e32106 + bc62a92
commit 370edb6
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/parsely/src/main/java/com/parsely/parselyandroid/ParselyTracker.java b/parsely/src/main/java/com/parsely/parselyandroid/ParselyTracker.java
@@ -887,13 +887,17 @@ public boolean cancel() {
 
         private void doEnqueue(long scheduledExecutionTime) {
             // Create a copy of the base event to enqueue
-            Map<String, Object> event = new HashMap(this.baseEvent);
+            Map<String, Object> event = new HashMap<>(this.baseEvent);
             PLog(String.format("Enqueuing %s event.", event.get("action")));
 
             // Update `ts` for the event since it's happening right now.
             Calendar now = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
-            Map<String, Object> data = (Map<String, Object>) event.get("data");
+            @SuppressWarnings("unchecked")
+            Map<String, Object> baseEventData = (Map<String, Object>) event.get("data");
+            assert baseEventData != null;
+            Map<String, Object> data = new HashMap<>((Map<String, Object>) baseEventData);
             data.put("ts", now.getTimeInMillis() / 1000);
+            event.put("data", data);
 
             // Adjust inc by execution time in case we're late or early.
             long executionDiff = (System.currentTimeMillis() - scheduledExecutionTime);