Skip to content

Commit c3f7f8b

Browse files
PR fix
1 parent b5ac016 commit c3f7f8b

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

features/dd-sdk-android-rum/src/main/kotlin/com/datadog/android/rum/internal/utils/window/RumWindowCallbacksRegistry.kt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,24 +48,22 @@ internal class RumWindowCallbacksRegistryImpl : RumWindowCallbacksRegistry {
4848
private fun Window.wrapCallback(): RumWindowCallback {
4949
val currentCallback = callback
5050
val newCallback = RumWindowCallback(
51-
wrapped = currentCallback,
52-
registry = this@RumWindowCallbacksRegistryImpl
51+
wrapped = currentCallback
5352
)
5453
callback = newCallback
5554
return newCallback
5655
}
5756

5857
private fun Window.tryToRemoveCallback() {
5958
val currentCallback = callback
60-
if (currentCallback is RumWindowCallback && currentCallback.registry === this@RumWindowCallbacksRegistryImpl) {
59+
if (currentCallback is RumWindowCallback && currentCallback in callbacks.values) {
6160
callback = currentCallback.wrapped
6261
}
6362
}
6463
}
6564

6665
private class RumWindowCallback(
67-
val wrapped: Window.Callback,
68-
val registry: RumWindowCallbacksRegistry
66+
val wrapped: Window.Callback
6967
) : FixedWindowCallback(wrapped) {
7068

7169
val subscription = DDCoreSubscription.create<RumWindowCallbackListener>()

0 commit comments

Comments
 (0)