flatpak: update metainfo (#5381)

.github/workflows/build.yml

@@ -150,13 +150,9 @@ jobs:
         if: startsWith(github.ref, 'refs/tags/v') && matrix.asset_name && matrix.os == 'ubuntu-20.04'
         run: sudo apt install -y desktop-file-utils
 
-      - name: Install Linux dependencies
-        if: matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-22.04'
-        run: sudo apt install -y libturbojpeg0-dev
-
-      - name: Install pkg-config for Mac
+      - name: Install openssl for Mac
         if: matrix.os == 'macos-latest' || matrix.os == 'macos-13'
-        run: brew install openssl@3.0 pkg-config jpeg-turbo
+        run: brew install openssl@3.0
 
       - name: Unix prepare cabal.project.local for Ubuntu
         if: matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-22.04'
@@ -326,7 +322,6 @@ jobs:
             git
             perl
             make
-            mingw-w64-x86_64-libjpeg-turbo
           pacboy: >-
             toolchain:p
             cmake:p

apps/ios/SimpleXChat/CryptoFile.swift

@@ -25,18 +25,6 @@ public func writeCryptoFile(path: String, data: Data) throws -> CryptoFileArgs {
     }
 }
 
-public func writeCryptoImage(maxSize: Int, path: String, data: Data, encrypted: Bool) throws -> CryptoFileArgs {
-    let ptr: UnsafeMutableRawPointer = malloc(data.count)
-    memcpy(ptr, (data as NSData).bytes, data.count)
-    var cPath = path.cString(using: .utf8)!
-    let cjson = chat_write_image(getChatCtrl(), maxSize, &cPath, ptr, Int32(data.count), encrypted)!
-    let d = fromCString(cjson).data(using: .utf8)!
-    switch try jsonDecoder.decode(WriteFileResult.self, from: d) {
-    case let .result(cfArgs): return cfArgs
-    case let .error(err): throw RuntimeError(err)
-    }
-}
-
 public func readCryptoFile(path: String, cryptoArgs: CryptoFileArgs) throws -> Data {
     var cPath = path.cString(using: .utf8)!
     var cKey = cryptoArgs.fileKey.cString(using: .utf8)!

apps/ios/SimpleXChat/FileUtils.swift

@@ -223,17 +223,6 @@ public func saveFile(_ data: Data, _ fileName: String, encrypted: Bool) -> Crypt
     }
 }
 
