dandri/simplex-chat
1
0
Fork 0
mirror of https://github.com/simplex-chat/simplex-chat.git synced 2026-08-28 12:04:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into remote-desktop

Browse Source
This commit is contained in:
Evgeny Poberezkin
2023-11-14 14:43:58 +00:00
parent f9df5aa41b 5bbde22ffa
commit 4da1d21c81
6 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Simplex/Chat/Messages/CIContent.hs
+7 -1
View File
@@ -151,7 +151,12 @@ ciMsgContent = \case
CIRcvMsgContent mc -> Just mc
_ -> Nothing
data MsgDecryptError = MDERatchetHeader | MDETooManySkipped | MDERatchetEarlier | MDEOther
data MsgDecryptError
= MDERatchetHeader
| MDETooManySkipped
| MDERatchetEarlier
| MDEOther
| MDERatchetSync
deriving (Eq, Show)
ciRequiresAttention :: forall d. MsgDirectionI d => CIContent d -> Bool
@@ -322,6 +327,7 @@ msgDecryptErrorText err n =
MDETooManySkipped -> Just $ "too many skipped messages" <> counter
MDERatchetEarlier -> Just $ "earlier message" <> counter
MDEOther -> counter_
MDERatchetSync -> Just "synchronization error"
counter_ = if n == 1 then Nothing else Just $ tshow n <> " messages"
counter = maybe "" (", " <>) counter_