Let DefaultNotificationDrawerManager use NotificationDisplayer instead of NotificationManagerCompat

features/call/impl/build.gradle.kts

@@ -93,6 +93,7 @@ dependencies {
     testImplementation(projects.libraries.featureflag.test)
     testImplementation(projects.libraries.preferences.test)
     testImplementation(projects.libraries.matrix.test)
+    testImplementation(projects.libraries.matrixuiTest)
     testImplementation(projects.libraries.push.test)
     testImplementation(projects.services.analytics.test)
     testImplementation(projects.services.appnavstate.test)

features/call/impl/src/test/kotlin/io/element/android/features/call/notifications/RingingCallNotificationCreatorTest.kt

@@ -18,7 +18,7 @@ import io.element.android.libraries.matrix.test.A_SESSION_ID
 import io.element.android.libraries.matrix.test.A_USER_ID_2
 import io.element.android.libraries.matrix.test.FakeMatrixClient
 import io.element.android.libraries.matrix.test.FakeMatrixClientProvider
-import io.element.android.libraries.push.test.notifications.FakeImageLoaderHolder
+import io.element.android.libraries.matrix.ui.test.media.FakeImageLoaderHolder
 import io.element.android.libraries.push.test.notifications.push.FakeNotificationBitmapLoader
 import io.element.android.tests.testutils.lambda.lambdaRecorder
 import kotlinx.coroutines.test.runTest

features/call/impl/src/test/kotlin/io/element/android/features/call/utils/DefaultActiveCallManagerTest.kt

@@ -33,9 +33,9 @@ import io.element.android.libraries.matrix.test.FakeMatrixClientProvider
 import io.element.android.libraries.matrix.test.room.FakeBaseRoom
 import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
 import io.element.android.libraries.matrix.test.room.aRoomInfo
+import io.element.android.libraries.matrix.ui.test.media.FakeImageLoaderHolder
 import io.element.android.libraries.push.api.notifications.ForegroundServiceType
 import io.element.android.libraries.push.api.notifications.NotificationIdProvider
-import io.element.android.libraries.push.test.notifications.FakeImageLoaderHolder
 import io.element.android.libraries.push.test.notifications.FakeOnMissedCallNotificationHandler
 import io.element.android.libraries.push.test.notifications.push.FakeNotificationBitmapLoader
 import io.element.android.services.appnavstate.test.FakeAppForegroundStateService
@@ -415,6 +415,7 @@ class DefaultActiveCallManagerTest {
 
         verify { notificationManagerCompat.cancel(any()) }
     }
+
     @OptIn(ExperimentalCoroutinesApi::class)
     @Test
     fun `IncomingCall - ignore expired ring lifetime`() = runTest {

libraries/matrixui-test/build.gradle.kts

@@ -0,0 +1,20 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+plugins {
+    id("io.element.android-library")
+}
+
+android {
+    namespace = "io.element.android.libraries.matrix.ui.test"
+}
+
+dependencies {
+    implementation(projects.libraries.matrix.api)
+    implementation(projects.libraries.matrixui)
+    implementation(libs.coil.compose)
+}

libraries/matrixui-test/src/main/kotlin/io/element/android/libraries/matrix/ui/test/media/FakeImageLoader.kt

@@ -0,0 +1,50 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.ui.test.media
+
+import coil3.ComponentRegistry
+import coil3.ImageLoader
+import coil3.disk.DiskCache
+import coil3.memory.MemoryCache
+import coil3.request.Disposable
+import coil3.request.ImageRequest
+import coil3.request.ImageResult
+
+class FakeImageLoader : ImageLoader {
+    private val executedRequests = mutableListOf<ImageRequest>()
+
+    override val defaults: ImageRequest.Defaults
+        get() = error("Not implemented")
+    override val components: ComponentRegistry
+        get() = error("Not implemented")
+    override val memoryCache: MemoryCache?
+        get() = error("Not implemented")
+    override val diskCache: DiskCache?
+        get() = error("Not implemented")
+
+    override fun enqueue(request: ImageRequest): Disposable {
+        error("Not implemented")
+    }
+
+    override suspend fun execute(request: ImageRequest): ImageResult {
+        executedRequests.add(request)
+        error("Not implemented")
+    }
+
+    override fun shutdown() {
+        error("Not implemented")
+    }
+
+    override fun newBuilder(): ImageLoader.Builder {
+        error("Not implemented")
+    }
+
+    fun getExecutedRequestsData(): List<Any> {
+        return executedRequests.map { it.data }
+    }
+}

libraries/matrixui-test/src/main/kotlin/io/element/android/libraries/matrix/ui/test/media/FakeImageLoaderHolder.kt

@@ -1,21 +1,22 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright 2025 New Vector Ltd.
  *
  * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.libraries.push.test.notifications
+package io.element.android.libraries.matrix.ui.test.media
 
 import coil3.ImageLoader
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.matrix.ui.media.ImageLoaderHolder
 
-class FakeImageLoaderHolder : ImageLoaderHolder {
-    private val fakeImageLoader = FakeImageLoader()
+class FakeImageLoaderHolder(
+    val fakeImageLoader: ImageLoader = FakeImageLoader(),
+) : ImageLoaderHolder {
     override fun get(client: MatrixClient): ImageLoader {
-        return fakeImageLoader.getImageLoader()
+        return fakeImageLoader
     }
 
     override fun remove(sessionId: SessionId) {

libraries/push/impl/build.gradle.kts

@@ -70,6 +70,7 @@ dependencies {
     testCommonDependencies(libs)
     testImplementation(libs.coil.test)
     testImplementation(projects.libraries.matrix.test)
+    testImplementation(projects.libraries.matrixuiTest)
     testImplementation(projects.libraries.preferences.test)
     testImplementation(projects.libraries.sessionStorage.test)
     testImplementation(projects.libraries.push.test)

libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotificationDrawerManager.kt

@@ -8,7 +8,6 @@
 package io.element.android.libraries.push.impl.notifications
 
 import androidx.annotation.VisibleForTesting
-import androidx.core.app.NotificationManagerCompat
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
 import dev.zacsweers.metro.SingleIn
@@ -46,7 +45,7 @@ private val loggerTag = LoggerTag("DefaultNotificationDrawerManager", LoggerTag.
 @SingleIn(AppScope::class)
 @ContributesBinding(AppScope::class)
 class DefaultNotificationDrawerManager(
-    private val notificationManager: NotificationManagerCompat,
+    private val notificationDisplayer: NotificationDisplayer,
     private val notificationRenderer: NotificationRenderer,
     private val appNavigationStateService: AppNavigationStateService,
     @AppCoroutineScope
@@ -124,7 +123,7 @@ class DefaultNotificationDrawerManager(
      * Clear all known message events for a [sessionId].
      */
     override fun clearAllMessagesEvents(sessionId: SessionId) {
-        notificationManager.cancel(null, NotificationIdProvider.getRoomMessagesNotificationId(sessionId))
+        notificationDisplayer.cancelNotification(null, NotificationIdProvider.getRoomMessagesNotificationId(sessionId))
         clearSummaryNotificationIfNeeded(sessionId)
     }
 
@@ -133,7 +132,7 @@ class DefaultNotificationDrawerManager(
      */
     fun clearAllEvents(sessionId: SessionId) {
         activeNotificationsProvider.getNotificationsForSession(sessionId)
-            .forEach { notificationManager.cancel(it.tag, it.id) }
+            .forEach { notificationDisplayer.cancelNotification(it.tag, it.id) }
     }
 
     /**
@@ -142,7 +141,7 @@ class DefaultNotificationDrawerManager(
      * Can also be called when a notification for this room is dismissed by the user.
      */
     override fun clearMessagesForRoom(sessionId: SessionId, roomId: RoomId) {
-        notificationManager.cancel(roomId.value, NotificationIdProvider.getRoomMessagesNotificationId(sessionId))
+        notificationDisplayer.cancelNotification(roomId.value, NotificationIdProvider.getRoomMessagesNotificationId(sessionId))
         clearSummaryNotificationIfNeeded(sessionId)
     }
 
@@ -158,7 +157,7 @@ class DefaultNotificationDrawerManager(
 
     override fun clearMembershipNotificationForSession(sessionId: SessionId) {
         activeNotificationsProvider.getMembershipNotificationForSession(sessionId)
-            .forEach { notificationManager.cancel(it.tag, it.id) }
+            .forEach { notificationDisplayer.cancelNotification(it.tag, it.id) }
         clearSummaryNotificationIfNeeded(sessionId)
     }
 
@@ -167,7 +166,7 @@ class DefaultNotificationDrawerManager(
      */
     override fun clearMembershipNotificationForRoom(sessionId: SessionId, roomId: RoomId) {
         activeNotificationsProvider.getMembershipNotificationForRoom(sessionId, roomId)
-            .forEach { notificationManager.cancel(it.tag, it.id) }
+            .forEach { notificationDisplayer.cancelNotification(it.tag, it.id) }
         clearSummaryNotificationIfNeeded(sessionId)
     }
 
@@ -176,14 +175,14 @@ class DefaultNotificationDrawerManager(
      */
     override fun clearEvent(sessionId: SessionId, eventId: EventId) {
         val id = NotificationIdProvider.getRoomEventNotificationId(sessionId)
-        notificationManager.cancel(eventId.value, id)
+        notificationDisplayer.cancelNotification(eventId.value, id)
         clearSummaryNotificationIfNeeded(sessionId)
     }
 
     private fun clearSummaryNotificationIfNeeded(sessionId: SessionId) {
         val summaryNotification = activeNotificationsProvider.getSummaryNotification(sessionId)
         if (summaryNotification != null && activeNotificationsProvider.count(sessionId) == 1) {
-            notificationManager.cancel(null, summaryNotification.id)
+            notificationDisplayer.cancelNotification(null, summaryNotification.id)
         }
     }
 

libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationDisplayer.kt

@@ -61,6 +61,7 @@ class DefaultNotificationDisplayer(
 
     companion object {
         private const val TAG_DIAGNOSTIC = "DIAGNOSTIC"
+
         /* ==========================================================================================
          * IDs for notifications
          * ========================================================================================== */

libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultBaseRoomGroupMessageCreatorTest.kt

@@ -18,12 +18,12 @@ import io.element.android.libraries.matrix.test.A_TIMESTAMP
 import io.element.android.libraries.matrix.ui.components.aMatrixUser
 import io.element.android.libraries.matrix.ui.media.AVATAR_THUMBNAIL_SIZE_IN_PIXEL
 import io.element.android.libraries.matrix.ui.media.MediaRequestData
+import io.element.android.libraries.matrix.ui.test.media.FakeImageLoader
 import io.element.android.libraries.push.impl.notifications.factories.MARK_AS_READ_ACTION_TITLE
 import io.element.android.libraries.push.impl.notifications.factories.QUICK_REPLY_ACTION_TITLE
 import io.element.android.libraries.push.impl.notifications.factories.aNotificationAccountParams
 import io.element.android.libraries.push.impl.notifications.factories.createNotificationCreator
 import io.element.android.libraries.push.impl.notifications.fixtures.aNotifiableMessageEvent
-import io.element.android.libraries.push.test.notifications.FakeImageLoader
 import io.element.android.services.toolbox.api.sdk.BuildVersionSdkIntProvider
 import io.element.android.services.toolbox.impl.strings.AndroidStringProvider
 import io.element.android.services.toolbox.test.sdk.FakeBuildVersionSdkIntProvider
@@ -51,7 +51,7 @@ class DefaultBaseRoomGroupMessageCreatorTest {
                 )
             ),
             roomId = A_ROOM_ID,
-            imageLoader = fakeImageLoader.getImageLoader(),
+            imageLoader = fakeImageLoader,
             existingNotification = null,
             threadId = null,
         )
@@ -59,7 +59,7 @@ class DefaultBaseRoomGroupMessageCreatorTest {
         @Suppress("DEPRECATION")
         assertThat(result.priority).isEqualTo(NotificationCompat.PRIORITY_LOW)
         assertThat(result.`when`).isEqualTo(A_TIMESTAMP)
-        assertThat(fakeImageLoader.getCoilRequests().size).isEqualTo(0)
+        assertThat(fakeImageLoader.getExecutedRequestsData()).isEmpty()
     }
 
     @Test
@@ -74,13 +74,13 @@ class DefaultBaseRoomGroupMessageCreatorTest {
                 )
             ),
             roomId = A_ROOM_ID,
-            imageLoader = fakeImageLoader.getImageLoader(),
+            imageLoader = fakeImageLoader,
             existingNotification = null,
             threadId = null,
         )
         @Suppress("DEPRECATION")
         assertThat(result.priority).isEqualTo(NotificationCompat.PRIORITY_DEFAULT)
-        assertThat(fakeImageLoader.getCoilRequests().size).isEqualTo(0)
+        assertThat(fakeImageLoader.getExecutedRequestsData()).isEmpty()
     }
 
     @Test
@@ -141,12 +141,12 @@ class DefaultBaseRoomGroupMessageCreatorTest {
                 )
             ),
             roomId = A_ROOM_ID,
-            imageLoader = fakeImageLoader.getImageLoader(),
+            imageLoader = fakeImageLoader,
             existingNotification = null,
             threadId = null,
         )
         assertThat(result.number).isEqualTo(1)
-        assertThat(fakeImageLoader.getCoilRequests()).containsExactlyElementsIn(expectedCoilRequests)
+        assertThat(fakeImageLoader.getExecutedRequestsData()).containsExactlyElementsIn(expectedCoilRequests)
     }
 
     @Test
@@ -160,7 +160,7 @@ class DefaultBaseRoomGroupMessageCreatorTest {
                 aNotifiableMessageEvent(timestamp = A_TIMESTAMP + 10),
             ),
             roomId = A_ROOM_ID,
-            imageLoader = fakeImageLoader.getImageLoader(),
+            imageLoader = fakeImageLoader,
             existingNotification = null,
             threadId = null,
         )
@@ -173,7 +173,7 @@ class DefaultBaseRoomGroupMessageCreatorTest {
                 QUICK_REPLY_ACTION_TITLE.takeIf { NotificationConfig.SHOW_QUICK_REPLY_ACTION },
             )
         )
-        assertThat(fakeImageLoader.getCoilRequests().size).isEqualTo(0)
+        assertThat(fakeImageLoader.getExecutedRequestsData()).isEmpty()
     }
 
     @Test
@@ -189,7 +189,7 @@ class DefaultBaseRoomGroupMessageCreatorTest {
                 ),
             ),
             roomId = A_ROOM_ID,
-            imageLoader = fakeImageLoader.getImageLoader(),
+            imageLoader = fakeImageLoader,
             existingNotification = null,
             threadId = null,
         )
@@ -199,7 +199,7 @@ class DefaultBaseRoomGroupMessageCreatorTest {
                 MARK_AS_READ_ACTION_TITLE.takeIf { NotificationConfig.SHOW_MARK_AS_READ_ACTION }
             )
         )
-        assertThat(fakeImageLoader.getCoilRequests().size).isEqualTo(0)
+        assertThat(fakeImageLoader.getExecutedRequestsData()).isEmpty()
     }
 
     @Test
