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

change (media preview config) : address review remarks

Browse source
This commit is contained in:
ganfra 2025-07-01 11:22:03 +02:00
parent 341ae17b72
commit 9b593e4bb9
4 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
appnav/src/main/kotlin/io/element/android/appnav/loggedin/MediaPreviewConfigMigration.kt
View file

@ -52,7 +52,7 @@ class MediaPreviewConfigMigration @Inject constructor(
} }
} }
.onFailure { .onFailure {
Timber.d("Couldn't perform migration, failed to fetch media preview config.") Timber.e(it, "Couldn't perform migration, failed to fetch media preview config.")
} }
} }
} }

11
features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/advanced/AdvancedSettingsView.kt
View file

@ -7,7 +7,6 @@
package io.element.android.features.preferences.impl.advanced package io.element.android.features.preferences.impl.advanced
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.navigationBarsPadding import androidx.compose.foundation.layout.navigationBarsPadding
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue import androidx.compose.runtime.getValue
@ -143,12 +142,10 @@ private fun ModerationAndSafety(
title = stringResource(R.string.screen_advanced_settings_show_media_timeline_title), title = stringResource(R.string.screen_advanced_settings_show_media_timeline_title),
hasDivider = false, hasDivider = false,
description = { description = {
Row { ListSupportingText(
ListSupportingText( text = stringResource(R.string.screen_advanced_settings_show_media_timeline_subtitle),
text = stringResource(R.string.screen_advanced_settings_show_media_timeline_subtitle), contentPadding = ListSupportingTextDefaults.Padding.None,
contentPadding = ListSupportingTextDefaults.Padding.None, )
)
}
} }
) )
ListItem( ListItem(

6
features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/advanced/MediaPreviewConfigStateStore.kt
View file

@ -88,8 +88,9 @@ class DefaultMediaPreviewConfigStateStore @Inject constructor(
override fun setHideInviteAvatars(hide: Boolean) { override fun setHideInviteAvatars(hide: Boolean) {
sessionCoroutineScope.launch { sessionCoroutineScope.launch {
Timber.d("Setting hide invite avatars to $hide")
val prevHideInviteAvatars = hideInviteAvatars.value val prevHideInviteAvatars = hideInviteAvatars.value
if (prevHideInviteAvatars == hide) return@launch
Timber.d("Setting hide invite avatars to $hide")
hideInviteAvatars.value = hide hideInviteAvatars.value = hide
runUpdatingState(setHideInviteAvatarsAction) { runUpdatingState(setHideInviteAvatarsAction) {
mediaPreviewService mediaPreviewService
@ -104,8 +105,9 @@ class DefaultMediaPreviewConfigStateStore @Inject constructor(
override fun setTimelineMediaPreviewValue(value: MediaPreviewValue) { override fun setTimelineMediaPreviewValue(value: MediaPreviewValue) {
sessionCoroutineScope.launch { sessionCoroutineScope.launch {
Timber.d("Setting timeline media preview value to $value")
val prevTimelineMediaPreviewValue = timelineMediaPreviewValue.value val prevTimelineMediaPreviewValue = timelineMediaPreviewValue.value
if (prevTimelineMediaPreviewValue == value) return@launch
Timber.d("Setting timeline media preview value to $value")
timelineMediaPreviewValue.value = value timelineMediaPreviewValue.value = value
runUpdatingState(setTimelineMediaPreviewAction) { runUpdatingState(setTimelineMediaPreviewAction) {
mediaPreviewService mediaPreviewService

2
libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/media/RustMediaPreviewService.kt
View file

@ -56,7 +56,7 @@ class RustMediaPreviewService(
private fun RustMediaPreviewConfig.into(): MediaPreviewConfig { private fun RustMediaPreviewConfig.into(): MediaPreviewConfig {
return MediaPreviewConfig( return MediaPreviewConfig(
mediaPreviewValue = this@into.mediaPreviews.into(), mediaPreviewValue = mediaPreviews.into(),
hideInviteAvatar = inviteAvatars == InviteAvatars.OFF hideInviteAvatar = inviteAvatars == InviteAvatars.OFF
) )
} }