-public func saveImage(_ data: Data, _ fileName: String, maxSize: Long, encrypted: Bool) -> CryptoFile? {
-    let filePath = getAppFilePath(fileName)
-    do {
-        let cfArgs = try writeCryptoImage(maxSize: maxSize, path: filePath.path, data: data, encrypted: encrypted)
-        return CryptoFile(filePath: fileName, cryptoArgs: cfArgs)
-    } catch {
-        logger.error("FileUtils.saveImage error: \(error.localizedDescription)")
-        return nil
-    }
-}
-
 public func removeFile(_ url: URL) {
     do {
         try FileManager.default.removeItem(atPath: url.path)

apps/ios/SimpleXChat/ImageUtils.swift

@@ -101,27 +101,19 @@ public func resizeImageToDataSize(_ image: UIImage, maxDataSize: Int64, hasAlpha
 }
 
 public func resizeImageToStrSizeSync(_ image: UIImage, maxDataSize: Int64) -> String? {
-    // XXX: only needed when the original encoding isn't available
-    let tmpFile = generateNewFileName(getTempFilesDirectory().path + "/" + "resize", "png", fullPath: true)
-    // encode as png and let the backend deal with alpha and formats
-    guard let d = image.pngData() else { return nil }
-    if let _ = saveFile(d, tmpFile, encrypted: false) {
-        defer { removeFile(tmpFile) }
-        let ptr = chat_resize_image_to_str_size(tmpFile, maxDataSize)
-        if let ptr = ptr {
-            let str = fromCString(ptr)
-            let dataSize = str.count
-            if dataSize <= 0 { return nil }
-            logger.debug("resizeImageToStrSize final \(dataSize)")
-            return str
-        } else {
-            logger.error("resizeImageToStrSize failed")
-            return nil
-        }
-    } else {
-        logger.error("saveFile failed")
-        return nil
+    var img = image
+    let hasAlpha = imageHasAlpha(image)
+    var str = compressImageStr(img, hasAlpha: hasAlpha)
+    var dataSize = str?.count ?? 0
+    while dataSize != 0 && dataSize > maxDataSize {
+        let ratio = sqrt(Double(dataSize) / Double(maxDataSize))
+        let clippedRatio = min(ratio, 2.0)
+        img = reduceSize(img, ratio: clippedRatio, hasAlpha: hasAlpha)
+        str = compressImageStr(img, hasAlpha: hasAlpha)
+        dataSize = str?.count ?? 0
     }
+    logger.debug("resizeImageToStrSize final \(dataSize)")
+    return str
 }
 
 public func resizeImageToStrSize(_ image: UIImage, maxDataSize: Int64) async -> String? {
@@ -319,7 +311,7 @@ private func getTimestamp() -> String {
 }
 
 public func dropImagePrefix(_ s: String) -> String {
-    dropPrefix(dropPrefix(dropPrefix(s, "data:image/png;base64,"), "data:image/jpg;base64,"), "data:image/jpeg;base64,")
+    dropPrefix(dropPrefix(s, "data:image/png;base64,"), "data:image/jpg;base64,")
 }
 
 private func dropPrefix(_ s: String, _ prefix: String) -> String {

apps/ios/SimpleXChat/SimpleX.h

@@ -29,14 +29,10 @@ extern char *chat_valid_name(char *name);
 extern int chat_json_length(char *str);
 extern char *chat_encrypt_media(chat_ctrl ctl, char *key, char *frame, int len);
 extern char *chat_decrypt_media(char *key, char *frame, int len);
-extern char *chat_resize_image_to_str_size(const char *path, long maxSize);
 
 // chat_write_file returns null-terminated string with JSON of WriteFileResult
 extern char *chat_write_file(chat_ctrl ctl, char *path, char *data, int len);
 
-// chat_write_image returns null-terminated string with JSON of WriteFileResult
-extern char *chat_write_image(chat_ctrl ctl, long maxSize, char *path, char *data, int len, bool encrypted);
-
 // chat_read_file returns a buffer with:
 // result status (1 byte), then if
 //   status == 0 (success): buffer length (uint32, 4 bytes), buffer of specified length.

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

@@ -14,12 +14,8 @@ import boofcv.android.ConvertBitmap
 import boofcv.struct.image.GrayU8
 import chat.simplex.common.R
 import chat.simplex.common.views.helpers.errorBitmap
-import chat.simplex.common.views.helpers.generateNewFileName
 import chat.simplex.common.views.helpers.getFileName
-import chat.simplex.common.views.helpers.removeFile
 import java.io.ByteArrayOutputStream
-import java.io.File
-import java.io.FileOutputStream
 import java.io.InputStream
 import java.net.URI
 import kotlin.math.min
@@ -29,25 +25,26 @@ actual fun base64ToBitmap(base64ImageString: String): ImageBitmap {
   val imageString = base64ImageString
     .removePrefix("data:image/png;base64,")
     .removePrefix("data:image/jpg;base64,")
-    .removePrefix("data:image/jpeg;base64,")
   return try {
     val imageBytes = Base64.decode(imageString, Base64.NO_WRAP)
     BitmapFactory.decodeByteArray(imageBytes, 0, imageBytes.size).asImageBitmap()
   } catch (e: Exception) {
-    Log.e(TAG, "base64ToBitmap error: $e for input '$base64ImageString' -> '$imageString'")
+    Log.e(TAG, "base64ToBitmap error: $e")
     errorBitmap.asImageBitmap()
   }
 }
 
 actual fun resizeImageToStrSize(image: ImageBitmap, maxDataSize: Long): String {
-  val tmpFileName = generateNewFileName("IMG", "png", tmpDir)
-  val tmpFile = File(tmpDir, tmpFileName)
-  val output = FileOutputStream(tmpFile)
-  compressImageData(image, true).writeTo(output)
-  output.flush()
-  output.close()
-  var str = chatResizeImageToStrSize(tmpFile.absolutePath, maxDataSize)
-  removeFile(tmpFileName)
+  var img = image
+  var str = compressImageStr(img)
+  while (str.length > maxDataSize) {
+    val ratio = sqrt(str.length.toDouble() / maxDataSize.toDouble())
+    val clippedRatio = min(ratio, 2.0)
+    val width = (img.width.toDouble() / clippedRatio).toInt()
+    val height = img.height * width / img.width
+    img = Bitmap.createScaledBitmap(img.asAndroidBitmap(), width, height, true).asImageBitmap()
+    str = compressImageStr(img)
+  }
   return str
 }
 
@@ -74,11 +71,11 @@ fun Bitmap.clipToCircle(): Bitmap {
   return circle
 }
 
-// actual fun compressImageStr(bitmap: ImageBitmap): String {
-//   val usePng = bitmap.hasAlpha()
-//   val ext = if (usePng) "png" else "jpg"
-//   return "data:image/$ext;base64," + Base64.encodeToString(compressImageData(bitmap, usePng).toByteArray(), Base64.NO_WRAP)
-// }
+actual fun compressImageStr(bitmap: ImageBitmap): String {
+  val usePng = bitmap.hasAlpha()
+  val ext = if (usePng) "png" else "jpg"
+  return "data:image/$ext;base64," + Base64.encodeToString(compressImageData(bitmap, usePng).toByteArray(), Base64.NO_WRAP)
+}
 
 actual fun compressImageData(bitmap: ImageBitmap, usePng: Boolean): ByteArrayOutputStream {
   val stream = ByteArrayOutputStream()
@@ -86,19 +83,19 @@ actual fun compressImageData(bitmap: ImageBitmap, usePng: Boolean): ByteArrayOut
   return stream
 }
 
-// actual fun resizeImageToDataSize(image: ImageBitmap, usePng: Boolean, maxDataSize: Long): ByteArrayOutputStream {
-//   var img = image
-//   var stream = compressImageData(img, usePng)
-//   while (stream.size() > maxDataSize) {
-//     val ratio = sqrt(stream.size().toDouble() / maxDataSize.toDouble())
-//     val clippedRatio = min(ratio, 2.0)
-//     val width = (img.width.toDouble() / clippedRatio).toInt()
-//     val height = img.height * width / img.width
-//     img = Bitmap.createScaledBitmap(img.asAndroidBitmap(), width, height, true).asImageBitmap()
-//     stream = compressImageData(img, usePng)
-//   }
-//   return stream
-// }
+actual fun resizeImageToDataSize(image: ImageBitmap, usePng: Boolean, maxDataSize: Long): ByteArrayOutputStream {
+  var img = image
+  var stream = compressImageData(img, usePng)
+  while (stream.size() > maxDataSize) {
+    val ratio = sqrt(stream.size().toDouble() / maxDataSize.toDouble())
+    val clippedRatio = min(ratio, 2.0)
+    val width = (img.width.toDouble() / clippedRatio).toInt()
+    val height = img.height * width / img.width
+    img = Bitmap.createScaledBitmap(img.asAndroidBitmap(), width, height, true).asImageBitmap()
+    stream = compressImageData(img, usePng)
+  }
+  return stream
+}
 
 actual fun GrayU8.toImageBitmap(): ImageBitmap = ConvertBitmap.grayToBitmap(this, Bitmap.Config.RGB_565).asImageBitmap()
 

apps/multiplatform/common/src/commonMain/cpp/android/simplex-api.c

@@ -1,8 +1,7 @@
 #include <jni.h>
 #include <string.h>
-#include <stdbool.h>
 #include <stdint.h>
-#include <stdlib.h>
+//#include <stdlib.h>
 //#include <android/log.h>
 
 // from the RTS
@@ -69,31 +68,9 @@ extern char *chat_password_hash(const char *pwd, const char *salt);
 extern char *chat_valid_name(const char *name);
 extern int chat_json_length(const char *str);
 extern char *chat_write_file(chat_ctrl ctrl, const char *path, char *ptr, int length);
-extern char *chat_write_image(chat_ctrl ctrl, long max_size, const char *path, char *ptr, int length, bool encrypt);
 extern char *chat_read_file(const char *path, const char *key, const char *nonce);
 extern char *chat_encrypt_file(chat_ctrl ctrl, const char *from_path, const char *to_path);
 extern char *chat_decrypt_file(const char *from_path, const char *key, const char *nonce, const char *to_path);
-extern char *chat_resize_image_to_str_size(const char *from_path, long max_size);
-
-char * encode_to_utf8_chars(JNIEnv *env, jstring string) {
-    if (!string) return "";
-
-    const jclass cls_string = (*env)->FindClass(env, "java/lang/String");
-    const jmethodID mid_getBytes = (*env)->GetMethodID(env, cls_string, "getBytes", "(Ljava/lang/String;)[B");
-    const jbyteArray jbyte_array = (jbyteArray) (*env)->CallObjectMethod(env, string, mid_getBytes, (*env)->NewStringUTF(env, "UTF-8"));
-    jint length = (jint) (*env)->GetArrayLength(env, jbyte_array);
-    jbyte *jbytes = malloc(length + 1);
-    (*env)->GetByteArrayRegion(env, jbyte_array, 0, length, jbytes);
-    // char * should be null terminated but jbyte * isn't. Terminate it with \0. Otherwise, Haskell will not see the end of string
-    jbytes[length] = '\0';
-
-    //for (int i = 0; i < length; ++i)
-    //    fprintf(stderr, "%d: %02x\n", i, jbytes[i]);
-
-    (*env)->DeleteLocalRef(env, jbyte_array);
-    (*env)->DeleteLocalRef(env, cls_string);
-    return (char *) jbytes;
-}
 
 JNIEXPORT jobjectArray JNICALL
 Java_chat_simplex_common_platform_CoreKt_chatMigrateInit(JNIEnv *env, __unused jclass clazz, jstring dbPath, jstring dbKey, jstring confirm) {
@@ -205,16 +182,6 @@ Java_chat_simplex_common_platform_CoreKt_chatWriteFile(JNIEnv *env, jclass clazz
     return res;
 }
 
-JNIEXPORT jstring JNICALL
-Java_chat_simplex_common_platform_CoreKt_chatWriteImage(JNIEnv *env, jclass clazz, jlong controller, jlong maxSize, jstring path, jobject buffer, jboolean encrypt) {
-    const char *_path = (*env)->GetStringUTFChars(env, path, JNI_FALSE);
-    jbyte *buff = (jbyte *) (*env)->GetDirectBufferAddress(env, buffer);
-    jlong capacity = (*env)->GetDirectBufferCapacity(env, buffer);
-    jstring res = (*env)->NewStringUTF(env, chat_write_image((void*)controller, maxSize, _path, buff, capacity, encrypt));
-    (*env)->ReleaseStringUTFChars(env, path, _path);
-    return res;
-}
-
 JNIEXPORT jobjectArray JNICALL
 Java_chat_simplex_common_platform_CoreKt_chatReadFile(JNIEnv *env, jclass clazz, jstring path, jstring key, jstring nonce) {
     const char *_path = (*env)->GetStringUTFChars(env, path, JNI_FALSE);
@@ -277,11 +244,3 @@ Java_chat_simplex_common_platform_CoreKt_chatDecryptFile(JNIEnv *env, jclass cla
     (*env)->ReleaseStringUTFChars(env, to_path, _to_path);
     return res;
 }
-
-JNIEXPORT jstring JNICALL
-Java_chat_simplex_common_platform_CoreKt_chatResizeImageToStrSize(JNIEnv *env, jclass clazz, jstring from_path, jlong max_size) {
-    const char *_from_path = (*env)->GetStringUTFChars(env, from_path, JNI_FALSE);
-    jstring res = (*env)->NewStringUTF(env, chat_resize_image_to_str_size(_from_path, max_size));
-    (*env)->ReleaseStringUTFChars(env, from_path, _from_path);
-    return res;
-}

apps/multiplatform/common/src/commonMain/cpp/desktop/simplex-api.c

@@ -1,6 +1,5 @@
 #include <jni.h>
 #include <string.h>
-#include <stdbool.h>
 #include <stdlib.h>
 #include <stdint.h>
 
@@ -42,11 +41,9 @@ extern char *chat_password_hash(const char *pwd, const char *salt);
 extern char *chat_valid_name(const char *name);
 extern int chat_json_length(const char *str);
 extern char *chat_write_file(chat_ctrl ctrl, const char *path, char *ptr, int length);
-extern char *chat_write_image(chat_ctrl ctrl, long max_size, const char *path, char *ptr, int length, bool encrypt);
 extern char *chat_read_file(const char *path, const char *key, const char *nonce);
 extern char *chat_encrypt_file(chat_ctrl ctrl, const char *from_path, const char *to_path);
 extern char *chat_decrypt_file(const char *from_path, const char *key, const char *nonce, const char *to_path);
-extern char *chat_resize_image_to_str_size(const char *from_path, long max_size);
 
 // As a reference: https://stackoverflow.com/a/60002045
 jstring decode_to_utf8_string(JNIEnv *env, char *string) {
@@ -195,16 +192,6 @@ Java_chat_simplex_common_platform_CoreKt_chatWriteFile(JNIEnv *env, jclass clazz
     return res;
 }
 
-JNIEXPORT jstring JNICALL
-Java_chat_simplex_common_platform_CoreKt_chatWriteImage(JNIEnv *env, jclass clazz, jlong controller, jlong maxSize, jstring path, jobject buffer, jboolean encrypt) {
-    const char *_path = encode_to_utf8_chars(env, path);
-    jbyte *buff = (jbyte *) (*env)->GetDirectBufferAddress(env, buffer);
-    jlong capacity = (*env)->GetDirectBufferCapacity(env, buffer);
-    jstring res = decode_to_utf8_string(env, chat_write_image((void*)controller, maxSize, _path, buff, capacity, encrypt));
-    (*env)->ReleaseStringUTFChars(env, path, _path);
-    return res;
-}
-
 JNIEXPORT jobjectArray JNICALL
 Java_chat_simplex_common_platform_CoreKt_chatReadFile(JNIEnv *env, jclass clazz, jstring path, jstring key, jstring nonce) {
     const char *_path = encode_to_utf8_chars(env, path);
@@ -267,11 +254,3 @@ Java_chat_simplex_common_platform_CoreKt_chatDecryptFile(JNIEnv *env, jclass cla
     (*env)->ReleaseStringUTFChars(env, to_path, _to_path);
     return res;
 }
-
-JNIEXPORT jstring JNICALL
-Java_chat_simplex_common_platform_CoreKt_chatResizeImageToStrSize(JNIEnv *env, jclass clazz, jstring from_path, jlong max_size) {
-    const char *_from_path = encode_to_utf8_chars(env, from_path);
-    jstring res = decode_to_utf8_string(env, chat_resize_image_to_str_size(_from_path, max_size));
-    (*env)->ReleaseStringUTFChars(env, from_path, _from_path);
-    return res;
-}

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

@@ -1,6 +1,5 @@
 package chat.simplex.common.model
 
-import androidx.compose.ui.graphics.ImageBitmap
 import chat.simplex.common.platform.*
 import kotlinx.serialization.*
 import java.nio.ByteBuffer
@@ -33,19 +32,6 @@ fun writeCryptoFile(path: String, data: ByteArray): CryptoFileArgs {
   }
 }
 
-fun writeCryptoImage(maxSize: Long, image: ImageBitmap, path: String, encrypt: Boolean): CryptoFileArgs {
-  val ctrl = ChatController.ctrl ?: throw Exception("Controller is not initialized")
-  val data = compressImageData(image, image.hasAlpha).toByteArray()
-  val buffer = ByteBuffer.allocateDirect(data.size)
-  buffer.put(data)
-  buffer.rewind()
-  val str = chatWriteImage(ctrl, maxSize, path, buffer, encrypt)
-  return when (val d = json.decodeFromString(WriteFileResult.serializer(), str)) {
-    is WriteFileResult.Result -> d.cryptoArgs
-    is WriteFileResult.Error -> throw Exception(d.writeError)
-  }
-}
-
 fun readCryptoFile(path: String, cryptoArgs: CryptoFileArgs): ByteArray {
   val res: Array<Any> = chatReadFile(path, cryptoArgs.fileKey, cryptoArgs.fileNonce)
   val status = (res[0] as Integer).toInt()

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/platform/Core.kt

@@ -32,11 +32,9 @@ external fun chatPasswordHash(pwd: String, salt: String): String
 external fun chatValidName(name: String): String
 external fun chatJsonLength(str: String): Int
 external fun chatWriteFile(ctrl: ChatCtrl, path: String, buffer: ByteBuffer): String
-external fun chatWriteImage(ctrl: ChatCtrl, maxSize: Long, path: String, buffer: ByteBuffer, encrypt: Boolean): String
 external fun chatReadFile(path: String, key: String, nonce: String): Array<Any>
 external fun chatEncryptFile(ctrl: ChatCtrl, fromPath: String, toPath: String): String
 external fun chatDecryptFile(fromPath: String, key: String, nonce: String, toPath: String): String
-external fun chatResizeImageToStrSize(fromPath: String, maxSize: Long): String
 
 val chatModel: ChatModel
   get() = chatController.chatModel

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/platform/Images.kt

@@ -7,11 +7,10 @@ import java.io.InputStream
 import java.net.URI
 
 expect fun base64ToBitmap(base64ImageString: String): ImageBitmap
-// XXX: Not a part of platform services anymore?
 expect fun resizeImageToStrSize(image: ImageBitmap, maxDataSize: Long): String
-// expect fun resizeImageToDataSize(image: ImageBitmap, usePng: Boolean, maxDataSize: Long): ByteArrayOutputStream
+expect fun resizeImageToDataSize(image: ImageBitmap, usePng: Boolean, maxDataSize: Long): ByteArrayOutputStream
 expect fun cropToSquare(image: ImageBitmap): ImageBitmap
-// expect fun compressImageStr(bitmap: ImageBitmap): String
+expect fun compressImageStr(bitmap: ImageBitmap): String
 expect fun compressImageData(bitmap: ImageBitmap, usePng: Boolean): ByteArrayOutputStream
 
 expect fun GrayU8.toImageBitmap(): ImageBitmap

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

@@ -169,19 +169,24 @@ fun saveImage(image: ImageBitmap): CryptoFile? {
   return try {
     val encrypted = chatController.appPrefs.privacyEncryptLocalFiles.get()
     val ext = if (image.hasAlpha()) "png" else "jpg"
+    val dataResized = resizeImageToDataSize(image, ext == "png", maxDataSize = MAX_IMAGE_SIZE)
     val destFileName = generateNewFileName("IMG", ext, File(getAppFilePath("")))
     val destFile = File(getAppFilePath(destFileName))
-    try {
-      val args = writeCryptoImage(MAX_IMAGE_SIZE, image, destFile.absolutePath, encrypted)
-      if (encrypted) {
+    if (encrypted) {
+      try {
+        val args = writeCryptoFile(destFile.absolutePath, dataResized.toByteArray())
         CryptoFile(destFileName, args)
-      } else {
-        CryptoFile.plain(destFileName)
+      } catch (e: Exception) {
+        Log.e(TAG, "Unable to write crypto file: " + e.stackTraceToString())
+        AlertManager.shared.showAlertMsg(title = generalGetString(MR.strings.error), text = e.stackTraceToString())
+        null
       }
-    } catch (e: Exception) {
-      Log.e(TAG, "Unable to write crypto file: " + e.stackTraceToString())
-      AlertManager.shared.showAlertMsg(title = generalGetString(MR.strings.error), text = e.stackTraceToString())
-      null
+    } else {
+      val output = FileOutputStream(destFile)
+      dataResized.writeTo(output)
+      output.flush()
+      output.close()
+      CryptoFile.plain(destFileName)
     }
   } catch (e: Exception) {
     Log.e(TAG, "Util.kt saveImage error: ${e.stackTraceToString()}")
@@ -193,10 +198,14 @@ fun desktopSaveImageInTmp(uri: URI): CryptoFile? {
   val image = getBitmapFromUri(uri) ?: return null
   return try {
     val ext = if (image.hasAlpha()) "png" else "jpg"
+    val dataResized = resizeImageToDataSize(image, ext == "png", maxDataSize = MAX_IMAGE_SIZE)
     val destFileName = generateNewFileName("IMG", ext, tmpDir)
     val destFile = File(tmpDir, destFileName)
-    val args = writeCryptoImage(MAX_IMAGE_SIZE, image, destFile.absolutePath, false)
-    CryptoFile(destFileName, args)
+    val output = FileOutputStream(destFile)
+    dataResized.writeTo(output)
+    output.flush()
+    output.close()
+    CryptoFile.plain(destFile.absolutePath)
   } catch (e: Exception) {
     Log.e(TAG, "Util.kt desktopSaveImageInTmp error: ${e.stackTraceToString()}")
     null
@@ -292,7 +301,11 @@ fun saveWallpaperFile(uri: URI): String? {
 fun saveWallpaperFile(image: ImageBitmap): String {
   val destFileName = generateNewFileName("wallpaper", "jpg", File(getWallpaperFilePath("")))
   val destFile = File(getWallpaperFilePath(destFileName))
-  writeCryptoImage(5_000_000, image, destFile.absolutePath, false)
+  val dataResized = resizeImageToDataSize(image, false, maxDataSize = 5_000_000)
+  val output = FileOutputStream(destFile)
+  dataResized.use {
+    it.writeTo(output)
+  }
   return destFile.name
 }
 
@@ -352,10 +365,7 @@ fun formatBytes(bytes: Long): String {
 }
 
 fun removeFile(fileName: String): Boolean {
-  return removeFile(File(getAppFilePath(fileName)))
-}
-
-fun removeFile(file: File): Boolean {
+  val file = File(getAppFilePath(fileName))
   val fileDeleted = file.delete()
   if (!fileDeleted) {
     Log.e(TAG, "Util.kt removeFile error")

apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/platform/Images.desktop.kt

@@ -5,8 +5,6 @@ import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.IntSize
 import boofcv.io.image.ConvertBufferedImage
 import boofcv.struct.image.GrayU8
-import chat.simplex.common.views.helpers.generateNewFileName
-import chat.simplex.common.views.helpers.removeFile
 import chat.simplex.res.MR
 import org.jetbrains.skia.Image
 import java.awt.RenderingHints
@@ -27,40 +25,40 @@ actual fun base64ToBitmap(base64ImageString: String): ImageBitmap {
   val imageString = base64ImageString
     .removePrefix("data:image/png;base64,")
     .removePrefix("data:image/jpg;base64,")
-    .removePrefix("data:image/jpeg;base64,")
   return try {
     ImageIO.read(ByteArrayInputStream(Base64.getMimeDecoder().decode(imageString))).toComposeImageBitmap()
-  } catch (e: Exception) { // ByteArrayInputStream returns null
-    Log.e(TAG, "base64ToBitmap error: $e for input '$base64ImageString' -> '$imageString'")
+  } catch (e: IOException) {
+    Log.e(TAG, "base64ToBitmap error: $e")
     errorBitmap()
   }
 }
 
 actual fun resizeImageToStrSize(image: ImageBitmap, maxDataSize: Long): String {
-  val tmpFileName = generateNewFileName("IMG", "png", tmpDir)
-  val tmpFile = File(tmpDir, tmpFileName)
-  val output = FileOutputStream(tmpFile)
-  compressImageData(image, true).writeTo(output)
-  output.flush()
-  output.close()
-  var str = chatResizeImageToStrSize(tmpFile.absolutePath, maxDataSize)
-  removeFile(tmpFile)
+  var img = image
+  var str = compressImageStr(img)
+  while (str.length > maxDataSize) {
+    val ratio = sqrt(str.length.toDouble() / maxDataSize.toDouble())
+    val clippedRatio = kotlin.math.min(ratio, 2.0)
+    val width = (img.width.toDouble() / clippedRatio).toInt()
+    val height = img.height * width / img.width
+    img = img.scale(width, height)
+    str = compressImageStr(img)
+  }
   return str
 }
-
-// actual fun resizeImageToDataSize(image: ImageBitmap, usePng: Boolean, maxDataSize: Long): ByteArrayOutputStream {
-//   var img = image
-//   var stream = compressImageData(img, usePng)
-//   while (stream.size() > maxDataSize) {
-//     val ratio = sqrt(stream.size().toDouble() / maxDataSize.toDouble())
-//     val clippedRatio = kotlin.math.min(ratio, 2.0)
-//     val width = (img.width.toDouble() / clippedRatio).toInt()
-//     val height = img.height * width / img.width
-//     img = img.scale(width, height)
-//     stream = compressImageData(img, usePng)
-//   }
-//   return stream
-// }
+actual fun resizeImageToDataSize(image: ImageBitmap, usePng: Boolean, maxDataSize: Long): ByteArrayOutputStream {
+  var img = image
+  var stream = compressImageData(img, usePng)
+  while (stream.size() > maxDataSize) {
+    val ratio = sqrt(stream.size().toDouble() / maxDataSize.toDouble())
+    val clippedRatio = kotlin.math.min(ratio, 2.0)
+    val width = (img.width.toDouble() / clippedRatio).toInt()
+    val height = img.height * width / img.width
+    img = img.scale(width, height)
+    stream = compressImageData(img, usePng)
+  }
+  return stream
+}
 
 actual fun cropToSquare(image: ImageBitmap): ImageBitmap {
   var xOffset = 0
@@ -83,17 +81,17 @@ actual fun cropToSquare(image: ImageBitmap): ImageBitmap {
   return croppedImage
 }
 
-// actual fun compressImageStr(bitmap: ImageBitmap): String {
-//   val usePng = bitmap.hasAlpha()
-//   val ext = if (usePng) "png" else "jpg"
-//   return try {
-//     val encoded  = Base64.getEncoder().encodeToString(compressImageData(bitmap, usePng).toByteArray())
-//     "data:image/$ext;base64,$encoded"
-//   } catch (e: Exception) {
-//     Log.e(TAG, "resizeImageToStrSize error: $e")
-//     throw e
-//   }
-// }
+actual fun compressImageStr(bitmap: ImageBitmap): String {
+  val usePng = bitmap.hasAlpha()
+  val ext = if (usePng) "png" else "jpg"
+  return try {
+    val encoded  = Base64.getEncoder().encodeToString(compressImageData(bitmap, usePng).toByteArray())
+    "data:image/$ext;base64,$encoded"
+  } catch (e: Exception) {
+    Log.e(TAG, "resizeImageToStrSize error: $e")
+    throw e
+  }
+}
 
 actual fun compressImageData(bitmap: ImageBitmap, usePng: Boolean): ByteArrayOutputStream {
   val writer = ImageIO.getImageWritersByFormatName(if (usePng) "png" else "jpg").next()

cabal.project

@@ -63,9 +63,3 @@ source-repository-package
     location: https://github.com/simplex-chat/wai.git
     tag: 2f6e5aa5f05ba9140ac99e195ee647b4f7d926b0
     subdir: warp
-
-source-repository-package
-    type: git
-    location: https://gitlab.com/dpwiz/hs-jpeg-turbo
-    tag: d2844e00e7834124e27171cde21cf280d6772aa8
-    subdir: JuicyPixels-jpeg-turbo jpeg-turbo

flake.nix

@@ -198,7 +198,6 @@
                   packages.direct-sqlcipher.components.library.libs = pkgs.lib.mkForce [
                     pkgs.pkgsCross.mingwW64.openssl
                   ];
-                  packages."jpeg-turbo".flags.static = true;
                   packages.simplexmq.flags.client_library = true;
                   packages.simplexmq.components.library.libs = pkgs.lib.mkForce [
                     pkgs.pkgsCross.mingwW64.openssl
@@ -337,7 +336,6 @@
                   packages.direct-sqlcipher.patches = [
                     ./scripts/nix/direct-sqlcipher-android-log.patch
                   ];
-                  packages."jpeg-turbo".flags.static = true;
                   packages.simplexmq.flags.client_library = true;
                   packages.simplexmq.components.library.libs = pkgs.lib.mkForce [
                     (android32Pkgs.openssl.override { static = true; enableKTLS = false; })
@@ -391,8 +389,6 @@
                   "chat_valid_name"
                   "chat_json_length"
                   "chat_write_file"
-                  "chat_write_image"
-                  "chat_resize_image_to_str_size"
                 ];
                 postInstall = ''
                   set -x
@@ -449,11 +445,6 @@
                   packages.direct-sqlcipher.patches = [
                     ./scripts/nix/direct-sqlcipher-android-log.patch
                   ];
-                  packages.jpeg-turbo.flags.static = true;
-                  packages.jpeg-turbo.components.library.libs = pkgs.lib.mkForce [
-                    (androidPkgs.libjpeg_turbo.override { enableStatic = true; })
-                  ];
-
                   packages.simplexmq.flags.client_library = true;
                   packages.simplexmq.components.library.libs = pkgs.lib.mkForce [
                     (androidPkgs.openssl.override { static = true; })
@@ -502,8 +493,6 @@
                   "chat_valid_name"
                   "chat_json_length"
                   "chat_write_file"
-                  "chat_write_image"
-                  "chat_resize_image_to_str_size"
                 ];
                 postInstall = ''
                   set -x
@@ -561,7 +550,6 @@
                   packages.simplexmq.flags.swift = true;
                   packages.direct-sqlcipher.flags.commoncrypto = true;
                   packages.entropy.flags.DoNotGetEntropy = true;
-                  packages."jpeg-turbo".flags.static = true;
                   packages.simplexmq.flags.client_library = true;
                   packages.simplexmq.components.library.libs = pkgs.lib.mkForce [
                     # TODO: have a cross override for iOS, that sets this.
@@ -577,7 +565,6 @@
                 extra-modules = [{
                   packages.direct-sqlcipher.flags.commoncrypto = true;
                   packages.entropy.flags.DoNotGetEntropy = true;
-                  packages."jpeg-turbo".flags.static = true;
                   packages.simplexmq.flags.client_library = true;
                   packages.simplexmq.components.library.libs = pkgs.lib.mkForce [
                     ((pkgs.openssl.override { static = true; }).overrideDerivation (old: { CFLAGS = "-mcpu=apple-a7 -march=armv8-a+norcpc" ;}))
@@ -596,7 +583,6 @@
                   packages.simplexmq.flags.swift = true;
                   packages.direct-sqlcipher.flags.commoncrypto = true;
                   packages.entropy.flags.DoNotGetEntropy = true;
-                  packages."jpeg-turbo".flags.static = true;
                   packages.simplexmq.flags.client_library = true;
                   packages.simplexmq.components.library.libs = pkgs.lib.mkForce [
                     (pkgs.openssl.override { static = true; })
@@ -611,7 +597,6 @@
                 extra-modules = [{
                   packages.direct-sqlcipher.flags.commoncrypto = true;
                   packages.entropy.flags.DoNotGetEntropy = true;
-                  packages."jpeg-turbo".flags.static = true;
                   packages.simplexmq.flags.client_library = true;
                   packages.simplexmq.components.library.libs = pkgs.lib.mkForce [
                     (pkgs.openssl.override { static = true; })

libsimplex.dll.def

@@ -16,8 +16,6 @@ EXPORTS
     chat_encrypt_media
     chat_decrypt_media
     chat_write_file
-    chat_write_image
     chat_read_file
     chat_encrypt_file
-    chat_decrypt_file
-    chat_resize_image_to_str_size
+    chat_decrypt_file

package.yaml

@@ -52,9 +52,6 @@ dependencies:
   - unliftio-core == 0.2.*
   - uuid == 1.3.*
   - zip == 2.0.*
-  - JuicyPixels
-  - JuicyPixels-jpeg-turbo
-  - JuicyPixels-stbir
 
 flags:
   swift:

scripts/flatpak/chat.simplex.simplex.metainfo.xml

@@ -38,6 +38,25 @@
   </description>
 
   <releases>
+    <release version="6.2.1" date="2024-12-12">
+      <url type="details">https://simplex.chat/blog/20241210-simplex-network-v6-2-servers-by-flux-business-chats.html</url>
+      <description>
+        <p>New in v6.2.1:</p>
+        <ul>
+          <li>fixes</li>
+          <li>offer to "fix" encryption when calling or making direct connection with member.</li>
+          <li>broken layout.</li>
+          <li>option to enable debug logs (disabled by default).</li>
+          <li>show who reacted in direct chats.</li>
+        </ul>
+        <p>New in v6.2:</p>
+        <ul>
+          <li>SimpleX Chat and Flux made an agreement to include servers operated by Flux into the app – to improve metadata privacy.</li>
+          <li>Business chats – your customers privacy.</li>
+          <li>Improved user experience in chats: open on the first unread, jump to quoted messages, see who reacted.</li>
+        </ul>
+      </description>
+    </release>
     <release version="6.2.0" date="2024-12-08">
       <url type="details">https://simplex.chat/blog/20241210-simplex-network-v6-2-servers-by-flux-business-chats.html</url>
       <description>

scripts/nix/sha256map.nix

@@ -9,5 +9,4 @@
   "https://github.com/simplex-chat/zip.git"."bd421c6b19cc4c465cd7af1f6f26169fb8ee1ebc" = "1csqfjhvc8wb5h4kxxndmb6iw7b4ib9ff2n81hrizsmnf45a6gg0";
   "https://github.com/yesodweb/wai.git"."ec5e017d896a78e787a5acea62b37a4e677dec2e" = "1ckcpmpjfy9jiqrb52q20lj7ln4hmq9v2jk6kpkf3m68c1m9c2bx";
   "https://github.com/simplex-chat/wai.git"."2f6e5aa5f05ba9140ac99e195ee647b4f7d926b0" = "199g4rjdf1zp1fcw8nqdsyr1h36hmg424qqx03071jk7j00z7ay4";
-  "https://gitlab.com/dpwiz/hs-jpeg-turbo"."d2844e00e7834124e27171cde21cf280d6772aa8" = "1gbvpkx7g2r62bfgpmf8ljdvpccnskdnhqzblm515cb70pyrfq07";
 }

simplex-chat.cabal

@@ -35,7 +35,6 @@ library
       Simplex.Chat.Core
       Simplex.Chat.Files
       Simplex.Chat.Help
-      Simplex.Chat.Image
       Simplex.Chat.Markdown
       Simplex.Chat.Messages
       Simplex.Chat.Messages.Batch
@@ -206,10 +205,7 @@ library
       StrictData
   ghc-options: -O2 -Weverything -Wno-missing-exported-signatures -Wno-missing-import-lists -Wno-missed-specialisations -Wno-all-missed-specialisations -Wno-unsafe -Wno-safe -Wno-missing-local-signatures -Wno-missing-kind-signatures -Wno-missing-deriving-strategies -Wno-monomorphism-restriction -Wno-prepositive-qualified-module -Wno-unused-packages -Wno-implicit-prelude -Wno-missing-safe-haskell-mode -Wno-missing-export-lists -Wno-partial-fields -Wcompat -Werror=incomplete-record-updates -Werror=incomplete-patterns -Werror=missing-methods -Werror=incomplete-uni-patterns -Werror=tabs -Wredundant-constraints -Wincomplete-record-updates -Wunused-type-patterns
   build-depends:
-      JuicyPixels
-    , JuicyPixels-jpeg-turbo
-    , JuicyPixels-stbir
-    , aeson ==2.2.*
+      aeson ==2.2.*
     , ansi-terminal >=0.10 && <0.12
     , async ==2.2.*
     , attoparsec ==0.14.*
@@ -274,10 +270,7 @@ executable simplex-bot
       StrictData
   ghc-options: -O2 -Weverything -Wno-missing-exported-signatures -Wno-missing-import-lists -Wno-missed-specialisations -Wno-all-missed-specialisations -Wno-unsafe -Wno-safe -Wno-missing-local-signatures -Wno-missing-kind-signatures -Wno-missing-deriving-strategies -Wno-monomorphism-restriction -Wno-prepositive-qualified-module -Wno-unused-packages -Wno-implicit-prelude -Wno-missing-safe-haskell-mode -Wno-missing-export-lists -Wno-partial-fields -Wcompat -Werror=incomplete-record-updates -Werror=incomplete-patterns -Werror=missing-methods -Werror=incomplete-uni-patterns -Werror=tabs -Wredundant-constraints -Wincomplete-record-updates -Wunused-type-patterns -threaded
   build-depends:
-      JuicyPixels
-    , JuicyPixels-jpeg-turbo
-    , JuicyPixels-stbir
-    , aeson ==2.2.*
+      aeson ==2.2.*
     , ansi-terminal >=0.10 && <0.12
     , async ==2.2.*
     , attoparsec ==0.14.*
@@ -343,10 +336,7 @@ executable simplex-bot-advanced
       StrictData
   ghc-options: -O2 -Weverything -Wno-missing-exported-signatures -Wno-missing-import-lists -Wno-missed-specialisations -Wno-all-missed-specialisations -Wno-unsafe -Wno-safe -Wno-missing-local-signatures -Wno-missing-kind-signatures -Wno-missing-deriving-strategies -Wno-monomorphism-restriction -Wno-prepositive-qualified-module -Wno-unused-packages -Wno-implicit-prelude -Wno-missing-safe-haskell-mode -Wno-missing-export-lists -Wno-partial-fields -Wcompat -Werror=incomplete-record-updates -Werror=incomplete-patterns -Werror=missing-methods -Werror=incomplete-uni-patterns -Werror=tabs -Wredundant-constraints -Wincomplete-record-updates -Wunused-type-patterns -threaded
   build-depends:
-      JuicyPixels
-    , JuicyPixels-jpeg-turbo
-    , JuicyPixels-stbir
-    , aeson ==2.2.*
+      aeson ==2.2.*
     , ansi-terminal >=0.10 && <0.12
     , async ==2.2.*
     , attoparsec ==0.14.*
@@ -415,10 +405,7 @@ executable simplex-broadcast-bot
       Paths_simplex_chat
   ghc-options: -O2 -Weverything -Wno-missing-exported-signatures -Wno-missing-import-lists -Wno-missed-specialisations -Wno-all-missed-specialisations -Wno-unsafe -Wno-safe -Wno-missing-local-signatures -Wno-missing-kind-signatures -Wno-missing-deriving-strategies -Wno-monomorphism-restriction -Wno-prepositive-qualified-module -Wno-unused-packages -Wno-implicit-prelude -Wno-missing-safe-haskell-mode -Wno-missing-export-lists -Wno-partial-fields -Wcompat -Werror=incomplete-record-updates -Werror=incomplete-patterns -Werror=missing-methods -Werror=incomplete-uni-patterns -Werror=tabs -Wredundant-constraints -Wincomplete-record-updates -Wunused-type-patterns -threaded
   build-depends:
-      JuicyPixels
-    , JuicyPixels-jpeg-turbo
-    , JuicyPixels-stbir
-    , aeson ==2.2.*
+      aeson ==2.2.*
     , ansi-terminal >=0.10 && <0.12
     , async ==2.2.*
     , attoparsec ==0.14.*
@@ -485,10 +472,7 @@ executable simplex-chat
       StrictData
   ghc-options: -O2 -Weverything -Wno-missing-exported-signatures -Wno-missing-import-lists -Wno-missed-specialisations -Wno-all-missed-specialisations -Wno-unsafe -Wno-safe -Wno-missing-local-signatures -Wno-missing-kind-signatures -Wno-missing-deriving-strategies -Wno-monomorphism-restriction -Wno-prepositive-qualified-module -Wno-unused-packages -Wno-implicit-prelude -Wno-missing-safe-haskell-mode -Wno-missing-export-lists -Wno-partial-fields -Wcompat -Werror=incomplete-record-updates -Werror=incomplete-patterns -Werror=missing-methods -Werror=incomplete-uni-patterns -Werror=tabs -Wredundant-constraints -Wincomplete-record-updates -Wunused-type-patterns -threaded
   build-depends:
-      JuicyPixels
-    , JuicyPixels-jpeg-turbo
-    , JuicyPixels-stbir
-    , aeson ==2.2.*
+      aeson ==2.2.*
     , ansi-terminal >=0.10 && <0.12
     , async ==2.2.*
     , attoparsec ==0.14.*
@@ -561,10 +545,7 @@ executable simplex-directory-service
       Paths_simplex_chat
   ghc-options: -O2 -Weverything -Wno-missing-exported-signatures -Wno-missing-import-lists -Wno-missed-specialisations -Wno-all-missed-specialisations -Wno-unsafe -Wno-safe -Wno-missing-local-signatures -Wno-missing-kind-signatures -Wno-missing-deriving-strategies -Wno-monomorphism-restriction -Wno-prepositive-qualified-module -Wno-unused-packages -Wno-implicit-prelude -Wno-missing-safe-haskell-mode -Wno-missing-export-lists -Wno-partial-fields -Wcompat -Werror=incomplete-record-updates -Werror=incomplete-patterns -Werror=missing-methods -Werror=incomplete-uni-patterns -Werror=tabs -Wredundant-constraints -Wincomplete-record-updates -Wunused-type-patterns -threaded
   build-depends:
-      JuicyPixels
-    , JuicyPixels-jpeg-turbo
-    , JuicyPixels-stbir
-    , aeson ==2.2.*
+      aeson ==2.2.*
     , ansi-terminal >=0.10 && <0.12
     , async ==2.2.*
     , attoparsec ==0.14.*
@@ -637,7 +618,6 @@ test-suite simplex-chat-test
       ChatTests.Profiles
       ChatTests.Utils
       JSONTests
-      LinkPreviewTests
       MarkdownTests
       MessageBatching
       MobileTests
@@ -665,10 +645,7 @@ test-suite simplex-chat-test
       StrictData
   ghc-options: -O2 -Weverything -Wno-missing-exported-signatures -Wno-missing-import-lists -Wno-missed-specialisations -Wno-all-missed-specialisations -Wno-unsafe -Wno-safe -Wno-missing-local-signatures -Wno-missing-kind-signatures -Wno-missing-deriving-strategies -Wno-monomorphism-restriction -Wno-prepositive-qualified-module -Wno-unused-packages -Wno-implicit-prelude -Wno-missing-safe-haskell-mode -Wno-missing-export-lists -Wno-partial-fields -Wcompat -Werror=incomplete-record-updates -Werror=incomplete-patterns -Werror=missing-methods -Werror=incomplete-uni-patterns -Werror=tabs -Wredundant-constraints -Wincomplete-record-updates -Wunused-type-patterns -threaded
   build-depends:
-      JuicyPixels
-    , JuicyPixels-jpeg-turbo
-    , JuicyPixels-stbir
-    , QuickCheck ==2.14.*
+      QuickCheck ==2.14.*
     , aeson ==2.2.*
     , ansi-terminal >=0.10 && <0.12
     , async ==2.2.*

src/Simplex/Chat/Image.hs

@@ -1,127 +0,0 @@
-{-# LANGUAGE DataKinds #-}
-{-# LANGUAGE FlexibleContexts #-}
-{-# LANGUAGE GADTs #-}
-{-# LANGUAGE KindSignatures #-}
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE RankNTypes #-}
-{-# LANGUAGE TupleSections #-}
-{-# LANGUAGE TypeSynonymInstances #-}
-
-module Simplex.Chat.Image where
-
-import qualified Codec.Picture as Picture
-import qualified Codec.Picture.JPEGTurbo as JT
-import Codec.Picture.Metadata (Metadatas)
-import Codec.Picture.Png (encodePng)
-import qualified Codec.Picture.STBIR as STBIR
-import Codec.Picture.Types (dropAlphaLayer, pixelFoldMap)
-import Control.Monad.Except (ExceptT (..), runExceptT, throwError)
-import Data.ByteString (ByteString)
-import qualified Data.ByteString.Base64.Lazy as LB64
-import qualified Data.ByteString.Lazy.Char8 as LB
-import Data.Int (Int64)
-import Data.Monoid (All (..))
-import System.IO.Unsafe (unsafePerformIO)
-
-resizeImageToSize :: Bool -> Int -> Int64 -> ResizeableImage -> LB.ByteString
-resizeImageToSize toURI minJpegQuality maxSize (ResizeableImage fmt img encoder) = either resizePNG resizeJPG encoder
-  where
-    halveAndRetry = resizeImageToSize toURI minJpegQuality maxSize (ResizeableImage fmt imgHalved encoder)
-    imgHalved = downscale img 2.0
-    resizePNG enc
-      | LB.length encoded <= maxSize = encoded
-      | LB.length (encode imgHalved) > maxSize = halveAndRetry
-      | otherwise = fitScale 1.0 2.0
-      where
-        encode
-          | toURI = toDataUri "png" . enc
-          | otherwise = enc
-        encoded = encode img
-        fitScale l u
-          | u - l < 1 / 64 = encode $ downscale img u -- prefer lower resolution
-          | otherwise =
-              case compare maxSize (LB.length result) of
-                LT -> fitScale m u -- over budget, scale harder
-                EQ -> result
-                GT -> fitScale l m -- keep more pixels
-          where
-            m = (l + u) / 2
-            result = encode $ downscale img m
-    resizeJPG enc
-      | minSize > maxSize = halveAndRetry
-      | otherwise = fitQuality minJpegQuality 95
-      where
-        encode q
-          | toURI = toDataUri "jpg" $ enc q img -- the correct mime type is "jpeg", but only "jpg" is supported by older clients
-          | otherwise = enc q img
-        minSize = LB.length $ encode minJpegQuality
-        fitQuality l u
-          | u - l <= 1 = encode l -- prefer higher compression
-          | otherwise =
-              case compare (LB.length result) maxSize of
-                LT -> fitQuality m u -- keep more data
-                EQ -> result
-                GT -> fitQuality l m -- over budget, reduce quality
-          where
-            m = (l + u) `div` 2
-            result = encode m
-
-downscale :: STBIR.STBIRPixel pixel => Picture.Image pixel -> Float -> Picture.Image pixel
-downscale img scale = STBIR.resize STBIR.defaultOptions (scaled Picture.imageWidth) (scaled Picture.imageHeight) img
-  where
-    scaled f = round $ fromIntegral (f img) / min 2.0 (max 0.5 scale)
-
-toDataUri :: LB.ByteString -> LB.ByteString -> LB.ByteString
-toDataUri fmt body = "data:image/" <> fmt <> ";base64," <> LB64.encode body
-
-decodeResizeable :: ByteString -> Either String (ResizeableImage, Metadatas)
-decodeResizeable source = do
-  (input, metadata) <- Picture.decodeImageWithMetadata source
-  maybe (Left "unsupported image format") (pure . (,metadata)) $ resizeableImage (tryDropOpacity input)
-
-readResizeable :: FilePath -> IO (Either String (ResizeableImage, Metadatas))
-readResizeable inputPath = runExceptT $ do
-  (input, metadata) <- ExceptT $ Picture.readImageWithMetadata inputPath -- will use mmap instead of reading the whole file
-  maybe (throwError "unsupported image format") (pure . (,metadata)) $ resizeableImage (tryDropOpacity input)
-
-tryDropOpacity :: Picture.DynamicImage -> Picture.DynamicImage
-tryDropOpacity dyn = case dyn of
-  Picture.ImageRGBA16 img | opaque img -> Picture.ImageRGB16 $ dropAlphaLayer img
-  Picture.ImageRGBA8 img | opaque img -> Picture.ImageRGB8 $ dropAlphaLayer img
-  Picture.ImageYA16 img | opaque img -> Picture.ImageY16 $ dropAlphaLayer img
-  Picture.ImageYA8 img | opaque img -> Picture.ImageY8 $ dropAlphaLayer img
-  _ -> dyn
-  where
-    opaque :: (Picture.Pixel a, Eq (Picture.PixelBaseComponent a), Bounded (Picture.PixelBaseComponent a)) => Picture.Image a -> Bool
-    opaque = getAll . pixelFoldMap (All . \pix -> Picture.pixelOpacity pix == maxBound)
-
-data ResizeableImage where
-  ResizeableImage ::
-    STBIR.STBIRPixel a =>
-    -- | format label
-    String ->
-    -- | current image data
-    Picture.Image a ->
-    ImageEncoder a ->
-    ResizeableImage
-
-type ImageEncoder a = Either (PNGEncoder a) (JPGEncoder a)
-type PNGEncoder a = Picture.Image a -> LB.ByteString
-type JPGEncoder a = Int -> Picture.Image a -> LB.ByteString
-
-resizeableImage :: Picture.DynamicImage -> Maybe ResizeableImage
-resizeableImage dyn = case dyn of
-  Picture.ImageY8 img -> Just $ ResizeableImage "Y8" img $ Right $ \q -> LB.fromStrict . unsafePerformIO . JT.encodeRGB q . Picture.convertRGB8 . Picture.ImageY8 -- TODO: directly
-  Picture.ImageY16 img -> Just $ ResizeableImage "Y16" img $ Left encodePng
-  Picture.ImageY32 _ -> Nothing
-  Picture.ImageYF _ -> Nothing
-  Picture.ImageYA8 img -> Just $ ResizeableImage "YA8" img $ Left encodePng
-  Picture.ImageYA16 img -> Just $ ResizeableImage "YA16" img $ Left encodePng
-  Picture.ImageRGB8 img -> Just $ ResizeableImage "RGB8" img $ Right $ \q -> LB.fromStrict . unsafePerformIO . JT.encodeRGB q
-  Picture.ImageRGB16 img -> Just $ ResizeableImage "RGB16" img $ Left encodePng
-  Picture.ImageRGBF _ -> Nothing
-  Picture.ImageRGBA8 img -> Just $ ResizeableImage "RGBA8" img $ Left encodePng
-  Picture.ImageRGBA16 img -> Just $ ResizeableImage "RGBA16" img $ Left encodePng
-  Picture.ImageYCbCr8 img -> Just $ ResizeableImage "YCbCr8" img $ Right $ \q -> LB.fromStrict . unsafePerformIO . JT.encodeRGB q . Picture.convertRGB8 . Picture.ImageYCbCr8 -- TODO: JT.encodeYUV
-  Picture.ImageCMYK8 img -> Just $ ResizeableImage "CMYK8" img $ Right $ \q -> LB.fromStrict . unsafePerformIO . JT.encodeRGB q . Picture.convertRGB8 . Picture.ImageCMYK8
-  Picture.ImageCMYK16 _ -> Nothing

src/Simplex/Chat/Mobile.hs

@@ -21,7 +21,6 @@ import qualified Data.ByteString.Base64.URL as U
 import Data.ByteString.Char8 (ByteString)
 import qualified Data.ByteString.Char8 as B
 import qualified Data.ByteString.Lazy.Char8 as LB
-import Data.Either (fromRight)
 import Data.Functor (($>))
 import Data.List (find)
 import qualified Data.List.NonEmpty as L
@@ -30,14 +29,13 @@ import Data.Word (Word8)
 import Database.SQLite.Simple (SQLError (..))
 import qualified Database.SQLite.Simple as DB
 import Foreign.C.String
-import Foreign.C.Types (CBool (..), CInt (..), CLong (..))
+import Foreign.C.Types (CInt (..))
 import Foreign.Ptr
 import Foreign.StablePtr
 import Foreign.Storable (poke)
 import GHC.IO.Encoding (setFileSystemEncoding, setForeignEncoding, setLocaleEncoding)
 import Simplex.Chat
 import Simplex.Chat.Controller
-import Simplex.Chat.Image (readResizeable, resizeImageToSize)
 import Simplex.Chat.Markdown (ParsedMarkdown (..), parseMaybeMarkdownList)
 import Simplex.Chat.Mobile.File
 import Simplex.Chat.Mobile.Shared
@@ -47,7 +45,6 @@ import Simplex.Chat.Remote.Types
 import Simplex.Chat.Store
 import Simplex.Chat.Store.Profiles
 import Simplex.Chat.Types
-import Simplex.Chat.Util (liftIOEither)
 import Simplex.Messaging.Agent.Client (agentClientStore)
 import Simplex.Messaging.Agent.Env.SQLite (createAgentStore)
 import Simplex.Messaging.Agent.Store.SQLite (MigrationConfirmation (..), MigrationError, closeSQLiteStore, reopenSQLiteStore)
@@ -105,16 +102,12 @@ foreign export ccall "chat_decrypt_media" cChatDecryptMedia :: CString -> Ptr Wo
 
 foreign export ccall "chat_write_file" cChatWriteFile :: StablePtr ChatController -> CString -> Ptr Word8 -> CInt -> IO CJSONString
 
-foreign export ccall "chat_write_image" cChatWriteImage :: StablePtr ChatController -> CLong -> CString -> Ptr Word8 -> CInt -> CBool -> IO CJSONString
-
 foreign export ccall "chat_read_file" cChatReadFile :: CString -> CString -> CString -> IO (Ptr Word8)
 
 foreign export ccall "chat_encrypt_file" cChatEncryptFile :: StablePtr ChatController -> CString -> CString -> IO CJSONString
 
 foreign export ccall "chat_decrypt_file" cChatDecryptFile :: CString -> CString -> CString -> CString -> IO CString
 
-foreign export ccall "chat_resize_image_to_str_size" cChatResizeImageToStrSize :: CString -> CLong -> IO CString
-
 -- | check / migrate database and initialize chat controller on success
 cChatMigrateInit :: CString -> CString -> CString -> Ptr (StablePtr ChatController) -> IO CJSONString
 cChatMigrateInit fp key conf = cChatMigrateInitKey fp key 0 conf 0
@@ -189,37 +182,6 @@ cChatValidName cName = newCString . mkValidName =<< peekCString cName
 cChatJsonLength :: CString -> IO CInt
 cChatJsonLength s = fromIntegral . subtract 2 . LB.length . J.encode . safeDecodeUtf8 <$> B.packCString s
 
--- -- | Resize image at path to match specified dimensions preserving aspect ratio
--- cChatResizeImageToFit :: CString -> CInt -> CInt -> IO CString
--- cChatResizeImageToFit path maxWidth maxHeight = error "todo"
-
--- -- | Resize image at path to match specified dimensions, cropping the extra pixels
--- cChatResizeImageCrop :: CString -> CInt -> CInt -> IO CString
--- cChatResizeImageCrop path width height = error "todo" -- аватарки
-
--- -- | Downscale image at path until it fits into specified size
--- cChatResizeImageToDataSize :: CString -> CInt -> IO CString
--- cChatResizeImageToDataSize path maxSize = error "todo"
-
--- | Downscale image at path until its data-uri encoding fits into specified size.
--- Returns data-uri/base64 encoded image as 0-terminated string.
--- Empty result string means operation failure.
--- The caller must free the result ptr.
-cChatResizeImageToStrSize :: CString -> CLong -> IO CString
-cChatResizeImageToStrSize fp' maxSize = do
-  fp <- peekCString fp'
-  res <- runExceptT $ do
-    (ri, _) <- liftIOEither $ readResizeable fp
-    let resized = resizeImageToSize True previewMinQuality (fromIntegral maxSize) ri
-    if LB.length resized > fromIntegral maxSize then throwError "unable to fit" else pure resized
-  newCStringFromLazyBS $ fromRight "" res
-  where
-    previewMinQuality = 20
-
--- -- | Strip EXIF etc metadata from image, inlplace
--- cChatStripImageMetadata :: CString -> IO CBool
--- cChatStripImageMetadata path = error "todo"
-
 mobileChatOpts :: String -> ChatOpts
 mobileChatOpts dbFilePrefix =
   ChatOpts

src/Simplex/Chat/Mobile/File.hs

@@ -7,7 +7,6 @@
 
 module Simplex.Chat.Mobile.File
   ( cChatWriteFile,
-    cChatWriteImage,
     cChatReadFile,
     cChatEncryptFile,
     cChatDecryptFile,
@@ -36,8 +35,6 @@ import Foreign.Ptr
 import Foreign.StablePtr
 import Foreign.Storable (poke, pokeByteOff)
 import Simplex.Chat.Controller (ChatController (..))
-import Simplex.Chat.Image (resizeImageToSize)
-import qualified Simplex.Chat.Image as Picture
 import Simplex.Chat.Mobile.Shared
 import Simplex.Chat.Util (chunkSize, encryptFile)
 import Simplex.Messaging.Crypto.File (CryptoFile (..), CryptoFileArgs (..), CryptoFileHandle, FTCryptoError (..))
@@ -48,7 +45,7 @@ import Simplex.Messaging.Util (catchAll)
 import UnliftIO (Handle, IOMode (..), atomically, withFile)
 
 data WriteFileResult
-  = WFResult {cryptoArgs :: Maybe CryptoFileArgs}
+  = WFResult {cryptoArgs :: CryptoFileArgs}
   | WFError {writeError :: String}
 
 $(JQ.deriveToJSON (sumTypeJSON $ dropPrefix "WF") ''WriteFileResult)
@@ -64,32 +61,10 @@ cChatWriteFile cc cPath ptr len = do
 chatWriteFile :: ChatController -> FilePath -> ByteString -> IO WriteFileResult
 chatWriteFile ChatController {random} path s = do
   cfArgs <- atomically $ CF.randomArgs random
-  chatWriteFile_ (Just cfArgs) path s
-
-chatWriteFile_ :: Maybe CryptoFileArgs -> FilePath -> ByteString -> IO WriteFileResult
-chatWriteFile_ cfArgs_ path s = do
-  let file = CryptoFile path cfArgs_
-  either WFError (\_ -> WFResult cfArgs_)
+  let file = CryptoFile path $ Just cfArgs
+  either WFError (\_ -> WFResult cfArgs)
     <$> runCatchExceptT (withExceptT show $ CF.writeFile file $ LB.fromStrict s)
 
-cChatWriteImage :: StablePtr ChatController -> CLong -> CString -> Ptr Word8 -> CInt -> CBool -> IO CJSONString
-cChatWriteImage cc maxSize cPath ptr len encrypt = do
-  c <- deRefStablePtr cc
-  path <- peekCString cPath
-  src <- getByteString ptr len
-  cfArgs_ <- if encrypt /= 0 then Just <$> atomically (CF.randomArgs $ random c) else pure Nothing
-  r <-
-    case Picture.decodeResizeable src of
-      Left e -> pure $ WFError e
-      Right (ri, _metadata) -> do
-        let resized = resizeImageToSize False storeMinQuality (fromIntegral maxSize) ri
-        if LB.length resized > fromIntegral maxSize
-          then pure $ WFError "unable to fit"
-          else chatWriteFile_ cfArgs_ path (LB.toStrict resized)
-  newCStringFromLazyBS $ J.encode r
-  where
-    storeMinQuality = 20
-
 data ReadFileResult
   = RFResult {fileSize :: Int}
   | RFError {readError :: String}
@@ -131,7 +106,7 @@ chatEncryptFile ChatController {random} fromPath toPath =
     encrypt = do
       cfArgs <- atomically $ CF.randomArgs random
       encryptFile fromPath toPath cfArgs
-      pure $ Just cfArgs
+      pure cfArgs
 
 cChatDecryptFile :: CString -> CString -> CString -> CString -> IO CString
 cChatDecryptFile cFromPath cKey cNonce cToPath = do

tests/ChatTests/Files.hs

@@ -620,7 +620,7 @@ testXFTPFileTransferEncrypted =
     createDirectoryIfMissing True "./tests/tmp/alice/"
     createDirectoryIfMissing True "./tests/tmp/bob/"
     WFResult cfArgs <- chatWriteFile (chatController alice) srcPath src
-    let fileJSON = LB.unpack $ J.encode $ CryptoFile srcPath cfArgs
+    let fileJSON = LB.unpack $ J.encode $ CryptoFile srcPath $ Just cfArgs
     withXFTPServer $ do
       connectUsers alice bob
       alice ##> ("/_send @2 json [{\"msgContent\":{\"type\":\"file\", \"text\":\"\"}, \"fileSource\": " <> fileJSON <> "}]")

tests/LinkPreviewTests.hs

@@ -1,32 +0,0 @@
-module LinkPreviewTests where
-
-import qualified Data.ByteString.Base64.Lazy as LB64
-import qualified Data.ByteString.Lazy.Char8 as LB
-import qualified Codec.Picture as Picture
-import Control.Logger.Simple
-import Control.Monad
-import Simplex.Chat.Image (ResizeableImage (..))
-import qualified Simplex.Chat.Image as Image
-import Simplex.Messaging.Util (tshow)
-import Test.Hspec
-
-linkPreviewTests :: SpecWith FilePath
-linkPreviewTests = do
-  fdescribe "Image resize" $ do
-    it "JPG" $ resizeToStrTest "tests/fixtures/test.jpg"
-    it "PNG with alpha" $ resizeToStrTest "tests/fixtures/logo-large-rgba.png"
-    it "PNG without alpha" $ resizeToStrTest "tests/fixtures/preview-issue1.png"
-
-resizeToStrTest :: FilePath -> FilePath -> IO ()
-resizeToStrTest inputPath tmp = do
-  (ri@(ResizeableImage imgFormat _img encoder), metadata) <- either error pure =<< Image.readResizeable inputPath
-  logDebug $ tshow (metadata, imgFormat, either (const "png") (const "jpg") encoder)
-  let res = Image.resizeImageToSize True 20 maxSize ri
-      finalSize = LB.length res
-  unless (finalSize <= maxSize) $ error $ "Final size larger than maximum size: " <> show (finalSize, maxSize)
-  let (fmt, b64) = fmap (LB.drop 8) . LB.break (== ';') $ LB.drop 11 res
-      outFile = tmp ++ "/out." ++ LB.unpack fmt
-  either error (LB.writeFile outFile) $ LB64.decode b64
-  Picture.readImageWithMetadata outFile >>= either error (logDebug . tshow . snd)
-  where
-    maxSize = 14000

tests/MobileTests.hs

@@ -282,8 +282,8 @@ testFileCApi fileName tmp = do
   ptr <- mallocBytes $ B.length src
   putByteString ptr src
   r <- peekCAString =<< cChatWriteFile cc cPath ptr cLen
-  Just (WFResult cfArgs@(Just (CFArgs key nonce))) <- jDecode r
-  let encryptedFile = CryptoFile path cfArgs
+  Just (WFResult cfArgs@(CFArgs key nonce)) <- jDecode r
+  let encryptedFile = CryptoFile path $ Just cfArgs
   CF.getFileContentsSize encryptedFile `shouldReturn` fromIntegral (B.length src)
   cKey <- encodedCString key
   cNonce <- encodedCString nonce
@@ -318,8 +318,8 @@ testFileEncryptionCApi fileName tmp = do
   let toPath = tmp </> (fileName <> ".encrypted.pdf")
   cToPath <- newCString toPath
   r <- peekCAString =<< cChatEncryptFile cc cFromPath cToPath
-  Just (WFResult cfArgs@(Just (CFArgs key nonce))) <- jDecode r
-  CF.getFileContentsSize (CryptoFile toPath cfArgs) `shouldReturn` fromIntegral (B.length src)
+  Just (WFResult cfArgs@(CFArgs key nonce)) <- jDecode r
+  CF.getFileContentsSize (CryptoFile toPath $ Just cfArgs) `shouldReturn` fromIntegral (B.length src)
   cKey <- encodedCString key
   cNonce <- encodedCString nonce
   let toPath' = tmp </> (fileName <> ".decrypted.pdf")

tests/Test.hs

@@ -6,7 +6,6 @@ import ChatTests.Utils (xdescribe'')
 import Control.Logger.Simple
 import Data.Time.Clock.System
 import JSONTests
-import LinkPreviewTests
 import MarkdownTests
 import MessageBatching
 import MobileTests
@@ -23,7 +22,7 @@ import WebRTCTests
 
 main :: IO ()
 main = do
-  setLogLevel LogDebug
+  setLogLevel LogError
   withGlobalLogging logCfg . hspec $ do
     describe "Schema dump" schemaDumpTest
     describe "SimpleX chat markdown" markdownTests
@@ -41,7 +40,6 @@ main = do
       xdescribe'' "SimpleX Broadcast bot" broadcastBotTests
       xdescribe'' "SimpleX Directory service bot" directoryServiceTests
       describe "Remote session" remoteTests
-    around testBracket $ describe "Link preview" linkPreviewTests
   where
     testBracket test = withSmpServer $ tmpBracket test
     tmpBracket test = do