Merge branch 'master' into master-ghc8107

tests/ChatTests/Direct.hs

@@ -119,6 +119,8 @@ chatDirectTests = do
       testReqVRange vr11 supportedChatVRange
       testReqVRange vr11 vr11
     it "update peer version range on received messages" testUpdatePeerChatVRange
+  describe "network statuses" $ do
+    it "should get network statuses" testGetNetworkStatuses
   where
     testInvVRange vr1 vr2 = it (vRangeStr vr1 <> " - " <> vRangeStr vr2) $ testConnInvChatVRange vr1 vr2
     testReqVRange vr1 vr2 = it (vRangeStr vr1 <> " - " <> vRangeStr vr2) $ testConnReqChatVRange vr1 vr2
@@ -2623,6 +2625,20 @@ testUpdatePeerChatVRange tmp =
   where
     cfg11 = testCfg {chatVRange = vr11} :: ChatConfig
 
+testGetNetworkStatuses :: HasCallStack => FilePath -> IO ()
+testGetNetworkStatuses tmp = do
+  withNewTestChatCfg tmp cfg "alice" aliceProfile $ \alice -> do
+    withNewTestChatCfg tmp cfg "bob" bobProfile $ \bob -> do
+      connectUsers alice bob
+      alice ##> "/_network_statuses"
+      alice <## "1 connections connected"
+  withTestChatCfg tmp cfg "alice" $ \alice ->
+    withTestChatCfg tmp cfg "bob" $ \bob -> do
+      alice <## "1 connections connected"
+      bob <## "1 connections connected"
+  where
+    cfg = testCfg {coreApi = True}
+
 vr11 :: VersionRange
 vr11 = mkVersionRange 1 1
 

tests/ChatTests/Files.hs

@@ -31,6 +31,7 @@ chatFileTests = do
     describe "send and receive file" $ fileTestMatrix2 runTestFileTransfer
     describe "send file, receive and locally encrypt file" $ fileTestMatrix2 runTestFileTransferEncrypted
     it "send and receive file inline (without accepting)" testInlineFileTransfer
+    it "send inline file, receive (without accepting) and locally encrypt" testInlineFileTransferEncrypted
     xit'' "accept inline file transfer, sender cancels during transfer" testAcceptInlineFileSndCancelDuringTransfer
     it "send and receive small file inline (default config)" testSmallInlineFileTransfer
     it "small file sent without acceptance is ignored in terminal by default" testSmallInlineFileIgnored
@@ -105,7 +106,6 @@ runTestFileTransferEncrypted alice bob = do
   bob <## "use /fr 1 [<dir>/ | <path>] to receive it"
   bob ##> "/fr 1 encrypt=on ./tests/tmp"
   bob <## "saving file 1 from alice to ./tests/tmp/test.pdf"
-  Just (CFArgs key nonce) <- J.decode . LB.pack <$> getTermLine bob
   concurrently_
     (bob <## "started receiving file 1 (test.pdf) from alice")
     (alice <## "started sending file 1 (test.pdf) to bob")
@@ -121,6 +121,7 @@ runTestFileTransferEncrypted alice bob = do
                "completed sending file 1 (test.pdf) to bob"
              ]
     ]
+  Just (CFArgs key nonce) <- J.decode . LB.pack <$> getTermLine bob
   src <- B.readFile "./tests/fixtures/test.pdf"
   -- dest <- B.readFile "./tests/tmp/test.pdf"
   -- dest `shouldBe` src
@@ -152,6 +153,34 @@ testInlineFileTransfer =
   where
     cfg = testCfg {inlineFiles = defaultInlineFilesConfig {offerChunks = 100, sendChunks = 100, receiveChunks = 100}}
 
