From 8ef27de503e920db6f8126e8a47c1007db3ad4a1 Mon Sep 17 00:00:00 2001
From: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com>
Date: Fri, 8 Apr 2022 09:21:56 +0100
Subject: [PATCH] update simplexmq, cabal flag, fix tests

---
 cabal.project        | 2 +-
 flake.nix            | 2 +-
 sha256map.nix        | 2 +-
 stack.yaml           | 2 +-
 tests/MobileTests.hs | 8 ++++----
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/cabal.project b/cabal.project
index 37dd62c1ee..9f3a5af05e 100644
--- a/cabal.project
+++ b/cabal.project
@@ -3,7 +3,7 @@ packages: .
 source-repository-package
     type: git
     location: https://github.com/simplex-chat/simplexmq.git
-    tag: ac7ffc413e1ff0fd09082278878e9d63e3bdfeb8
+    tag: 390e99ca9552c01685dc91cd81b4151285c30b44
 
 source-repository-package
     type: git
diff --git a/flake.nix b/flake.nix
index 4a17194ff0..4b0ead6e98 100644
--- a/flake.nix
+++ b/flake.nix
@@ -214,7 +214,7 @@
             };
             "aarch64-darwin" = {
               # this is the aarch64-darwin iOS build (to be patched with mac2ios)
-              "aarch64-darwin-ios:lib:simplex-chat" = (drv' { pkgs' = pkgs; extra-modules = [{ packages.simplexmq.flags.swiftJSON = true; }]; } ).simplex-chat.components.library.override {
+              "aarch64-darwin-ios:lib:simplex-chat" = (drv' { pkgs' = pkgs; extra-modules = [{ packages.simplexmq.flags.swift = true; }]; } ).simplex-chat.components.library.override {
                 smallAddressSpace = true; enableShared = false;
                 # we need threaded here, otherwise all the queing logic doesn't work properly.
                 # for iOS we also use -staticlib, to get one rolled up library.
diff --git a/sha256map.nix b/sha256map.nix
index abc341216e..466f2b7947 100644
--- a/sha256map.nix
+++ b/sha256map.nix
@@ -1,5 +1,5 @@
 {
-  "https://github.com/simplex-chat/simplexmq.git"."ac7ffc413e1ff0fd09082278878e9d63e3bdfeb8" = "1lsp2x1sm5bpmax6ngwnmn8hb5812mqigszjxigip69kyaq5nn2s";
+  "https://github.com/simplex-chat/simplexmq.git"."390e99ca9552c01685dc91cd81b4151285c30b44" = "0d3g2n9rxwdc948mn726mf932xsgasqzc8p81xdyq0ii520apsx9";
   "https://github.com/simplex-chat/aeson.git"."3eb66f9a68f103b5f1489382aad89f5712a64db7" = "0kilkx59fl6c3qy3kjczqvm8c3f4n3p0bdk9biyflf51ljnzp4yp";
   "https://github.com/simplex-chat/haskell-terminal.git"."f708b00009b54890172068f168bf98508ffcd495" = "0zmq7lmfsk8m340g47g5963yba7i88n4afa6z93sg9px5jv1mijj";
   "https://github.com/zw3rk/android-support.git"."3c3a5ab0b8b137a072c98d3d0937cbdc96918ddb" = "1r6jyxbim3dsvrmakqfyxbd6ms6miaghpbwyl0sr6dzwpgaprz97";
diff --git a/stack.yaml b/stack.yaml
index ff5608a855..23db2b0e95 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -49,7 +49,7 @@ extra-deps:
   # - simplexmq-1.0.0@sha256:34b2004728ae396e3ae449cd090ba7410781e2b3cefc59259915f4ca5daa9ea8,8561
   # - ../simplexmq
   - github: simplex-chat/simplexmq
-    commit: ac7ffc413e1ff0fd09082278878e9d63e3bdfeb8
+    commit: 390e99ca9552c01685dc91cd81b4151285c30b44
   # - terminal-0.2.0.0@sha256:de6770ecaae3197c66ac1f0db5a80cf5a5b1d3b64a66a05b50f442de5ad39570,2977
   - github: simplex-chat/aeson
     commit: 3eb66f9a68f103b5f1489382aad89f5712a64db7
diff --git a/tests/MobileTests.hs b/tests/MobileTests.hs
index ce9add0e8a..0ca78fa798 100644
--- a/tests/MobileTests.hs
+++ b/tests/MobileTests.hs
@@ -16,28 +16,28 @@ mobileTests = do
     it "start new chat with existing user" testChatApi
 
 noActiveUser :: String
-#if defined(darwin_HOST_OS)
+#if defined(darwin_HOST_OS) && defined(swiftJSON)
 noActiveUser = "{\"resp\":{\"chatCmdError\":{\"chatError\":{\"error\":{\"errorType\":{\"noActiveUser\":{}}}}}}}"
 #else
 noActiveUser = "{\"resp\":{\"type\":\"chatCmdError\",\"chatError\":{\"type\":\"error\",\"errorType\":{\"type\":\"noActiveUser\"}}}}"
 #endif
 
 activeUserExists :: String
-#if defined(darwin_HOST_OS)
+#if defined(darwin_HOST_OS) && defined(swiftJSON)
 activeUserExists = "{\"resp\":{\"chatCmdError\":{\"chatError\":{\"error\":{\"errorType\":{\"activeUserExists\":{}}}}}}}"
 #else
 activeUserExists = "{\"resp\":{\"type\":\"chatCmdError\",\"chatError\":{\"type\":\"error\",\"errorType\":{\"type\":\"activeUserExists\"}}}}"
 #endif
 
 activeUser :: String
-#if defined(darwin_HOST_OS)
+#if defined(darwin_HOST_OS) && defined(swiftJSON)
 activeUser = "{\"resp\":{\"activeUser\":{\"user\":{\"userId\":1,\"userContactId\":1,\"localDisplayName\":\"alice\",\"profile\":{\"displayName\":\"alice\",\"fullName\":\"Alice\"},\"activeUser\":true}}}}"
 #else
 activeUser = "{\"resp\":{\"type\":\"activeUser\",\"user\":{\"userId\":1,\"userContactId\":1,\"localDisplayName\":\"alice\",\"profile\":{\"displayName\":\"alice\",\"fullName\":\"Alice\"},\"activeUser\":true}}}"
 #endif
 
 chatStarted :: String
-#if defined(darwin_HOST_OS)
+#if defined(darwin_HOST_OS) && defined(swiftJSON)
 chatStarted = "{\"resp\":{\"chatStarted\":{}}}"
 #else
 chatStarted = "{\"resp\":{\"type\":\"chatStarted\"}}"