FromChat/app
1
0
Fork 0
mirror of https://github.com/fromchat-messenger/app.git synced 2026-09-22 19:15:05 +03:00
Code Issues Packages Projects Releases Wiki Activity

Small fixes

Browse Source 
Signed-off-by: denis0001-dev <denis0001.dev@ya.ru>
This commit is contained in:
denis0001-dev
2026-04-14 21:47:55 +03:00
Unverified
parent 5b08ff71f5
commit 7a62359aaa
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/shared/src/commonMain/kotlin/ru/fromchat/ui/dm/DmPanel.kt
+5 -5
View File
@@ -1,11 +1,11 @@
package ru.fromchat.ui.dm package ru.fromchat.ui.dm
import io.ktor.client.plugins.ClientRequestException
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.Mutex
import kotlinx.coroutines.sync.withLock import kotlinx.coroutines.sync.withLock
import io.ktor.client.plugins.ClientRequestException
import kotlinx.serialization.json.Json import kotlinx.serialization.json.Json
import kotlinx.serialization.json.JsonArray import kotlinx.serialization.json.JsonArray
import kotlinx.serialization.json.JsonElement import kotlinx.serialization.json.JsonElement
@@ -17,13 +17,13 @@ import ru.fromchat.api.ApiClient
import ru.fromchat.api.DmEnvelope import ru.fromchat.api.DmEnvelope
import ru.fromchat.api.Message import ru.fromchat.api.Message
import ru.fromchat.api.ProfileCache import ru.fromchat.api.ProfileCache
import ru.fromchat.api.visibleDisplayName
import ru.fromchat.api.WebSocketMessage import ru.fromchat.api.WebSocketMessage
import ru.fromchat.api.db.MessageCacheStore
import ru.fromchat.api.visibleDisplayName
import ru.fromchat.core.Logger import ru.fromchat.core.Logger
import ru.fromchat.crypto.CorruptedDmMessagePlaceholder import ru.fromchat.crypto.CorruptedDmMessagePlaceholder
import ru.fromchat.crypto.DmCiphertextCorruptedException import ru.fromchat.crypto.DmCiphertextCorruptedException
import ru.fromchat.crypto.decryptEnvelope import ru.fromchat.crypto.decryptEnvelope
import ru.fromchat.api.db.MessageCacheStore
import ru.fromchat.ui.chat.AvatarInfo import ru.fromchat.ui.chat.AvatarInfo
import ru.fromchat.ui.chat.ChatPanel import ru.fromchat.ui.chat.ChatPanel
import ru.fromchat.ui.chat.DecryptedImageCache import ru.fromchat.ui.chat.DecryptedImageCache
@@ -140,7 +140,7 @@ class DmPanel(
val historyResult = runCatching { ApiClient.getDmHistory(otherUserId) } val historyResult = runCatching { ApiClient.getDmHistory(otherUserId) }
if (historyResult.isSuccess) { if (historyResult.isSuccess) {
val response = historyResult.getOrNull() ?: return@loadMessages val response = historyResult.getOrNull() ?: return
clearMessages() clearMessages()
val decryptedForLog = mutableListOf<Pair<Int, String>>() val decryptedForLog = mutableListOf<Pair<Int, String>>()
val messages = response.messages.map { envelope -> val messages = response.messages.map { envelope ->
@@ -422,7 +422,7 @@ class DmPanel(
override fun getTypingHandler(): TypingHandler = typingHandler override fun getTypingHandler(): TypingHandler = typingHandler
override fun getRecipientId(): Int? = otherUserId override fun getRecipientId(): Int = otherUserId
override val showUsernamesInMessages: Boolean override val showUsernamesInMessages: Boolean
get() = false get() = false