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

Merge pull request #4195 from element-hq/feature/bma/snackBar

Browse source 
Fix snack bar not displayed in MediaViewer
This commit is contained in:
Benoit Marty 2025-01-27 09:52:36 +01:00 • committed by GitHub
commit df82afb6dc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt
View file

@ -484,7 +484,7 @@ class MessagesPresenter @AssistedInject constructor(
)
}
private suspend fun handleCopyContents(event: TimelineItem.Event) {
private fun handleCopyContents(event: TimelineItem.Event) {
val content = when (event.content) {
is TimelineItemTextBasedContent -> event.content.body
is TimelineItemStateContent -> event.content.body
@ -496,7 +496,7 @@ class MessagesPresenter @AssistedInject constructor(
}
}
private suspend fun handleCopyCaption(event: TimelineItem.Event) {
private fun handleCopyCaption(event: TimelineItem.Event) {
val content = (event.content as? TimelineItemEventContentWithAttachment)?.caption ?: return
clipboardHelper.copyPlainText(content)
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {

8
features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/SecureBackupSetupNode.kt
View file

@ -8,7 +8,6 @@
package io.element.android.features.securebackup.impl.setup
import androidx.compose.runtime.Composable
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.ui.Modifier
import com.bumble.appyx.core.modality.BuildContext
import com.bumble.appyx.core.node.Node
@ -22,8 +21,6 @@ import io.element.android.libraries.architecture.inputs
import io.element.android.libraries.designsystem.utils.snackbar.SnackbarDispatcher
import io.element.android.libraries.designsystem.utils.snackbar.SnackbarMessage
import io.element.android.libraries.di.SessionScope
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.launch
@ContributesNode(SessionScope::class)
class SecureBackupSetupNode @AssistedInject constructor(
@ -42,12 +39,11 @@ class SecureBackupSetupNode @AssistedInject constructor(
@Composable
override fun View(modifier: Modifier) {
val coroutineScope = rememberCoroutineScope()
val state = presenter.present()
SecureBackupSetupView(
state = state,
onSuccess = {
coroutineScope.postSuccessSnackbar()
postSuccessSnackbar()
navigateUp()
},
onBackClick = ::navigateUp,
@ -55,7 +51,7 @@ class SecureBackupSetupNode @AssistedInject constructor(
)
}
private fun CoroutineScope.postSuccessSnackbar() = launch {
private fun postSuccessSnackbar() {
snackbarDispatcher.post(
SnackbarMessage(
messageResId = if (inputs.isChangeRecoveryKeyUserStory) {