+testInlineFileTransferEncrypted :: HasCallStack => FilePath -> IO ()
+testInlineFileTransferEncrypted =
+  testChatCfg2 cfg aliceProfile bobProfile $ \alice bob -> do
+    connectUsers alice bob
+    bob ##> "/_files_folder ./tests/tmp/"
+    bob <## "ok"
+    bob ##> "/_files_encrypt on"
+    bob <## "ok"
+    alice ##> "/_send @2 json {\"msgContent\":{\"type\":\"voice\", \"duration\":10, \"text\":\"\"}, \"filePath\":\"./tests/fixtures/test.jpg\"}"
+    alice <# "@bob voice message (00:10)"
+    alice <# "/f @bob ./tests/fixtures/test.jpg"
+    -- below is not shown in "sent" mode
+    -- alice <## "use /fc 1 to cancel sending"
+    bob <# "alice> voice message (00:10)"
+    bob <# "alice> sends file test.jpg (136.5 KiB / 139737 bytes)"
+    -- below is not shown in "sent" mode
+    -- bob <## "use /fr 1 [<dir>/ | <path>] to receive it"
+    bob <## "started receiving file 1 (test.jpg) from alice"
+    concurrently_
+      (alice <## "completed sending file 1 (test.jpg) to bob")
+      (bob <## "completed receiving file 1 (test.jpg) from alice")
+    Just (CFArgs key nonce) <- J.decode . LB.pack <$> getTermLine bob
+    src <- B.readFile "./tests/fixtures/test.jpg"
+    Right dest <- chatReadFile "./tests/tmp/test.jpg" (strEncode key) (strEncode nonce)
+    LB.toStrict dest `shouldBe` src
+  where
+    cfg = testCfg {inlineFiles = defaultInlineFilesConfig {offerChunks = 100, sendChunks = 100, receiveChunks = 100}}
+
 testAcceptInlineFileSndCancelDuringTransfer :: HasCallStack => FilePath -> IO ()
 testAcceptInlineFileSndCancelDuringTransfer =
   testChatCfg2 cfg aliceProfile bobProfile $ \alice bob -> do
@@ -1075,10 +1104,10 @@ testXFTPFileTransferEncrypted =
       bob <## "use /fr 1 [<dir>/ | <path>] to receive it"
       bob ##> "/fr 1 encrypt=on ./tests/tmp/bob/"
       bob <## "saving file 1 from alice to ./tests/tmp/bob/test.pdf"
-      Just (CFArgs key nonce) <- J.decode . LB.pack <$> getTermLine bob
       alice <## "completed uploading file 1 (test.pdf) for bob"
       bob <## "started receiving file 1 (test.pdf) from alice"
       bob <## "completed receiving file 1 (test.pdf) from alice"
+      Just (CFArgs key nonce) <- J.decode . LB.pack <$> getTermLine bob
       Right dest <- chatReadFile "./tests/tmp/bob/test.pdf" (strEncode key) (strEncode nonce)
       LB.length dest `shouldBe` fromIntegral srcLen
       LB.toStrict dest `shouldBe` src

tests/ChatTests/Groups.hs

@@ -2461,7 +2461,7 @@ testPlanGroupLinkLeaveRejoin =
       concurrentlyN_
         [ alice
             <### [ "bob_1 (Bob): contact is connected",
-                   "bob_1 invited to group #team via your group link",
+                   EndsWith "invited to group #team via your group link",
                    EndsWith "joined the group",
                    "contact bob_1 is merged into bob",
                    "use @bob <message> to send messages"
@@ -3278,7 +3278,7 @@ testMemberContactInvitedConnectionReplaced tmp = do
 
         bob ##> "/_get chat @2 count=100"
         items <- chat <$> getTermLine bob
-        items `shouldContain` [(0, "received invitation to join group team as admin"), (0, "contact deleted"), (0, "hi"), (0, "security code changed")]
+        items `shouldContain` [(0, "security code changed")]
 
     withTestChat tmp "bob" $ \bob -> do
       subscriptions bob 1

tests/ChatTests/Profiles.hs

@@ -650,8 +650,10 @@ testPlanAddressConnecting tmp = do
     alice ##> "/ad"
     getContactLink alice True
   withNewTestChat tmp "bob" bobProfile $ \bob -> do
+    threadDelay 100000
     bob ##> ("/c " <> cLink)
     bob <## "connection request sent!"
+    threadDelay 100000
   withTestChat tmp "alice" $ \alice -> do
     alice <## "Your address is active! To show: /sa"
     alice <## "bob (Bob) wants to connect to you!"

tests/MobileTests.hs

@@ -120,19 +120,19 @@ chatStartedSwift = "{\"resp\":{\"_owsf\":true,\"chatStarted\":{}}}"
 chatStartedTagged :: LB.ByteString
 chatStartedTagged = "{\"resp\":{\"type\":\"chatStarted\"}}"
 
-contactSubSummary :: LB.ByteString
-contactSubSummary =
+networkStatuses :: LB.ByteString
+networkStatuses =
 #if defined(darwin_HOST_OS) && defined(swiftJSON)
-  contactSubSummarySwift
+  networkStatusesSwift
 #else
-  contactSubSummaryTagged
+  networkStatusesTagged
 #endif
 
-contactSubSummarySwift :: LB.ByteString
-contactSubSummarySwift = "{\"resp\":{\"_owsf\":true,\"contactSubSummary\":{" <> userJSON <> ",\"contactSubscriptions\":[]}}}"
+networkStatusesSwift :: LB.ByteString
+networkStatusesSwift = "{\"resp\":{\"_owsf\":true,\"networkStatuses\":{\"user_\":" <> userJSON <> ",\"networkStatuses\":[]}}}"
 
-contactSubSummaryTagged :: LB.ByteString
-contactSubSummaryTagged = "{\"resp\":{\"type\":\"contactSubSummary\"," <> userJSON <> ",\"contactSubscriptions\":[]}}"
+networkStatusesTagged :: LB.ByteString
+networkStatusesTagged = "{\"resp\":{\"type\":\"networkStatuses\",\"user_\":" <> userJSON <> ",\"networkStatuses\":[]}}"
 
 memberSubSummary :: LB.ByteString
 memberSubSummary =
@@ -143,10 +143,10 @@ memberSubSummary =
 #endif
 
 memberSubSummarySwift :: LB.ByteString
-memberSubSummarySwift = "{\"resp\":{\"_owsf\":true,\"memberSubSummary\":{" <> userJSON <> ",\"memberSubscriptions\":[]}}}"
+memberSubSummarySwift = "{\"resp\":{\"_owsf\":true,\"memberSubSummary\":{\"user\":" <> userJSON <> ",\"memberSubscriptions\":[]}}}"
 
 memberSubSummaryTagged :: LB.ByteString
-memberSubSummaryTagged = "{\"resp\":{\"type\":\"memberSubSummary\"," <> userJSON <> ",\"memberSubscriptions\":[]}}"
+memberSubSummaryTagged = "{\"resp\":{\"type\":\"memberSubSummary\",\"user\":" <> userJSON <> ",\"memberSubscriptions\":[]}}"
 
 userContactSubSummary :: LB.ByteString
 userContactSubSummary =
@@ -157,10 +157,10 @@ userContactSubSummary =
 #endif
 
 userContactSubSummarySwift :: LB.ByteString
-userContactSubSummarySwift = "{\"resp\":{\"_owsf\":true,\"userContactSubSummary\":{" <> userJSON <> ",\"userContactSubscriptions\":[]}}}"
+userContactSubSummarySwift = "{\"resp\":{\"_owsf\":true,\"userContactSubSummary\":{\"user\":" <> userJSON <> ",\"userContactSubscriptions\":[]}}}"
 
 userContactSubSummaryTagged :: LB.ByteString
-userContactSubSummaryTagged = "{\"resp\":{\"type\":\"userContactSubSummary\"," <> userJSON <> ",\"userContactSubscriptions\":[]}}"
+userContactSubSummaryTagged = "{\"resp\":{\"type\":\"userContactSubSummary\",\"user\":" <> userJSON <> ",\"userContactSubscriptions\":[]}}"
 
 pendingSubSummary :: LB.ByteString
 pendingSubSummary =
@@ -171,13 +171,13 @@ pendingSubSummary =
 #endif
 
 pendingSubSummarySwift :: LB.ByteString
-pendingSubSummarySwift = "{\"resp\":{\"_owsf\":true,\"pendingSubSummary\":{" <> userJSON <> ",\"pendingSubscriptions\":[]}}}"
+pendingSubSummarySwift = "{\"resp\":{\"_owsf\":true,\"pendingSubSummary\":{\"user\":" <> userJSON <> ",\"pendingSubscriptions\":[]}}}"
 
 pendingSubSummaryTagged :: LB.ByteString
-pendingSubSummaryTagged = "{\"resp\":{\"type\":\"pendingSubSummary\"," <> userJSON <> ",\"pendingSubscriptions\":[]}}"
+pendingSubSummaryTagged = "{\"resp\":{\"type\":\"pendingSubSummary\",\"user\":" <> userJSON <> ",\"pendingSubscriptions\":[]}}"
 
 userJSON :: LB.ByteString
-userJSON = "\"user\":{\"userId\":1,\"agentUserId\":\"1\",\"userContactId\":1,\"localDisplayName\":\"alice\",\"profile\":{\"profileId\":1,\"displayName\":\"alice\",\"fullName\":\"Alice\",\"localAlias\":\"\"},\"fullPreferences\":{\"timedMessages\":{\"allow\":\"yes\"},\"fullDelete\":{\"allow\":\"no\"},\"reactions\":{\"allow\":\"yes\"},\"voice\":{\"allow\":\"yes\"},\"calls\":{\"allow\":\"yes\"}},\"activeUser\":true,\"showNtfs\":true,\"sendRcptsContacts\":true,\"sendRcptsSmallGroups\":true}"
+userJSON = "{\"userId\":1,\"agentUserId\":\"1\",\"userContactId\":1,\"localDisplayName\":\"alice\",\"profile\":{\"profileId\":1,\"displayName\":\"alice\",\"fullName\":\"Alice\",\"localAlias\":\"\"},\"fullPreferences\":{\"timedMessages\":{\"allow\":\"yes\"},\"fullDelete\":{\"allow\":\"no\"},\"reactions\":{\"allow\":\"yes\"},\"voice\":{\"allow\":\"yes\"},\"calls\":{\"allow\":\"yes\"}},\"activeUser\":true,\"showNtfs\":true,\"sendRcptsContacts\":true,\"sendRcptsSmallGroups\":true}"
 
 parsedMarkdown :: LB.ByteString
 parsedMarkdown =
@@ -215,7 +215,7 @@ testChatApi tmp = do
   chatSendCmd cc "/u" `shouldReturn` activeUser
   chatSendCmd cc "/create user alice Alice" `shouldReturn` activeUserExists
   chatSendCmd cc "/_start" `shouldReturn` chatStarted
-  chatRecvMsg cc `shouldReturn` contactSubSummary
+  chatRecvMsg cc `shouldReturn` networkStatuses
   chatRecvMsg cc `shouldReturn` userContactSubSummary
   chatRecvMsg cc `shouldReturn` memberSubSummary
   chatRecvMsgWait cc 10000 `shouldReturn` pendingSubSummary