Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Fix compilation issue after rebase.

Browse source
This commit is contained in:
Benoit Marty 2023-06-01 17:02:48 +02:00
parent 42bafbdc1a
commit 99204ce9e6
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
libraries/push/impl/build.gradle.kts
View file

@ -43,6 +43,7 @@ dependencies {
implementation(projects.libraries.androidutils) implementation(projects.libraries.androidutils)
implementation(projects.libraries.network) implementation(projects.libraries.network)
implementation(projects.libraries.matrix.api) implementation(projects.libraries.matrix.api)
implementation(projects.libraries.matrixui)
api(projects.libraries.pushproviders.api) api(projects.libraries.pushproviders.api)
api(projects.libraries.pushstore.api) api(projects.libraries.pushstore.api)
api(projects.libraries.push.api) api(projects.libraries.push.api)

7
libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationBitmapLoader.kt
View file

@ -25,7 +25,8 @@ import coil.imageLoader
import coil.request.ImageRequest import coil.request.ImageRequest
import coil.transform.CircleCropTransformation import coil.transform.CircleCropTransformation
import io.element.android.libraries.di.ApplicationContext 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 timber.log.Timber
import javax.inject.Inject import javax.inject.Inject
@ -47,7 +48,7 @@ class NotificationBitmapLoader @Inject constructor(
private suspend fun loadRoomBitmap(path: String): Bitmap? { private suspend fun loadRoomBitmap(path: String): Bitmap? {
return try { return try {
val imageRequest = ImageRequest.Builder(context) val imageRequest = ImageRequest.Builder(context)
.data(MediaResolver.Meta(path, MediaResolver.Kind.Thumbnail(1024))) .data(MediaRequestData(MediaSource(path), MediaRequestData.Kind.Thumbnail(1024)))
.build() .build()
val result = context.imageLoader.execute(imageRequest) val result = context.imageLoader.execute(imageRequest)
result.drawable?.toBitmap() result.drawable?.toBitmap()
@ -73,7 +74,7 @@ class NotificationBitmapLoader @Inject constructor(
private suspend fun loadUserIcon(path: String): IconCompat? { private suspend fun loadUserIcon(path: String): IconCompat? {
return try { return try {
val imageRequest = ImageRequest.Builder(context) val imageRequest = ImageRequest.Builder(context)
.data(MediaResolver.Meta(path, MediaResolver.Kind.Thumbnail(1024))) .data(MediaRequestData(MediaSource(path), MediaRequestData.Kind.Thumbnail(1024)))
.transformations(CircleCropTransformation()) .transformations(CircleCropTransformation())
.build() .build()
val result = context.imageLoader.execute(imageRequest) val result = context.imageLoader.execute(imageRequest)