Merge branch 'master' into master-android

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

@@ -2907,6 +2907,7 @@ object ChatController {
       is CR.RemoteHostConnected -> {
         // TODO needs to update it instead in sessions
         chatModel.currentRemoteHost.value = r.remoteHost
+        ModalManager.start.closeModals()
         switchUIRemoteHost(r.remoteHost.remoteHostId)
       }
       is CR.ContactDisabled -> {

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

@@ -40,11 +40,21 @@ suspend fun getLinkPreview(url: String): LinkPreview? {
           url
         }
         else -> {
-          val response = Jsoup.connect(url)
+          val connection = Jsoup.connect(url)
             .ignoreContentType(true)
             .timeout(10000)
             .followRedirects(true)
-            .execute()
+
+          val response = if (url.lowercase().startsWith("https://x.com/")) {
+            // Apple sends request with special user-agent which handled differently by X.com.
+            // Different response that includes video poster from post
+            connection
+              .userAgent("Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_1) AppleWebKit/601.2.4 (KHTML, like Gecko) Version/9.0.1 Safari/601.2.4 facebookexternalhit/1.1 Facebot Twitterbot/1.0")
+              .execute()
+          } else {
+            connection
+              .execute()
+          }
           val doc = response.parse()
           val ogTags = doc.select(OG_SELECT_QUERY)
           title = ogTags.firstOrNull { it.attr("property") == "og:title" }?.attr("content") ?: doc.title()

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/onboarding/WhatsNewView.kt

@@ -762,6 +762,45 @@ private val versionDescriptions: List<VersionDescription> = listOf(
         descrId = MR.strings.v6_2_improved_chat_navigation_descr
       ),
     ),
+  ),
+  VersionDescription(
+    version = "v6.3",
+    // post = "https://simplex.chat/blog/20241210-simplex-network-v6-2-servers-by-flux-business-chats.html",
+    features = listOf(
+      VersionFeature.FeatureDescription(
+        icon = MR.images.ic_at,
+        titleId = MR.strings.v6_3_mentions,
+        descrId = MR.strings.v6_3_mentions_descr
+      ),
+      VersionFeature.FeatureDescription(
+        icon = MR.images.ic_flag,
+        titleId = MR.strings.v6_3_reports,
+        descrId = MR.strings.v6_3_reports_descr
+      ),
+      VersionFeature.FeatureDescription(
+        icon = MR.images.ic_menu,
+        titleId = MR.strings.v6_3_organize_chat_lists,
+        descrId = MR.strings.v6_3_organize_chat_lists_descr
+      ),
+      VersionFeature.FeatureDescription(
+        icon = null,
+        titleId = MR.strings.v6_3_better_privacy_and_security,
+        descrId = null,
+        subfeatures = listOf(
+          MR.images.ic_visibility_off to MR.strings.v6_3_private_media_file_names,
+          MR.images.ic_delete to MR.strings.v6_3_set_message_expiration_in_chats
+        )
+      ),
+      VersionFeature.FeatureDescription(
+        icon = null,
+        titleId = MR.strings.v6_3_better_groups_performance,
+        descrId = null,
+        subfeatures = listOf(
+          MR.images.ic_bolt to MR.strings.v6_3_faster_sending_messages,
+          MR.images.ic_group_off to MR.strings.v6_3_faster_deletion_of_groups
+        )
+      ),
+    )
   )
 )
 

apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml

@@ -2282,6 +2282,18 @@
   <string name="v6_2_improved_chat_navigation_descr">- Open chat on the first unread message.\n- Jump to quoted messages.</string>
   <string name="v6_2_business_chats">Business chats</string>
   <string name="v6_2_business_chats_descr">Privacy for your customers.</string>
+  <string name="v6_3_mentions">Mention members 👋</string>
+  <string name="v6_3_mentions_descr">Get notified when mentioned.</string>
+  <string name="v6_3_reports">Send private reports</string>
+  <string name="v6_3_reports_descr">Help admins moderating their groups.</string>
+  <string name="v6_3_organize_chat_lists">Organize chats into lists</string>
+  <string name="v6_3_organize_chat_lists_descr">Don\'t miss important messages.</string>
+  <string name="v6_3_better_privacy_and_security">Better privacy and security</string>
+  <string name="v6_3_private_media_file_names">Private media file names.</string>
+  <string name="v6_3_set_message_expiration_in_chats">Set message expiration in chats.</string>
+  <string name="v6_3_better_groups_performance">Better groups performance</string>
+  <string name="v6_3_faster_sending_messages">Faster sending messages.</string>
+  <string name="v6_3_faster_deletion_of_groups">Faster deletion of groups.</string>
   <string name="view_updated_conditions">View updated conditions</string>
 
   <!-- CustomTimePicker -->

