fix(overlay): stop the service only for the newest start when an overlay closes

dismiss() called plain stopSelf(), which stops the service even when a
newer start is already queued. The start intent is then delivered,
shows its overlay, and onDestroy removes it right after. The withdrawal
added in fc53929 makes that reachable: a rejected caller's withdrawal
followed within milliseconds by the next caller's overlay start.

The service now records the newest startId it was handed, and dismiss()
calls stopSelf(latestStartId). Android ignores that while a newer start
is pending, and stops the service exactly as before otherwise. Found by
the verification pass over fc53929.

Tests: CallerIdOverlayWithdrawTest gains a case that checks the stop
names the newest start; no existing test changed. A control run with
plain stopSelf() back in dismiss() fails it.

Author: SysAdminDoc

README.md

@@ -12,7 +12,7 @@
 <p align="center">
   <a href="https://github.com/SysAdminDoc/CallShield/releases/latest"><img src="https://img.shields.io/github/v/release/SysAdminDoc/CallShield?style=flat-square&color=a6e3a1" alt="Release"></a>
   <img src="https://img.shields.io/badge/Spam%20Numbers-51%2C403-f38ba8?style=flat-square" alt="51,403 Numbers">
-  <img src="https://img.shields.io/badge/JVM%20unit%20tests-2061-94e2d5?style=flat-square" alt="2061 JVM unit tests">
+  <img src="https://img.shields.io/badge/JVM%20unit%20tests-2062-94e2d5?style=flat-square" alt="2062 JVM unit tests">
   <img src="https://img.shields.io/badge/Android-10%2B-89b4fa?style=flat-square" alt="Android 10+">
   <img src="https://img.shields.io/badge/License-MIT-cba6f7?style=flat-square" alt="MIT License">
   <img src="https://img.shields.io/badge/API%20Keys-None-fab387?style=flat-square" alt="No required API keys">
@@ -592,12 +592,12 @@ RELEASE_KEY_PASSWORD=...
 ## Testing
 
 ```bash
-./gradlew testDebugUnitTest   # 2061 tests
+./gradlew testDebugUnitTest   # 2062 tests
 ./gradlew connectedDebugAndroidTest -Pandroid.testInstrumentationRunnerArguments.class=com.sysadmindoc.callshield.platform.TargetSdkBehaviorSmokeTest
 ./gradlew verifyPipelineTests # Cloudflare Worker (node) + data-pipeline and translation checks (python)
 ```
 
-The suite is **2061 total JVM unit tests**, run with Robolectric wherever a screen, a service or the database is involved.
+The suite is **2062 total JVM unit tests**, run with Robolectric wherever a screen, a service or the database is involved.
 
 Two GitHub workflows run without building the app. **Validation** runs the Worker and
 pipeline suites on every push except report-only ones (`run-pipeline-tests.ps1 -CorrectnessOnly`),
@@ -634,7 +634,7 @@ language in [issue #7](https://github.com/SysAdminDoc/CallShield/issues/7).
 | Community API | Cloudflare Workers |
 | URL Safety | Local spam-domain data, with optional PhishTank and OpenPhish |
 | Verification | Local Gradle, lint, and release-artifact checks |
-| Tests | 2061 JVM unit tests (JUnit) |
+| Tests | 2062 JVM unit tests (JUnit) |
 | Strings | 1794 string resources and 49 plural groups (translation-ready) |
 | Accessibility | 100+ content descriptions, 48dp touch targets |
 | Min SDK | 29 (Android 10) |

app/src/main/java/com/sysadmindoc/callshield/service/CallerIdOverlayService.kt

@@ -302,6 +302,12 @@ class CallerIdOverlayService : Service() {
 
     @Volatile private var activeConfidence = 0
 
+    // The newest start delivered. Closing an overlay stops the service only
+    // for this start, so a start queued behind it (the next caller's overlay
+    // right after a withdrawal) keeps the service running instead of being
+    // torn down as soon as it shows.
+    private var latestStartId = 0
+
     // UI elements we need to update
     private var headerText: TextView? = null
     private var scoreText: TextView? = null
@@ -323,6 +329,7 @@ class CallerIdOverlayService : Service() {
         flags: Int,
         startId: Int,
     ): Int {
+        latestStartId = startId
         val number = intent?.getStringExtra(EXTRA_NUMBER) ?: ""
         val confidence = intent?.getIntExtra(EXTRA_CONFIDENCE, 0) ?: 0
         val reason = intent?.getStringExtra(EXTRA_REASON) ?: ""
@@ -1311,7 +1318,7 @@ class CallerIdOverlayService : Service() {
         handler.removeCallbacksAndMessages(null)
         deactivateOverlaySession()
         removeOverlay()
-        stopSelf()
+        stopSelf(latestStartId)
     }
 
     private fun isCurrentSession(sessionId: Long): Boolean = isOverlayActive && activeSessionId == sessionId && overlayView != null

app/src/test/java/com/sysadmindoc/callshield/service/CallerIdOverlayWithdrawTest.kt

@@ -79,6 +79,19 @@ class CallerIdOverlayWithdrawTest {
         assertEquals(1, overlayViews().size)
     }
 
+    @Test
+    fun `closing an overlay stops the service only for the newest start`() {
+        CallerIdOverlayService.startIncoming(application, CALLER, 40, "invalid_format")
+        deliverNextStart()
+        CallerIdOverlayService.withdrawIncoming(application, CALLER)
+        deliverNextStart()
+
+        // Android ignores stopSelf(id) when a start newer than id is queued,
+        // so the next caller's overlay can't be torn down as it shows.
+        assertEquals(startId, shadowOf(controller.get()).stopSelfId)
+        assertTrue(overlayViews().isEmpty())
+    }
+
     @Test
     fun `a withdrawal with nothing shown stops the service`() {
         controller.get().onStartCommand(withdrawIntent(CALLER), 0, ++startId)