Merge pull request #3003 from DataDog/aleksandr-gringauz/rumwindowcallbackregistry-fix

Fix RumWindowCallbacksRegistry for multiple SDK instances

Author: aleksandr-gringauz

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

@@ -44,21 +44,21 @@ internal class RumWindowCallbacksRegistryImpl : RumWindowCallbacksRegistry {
             }
         }
     }
-}
 
-private fun Window.wrapCallback(): RumWindowCallback {
-    val currentCallback = callback
-    val newCallback = RumWindowCallback(
-        wrapped = currentCallback
-    )
-    callback = newCallback
-    return newCallback
-}
+    private fun Window.wrapCallback(): RumWindowCallback {
+        val currentCallback = callback
+        val newCallback = RumWindowCallback(
+            wrapped = currentCallback
+        )
+        callback = newCallback
+        return newCallback
+    }
 
-private fun Window.tryToRemoveCallback() {
-    val currentCallback = callback
-    if (currentCallback is RumWindowCallback) {
-        callback = currentCallback.wrapped
+    private fun Window.tryToRemoveCallback() {
+        val currentCallback = callback
+        if (currentCallback is RumWindowCallback && currentCallback in callbacks.values) {
+            callback = currentCallback.wrapped
+        }
     }
 }
 

features/dd-sdk-android-rum/src/test/kotlin/com/datadog/android/rum/internal/utils/RumWindowCallbacksRegistryTest.kt

@@ -130,6 +130,52 @@ class RumWindowCallbacksRegistryTest {
         // Then
         assertThat(callback).isEqualTo(anotherWrapper)
     }
+
+    @Test
+    fun `M not restore the callback W removeListener { if there is another RumWindowCallbacksRegistry }`() {
+        // Given
+        val anotherRegistry = RumWindowCallbacksRegistryImpl()
+        val anotherListener = mock<RumWindowCallbackListener>()
+
+        registry.addListener(activity, listener)
+        val callback1 = window.callback
+
+        anotherRegistry.addListener(activity, anotherListener)
+        val callback2 = window.callback
+
+        // When
+        registry.removeListener(activity, listener)
+
+        // Then
+        assertThat(callback1).isNotEqualTo(callback2)
+        assertThat(window.callback).isEqualTo(callback2)
+    }
+
+    @Test
+    fun `M call listeners from both RumWindowCallbacksRegistries W addListener { onContentChanged called }`() {
+        // Given
+        val anotherRegistry = RumWindowCallbacksRegistryImpl()
+        val anotherListener = mock<RumWindowCallbackListener>()
+
+        registry.addListener(activity, listener)
+        val callback1 = window.callback
+
+        anotherRegistry.addListener(activity, anotherListener)
+        val callback2 = window.callback
+
+        // When
+        callback.onContentChanged()
+
+        // Then
+        inOrder(listener, existingCallback, anotherListener) {
+            verify(existingCallback).onContentChanged()
+            verify(listener).onContentChanged()
+            verify(anotherListener).onContentChanged()
+            verifyNoMoreInteractions()
+        }
+        assertThat(callback1).isNotEqualTo(callback2)
+        assertThat(window.callback).isEqualTo(callback2)
+    }
 }
 
 private class TestWindowCallbackWrapper(wrapped: Window.Callback) : FixedWindowCallback(wrapped)