Merge branch 'master-ghc8107' into master-android

apps/multiplatform/common/build.gradle.kts

@@ -223,8 +223,8 @@ afterEvaluate {
         return this
       }
       val fileRegex = Regex("MR/../strings.xml$|MR/..-.../strings.xml$|MR/..-../strings.xml$|MR/base/strings.xml$")
-      val tree = kotlin.sourceSets["commonMain"].resources.filter { fileRegex.containsMatchIn(it.absolutePath) }.asFileTree
-      val baseStringsFile = tree.first { it.absolutePath.endsWith("base/strings.xml") } ?: throw Exception("No base/strings.xml found")
+      val tree = kotlin.sourceSets["commonMain"].resources.filter { fileRegex.containsMatchIn(it.absolutePath.replace("\\", "/")) }.asFileTree
+      val baseStringsFile = tree.firstOrNull { it.absolutePath.replace("\\", "/").endsWith("base/strings.xml") } ?: throw Exception("No base/strings.xml found")
       val treeList = ArrayList(tree.toList())
       treeList.remove(baseStringsFile)
       treeList.add(0, baseStringsFile)

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/ChatModel.kt

@@ -58,7 +58,7 @@ object ChatModel {
   val chatItemStatuses = mutableMapOf<Long, CIStatus>()
   val groupMembers = mutableStateListOf<GroupMember>()
 
-  val terminalItems = mutableStateListOf<TerminalItem>()
+  val terminalItems = mutableStateOf<List<TerminalItem>>(listOf())
   val userAddress = mutableStateOf<UserContactLinkRec?>(null)
   // Allows to temporary save servers that are being edited on multiple screens
   val userSMPServersUnsaved = mutableStateOf<(List<ServerCfg>)?>(null)
@@ -620,10 +620,10 @@ object ChatModel {
   }
 
   fun addTerminalItem(item: TerminalItem) {
-    if (terminalItems.size >= 500) {
-      terminalItems.removeAt(0)
+    if (terminalItems.value.size >= 500) {
+      terminalItems.value = terminalItems.value.subList(1, terminalItems.value.size)
     }
-    terminalItems.add(item)
+    terminalItems.value += item
   }
 
   val connectedToRemote: Boolean @Composable get() = currentRemoteHost.value != null || remoteCtrlSession.value?.active == true

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/TerminalView.kt

@@ -34,7 +34,6 @@ fun TerminalView(chatModel: ChatModel, close: () -> Unit) {
     close()
   })
   TerminalLayout(
-    remember { chatModel.terminalItems },
     composeState,
     sendCommand = { sendCommand(chatModel, composeState) },
     close
@@ -63,7 +62,6 @@ private fun sendCommand(chatModel: ChatModel, composeState: MutableState<Compose
 
 @Composable
 fun TerminalLayout(
-  terminalItems: List<TerminalItem>,
   composeState: MutableState<ComposeState>,
   sendCommand: () -> Unit,
   close: () -> Unit
@@ -111,7 +109,7 @@ fun TerminalLayout(
           .fillMaxWidth(),
         color = MaterialTheme.colors.background
       ) {
-        TerminalLog(terminalItems)
+        TerminalLog()
       }
     }
   }
@@ -120,22 +118,13 @@ fun TerminalLayout(
 private var lazyListState = 0 to 0
 
 @Composable
-fun TerminalLog(terminalItems: List<TerminalItem>) {
+fun TerminalLog() {
   val listState = rememberLazyListState(lazyListState.first, lazyListState.second)
   DisposableEffect(Unit) {
     onDispose { lazyListState = listState.firstVisibleItemIndex to listState.firstVisibleItemScrollOffset }
   }
   val reversedTerminalItems by remember {
-    derivedStateOf {
-      // Such logic prevents concurrent modification
-      val res = ArrayList<TerminalItem>()
-      var i = 0
-      while (i < terminalItems.size) {
-        res.add(terminalItems[i])
-        i++
-      }
-      res.asReversed()
-    }
+    derivedStateOf { chatModel.terminalItems.value.asReversed() }
   }
   val clipboard = LocalClipboardManager.current
   LazyColumn(state = listState, reverseLayout = true) {
@@ -175,7 +164,6 @@ fun TerminalLog(terminalItems: List<TerminalItem>) {
 fun PreviewTerminalLayout() {
   SimpleXTheme {
     TerminalLayout(
-      terminalItems = TerminalItem.sampleData,
       composeState = remember { mutableStateOf(ComposeState(useLinkPreviews = false)) },
       sendCommand = {},
       close = {}

cabal.project

@@ -14,7 +14,7 @@ constraints: zip +disable-bzip2 +disable-zstd
 source-repository-package
     type: git
     location: https://github.com/simplex-chat/simplexmq.git
-    tag: 22e193237227ed4d243ec9cac8d8249f757d9601
+    tag: d0588bd0ac23a459cbfc9a4789633014e91ffa19
 
 source-repository-package
     type: git

package.yaml

@@ -1,5 +1,5 @@
 name: simplex-chat
-version: 5.4.2.0
+version: 5.4.2.1
 #synopsis:
 #description:
 homepage: https://github.com/simplex-chat/simplex-chat#readme

scripts/nix/sha256map.nix

@@ -1,5 +1,5 @@
 {
-  "https://github.com/simplex-chat/simplexmq.git"."22e193237227ed4d243ec9cac8d8249f757d9601" = "01h16jc0g5pqdq56k1n0afl2248ln2d11l662ikl6hdn3p3zab0d";
+  "https://github.com/simplex-chat/simplexmq.git"."d0588bd0ac23a459cbfc9a4789633014e91ffa19" = "0b17qy74capb0jyli8f3pg1xi4aawhcgpmaz2ykl9g3605png1na";
   "https://github.com/simplex-chat/hs-socks.git"."a30cc7a79a08d8108316094f8f2f82a0c5e1ac51" = "0yasvnr7g91k76mjkamvzab2kvlb1g5pspjyjn2fr6v83swjhj38";
   "https://github.com/simplex-chat/direct-sqlcipher.git"."f814ee68b16a9447fbb467ccc8f29bdd3546bfd9" = "1ql13f4kfwkbaq7nygkxgw84213i0zm7c1a8hwvramayxl38dq5d";
   "https://github.com/simplex-chat/sqlcipher-simple.git"."a46bd361a19376c5211f1058908fc0ae6bf42446" = "1z0r78d8f0812kxbgsm735qf6xx8lvaz27k1a0b4a2m0sshpd5gl";

simplex-chat.cabal

@@ -5,7 +5,7 @@ cabal-version: 1.12
 -- see: https://github.com/sol/hpack
 
 name:           simplex-chat
-version:        5.4.2.0
+version:        5.4.2.1
 category:       Web, System, Services, Cryptography
 homepage:       https://github.com/simplex-chat/simplex-chat#readme
 author:         simplex.chat

src/Simplex/Chat.hs

@@ -2855,8 +2855,8 @@ subscribeUserConnections vr onlyNeeded agentBatchSubscribe user@User {userId} =
     getContactConns :: m ([ConnId], Map ConnId Contact)
     getContactConns = do
       cts <- withStore_ ("subscribeUserConnections " <> show userId <> ", getUserContacts") getUserContacts
-      let connIds = mapMaybe contactConnId (filter contactActive cts)
-      pure (connIds, M.fromList $ zip connIds cts)
+      let cts' = mapMaybe (\ct -> (,ct) <$> contactConnId ct) $ filter contactActive cts
+      pure (map fst cts', M.fromList cts')
     getUserContactLinkConns :: m ([ConnId], Map ConnId UserContact)
     getUserContactLinkConns = do
       (cs, ucs) <- unzip <$> withStore_ ("subscribeUserConnections " <> show userId <> ", getUserContactLinks") getUserContactLinks

src/Simplex/Chat/Remote.hs

@@ -72,11 +72,11 @@ import UnliftIO.Directory (copyFile, createDirectoryIfMissing, doesDirectoryExis
 
 -- when acting as host
 minRemoteCtrlVersion :: AppVersion
-minRemoteCtrlVersion = AppVersion [5, 4, 0, 4]
+minRemoteCtrlVersion = AppVersion [5, 4, 2, 0]
 
 -- when acting as controller
 minRemoteHostVersion :: AppVersion
-minRemoteHostVersion = AppVersion [5, 4, 0, 4]
+minRemoteHostVersion = AppVersion [5, 4, 2, 0]
 
 currentAppVersion :: AppVersion
 currentAppVersion = AppVersion SC.version

tests/ChatClient.hs

@@ -405,6 +405,7 @@ xftpServerConfig =
       allowNewFiles = True,
       newFileBasicAuth = Nothing,
       fileExpiration = Just defaultFileExpiration,
+      inactiveClientExpiration = Just defaultInactiveClientExpiration,
       caCertificateFile = "tests/fixtures/tls/ca.crt",
       privateKeyFile = "tests/fixtures/tls/server.key",
       certificateFile = "tests/fixtures/tls/server.crt",