nix

apps/multiplatform/android/src/main/java/chat/simplex/app/SimplexApp.kt

@@ -66,7 +66,7 @@ class SimplexApp: Application(), LifecycleEventObserver, Configuration.Provider
       }
     }
     context = this
-    initHaskell()
+    initHaskell(packageName)
     initMultiplatform()
     runMigrations()
     tmpDir.deleteRecursively()

apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/platform/AppCommon.android.kt

@@ -31,22 +31,19 @@ lateinit var androidAppContext: Context
 var mainActivity: WeakReference<FragmentActivity> = WeakReference(null)
 var callActivity: WeakReference<ComponentActivity> = WeakReference(null)
 
-fun initHaskell() {
-  val socketName = "chat.simplex.app.local.socket.address.listen.native.cmd2" + Random.nextLong(100000)
+fun initHaskell(packageName: String) {
   val s = Semaphore(0)
   thread(name="stdout/stderr pipe") {
     Log.d(TAG, "starting server")
-    var server: LocalServerSocket? = null
-    for (i in 0..100) {
-      try {
-        server = LocalServerSocket(socketName + i)
-        break
-      } catch (e: IOException) {
-        Log.e(TAG, e.stackTraceToString())
-      }
-    }
-    if (server == null) {
-      throw Error("Unable to setup local server socket. Contact developers")
+    val server: LocalServerSocket
+    try {
+      server = LocalServerSocket(packageName)
+    } catch (e: IOException) {
+      Log.e(TAG, e.stackTraceToString())
+      Log.e(TAG, "Unable to setup local server socket. Contact developers")
+      s.release()
+      // Will not have logs from backend
+      return@thread
     }
     Log.d(TAG, "started server")
     s.release()
@@ -60,7 +57,7 @@ fun initHaskell() {
       Log.d(TAG, "starting receiver loop")
       while (true) {
         val line = input.readLine() ?: break
-        Log.w("$TAG (stdout/stderr)", line)
+        Log.w(TAG, "(stdout/stderr) $line")
         logbuffer.add(line)
       }
       Log.w(TAG, "exited receiver loop")
@@ -70,7 +67,7 @@ fun initHaskell() {
   System.loadLibrary("app-lib")
 
   s.acquire()
-  pipeStdOutToSocket(socketName)
+  pipeStdOutToSocket(packageName)
 
   initHS()
 }

cabal.project

@@ -12,7 +12,7 @@ constraints: zip +disable-bzip2 +disable-zstd
 source-repository-package
     type: git
     location: https://github.com/simplex-chat/simplexmq.git
-    tag: f5e666ae4f41351d5d5ac416cd6fb1d5fadc8ab7
+    tag: 6302a32922884c4ac296a6ea0203da7fbc6b48fd
 
 source-repository-package
     type: git

scripts/nix/sha256map.nix

@@ -1,5 +1,5 @@
 {
-  "https://github.com/simplex-chat/simplexmq.git"."f5e666ae4f41351d5d5ac416cd6fb1d5fadc8ab7" = "1cq9apm9vp40v4ck0wcbis4463q3cjd9fbx5511hhh6lah6llifc";
+  "https://github.com/simplex-chat/simplexmq.git"."6302a32922884c4ac296a6ea0203da7fbc6b48fd" = "1y6sbqizrias40grzwir14xh61n3wxcxi61y3qgblhjmyqaxql87";
   "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";