Merge branch 'master' into master-android

scripts/android/copy-assets.sh

@@ -0,0 +1,21 @@
+#!/bin/sh
+set -eu
+
+# Copies generated multiplatform assets into the SimpleX assets directory.
+# Called by Gradle build when simplex.assets.dir property is set.
+#
+# Usage: copy-assets.sh <source-dir> <dest-dir>
+
+SRC_DIR="$1/multiplatform/resources/MR/images"
+DEST_DIR="$2/MR/images"
+
+if [ ! -d "$SRC_DIR" ]; then
+  echo "Error: source assets not found: $SRC_DIR (run resize.sh first)" >&2
+  exit 1
+fi
+
+rm -rf "$DEST_DIR"
+mkdir -p "$DEST_DIR"
+
+cp "$SRC_DIR"/* "$DEST_DIR/"
+echo "Copied multiplatform assets to $DEST_DIR"

scripts/ios/copy-assets.sh

@@ -0,0 +1,50 @@
+#!/bin/sh
+set -eu
+
+# Copies generated iOS assets into SimpleXAssets.xcassets.
+# Intended to run as an Xcode Run Script build phase.
+# Skips silently if SIMPLEX_ASSETS is not in SWIFT_ACTIVE_COMPILATION_CONDITIONS
+# or if the source directory is not found.
+#
+# The source path is resolved in order:
+#   1. Command-line argument
+#   2. SIMPLEX_ASSETS_DIR build setting (set in Local.xcconfig)
+#   3. No default — skips if neither is set
+#
+# Manual usage: ./scripts/copy-assets.sh path/to/assets
+
+# Skip if SIMPLEX_ASSETS flag is not set (unless run manually outside Xcode)
+if [ -n "${SWIFT_ACTIVE_COMPILATION_CONDITIONS:-}" ]; then
+  case " $SWIFT_ACTIVE_COMPILATION_CONDITIONS " in
+    *" SIMPLEX_ASSETS "*) ;;
+    *) exit 0 ;;
+  esac
+fi
+
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+IOS_DIR="$SCRIPT_DIR/../../apps/ios/Shared/SimpleXAssets.xcassets"
+
+ASSETS_ROOT="${1:-${SIMPLEX_ASSETS_DIR:-}}"
+if [ -z "$ASSETS_ROOT" ]; then
+  echo "warning: SIMPLEX_ASSETS_DIR not set and no path argument provided" >&2
+  exit 0
+fi
+
+SRC_DIR="$ASSETS_ROOT/ios/Assets.xcassets"
+
+if [ ! -d "$SRC_DIR" ]; then
+  echo "warning: source assets not found: $SRC_DIR (run resize.sh first)" >&2
+  exit 0
+fi
+
+# Remove old imagesets but keep root Contents.json
+find "$IOS_DIR" -name "*.imageset" -type d -exec rm -rf {} + 2>/dev/null || true
+
+# Copy imagesets
+for imageset in "$SRC_DIR"/*.imageset; do
+  [ -d "$imageset" ] || continue
+  cp -r "$imageset" "$IOS_DIR/"
+  echo "Copied $(basename "$imageset")"
+done
+
+echo "Done. Assets copied to $IOS_DIR"

scripts/nix/sha256map.nix

@@ -1,5 +1,5 @@
 {
-  "https://github.com/simplex-chat/simplexmq.git"."bc5ea42bec3a63e46b191e4150dd79957f114e01" = "0lswj7crfnwzh4g28kgxxl7g4i2a9pn03pxj7sqfqy3vs83m3bax";
+  "https://github.com/simplex-chat/simplexmq.git"."858fac7f4f821a2df6fbea03a1bfbb82ea9717c5" = "1fhzynf80db7h6y2wv61fsdfd80f0blja9ljsfh405r11yg2yxvi";
   "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";