@@ -214,13 +214,13 @@ class DefaultBaseRoomGroupMessageCreatorTest {
                 ),
             ),
             roomId = A_ROOM_ID,
-            imageLoader = fakeImageLoader.getImageLoader(),
+            imageLoader = fakeImageLoader,
             existingNotification = null,
             threadId = null,
         )
         assertThat(result.number).isEqualTo(1)
         assertThat(result.`when`).isEqualTo(A_TIMESTAMP)
-        assertThat(fakeImageLoader.getCoilRequests().size).isEqualTo(0)
+        assertThat(fakeImageLoader.getExecutedRequestsData()).isEmpty()
     }
 }
 

libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotificationDrawerManagerTest.kt

@@ -9,7 +9,6 @@ package io.element.android.libraries.push.impl.notifications
 
 import android.app.Notification
 import androidx.compose.ui.graphics.Color
-import androidx.core.app.NotificationManagerCompat
 import com.google.common.truth.Truth.assertThat
 import io.element.android.features.enterprise.api.EnterpriseService
 import io.element.android.features.enterprise.test.FakeEnterpriseService
@@ -22,14 +21,15 @@ import io.element.android.libraries.matrix.test.A_THREAD_ID
 import io.element.android.libraries.matrix.test.FakeMatrixClient
 import io.element.android.libraries.matrix.test.FakeMatrixClientProvider
 import io.element.android.libraries.matrix.ui.components.aMatrixUser
