devol
/
smalltalk-matrix
mirror of https://github.com/ouchadam/small-talk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #304 from ouchadam/bug-reply-to-reply-crash 

Crash fix when sending message after replying to an unsupported message type
This commit is contained in:
Adam Brown 2023-01-07 15:59:18 +00:00 committed by GitHub
parent 068d121634 b13ca617c5
commit a64ee133ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
features/messenger/src/main/kotlin/app/dapk/st/messenger/state/MessengerReducer.kt
View File

@ -85,13 +85,23 @@ internal fun messengerReducer(
change(ComposerStateChange.ReplyMode::class) { action, state -> change(ComposerStateChange.ReplyMode::class) { action, state ->
when (action) { when (action) {
is ComposerStateChange.ReplyMode.Enter -> state.copy( is ComposerStateChange.ReplyMode.Enter -> {
when (action.replyingTo) {
is RoomEvent.Message -> state.copy(
composerState = when (state.composerState) { composerState = when (state.composerState) {
is ComposerState.Attachments -> state.composerState.copy(reply = action.replyingTo) is ComposerState.Attachments -> state.composerState.copy(reply = action.replyingTo)
is ComposerState.Text -> state.composerState.copy(reply = action.replyingTo) is ComposerState.Text -> state.composerState.copy(reply = action.replyingTo)
} }
) )
// TODO support replying to more message types
is RoomEvent.Encrypted,
is RoomEvent.Image,
is RoomEvent.Redacted,
is RoomEvent.Reply -> state
}
}
ComposerStateChange.ReplyMode.Exit -> state.copy( ComposerStateChange.ReplyMode.Exit -> state.copy(
composerState = when (state.composerState) { composerState = when (state.composerState) {
is ComposerState.Attachments -> state.composerState.copy(reply = null) is ComposerState.Attachments -> state.composerState.copy(reply = null)

18
features/messenger/src/test/kotlin/app/dapk/st/messenger/MessengerReducerTest.kt
View File

@ -29,7 +29,8 @@ private val AN_EVENT_ID = anEventId("state event")
private val A_SELF_ID = aUserId("self") private val A_SELF_ID = aUserId("self")
private val A_MESSENGER_PAGE_STATE = aMessengerStateWithEvent(AN_EVENT_ID, A_SELF_ID) private val A_MESSENGER_PAGE_STATE = aMessengerStateWithEvent(AN_EVENT_ID, A_SELF_ID)
private val A_MESSAGE_ATTACHMENT = MessageAttachment(AndroidUri("a-uri"), MimeType.Image) private val A_MESSAGE_ATTACHMENT = MessageAttachment(AndroidUri("a-uri"), MimeType.Image)
private val A_REPLY = aRoomReplyMessageEvent() private val A_REPLY = aRoomMessageEvent()
private val AN_SUPPORTED_REPLY = aRoomReplyMessageEvent()
private val AN_IMAGE_BUBBLE = BubbleModel.Image( private val AN_IMAGE_BUBBLE = BubbleModel.Image(
BubbleModel.Image.ImageContent(100, 200, "a-url"), BubbleModel.Image.ImageContent(100, 200, "a-url"),
mockk(), mockk(),
@ -184,7 +185,7 @@ class MessengerReducerTest {
} }
@Test @Test
fun `given text composer, when Enter ReplyMode, then updates composer state with reply`() = runReducerTest { fun `given message text composer, when Enter ReplyMode, then updates composer state with reply`() = runReducerTest {
setState { it.copy(composerState = ComposerState.Text(A_MESSAGE_CONTENT, reply = null)) } setState { it.copy(composerState = ComposerState.Text(A_MESSAGE_CONTENT, reply = null)) }
reduce(ComposerStateChange.ReplyMode.Enter(A_REPLY)) reduce(ComposerStateChange.ReplyMode.Enter(A_REPLY))
@ -194,6 +195,15 @@ class MessengerReducerTest {
} }
} }
@Test
fun `given text composer, when Enter ReplyMode with unsupported content, then does nothing`() = runReducerTest {
setState { it.copy(composerState = ComposerState.Text(A_MESSAGE_CONTENT, reply = null)) }
reduce(ComposerStateChange.ReplyMode.Enter(AN_SUPPORTED_REPLY))
assertNoChanges()
}
@Test @Test
fun `given text composer, when Exit ReplyMode, then updates composer state`() = runReducerTest { fun `given text composer, when Exit ReplyMode, then updates composer state`() = runReducerTest {
setState { it.copy(composerState = ComposerState.Text(A_MESSAGE_CONTENT, reply = A_REPLY)) } setState { it.copy(composerState = ComposerState.Text(A_MESSAGE_CONTENT, reply = A_REPLY)) }
@ -333,8 +343,8 @@ class MessengerReducerTest {
@Test @Test
fun `given text composer with reply, when SendMessage, then clear composer and sends text message`() = runReducerTest { fun `given text composer with reply, when SendMessage, then clear composer and sends text message`() = runReducerTest {
setState { it.copy(composerState = ComposerState.Text(A_MESSAGE_CONTENT, reply = A_REPLY.message), roomState = Lce.Content(A_MESSENGER_PAGE_STATE)) } setState { it.copy(composerState = ComposerState.Text(A_MESSAGE_CONTENT, reply = A_REPLY), roomState = Lce.Content(A_MESSENGER_PAGE_STATE)) }
fakeChatEngine.expectUnit { it.send(expectTextMessage(A_MESSAGE_CONTENT, reply = A_REPLY.message), A_MESSENGER_PAGE_STATE.roomState.roomOverview) } fakeChatEngine.expectUnit { it.send(expectTextMessage(A_MESSAGE_CONTENT, reply = A_REPLY), A_MESSENGER_PAGE_STATE.roomState.roomOverview) }
reduce(ScreenAction.SendMessage) reduce(ScreenAction.SendMessage)