reset crashedLastRun in PreviousSessionFinalizer and add test-case

Author: supervacuus

sentry/src/main/java/io/sentry/PreviousSessionFinalizer.java

@@ -92,8 +92,10 @@ public void run() {
           if (session.getStatus() == Session.State.Crashed) {
             // this means the session was already updated from tombstone data and there is no need
             // to consider the crash-marker file from the Native SDK. However, we can use this to
-            // set crashedLastRun.
-            SentryCrashLastRunState.getInstance().setCrashedLastRun(true);
+            // reset crashedLastRun.
+            final @NotNull SentryCrashLastRunState crashLastRunState = SentryCrashLastRunState.getInstance();
+            crashLastRunState.reset();
+            crashLastRunState.setCrashedLastRun(true);
           } else if (crashMarkerFile.exists()) {
             // this means that the Native SDK is solely responsible for Native crashes and we must
             // update the session state and timestamp.

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

@@ -237,6 +237,23 @@ class PreviousSessionFinalizerTest {
     assertTrue(SentryCrashLastRunState.getInstance().isCrashedLastRun(null, false)!!)
   }
 
+  @Test
+  fun `when previous session is already crashed and SessionStart was processed and no native crash marker exists, crashedLastRun is still true`() {
+    // Create a session that is already in Crashed state (simulating tombstone integration)
+    val crashedSession =
+      Session(null, null, null, "io.sentry.sample@1.0").apply { update(Crashed, null, true) }
+
+    val finalizer = fixture.getSut(tmpDir, session = crashedSession)
+
+    // If the EnvelopeCache stored a SessionStart and no native crash marker was present then crashedLastRun would be false
+    SentryCrashLastRunState.getInstance().setCrashedLastRun(false)
+
+    finalizer.run()
+
+    // the finalizer must be aware that this could have happened before and reset the crashedLastRun to true
+    assertTrue(SentryCrashLastRunState.getInstance().isCrashedLastRun(null, false)!!)
+  }
+
   @Test
   fun `when native crash marker exists but session is not crashed, does not set crashedLastRun`() {
     // Session is not crashed, but native crash marker exists