ehealthsolutions/element-x-android
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-android.git synced 2026-11-07 01:19:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove RetryLoading (use LoadMedia)

Browse Source
This commit is contained in:
Benoit Marty
2025-01-17 11:38:03 +01:00
committed by Benoit Marty
parent cbf7bf0fd4
commit a06607f530
3 changed files with 18 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerEvents.kt
-1
View File
@@ -15,7 +15,6 @@ sealed interface MediaViewerEvents {
data class SaveOnDisk(val data: MediaViewerPageData.MediaViewerData) : MediaViewerEvents
data class Share(val data: MediaViewerPageData.MediaViewerData) : MediaViewerEvents
data class OpenWith(val data: MediaViewerPageData.MediaViewerData) : MediaViewerEvents
data class RetryLoading(val eventId: EventId) : MediaViewerEvents
data class ClearLoadingError(val eventId: EventId) : MediaViewerEvents
data class ViewInTimeline(val eventId: EventId) : MediaViewerEvents
data class OpenInfo(val data: MediaViewerPageData.MediaViewerData) : MediaViewerEvents
libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerPresenter.kt
-5
View File
@@ -11,7 +11,6 @@ import android.content.ActivityNotFoundException
import androidx.compose.runtime.Composable
import androidx.compose.runtime.DisposableEffect
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.MutableIntState
import androidx.compose.runtime.MutableState
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.derivedStateOf
@@ -81,7 +80,6 @@ class MediaViewerPresenter @AssistedInject constructor(
val groupedMediaItem by remember { mediaGalleryDataSource.groupedMediaItemsFlow() }
.collectAsState(mediaGalleryDataSource.getLastData())
val loadMediaTrigger: MutableMap<EventId?, MutableIntState> = remember { mutableMapOf() }
val mediaFile: MutableMap<EventId?, MutableState<MediaFile?>> = remember { mutableMapOf() }
val localMedia: MutableMap<EventId?, MutableState<AsyncData<LocalMedia>>> = remember { mutableMapOf() }
DisposableEffect(Unit) {
@@ -134,9 +132,6 @@ class MediaViewerPresenter @AssistedInject constructor(
mediaFile = mediaFile.getOrPut(event.data.eventId) { mutableStateOf(null) },
localMedia = localMedia.getOrPut(event.data.eventId) { mutableStateOf(AsyncData.Uninitialized) },
)
is MediaViewerEvents.RetryLoading -> {
loadMediaTrigger.getOrPut(event.eventId) { mutableIntStateOf(0) }.intValue++
}
is MediaViewerEvents.ClearLoadingError -> {
localMedia.getOrPut(event.eventId) { mutableStateOf(AsyncData.Uninitialized) }.value = AsyncData.Uninitialized
}
libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerView.kt
+1 -3
View File
@@ -255,9 +255,7 @@ private fun MediaViewerPage(
modifier: Modifier = Modifier,
) {
fun onRetry() {
data.eventId?.let {
state.eventSink(MediaViewerEvents.RetryLoading(it))
}
state.eventSink(MediaViewerEvents.LoadMedia(data))
}
fun onDismissError() {