+import io.element.android.libraries.matrix.ui.test.media.FakeImageLoaderHolder
 import io.element.android.libraries.push.api.notifications.NotificationIdProvider
 import io.element.android.libraries.push.impl.notifications.factories.aNotificationAccountParams
 import io.element.android.libraries.push.impl.notifications.fake.FakeActiveNotificationsProvider
 import io.element.android.libraries.push.impl.notifications.fake.FakeNotificationCreator
+import io.element.android.libraries.push.impl.notifications.fake.FakeNotificationDisplayer
 import io.element.android.libraries.push.impl.notifications.fake.FakeRoomGroupMessageCreator
 import io.element.android.libraries.push.impl.notifications.fake.FakeSummaryGroupMessageCreator
 import io.element.android.libraries.push.impl.notifications.fixtures.aNotifiableMessageEvent
-import io.element.android.libraries.push.test.notifications.FakeImageLoaderHolder
 import io.element.android.libraries.sessionstorage.api.SessionStore
 import io.element.android.libraries.sessionstorage.test.InMemorySessionStore
 import io.element.android.services.appnavstate.api.AppNavigationState
@@ -43,19 +43,14 @@ import io.element.android.tests.testutils.lambda.lambdaRecorder
 import io.element.android.tests.testutils.lambda.value
 import io.mockk.every
 import io.mockk.mockk
