From a1e0a2c08dd5123ff29b43467f148401394e3339 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 1 Jun 2023 17:02:48 +0200 Subject: [PATCH] Fix compilation issue after rebase. --- libraries/push/impl/build.gradle.kts | 1 + .../push/impl/notifications/NotificationBitmapLoader.kt | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/libraries/push/impl/build.gradle.kts b/libraries/push/impl/build.gradle.kts index da9122ef52..725961a248 100644 --- a/libraries/push/impl/build.gradle.kts +++ b/libraries/push/impl/build.gradle.kts @@ -43,6 +43,7 @@ dependencies { implementation(projects.libraries.androidutils) implementation(projects.libraries.network) implementation(projects.libraries.matrix.api) + implementation(projects.libraries.matrixui) api(projects.libraries.pushproviders.api) api(projects.libraries.pushstore.api) api(projects.libraries.push.api) diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationBitmapLoader.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationBitmapLoader.kt index a3644e737f..c2cdfc5677 100644 --- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationBitmapLoader.kt +++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationBitmapLoader.kt @@ -25,7 +25,8 @@ import coil.imageLoader import coil.request.ImageRequest import coil.transform.CircleCropTransformation import io.element.android.libraries.di.ApplicationContext -import io.element.android.libraries.matrix.api.media.MediaResolver +import io.element.android.libraries.matrix.api.media.MediaSource +import io.element.android.libraries.matrix.ui.media.MediaRequestData import timber.log.Timber import javax.inject.Inject @@ -47,7 +48,7 @@ class NotificationBitmapLoader @Inject constructor( private suspend fun loadRoomBitmap(path: String): Bitmap? { return try { val imageRequest = ImageRequest.Builder(context) - .data(MediaResolver.Meta(path, MediaResolver.Kind.Thumbnail(1024))) + .data(MediaRequestData(MediaSource(path), MediaRequestData.Kind.Thumbnail(1024))) .build() val result = context.imageLoader.execute(imageRequest) result.drawable?.toBitmap() @@ -73,7 +74,7 @@ class NotificationBitmapLoader @Inject constructor( private suspend fun loadUserIcon(path: String): IconCompat? { return try { val imageRequest = ImageRequest.Builder(context) - .data(MediaResolver.Meta(path, MediaResolver.Kind.Thumbnail(1024))) + .data(MediaRequestData(MediaSource(path), MediaRequestData.Kind.Thumbnail(1024))) .transformations(CircleCropTransformation()) .build() val result = context.imageLoader.execute(imageRequest)