From 47cd7de1ae2d6b0eca0df79389af108c3ce82a41 Mon Sep 17 00:00:00 2001 From: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com> Date: Tue, 21 Nov 2023 00:00:29 +0000 Subject: [PATCH] core: 5.4.0.4 --- package.yaml | 2 +- simplex-chat.cabal | 2 +- src/Simplex/Chat/Remote.hs | 4 ++-- tests/RemoteTests.hs | 12 ++++++------ 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package.yaml b/package.yaml index 386df150aa..da9de37131 100644 --- a/package.yaml +++ b/package.yaml @@ -1,5 +1,5 @@ name: simplex-chat -version: 5.4.0.3 +version: 5.4.0.4 #synopsis: #description: homepage: https://github.com/simplex-chat/simplex-chat#readme diff --git a/simplex-chat.cabal b/simplex-chat.cabal index abcfcc4c45..d33ffe8b54 100644 --- a/simplex-chat.cabal +++ b/simplex-chat.cabal @@ -5,7 +5,7 @@ cabal-version: 1.12 -- see: https://github.com/sol/hpack name: simplex-chat -version: 5.4.0.3 +version: 5.4.0.4 category: Web, System, Services, Cryptography homepage: https://github.com/simplex-chat/simplex-chat#readme author: simplex.chat diff --git a/src/Simplex/Chat/Remote.hs b/src/Simplex/Chat/Remote.hs index d9ef5bd648..d8d53aa0c4 100644 --- a/src/Simplex/Chat/Remote.hs +++ b/src/Simplex/Chat/Remote.hs @@ -71,11 +71,11 @@ import UnliftIO.Directory (copyFile, createDirectoryIfMissing, doesDirectoryExis -- when acting as host minRemoteCtrlVersion :: AppVersion -minRemoteCtrlVersion = AppVersion [5, 4, 0, 3] +minRemoteCtrlVersion = AppVersion [5, 4, 0, 4] -- when acting as controller minRemoteHostVersion :: AppVersion -minRemoteHostVersion = AppVersion [5, 4, 0, 3] +minRemoteHostVersion = AppVersion [5, 4, 0, 4] currentAppVersion :: AppVersion currentAppVersion = AppVersion SC.version diff --git a/tests/RemoteTests.hs b/tests/RemoteTests.hs index c734c94dbe..b7b34999b0 100644 --- a/tests/RemoteTests.hs +++ b/tests/RemoteTests.hs @@ -15,7 +15,7 @@ import Data.List.NonEmpty (NonEmpty (..)) import qualified Data.Map.Strict as M import qualified Network.TLS as TLS 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 Simplex.Chat.Mobile.File import Simplex.Chat.Remote.Types @@ -120,12 +120,12 @@ remoteHandshakeRejectTest = testChat3 aliceProfile aliceDesktopProfile bobProfil desktop <## "Remote session invitation:" inv <- getTermLine desktop 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" -- the server remains active after rejecting invalid client 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 <## "Compare session code with host:" sessId <- getTermLine desktop @@ -429,7 +429,7 @@ startRemote mobile desktop = do desktop <## "Remote session invitation:" inv <- getTermLine desktop 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" mobile <## "new remote controller connected" verifyRemoteCtrl mobile desktop @@ -444,7 +444,7 @@ startRemoteStored mobile desktop = do desktop <## "Remote session invitation:" inv <- getTermLine desktop 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" mobile <## "remote controller 1 connected" verifyRemoteCtrl mobile desktop @@ -463,7 +463,7 @@ startRemoteDiscover mobile desktop = do mobile <## "1. My desktop" 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" mobile <## "remote controller 1 connected" verifyRemoteCtrl mobile desktop