feature(crypto): verification violation handling and block sending #4126
+405
−81
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| /* | ||
| * Copyright 2025 New Vector Ltd. | ||
| * | ||
| * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial | ||
| * Please see LICENSE files in the repository root for full details. | ||
| */ | ||
|
|
||
| package io.element.android.features.messages.impl.messagecomposer | ||
|
|
||
| import androidx.compose.foundation.background | ||
| import androidx.compose.foundation.border | ||
| import androidx.compose.foundation.layout.Box | ||
| import androidx.compose.foundation.layout.Column | ||
| import androidx.compose.foundation.layout.IntrinsicSize | ||
| import androidx.compose.foundation.layout.Row | ||
| import androidx.compose.foundation.layout.Spacer | ||
| import androidx.compose.foundation.layout.fillMaxWidth | ||
| import androidx.compose.foundation.layout.height | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.foundation.layout.requiredHeightIn | ||
| import androidx.compose.foundation.layout.size | ||
| import androidx.compose.foundation.layout.width | ||
| import androidx.compose.foundation.shape.RoundedCornerShape | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.draw.clip | ||
| import androidx.compose.ui.res.stringResource | ||
| import androidx.compose.ui.unit.dp | ||
| import io.element.android.compound.theme.ElementTheme | ||
| import io.element.android.compound.tokens.generated.CompoundIcons | ||
| import io.element.android.libraries.designsystem.preview.ElementPreview | ||
| import io.element.android.libraries.designsystem.preview.PreviewsDayNight | ||
| import io.element.android.libraries.designsystem.theme.components.Icon | ||
| import io.element.android.libraries.designsystem.theme.components.IconButton | ||
| import io.element.android.libraries.designsystem.utils.CommonDrawables | ||
| import io.element.android.libraries.textcomposer.R | ||
|
|
||
| @Composable | ||
| internal fun DisabledComposerView( | ||
|
There was a problem hiding this comment. I understand the aim of this Composable, but, as @jmartinesp mentionned, we take the risk that if a change in the real composer UI is done, this component is not updated. I have seen that you have added screenshot test in the same view than the real composer, so this may mitigate this risk, thanks. So it's OK for me! There was a problem hiding this comment. ok. not ideal but enough for now. We need anyhow a way to have the composer disabled, and properly support transition to disabled in the middle of editing/recording .. |
||
| modifier: Modifier = Modifier, | ||
| ) { | ||
| Row( | ||
| modifier = modifier.padding(3.dp) | ||
| .fillMaxWidth(), | ||
| verticalAlignment = Alignment.CenterVertically, | ||
| ) { | ||
| IconButton( | ||
| modifier = Modifier | ||
| .size(48.dp), | ||
| enabled = false, | ||
| onClick = {}, | ||
| ) { | ||
| Icon( | ||
| modifier = Modifier.size(30.dp), | ||
| resourceId = CommonDrawables.ic_plus_composer, | ||
| contentDescription = stringResource(R.string.rich_text_editor_a11y_add_attachment), | ||
| tint = ElementTheme.colors.iconDisabled, | ||
| ) | ||
| } | ||
|
|
||
| val bgColor = ElementTheme.colors.bgCanvasDisabled | ||
| val borderColor = ElementTheme.colors.borderDisabled | ||
|
|
||
| Box( | ||
| modifier = Modifier | ||
| .clip(RoundedCornerShape(21.dp)) | ||
| .border(0.5.dp, borderColor, RoundedCornerShape(21.dp)) | ||
| .background(color = bgColor) | ||
| .size(42.dp) | ||
| .requiredHeightIn(min = 42.dp) | ||
| .weight(1f), | ||
| ) | ||
|
|
||
| Spacer(modifier = Modifier.width(8.dp)) | ||
| IconButton( | ||
| modifier = Modifier | ||
| .padding(start = 2.dp) | ||
| .size(48.dp), | ||
| enabled = false, | ||
| onClick = {}, | ||
| ) { | ||
| Icon( | ||
| modifier = Modifier.size(30.dp), | ||
| imageVector = CompoundIcons.SendSolid(), | ||
| contentDescription = "", | ||
| tint = ElementTheme.colors.iconQuaternary | ||
| ) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @PreviewsDayNight | ||
| @Composable | ||
| internal fun DisabledComposerViewPreview() = ElementPreview { | ||
| Column { | ||
| DisabledComposerView( | ||
| modifier = Modifier.height(IntrinsicSize.Min), | ||
| ) | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you remove the 2 comments above please? Looks like there are not true anymore :)
Also probably
pinViolationIdentityChangecould be rename to something more generic likefirstRoomMemberIdentityStateChange.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done