Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(mls): handle unsupported protocol case [WPB-5047] #2579

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.res.vectorResource
import androidx.compose.ui.text.AnnotatedString
import androidx.compose.ui.tooling.preview.Preview
import com.wire.android.R
import com.wire.android.ui.common.banner.SecurityClassificationBannerForConversation
import com.wire.android.ui.common.bottomsheet.WireModalSheetState
Expand All @@ -58,8 +57,10 @@ import com.wire.android.ui.home.messagecomposer.state.MessageComposition
import com.wire.android.ui.home.messagecomposer.state.MessageCompositionHolder
import com.wire.android.ui.home.messagecomposer.state.MessageCompositionInputStateHolder
import com.wire.android.ui.home.messagecomposer.state.Ping
import com.wire.android.ui.theme.WireTheme
import com.wire.android.ui.theme.wireColorScheme
import com.wire.android.ui.theme.wireTypography
import com.wire.android.util.ui.PreviewMultipleThemes
import com.wire.android.util.ui.stringWithStyledArgs
import com.wire.kalium.logic.data.conversation.Conversation.TypingIndicatorMode
import com.wire.kalium.logic.data.id.ConversationId
Expand Down Expand Up @@ -109,6 +110,18 @@ fun MessageComposer(
messageListContent = messageListContent
)

InteractionAvailability.UNSUPPORTED_PROTOCOL -> DisabledInteractionMessageComposer(
conversationId = conversationId,
warningText = LocalContext.current.resources.stringWithStyledArgs(
R.string.label_system_message_unsupported_protocol,
MaterialTheme.wireTypography.body01,
MaterialTheme.wireTypography.body02,
colorsScheme().secondaryText,
colorsScheme().onBackground,
),
messageListContent = messageListContent
)

InteractionAvailability.NOT_MEMBER, InteractionAvailability.DISABLED -> DisabledInteractionMessageComposer(
conversationId = conversationId,
warningText = null,
Expand Down Expand Up @@ -195,10 +208,17 @@ private fun DisabledInteractionMessageComposer(
}
}

@Preview
@Composable
fun MessageComposerPreview() {
val messageComposerViewState = remember { mutableStateOf(MessageComposerViewState()) }
private fun BaseComposerPreview(
interactionAvailability: InteractionAvailability = InteractionAvailability.ENABLED,
) = WireTheme {
val messageComposerViewState = remember {
mutableStateOf(
MessageComposerViewState(
interactionAvailability = interactionAvailability
)
)
}
val messageComposition = remember { mutableStateOf(MessageComposition.DEFAULT) }
val selfDeletionTimer = remember { mutableStateOf(SelfDeletionTimer.Enabled(Duration.ZERO)) }

Expand Down Expand Up @@ -226,3 +246,15 @@ fun MessageComposerPreview() {
onTypingEvent = { }
)
}

@PreviewMultipleThemes
@Composable
private fun UnsupportedProtocolComposerPreview() = WireTheme {
BaseComposerPreview(interactionAvailability = InteractionAvailability.UNSUPPORTED_PROTOCOL)
}

@PreviewMultipleThemes
@Composable
private fun EnabledComposerPreview() = WireTheme {
BaseComposerPreview(interactionAvailability = InteractionAvailability.ENABLED)
}
3 changes: 3 additions & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -596,6 +596,9 @@
<item quantity="other">%1$s were removed from the team</item>
</plurals>
<string name="label_system_message_user_not_available">This user is no longer available</string>
<string name="label_system_message_unsupported_protocol">The conversation is using an encryption protocol that is
not supported by this device. Some devices from the involve users might need updating.
</string>
<string name="label_system_message_new_conversation_receipt_mode">Read receipts are %1$s</string>
<string name="label_system_message_read_receipt_changed_by_self">%1$s turned read receipts %2$s for everyone</string>
<string name="label_system_message_read_receipt_changed_by_other">%1$s turned read receipts %2$s for everyone</string>
Expand Down
2 changes: 1 addition & 1 deletion kalium
Submodule kalium updated 15 files
+4 −0 cryptography/src/appleMain/kotlin/com/wire/kalium/cryptography/MLSClientImpl.kt
+4 −0 cryptography/src/commonJvmAndroid/kotlin/com.wire.kalium.cryptography/MLSClientImpl.kt
+5 −0 cryptography/src/commonMain/kotlin/com/wire/kalium/cryptography/MLSClient.kt
+4 −0 cryptography/src/jsMain/kotlin/com/wire/kalium/cryptography/MLSClientImpl.kt
+17 −6 logic/src/commonMain/kotlin/com/wire/kalium/logic/data/e2ei/E2EIRepository.kt
+10 −0 logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/UserSessionScope.kt
+1 −1 logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/conversation/ConversationScope.kt
+50 −5 ...Main/kotlin/com/wire/kalium/logic/feature/conversation/ObserveConversationInteractionAvailabilityUseCase.kt
+47 −0 logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/e2ei/ACMECertificatesSyncWorker.kt
+87 −0 logic/src/commonTest/kotlin/com/wire/kalium/logic/data/e2ei/E2EIRepositoryTest.kt
+138 −58 .../kotlin/com/wire/kalium/logic/feature/conversation/ObserveConversationInteractionAvailabilityUseCaseTest.kt
+64 −0 logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/e2ei/ACMECertificatesSyncWorkerTest.kt
+42 −0 logic/src/commonTest/kotlin/com/wire/kalium/logic/util/arrangement/repository/E2EIRepositoryArrangement.kt
+9 −0 logic/src/commonTest/kotlin/com/wire/kalium/logic/util/arrangement/repository/UserRepositoryArrangement.kt
+6 −0 network/src/commonMain/kotlin/com/wire/kalium/network/api/base/unbound/acme/ACMEApi.kt