core: 5.4.0.4

This commit is contained in:
Evgeny Poberezkin committed 2023-11-21 00:00:29 +00:00
1 parent 624a3abba2
commit 47cd7de1ae
4 files changed
+10 -10

No files matched your search

+1 -1
View File
@@ -1,5 +1,5 @@
name: simplex-chat name: simplex-chat
version: 5.4.0.3 version: 5.4.0.4
#synopsis: #synopsis:
#description: #description:
homepage: https://github.com/simplex-chat/simplex-chat#readme homepage: https://github.com/simplex-chat/simplex-chat#readme
+1 -1
View File
@@ -5,7 +5,7 @@ cabal-version: 1.12
-- see: https://github.com/sol/hpack -- see: https://github.com/sol/hpack
name: simplex-chat name: simplex-chat
version: 5.4.0.3 version: 5.4.0.4
category: Web, System, Services, Cryptography category: Web, System, Services, Cryptography
homepage: https://github.com/simplex-chat/simplex-chat#readme homepage: https://github.com/simplex-chat/simplex-chat#readme
author: simplex.chat author: simplex.chat
+2 -2
View File
@@ -71,11 +71,11 @@ import UnliftIO.Directory (copyFile, createDirectoryIfMissing, doesDirectoryExis
-- when acting as host -- when acting as host
minRemoteCtrlVersion :: AppVersion minRemoteCtrlVersion :: AppVersion
minRemoteCtrlVersion = AppVersion [5, 4, 0, 3] minRemoteCtrlVersion = AppVersion [5, 4, 0, 4]
-- when acting as controller -- when acting as controller
minRemoteHostVersion :: AppVersion minRemoteHostVersion :: AppVersion
minRemoteHostVersion = AppVersion [5, 4, 0, 3] minRemoteHostVersion = AppVersion [5, 4, 0, 4]
currentAppVersion :: AppVersion currentAppVersion :: AppVersion
currentAppVersion = AppVersion SC.version currentAppVersion = AppVersion SC.version
+6 -6
View File
@@ -15,7 +15,7 @@ import Data.List.NonEmpty (NonEmpty (..))
import qualified Data.Map.Strict as M import qualified Data.Map.Strict as M
import qualified Network.TLS as TLS import qualified Network.TLS as TLS
import Simplex.Chat.Archive (archiveFilesFolder) import Simplex.Chat.Archive (archiveFilesFolder)
import Simplex.Chat.Controller (ChatConfig (..), XFTPFileConfig (..)) import Simplex.Chat.Controller (ChatConfig (..), XFTPFileConfig (..), versionNumber)
import qualified Simplex.Chat.Controller as Controller import qualified Simplex.Chat.Controller as Controller
import Simplex.Chat.Mobile.File import Simplex.Chat.Mobile.File
import Simplex.Chat.Remote.Types import Simplex.Chat.Remote.Types
@@ -120,12 +120,12 @@ remoteHandshakeRejectTest = testChat3 aliceProfile aliceDesktopProfile bobProfil
desktop <## "Remote session invitation:" desktop <## "Remote session invitation:"
inv <- getTermLine desktop inv <- getTermLine desktop
mobileBob ##> ("/connect remote ctrl " <> inv) mobileBob ##> ("/connect remote ctrl " <> inv)
mobileBob <## "connecting new remote controller: My desktop, v5.4.0.3" mobileBob <## ("connecting new remote controller: My desktop, v" <> versionNumber)
mobileBob <## "remote controller stopped" mobileBob <## "remote controller stopped"
-- the server remains active after rejecting invalid client -- the server remains active after rejecting invalid client
mobile ##> ("/connect remote ctrl " <> inv) mobile ##> ("/connect remote ctrl " <> inv)
mobile <## "connecting remote controller 1: My desktop, v5.4.0.3" mobile <## ("connecting remote controller 1: My desktop, v" <> versionNumber)
desktop <## "remote host 1 connecting" desktop <## "remote host 1 connecting"
desktop <## "Compare session code with host:" desktop <## "Compare session code with host:"
sessId <- getTermLine desktop sessId <- getTermLine desktop
@@ -429,7 +429,7 @@ startRemote mobile desktop = do
desktop <## "Remote session invitation:" desktop <## "Remote session invitation:"
inv <- getTermLine desktop inv <- getTermLine desktop
mobile ##> ("/connect remote ctrl " <> inv) mobile ##> ("/connect remote ctrl " <> inv)
mobile <## "connecting new remote controller: My desktop, v5.4.0.3" mobile <## ("connecting new remote controller: My desktop, v" <> versionNumber)
desktop <## "new remote host connecting" desktop <## "new remote host connecting"
mobile <## "new remote controller connected" mobile <## "new remote controller connected"
verifyRemoteCtrl mobile desktop verifyRemoteCtrl mobile desktop
@@ -444,7 +444,7 @@ startRemoteStored mobile desktop = do
desktop <## "Remote session invitation:" desktop <## "Remote session invitation:"
inv <- getTermLine desktop inv <- getTermLine desktop
mobile ##> ("/connect remote ctrl " <> inv) mobile ##> ("/connect remote ctrl " <> inv)
mobile <## "connecting remote controller 1: My desktop, v5.4.0.3" mobile <## ("connecting remote controller 1: My desktop, v" <> versionNumber)
desktop <## "remote host 1 connecting" desktop <## "remote host 1 connecting"
mobile <## "remote controller 1 connected" mobile <## "remote controller 1 connected"
verifyRemoteCtrl mobile desktop verifyRemoteCtrl mobile desktop
@@ -463,7 +463,7 @@ startRemoteDiscover mobile desktop = do
mobile <## "1. My desktop" mobile <## "1. My desktop"
mobile ##> "/confirm remote ctrl 1" mobile ##> "/confirm remote ctrl 1"
mobile <## "connecting remote controller 1: My desktop, v5.4.0.3" mobile <## ("connecting remote controller 1: My desktop, v" <> versionNumber)
desktop <## "remote host 1 connecting" desktop <## "remote host 1 connecting"
mobile <## "remote controller 1 connected" mobile <## "remote controller 1 connected"
verifyRemoteCtrl mobile desktop verifyRemoteCtrl mobile desktop