Skip to content

Commit e75d9bc

Browse files
style: don't read configuration/resources using LocalContext.current
AI-assistant: Claude Code v2.1.152 (Claude Sonnet 4.6) Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
1 parent 830fef0 commit e75d9bc

2 files changed

Lines changed: 5 additions & 4 deletions

File tree

app/src/main/java/com/nextcloud/talk/ui/OutOfOffice.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ import androidx.compose.runtime.remember
3838
import androidx.compose.runtime.setValue
3939
import androidx.compose.ui.Alignment
4040
import androidx.compose.ui.Modifier
41+
import androidx.compose.ui.platform.LocalConfiguration
4142
import androidx.compose.ui.platform.LocalContext
4243
import androidx.compose.ui.res.stringResource
4344
import androidx.compose.ui.text.font.FontWeight
@@ -98,7 +99,7 @@ fun OutOfOfficeView(data: OutOfOfficeViewData, viewThemeUtils: ViewThemeUtils, o
9899
val colorScheme = remember { viewThemeUtils.getColorScheme(context) }
99100
val scrollState = rememberScrollState()
100101
var isExpanded by remember { mutableStateOf(data.initialExpanded) }
101-
val locale = context.resources.configuration.locales[0]
102+
val locale = LocalConfiguration.current.locales[0]
102103
val dateState = rememberOutOfOfficeDateState(data.userAbsence, locale)
103104
val shortMessage = if (dateState.isSameDay) {
104105
stringResource(R.string.user_absence_for_one_day, data.displayName)

app/src/main/java/com/nextcloud/talk/ui/chat/MediaMessage.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ import com.nextcloud.talk.chat.data.model.decodeBlurhashPlaceholder
4444
import com.nextcloud.talk.chat.ui.model.ChatMessageUi
4545
import com.nextcloud.talk.chat.ui.model.MessageTypeContent
4646
import com.nextcloud.talk.contacts.load
47+
import com.nextcloud.talk.utils.Mimetype
4748
import com.nextcloud.talk.utils.MimetypeUtils
4849
import kotlinx.coroutines.delay
4950
import kotlinx.coroutines.launch
@@ -107,12 +108,11 @@ fun MediaMessage(
107108
Column {
108109
val context = LocalContext.current
109110
val scope = rememberCoroutineScope()
110-
val resourceName = context.resources.getResourceEntryName(typeContent.drawableResourceId)
111111
val isGif = MimetypeUtils.isGif(typeContent.mimeType)
112112
val showPlayButton = !typeContent.previewUrl.isNullOrEmpty() &&
113113
(
114-
resourceName.contains("video") ||
115-
resourceName.contains("audio") ||
114+
typeContent.mimeType.startsWith(Mimetype.VIDEO_PREFIX) ||
115+
typeContent.mimeType.startsWith(Mimetype.AUDIO_PREFIX) ||
116116
(isGif && !typeContent.animateGif)
117117
)
118118

0 commit comments

Comments
 (0)