apps/multiplatform/common/src/commonMain/resources/MR/images/ic_at.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="22" viewBox="0 -960 960 960" width="22" fill="#000000"><path d="M480-85q-82.01 0-154.15-31.13-72.13-31.13-125.49-84.5Q147-254 116-326.02q-31-72.03-31-153.92 0-81.97 31.13-154.13 31.13-72.17 84.5-125.55Q254-813 326.02-844q72.03-31 153.92-31 81.97 0 154.13 31.13 72.17 31.13 125.55 84.5Q813-706 844-633.9q31 72.11 31 154.09v51.78q0 54.97-38.92 92.75T741-297.5q-36.08 0-67.41-17.75Q642.25-333 625.5-364.5q-25.5 34-64.33 50.5-38.84 16.5-81.02 16.5-76.26 0-129.95-53-53.7-53-53.7-129.76 0-76.77 53.7-130.5Q403.89-664.5 480-664.5q76.1 0 129.8 53.76 53.7 53.76 53.7 130.58V-428q0 30.61 22.86 51.81Q709.22-355 740.5-355t54.14-21.19q22.86-21.2 22.86-51.81v-52q0-141.38-98.06-239.44T480-817.5q-141.37 0-239.44 98.06Q142.5-621.38 142.5-480q0 141.37 98.06 239.44Q338.63-142.5 480-142.5h184q11.67 0 20.09 8.46 8.41 8.47 8.41 20.22 0 12.32-8.41 20.57Q675.67-85 664-85H480Zm0-270q52.5 0 89.25-36.44t36.75-88.5q0-53.56-36.75-90.31T480-607q-52.5 0-89.25 36.69T354-480.06q0 52.06 36.75 88.56T480-355Z"/></svg>

apps/multiplatform/common/src/commonMain/resources/MR/images/ic_group_off.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="22" viewBox="0 -960 960 960" width="22" fill="#000000"><path d="m811.5-67-192-191h57v33q0 24.39-17.05 41.45Q642.39-166.5 618-166.5H103q-24.44 0-40.97-16.77Q45.5-200.03 45.5-224v-33.6q0-34.57 17.46-62.33 17.46-27.75 49.32-41.53Q185-393 242.5-407t118.27-14q28.11 0 54.48 3 26.37 3 52.75 8l-74-73.5q-8.17 2-16.3 2.5t-16.73.5Q296-480.5 255-521.38T214-627.5q0-8.37.5-16.65t2.5-16.35l-164.5-165q-9-8.5-9-20.5t8.75-20.5Q61-875 73-875t20.6 8.59L853-107.5q8.5 8.67 8.5 20.23T853-66.85Q843.97-58 831.98-58 820-58 811.5-67Zm-189-355.5q68 8.5 126.8 22.9 58.79 14.39 96.2 34.1 33 17.5 51.25 45.5T915-257.12v90.62h-39L726-317q-13-36-39.75-62t-63.75-43.5Zm-261.37 59q-56.37 0-105.25 10.75T135-310q-14 6.5-23 21.5t-9 31v33.5h516v-34.5l-64.5-65q-58-23.5-100.75-31.75t-92.62-8.25ZM535-508q15.5-22.5 23.75-53.18 8.25-30.67 8.25-66.88 0-44.28-12.25-78.11T518.5-768q10-2.81 23-4.66 13-1.84 23.5-1.84 65.24 0 106.12 41.03Q712-692.45 712-627.81q0 64.84-42.6 105.82Q626.8-481 562-481l-27-27Zm-45-45-43.5-43.5q2-7 3-14.75t1-16.25q0-39.09-25.21-64.29Q400.09-717 361-717q-8.5 0-16.25 1T330-713l-43.5-43.5q15.5-8.75 34.5-13.38 19-4.62 40-4.62 65.24 0 106.12 40.88Q508-692.74 508-627.5q0 21-4.62 40-4.63 19-13.38 34.5ZM367-224Zm21.5-431Z"/></svg>