Handle isStopped and isClosed separately

Author: romtsn

sentry-android-core/src/main/java/io/sentry/android/core/SystemEventsBreadcrumbsIntegration.java

@@ -67,6 +67,7 @@ public final class SystemEventsBreadcrumbsIntegration implements Integration, Cl
   private @Nullable IScopes scopes;
 
   private final @NotNull String[] actions;
+  private volatile boolean isClosed = false;
   private volatile boolean isStopped = false;
   private volatile IntentFilter filter = null;
   private final @NotNull AutoClosableReentrantLock receiverLock = new AutoClosableReentrantLock();
@@ -129,7 +130,7 @@ private void registerReceiver(
     }
 
     try (final @NotNull ISentryLifecycleToken ignored = receiverLock.acquire()) {
-      if (isStopped || receiver != null) {
+      if (isClosed || isStopped || receiver != null) {
         return;
       }
     }
@@ -140,7 +141,7 @@ private void registerReceiver(
           .submit(
               () -> {
                 try (final @NotNull ISentryLifecycleToken ignored = receiverLock.acquire()) {
-                  if (isStopped || receiver != null) {
+                  if (isClosed || isStopped || receiver != null) {
                     return;
                   }
 
@@ -265,6 +266,7 @@ private void removeObserverInternal() {
   @Override
   public void close() throws IOException {
     try (final @NotNull ISentryLifecycleToken ignored = receiverLock.acquire()) {
+      isClosed = true;
       filter = null;
     }
 

sentry-android-core/src/test/java/io/sentry/android/core/SystemEventsBreadcrumbsIntegrationTest.kt

@@ -389,4 +389,31 @@ class SystemEventsBreadcrumbsIntegrationTest {
         deferredExecutorService.runAll()
         assertNull(sut.receiver)
     }
+
+    @Test
+    fun `when enters foreground right after closing, receiver is not registered`() {
+        val deferredExecutorService = DeferredExecutorService()
+        val latch = CountDownLatch(1)
+
+        val sut = fixture.getSut(executorService = deferredExecutorService, mockHandler = false)
+        sut.register(fixture.scopes, fixture.options)
+        deferredExecutorService.runAll()
+        assertNotNull(sut.receiver)
+
+        Thread {
+            sut.close()
+            latch.countDown()
+        }.start()
+
+        latch.await()
+
+        sut.lifecycleHandler!!.onStart(mock())
+        assertNull(sut.receiver)
+        deferredExecutorService.runAll()
+
+        shadowOf(Looper.getMainLooper()).idle()
+
+        assertNull(sut.receiver)
+        assertNull(sut.lifecycleHandler)
+    }
 }