From d91bae8c9ce804770f4a45efcb6ca2d188149d39 Mon Sep 17 00:00:00 2001
From: IC Rainbow <aenor.realm@gmail.com>
Date: Thu, 31 Oct 2024 13:32:45 +0200
Subject: [PATCH] fixes

---
 apps/ios/SimpleXChat/ImageUtils.swift | 2 +-
 src/Simplex/Chat/Image.hs             | 2 +-
 tests/LinkPreviewTests.hs             | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/ios/SimpleXChat/ImageUtils.swift b/apps/ios/SimpleXChat/ImageUtils.swift
index bb25cbf48f..ecc216e18a 100644
--- a/apps/ios/SimpleXChat/ImageUtils.swift
+++ b/apps/ios/SimpleXChat/ImageUtils.swift
@@ -319,7 +319,7 @@ private func getTimestamp() -> String {
 }
 
 public func dropImagePrefix(_ s: String) -> String {
-    dropPrefix(dropPrefix(s, "data:image/png;base64,"), "data:image/jpg;base64,")
+    dropPrefix(dropPrefix(dropPrefix(s, "data:image/png;base64,"), "data:image/jpg;base64,"), "data:image/jpeg;base64,")
 }
 
 private func dropPrefix(_ s: String, _ prefix: String) -> String {
diff --git a/src/Simplex/Chat/Image.hs b/src/Simplex/Chat/Image.hs
index 776b0cdb0a..59f3eb9ca2 100644
--- a/src/Simplex/Chat/Image.hs
+++ b/src/Simplex/Chat/Image.hs
@@ -52,7 +52,7 @@ resizeImageToSize toURI maxSize (ResizeableImage fmt img encoder) = either resiz
       | otherwise = fitQuality 33 99
       where
         encode q
-          | toURI = toDataUri "jpeg" $ enc q img
+          | 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 33
         fitQuality l u
diff --git a/tests/LinkPreviewTests.hs b/tests/LinkPreviewTests.hs
index 4dc26d7980..b06cb3bcad 100644
--- a/tests/LinkPreviewTests.hs
+++ b/tests/LinkPreviewTests.hs
@@ -20,8 +20,8 @@ linkPreviewTests = do
 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 "jpeg") encoder)
-  let res = Image.resizeImageToStrSize maxSize ri
+  logDebug $ tshow (metadata, imgFormat, either (const "png") (const "jpg") encoder)
+  let res = Image.resizeImageToSize True 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