Adding onCurrentMainThreadMessageFinished and make MainThreadMessageS…

…copedLazy work all the time
square · Sep 11, 2024 · 8f4a330 · 8f4a330
1 parent e455c89
commit 8f4a330
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 24 deletions.
diff --git a/papa-main-trace/api/papa-main-trace.api b/papa-main-trace/api/papa-main-trace.api
@@ -21,7 +21,6 @@ public final class papa/MainThreadMessageSpy {
 	public final fun addTracer (Lpapa/MainThreadMessageSpy$Tracer;)V
 	public final fun getCurrentMessageAsString ()Ljava/lang/String;
 	public final fun getEnabled ()Z
-	public final fun onCurrentMessageFinished (Lkotlin/jvm/functions/Function0;)V
 	public final fun removeTracer (Lpapa/MainThreadMessageSpy$Tracer;)V
 	public final fun startSpyingMainThreadDispatching ()V
 	public final fun stopSpyingMainThreadDispatching ()V

diff --git a/papa-main-trace/src/main/java/papa/MainThreadMessageScopedLazy.kt b/papa-main-trace/src/main/java/papa/MainThreadMessageScopedLazy.kt
@@ -14,12 +14,9 @@ class MainThreadMessageScopedLazy<T>(val provider: () -> T) : ReadOnlyProperty<A
     valueOrNull?.let {
       return it
     }
-    check(MainThreadMessageSpy.enabled) {
-      "Can't use a MainThreadMessageScopedLazy when MainThreadMessageSpy is not enabled."
-    }
     val value = provider()
     valueOrNull = value
-    MainThreadMessageSpy.onCurrentMessageFinished {
+    Handlers.onCurrentMainThreadMessageFinished {
       valueOrNull = null
     }
     return value

diff --git a/papa-main-trace/src/main/java/papa/MainThreadMessageSpy.kt b/papa-main-trace/src/main/java/papa/MainThreadMessageSpy.kt
@@ -38,22 +38,6 @@ object MainThreadMessageSpy {
     tracers.removeAll { it === tracer }
   }
 
-  fun onCurrentMessageFinished(block: () -> Unit) {
-    if (!enabled) {
-      return
-    }
-    Handlers.checkOnMainThread()
-    tracers.add(object : Tracer {
-      override fun onMessageDispatch(
-        messageAsString: String,
-        before: Boolean
-      ) {
-        tracers.remove(this)
-        block()
-      }
-    })
-  }
-
   fun startSpyingMainThreadDispatching() {
     Handlers.checkOnMainThread()
     if (VERSION.SDK_INT == 28) {
@@ -96,4 +80,20 @@ object MainThreadMessageSpy {
     enabled = false
     Looper.getMainLooper().setMessageLogging(null)
   }
+
+  /**
+   * Internal, we expect callers to have checked that we're on the
+   * main thread and that enabled is true.
+   */
+  internal fun onCurrentMessageFinished(block: () -> Unit) {
+    tracers.add(object : Tracer {
+      override fun onMessageDispatch(
+        messageAsString: String,
+        before: Boolean
+      ) {
+        tracers.remove(this)
+        block()
+      }
+    })
+  }
 }
diff --git a/papa/src/androidTest/java/papa/test/MainThreadMessageSpyTest.kt b/papa/src/androidTest/java/papa/test/MainThreadMessageSpyTest.kt
@@ -64,7 +64,7 @@ class MainThreadMessageSpyTest {
         runOrder += "second post"
         runnablesRan.countDown()
       }
-      MainThreadMessageSpy.onCurrentMessageFinished {
+      Handlers.onCurrentMainThreadMessageFinished {
         runOrder += "first post finished"
         runnablesRan.countDown()
       }
@@ -81,8 +81,8 @@ class MainThreadMessageSpyTest {
   @Test
   fun no_ConcurrentModificationException_when_iterating_after_onCurrentMessageFinished_removes_its_tracer() {
     runOnMainSync {
-      MainThreadMessageSpy.onCurrentMessageFinished {}
-      MainThreadMessageSpy.onCurrentMessageFinished {}
+      Handlers.onCurrentMainThreadMessageFinished {}
+      Handlers.onCurrentMainThreadMessageFinished {}
     }
   }