-import io.mockk.verify
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.runCurrent
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
-import org.robolectric.RuntimeEnvironment
 
 @OptIn(ExperimentalCoroutinesApi::class)
-@RunWith(RobolectricTestRunner::class)
 class DefaultNotificationDrawerManagerTest {
     @Test
     fun `clearAllEvents should have no effect when queue is empty`() = runTest {
@@ -183,10 +178,12 @@ class DefaultNotificationDrawerManagerTest {
 
     @Test
     fun `clearSummaryNotificationIfNeeded will run after clearing all other notifications`() = runTest {
-        val notificationManager = mockk<NotificationManagerCompat> {
-            every { cancel(any(), any()) } returns Unit
-        }
+        val cancelNotificationResult = lambdaRecorder<String?, Int, Unit> { _, _ -> }
+        val notificationDisplayer = FakeNotificationDisplayer(
+            cancelNotificationResult = cancelNotificationResult,
+        )
         val summaryId = NotificationIdProvider.getSummaryNotificationId(A_SESSION_ID)
+        val roomMessageId = NotificationIdProvider.getRoomMessagesNotificationId(A_SESSION_ID)
         val activeNotificationsProvider = FakeActiveNotificationsProvider(
             getSummaryNotificationResult = {
                 mockk {
@@ -196,7 +193,7 @@ class DefaultNotificationDrawerManagerTest {
             countResult = { 1 },
         )
         val defaultNotificationDrawerManager = createDefaultNotificationDrawerManager(
-            notificationManager = notificationManager,
+            notificationDisplayer = notificationDisplayer,
             activeNotificationsProvider = activeNotificationsProvider,
         )
 
@@ -204,13 +201,16 @@ class DefaultNotificationDrawerManagerTest {
         defaultNotificationDrawerManager.clearAllMessagesEvents(A_SESSION_ID)
 
         // Verify we asked to cancel the notification with summaryId
-        verify { notificationManager.cancel(null, summaryId) }
+        cancelNotificationResult.assertions().isCalledExactly(2).withSequence(
+            listOf(value(null), value(roomMessageId)),
+            listOf(value(null), value(summaryId)),
+        )
 
         defaultNotificationDrawerManager.destroy()
     }
 
     private fun TestScope.createDefaultNotificationDrawerManager(
-        notificationManager: NotificationManagerCompat = NotificationManagerCompat.from(RuntimeEnvironment.getApplication()),
+        notificationDisplayer: NotificationDisplayer = FakeNotificationDisplayer(),
         appNavigationStateService: AppNavigationStateService = FakeAppNavigationStateService(),
         roomGroupMessageCreator: RoomGroupMessageCreator = FakeRoomGroupMessageCreator(),
         summaryGroupMessageCreator: SummaryGroupMessageCreator = FakeSummaryGroupMessageCreator(),
@@ -219,11 +219,10 @@ class DefaultNotificationDrawerManagerTest {
         sessionStore: SessionStore = InMemorySessionStore(),
         enterpriseService: EnterpriseService = FakeEnterpriseService(),
     ): DefaultNotificationDrawerManager {
-        val context = RuntimeEnvironment.getApplication()
         return DefaultNotificationDrawerManager(
-            notificationManager = notificationManager,
+            notificationDisplayer = notificationDisplayer,
             notificationRenderer = NotificationRenderer(
-                notificationDisplayer = DefaultNotificationDisplayer(context, NotificationManagerCompat.from(context)),
+                notificationDisplayer = FakeNotificationDisplayer(),
                 notificationDataFactory = DefaultNotificationDataFactory(
                     notificationCreator = FakeNotificationCreator(),
                     roomGroupMessageCreator = roomGroupMessageCreator,

libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultOnMissedCallNotificationHandlerTest.kt

@@ -15,22 +15,19 @@ import io.element.android.libraries.matrix.test.FakeMatrixClient
 import io.element.android.libraries.matrix.test.FakeMatrixClientProvider
 import io.element.android.libraries.matrix.test.notification.FakeNotificationService
 import io.element.android.libraries.matrix.test.notification.aNotificationData
+import io.element.android.libraries.matrix.ui.test.media.FakeImageLoaderHolder
 import io.element.android.libraries.push.impl.notifications.fake.FakeActiveNotificationsProvider
 import io.element.android.libraries.push.impl.notifications.fake.FakeNotificationDataFactory
+import io.element.android.libraries.push.impl.notifications.fake.FakeNotificationDisplayer
 import io.element.android.libraries.push.impl.notifications.fixtures.aNotifiableMessageEvent
 import io.element.android.libraries.push.test.notifications.FakeCallNotificationEventResolver
-import io.element.android.libraries.push.test.notifications.FakeImageLoaderHolder
 import io.element.android.services.appnavstate.test.FakeAppNavigationStateService
 import io.element.android.tests.testutils.lambda.lambdaRecorder
-import io.mockk.mockk
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runCurrent
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
 
-@RunWith(RobolectricTestRunner::class)
 class DefaultOnMissedCallNotificationHandlerTest {
     @OptIn(ExperimentalCoroutinesApi::class)
     @Test
@@ -50,7 +47,7 @@ class DefaultOnMissedCallNotificationHandlerTest {
         val defaultOnMissedCallNotificationHandler = DefaultOnMissedCallNotificationHandler(
             matrixClientProvider = matrixClientProvider,
             defaultNotificationDrawerManager = DefaultNotificationDrawerManager(
-                notificationManager = mockk(relaxed = true),
+                notificationDisplayer = FakeNotificationDisplayer(),
                 notificationRenderer = createNotificationRenderer(
                     notificationDataFactory = dataFactory,
                 ),

libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/NotificationDataFactoryTest.kt

@@ -13,6 +13,7 @@ import io.element.android.libraries.matrix.api.user.MatrixUser
 import io.element.android.libraries.matrix.test.AN_EVENT_ID
 import io.element.android.libraries.matrix.test.A_ROOM_ID
 import io.element.android.libraries.matrix.test.A_SESSION_ID
+import io.element.android.libraries.matrix.ui.test.media.FakeImageLoader
 import io.element.android.libraries.push.impl.notifications.factories.aNotificationAccountParams
 import io.element.android.libraries.push.impl.notifications.fake.FakeActiveNotificationsProvider
 import io.element.android.libraries.push.impl.notifications.fake.FakeNotificationCreator
@@ -21,7 +22,6 @@ import io.element.android.libraries.push.impl.notifications.fake.FakeSummaryGrou
 import io.element.android.libraries.push.impl.notifications.fixtures.aNotifiableMessageEvent
 import io.element.android.libraries.push.impl.notifications.fixtures.aSimpleNotifiableEvent
 import io.element.android.libraries.push.impl.notifications.fixtures.anInviteNotifiableEvent
-import io.element.android.libraries.push.test.notifications.FakeImageLoader
 import io.element.android.services.toolbox.test.strings.FakeStringProvider
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
@@ -98,7 +98,7 @@ class NotificationDataFactoryTest {
                 events = events,
                 roomId = A_ROOM_ID,
                 threadId = null,
-                imageLoader = FakeImageLoader().getImageLoader(),
+                imageLoader = FakeImageLoader(),
                 existingNotification = null,
             ),
             roomId = A_ROOM_ID,
@@ -113,12 +113,12 @@ class NotificationDataFactoryTest {
             notificationAccountParams = aNotificationAccountParams(
                 user = MatrixUser(A_SESSION_ID, A_SESSION_ID.value, MY_AVATAR_URL),
             ),
-            imageLoader = fakeImageLoader.getImageLoader(),
+            imageLoader = fakeImageLoader,
         )
 
         assertThat(result.size).isEqualTo(1)
         assertThat(result.first().isDataEqualTo(expectedNotification)).isTrue()
-        assertThat(fakeImageLoader.getCoilRequests().size).isEqualTo(0)
+        assertThat(fakeImageLoader.getExecutedRequestsData()).isEmpty()
     }
 
     @Test
@@ -129,10 +129,10 @@ class NotificationDataFactoryTest {
             notificationAccountParams = aNotificationAccountParams(
                 user = MatrixUser(A_SESSION_ID, A_SESSION_ID.value, MY_AVATAR_URL),
             ),
-            imageLoader = fakeImageLoader.getImageLoader(),
+            imageLoader = fakeImageLoader,
         )
         assertThat(result).isEmpty()
-        assertThat(fakeImageLoader.getCoilRequests().size).isEqualTo(0)
+        assertThat(fakeImageLoader.getExecutedRequestsData()).isEmpty()
     }
 
     @Test
@@ -152,7 +152,7 @@ class NotificationDataFactoryTest {
                 events = withRedactedRemoved,
                 roomId = A_ROOM_ID,
                 threadId = null,
-                imageLoader = FakeImageLoader().getImageLoader(),
+                imageLoader = FakeImageLoader(),
                 existingNotification = null,
             ),
             roomId = A_ROOM_ID,
@@ -168,12 +168,12 @@ class NotificationDataFactoryTest {
             notificationAccountParams = aNotificationAccountParams(
                 user = MatrixUser(A_SESSION_ID, A_SESSION_ID.value, MY_AVATAR_URL),
             ),
-            imageLoader = fakeImageLoader.getImageLoader(),
+            imageLoader = fakeImageLoader,
         )
 
         assertThat(result.size).isEqualTo(1)
         assertThat(result.first().isDataEqualTo(expectedNotification)).isTrue()
-        assertThat(fakeImageLoader.getCoilRequests().size).isEqualTo(0)
+        assertThat(fakeImageLoader.getExecutedRequestsData()).isEmpty()
     }
 }
 

libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/NotificationRendererTest.kt

@@ -13,6 +13,7 @@ import io.element.android.libraries.matrix.api.user.MatrixUser
 import io.element.android.libraries.matrix.test.AN_EVENT_ID
 import io.element.android.libraries.matrix.test.A_ROOM_ID
 import io.element.android.libraries.matrix.test.A_SESSION_ID
+import io.element.android.libraries.matrix.ui.test.media.FakeImageLoader
 import io.element.android.libraries.push.api.notifications.NotificationIdProvider
 import io.element.android.libraries.push.impl.notifications.fake.FakeActiveNotificationsProvider
 import io.element.android.libraries.push.impl.notifications.fake.FakeNotificationCreator
@@ -25,7 +26,6 @@ import io.element.android.libraries.push.impl.notifications.fixtures.aNotifiable
 import io.element.android.libraries.push.impl.notifications.fixtures.aSimpleNotifiableEvent
 import io.element.android.libraries.push.impl.notifications.fixtures.anInviteNotifiableEvent
 import io.element.android.libraries.push.impl.notifications.model.NotifiableEvent
-import io.element.android.libraries.push.test.notifications.FakeImageLoader
 import io.element.android.libraries.sessionstorage.api.SessionStore
 import io.element.android.libraries.sessionstorage.test.InMemorySessionStore
 import io.element.android.services.toolbox.test.strings.FakeStringProvider
@@ -113,7 +113,7 @@ class NotificationRendererTest {
             MatrixUser(A_SESSION_ID, MY_USER_DISPLAY_NAME, MY_USER_AVATAR_URL),
             useCompleteNotificationFormat = USE_COMPLETE_NOTIFICATION_FORMAT,
             eventsToProcess = events,
-            imageLoader = FakeImageLoader().getImageLoader(),
+            imageLoader = FakeImageLoader(),
         )
     }
 }

libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/conversations/DefaultNotificationConversationServiceTest.kt

@@ -20,9 +20,9 @@ import io.element.android.libraries.matrix.test.A_ROOM_ID_2
 import io.element.android.libraries.matrix.test.A_SESSION_ID
 import io.element.android.libraries.matrix.test.A_SESSION_ID_2
 import io.element.android.libraries.matrix.test.FakeMatrixClientProvider
+import io.element.android.libraries.matrix.ui.test.media.FakeImageLoaderHolder
 import io.element.android.libraries.push.impl.notifications.factories.FakeIntentProvider
 import io.element.android.libraries.push.impl.notifications.shortcut.createShortcutId
-import io.element.android.libraries.push.test.notifications.FakeImageLoaderHolder
 import io.element.android.libraries.push.test.notifications.push.FakeNotificationBitmapLoader
 import io.element.android.libraries.sessionstorage.test.observer.FakeSessionObserver
 import kotlinx.coroutines.ExperimentalCoroutinesApi

libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/factories/DefaultNotificationCreatorTest.kt

@@ -22,6 +22,7 @@ import io.element.android.libraries.matrix.test.A_SESSION_ID
 import io.element.android.libraries.matrix.test.A_THREAD_ID
 import io.element.android.libraries.matrix.test.core.aBuildMeta
 import io.element.android.libraries.matrix.ui.components.aMatrixUser
+import io.element.android.libraries.matrix.ui.test.media.FakeImageLoader
 import io.element.android.libraries.push.api.notifications.NotificationBitmapLoader
 import io.element.android.libraries.push.impl.notifications.DefaultNotificationBitmapLoader
 import io.element.android.libraries.push.impl.notifications.NotificationActionIds
@@ -36,7 +37,6 @@ import io.element.android.libraries.push.impl.notifications.fixtures.aNotifiable
 import io.element.android.libraries.push.impl.notifications.model.FallbackNotifiableEvent
 import io.element.android.libraries.push.impl.notifications.model.InviteNotifiableEvent
 import io.element.android.libraries.push.impl.notifications.model.SimpleNotifiableEvent
-import io.element.android.libraries.push.test.notifications.FakeImageLoader
 import io.element.android.services.toolbox.test.sdk.FakeBuildVersionSdkIntProvider
 import io.element.android.services.toolbox.test.strings.FakeStringProvider
 import io.element.android.services.toolbox.test.systemclock.A_FAKE_TIMESTAMP
@@ -246,7 +246,7 @@ class DefaultNotificationCreatorTest {
             lastMessageTimestamp = 123_456L,
             tickerText = "tickerText",
             existingNotification = null,
-            imageLoader = FakeImageLoader().getImageLoader(),
+            imageLoader = FakeImageLoader(),
             events = listOf(aNotifiableMessageEvent()),
         )
         result.commonAssertions()
@@ -271,7 +271,7 @@ class DefaultNotificationCreatorTest {
             lastMessageTimestamp = 123_456L,
             tickerText = "tickerText",
             existingNotification = null,
-            imageLoader = FakeImageLoader().getImageLoader(),
+            imageLoader = FakeImageLoader(),
             events = listOf(aNotifiableMessageEvent()),
         )
         result.commonAssertions()

libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/notifications/FakeImageLoader.kt

@@ -1,45 +0,0 @@
-/*
- * Copyright 2023, 2024 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.libraries.push.test.notifications
-
-import android.graphics.Color
-import android.graphics.drawable.ColorDrawable
-import coil3.ImageLoader
-import coil3.test.FakeImageLoaderEngine
-import coil3.test.intercept
-import org.robolectric.RuntimeEnvironment
-
-class FakeImageLoader {
-    private val coilRequests = mutableListOf<Any>()
-
-    private var cache: ImageLoader? = null
-
-    fun getImageLoader(): ImageLoader {
-        return cache ?: ImageLoader.Builder(RuntimeEnvironment.getApplication())
-            .components {
-                val engine = FakeImageLoaderEngine.Builder()
-                    .intercept(
-                        predicate = {
-                            coilRequests.add(it)
-                            true
-                        },
-                        drawable = ColorDrawable(Color.BLUE)
-                    )
-                    .build()
-                add(engine)
-            }
-            .build()
-            .also {
-                cache = it
-            }
-    }
-
-    fun getCoilRequests(): List<Any> {
-        return coilRequests.toList()
-    }
-}