Merge branch 'main' into rz/chore/disable-system-events-extras

Author: romtsn

sentry/src/main/java/io/sentry/cache/EnvelopeCache.java

@@ -442,8 +442,12 @@ public void movePreviousSession(
       final @NotNull File currentSessionFile, final @NotNull File previousSessionFile) {
     try (final @NotNull ISentryLifecycleToken ignored = sessionLock.acquire()) {
       if (previousSessionFile.exists()) {
-        options.getLogger().log(DEBUG, "Previous session file already exists.");
-        return;
+        options.getLogger().log(DEBUG, "Previous session file already exists, deleting it.");
+        if (!previousSessionFile.delete()) {
+          options
+              .getLogger()
+              .log(WARNING, "Unable to delete previous session file: %s", previousSessionFile);
+        }
       }
 
       if (currentSessionFile.exists()) {

sentry/src/test/java/io/sentry/MovePreviousSessionTest.kt

@@ -150,11 +150,10 @@ class MovePreviousSessionTest {
 
     (fixture.options.envelopeDiskCache as EnvelopeCache).waitPreviousSessionFlush()
 
-    // Files should remain unchanged when previous already exists
-    assertTrue(currentSessionFile.exists())
+    // Current session file should have been moved to previous
+    assertFalse(currentSessionFile.exists())
     assertTrue(previousSessionFile.exists())
-    assert(currentSessionFile.readText() == "current session")
-    assert(previousSessionFile.readText() == "previous session")
+    assert(previousSessionFile.readText() == "current session")
 
     fixture.cleanup()
   }

sentry/src/test/java/io/sentry/cache/EnvelopeCacheTest.kt

@@ -447,7 +447,7 @@ class EnvelopeCacheTest {
   }
 
   @Test
-  fun `movePreviousSession does nothing when previous session file already exists`() {
+  fun `movePreviousSession deletes file and moves session when previous session file already exists`() {
     val cache = fixture.getSUT()
 
     val currentSessionFile = EnvelopeCache.getCurrentSessionFile(fixture.options.cacheDirPath!!)
@@ -465,10 +465,9 @@ class EnvelopeCacheTest {
     // Call movePreviousSession when previous already exists
     cache.movePreviousSession(currentSessionFile, previousSessionFile)
 
-    // Both files should remain unchanged
-    assertTrue(currentSessionFile.exists())
+    // Current session should be moved to previous
+    assertFalse(currentSessionFile.exists())
     assertTrue(previousSessionFile.exists())
-    assertEquals("current session content", currentSessionFile.readText())
-    assertEquals("existing previous content", previousSessionFile.readText())
+    assertEquals("current session content", previousSessionFile.readText())
   }
 }