From a6ab3f5649258c486c32eb5afe124462253f2eee Mon Sep 17 00:00:00 2001 From: Luke De Feo Date: Wed, 25 Jan 2023 04:47:11 -0800 Subject: [PATCH] Remove Coordinate update event Summary: This idea did not pan out Reviewed By: lblasa Differential Revision: D42453231 fbshipit-source-id: 1feac79b8655f4249e84b64cdce9fded6e5f5718 --- .../plugins/uidebugger/model/Events.kt | 11 ---------- .../observers/TreeObserverManager.kt | 22 +++++-------------- 2 files changed, 5 insertions(+), 28 deletions(-) diff --git a/android/src/main/java/com/facebook/flipper/plugins/uidebugger/model/Events.kt b/android/src/main/java/com/facebook/flipper/plugins/uidebugger/model/Events.kt index ae6df92e5..7d39bb1dc 100644 --- a/android/src/main/java/com/facebook/flipper/plugins/uidebugger/model/Events.kt +++ b/android/src/main/java/com/facebook/flipper/plugins/uidebugger/model/Events.kt @@ -38,17 +38,6 @@ data class SubtreeUpdateEvent( } } -@kotlinx.serialization.Serializable -data class CoordinateUpdateEvent( - val observerType: String, - val nodeId: Id, - val coordinate: Coordinate -) { - companion object { - const val name = "coordinateUpdate" - } -} - /** Separate optional performance statistics event */ @kotlinx.serialization.Serializable data class PerfStatsEvent( diff --git a/android/src/main/java/com/facebook/flipper/plugins/uidebugger/observers/TreeObserverManager.kt b/android/src/main/java/com/facebook/flipper/plugins/uidebugger/observers/TreeObserverManager.kt index 5c188e450..4d3ec7ac3 100644 --- a/android/src/main/java/com/facebook/flipper/plugins/uidebugger/observers/TreeObserverManager.kt +++ b/android/src/main/java/com/facebook/flipper/plugins/uidebugger/observers/TreeObserverManager.kt @@ -17,8 +17,6 @@ import com.facebook.flipper.plugins.uidebugger.common.BitmapPool import com.facebook.flipper.plugins.uidebugger.core.Context import com.facebook.flipper.plugins.uidebugger.descriptors.Id import com.facebook.flipper.plugins.uidebugger.descriptors.MetadataRegister -import com.facebook.flipper.plugins.uidebugger.model.Coordinate -import com.facebook.flipper.plugins.uidebugger.model.CoordinateUpdateEvent import com.facebook.flipper.plugins.uidebugger.model.MetadataUpdateEvent import com.facebook.flipper.plugins.uidebugger.model.Node import com.facebook.flipper.plugins.uidebugger.model.PerfStatsEvent @@ -32,9 +30,6 @@ import kotlinx.serialization.json.Json sealed interface Update -data class CoordinateUpdate(val observerType: String, val nodeId: Id, val coordinate: Coordinate) : - Update - data class SubtreeUpdate( val observerType: String, val rootId: Id, @@ -43,18 +38,18 @@ data class SubtreeUpdate( val traversalCompleteTime: Long, val snapshotComplete: Long, val snapshot: BitmapPool.ReusableBitmap? -) : Update +) /** Holds the root observer and manages sending updates to desktop */ class TreeObserverManager(val context: Context) { private val rootObserver = ApplicationTreeObserver(context) - private lateinit var updates: Channel + private lateinit var updates: Channel private var job: Job? = null private val workerScope = CoroutineScope(Dispatchers.IO) private val txId = AtomicInteger() - fun enqueueUpdate(update: Update) { + fun enqueueUpdate(update: SubtreeUpdate) { updates.trySend(update) } @@ -72,15 +67,8 @@ class TreeObserverManager(val context: Context) { workerScope.launch { while (isActive) { try { - when (val update = updates.receive()) { - is SubtreeUpdate -> sendSubtreeUpdate(update) - is CoordinateUpdate -> { - val event = - CoordinateUpdateEvent(update.observerType, update.nodeId, update.coordinate) - val serialized = Json.encodeToString(CoordinateUpdateEvent.serializer(), event) - context.connectionRef.connection?.send(CoordinateUpdateEvent.name, serialized) - } - } + val update = updates.receive() + sendSubtreeUpdate(update) } catch (e: CancellationException) {} catch (e: java.lang.Exception) { Log.e(LogTag, "Unexpected Error in channel ", e) }