devol/smalltalk-matrix
1
0
Fork 0
mirror of https://github.com/ouchadam/small-talk.git synced 2025-02-18 05:00:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixing crash when sending messages, updating version for store release

Browse Source
This commit is contained in:
Adam Brown 2022-04-05 22:40:01 +01:00
parent 81d88b51fc
commit e17dd6ed3f
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
matrix/services/message/src/main/kotlin/app/dapk/st/matrix/message/internal/DefaultMessageService.kt
View File

@ -12,6 +12,8 @@ import kotlinx.serialization.json.Json
import java.net.SocketException import java.net.SocketException
import java.net.UnknownHostException import java.net.UnknownHostException
private const val MATRIX_MESSAGE_TASK_TYPE = "matrix-text-message"
internal class DefaultMessageService( internal class DefaultMessageService(
httpClient: MatrixHttpClient, httpClient: MatrixHttpClient,
private val localEchoStore: LocalEchoStore, private val localEchoStore: LocalEchoStore,
@ -22,10 +24,10 @@ internal class DefaultMessageService(
private val sendMessageUseCase = SendMessageUseCase(httpClient, messageEncrypter) private val sendMessageUseCase = SendMessageUseCase(httpClient, messageEncrypter)
private val sendEventMessageUseCase = SendEventMessageUseCase(httpClient) private val sendEventMessageUseCase = SendEventMessageUseCase(httpClient)
override suspend fun canRun(task: MatrixTaskRunner.MatrixTask) = task.type == "text-message" override suspend fun canRun(task: MatrixTaskRunner.MatrixTask) = task.type == MATRIX_MESSAGE_TASK_TYPE
override suspend fun run(task: MatrixTaskRunner.MatrixTask): MatrixTaskRunner.TaskResult { override suspend fun run(task: MatrixTaskRunner.MatrixTask): MatrixTaskRunner.TaskResult {
require(task.type == "text-message") require(task.type == MATRIX_MESSAGE_TASK_TYPE)
val message = Json.decodeFromString(MessageService.Message.TextMessage.serializer(), task.jsonPayload) val message = Json.decodeFromString(MessageService.Message.TextMessage.serializer(), task.jsonPayload)
return try { return try {
sendMessage(message) sendMessage(message)
@ -61,7 +63,10 @@ internal class DefaultMessageService(
private fun MessageService.Message.toTask(): BackgroundScheduler.Task { private fun MessageService.Message.toTask(): BackgroundScheduler.Task {
return when (this) { return when (this) {
is MessageService.Message.TextMessage -> { is MessageService.Message.TextMessage -> {
BackgroundScheduler.Task(type = "text-message", Json.encodeToString(MessageService.Message.TextMessage.serializer(), this)) BackgroundScheduler.Task(
type = MATRIX_MESSAGE_TASK_TYPE,
Json.encodeToString(MessageService.Message.TextMessage.serializer(), this)
)
} }
} }
} }

4
version.json
View File

@ -1,4 +1,4 @@
{ {
"name": "0.0.1-alpha02", "name": "0.0.1-alpha03",
"code": 3 "code": 4
} }