mobile: simplex links in UI, core: trusted uri for simplex links (#1410)

apps/android/app/src/main/java/chat/simplex/app/model/ChatModel.kt

@@ -1491,12 +1491,21 @@ object MsgContentSerializer : KSerializer<MsgContent> {
 
 @Serializable
 class FormattedText(val text: String, val format: Format? = null) {
+  // TODO make it dependent on simplexLinkMode preference
   val link: String? = when (format) {
     is Format.Uri -> text
+    is Format.SimplexLink -> format.simplexUri
     is Format.Email -> "mailto:$text"
     is Format.Phone -> "tel:$text"
     else -> null
   }
+
+  // TODO make it dependent on simplexLinkMode preference
+  val viewText: String =
+    if (format is Format.SimplexLink) simplexLinkText(format.linkType, format.smpHosts) else text
+
+  fun simplexLinkText(linkType: SimplexLinkType, smpHosts: List<String>): String =
+    "${linkType.description} (${String.format(generalGetString(R.string.simplex_link_connection), smpHosts.firstOrNull() ?: "?")})"
 }
 
 @Serializable
@@ -1508,6 +1517,8 @@ sealed class Format {
   @Serializable @SerialName("secret") class Secret: Format()
   @Serializable @SerialName("colored") class Colored(val color: FormatColor): Format()
   @Serializable @SerialName("uri") class Uri: Format()
+  // TODO trustedUri: Boolean
+  @Serializable @SerialName("simplexLink") class SimplexLink(val linkType: SimplexLinkType, val simplexUri: String, val smpHosts: List<String>): Format()
   @Serializable @SerialName("email") class Email: Format()
   @Serializable @SerialName("phone") class Phone: Format()
 
@@ -1519,6 +1530,7 @@ sealed class Format {
     is Secret -> SpanStyle(color = Color.Transparent, background = SecretColor)
     is Colored -> SpanStyle(color = this.color.uiColor)
     is Uri -> linkStyle
+    is SimplexLink -> linkStyle
     is Email -> linkStyle
     is Phone -> linkStyle
   }
@@ -1528,6 +1540,19 @@ sealed class Format {
   }
 }
 
+@Serializable
+enum class SimplexLinkType(val linkType: String) {
+  contact("contact"),
+  invitation("invitation"),
+  group("group");
+
+  val description: String get() = generalGetString(when (this) {
+      contact -> R.string.simplex_link_contact
+      invitation -> R.string.simplex_link_invitation
+      group -> R.string.simplex_link_group
+  })
+}
+
 @Serializable
 enum class FormatColor(val color: String) {
   red("red"),

apps/android/app/src/main/java/chat/simplex/app/model/SimpleXAPI.kt

@@ -60,6 +60,16 @@ enum class CallOnLockScreen {
   }
 }
 
+enum class SimplexLinkMode {
+  DESCRIPTION,
+  FULL,
+  BROWSER;
+
+  companion object {
+    val default = SimplexLinkMode.DESCRIPTION
+  }
+}
+
 class AppPreferences(val context: Context) {
   private val sharedPreferences: SharedPreferences = context.getSharedPreferences(SHARED_PREFS_ID, Context.MODE_PRIVATE)
 
@@ -91,6 +101,18 @@ class AppPreferences(val context: Context) {
   val privacyAcceptImages = mkBoolPreference(SHARED_PREFS_PRIVACY_ACCEPT_IMAGES, true)
   val privacyTransferImagesInline = mkBoolPreference(SHARED_PREFS_PRIVACY_TRANSFER_IMAGES_INLINE, false)
   val privacyLinkPreviews = mkBoolPreference(SHARED_PREFS_PRIVACY_LINK_PREVIEWS, true)
+  private val _simplexLinkMode = mkStrPreference(SHARED_PREFS_PRIVACY_SIMPLEX_LINK_MODE, SimplexLinkMode.default.name)
+  val simplexLinkMode: Preference<SimplexLinkMode> = Preference(
+    get = fun(): SimplexLinkMode {
+      val value = _simplexLinkMode.get() ?: return SimplexLinkMode.default
+      return try {
+        SimplexLinkMode.valueOf(value)
+      } catch (e: Error) {
+        SimplexLinkMode.default
+      }
+    },
+    set = fun(mode: SimplexLinkMode) { _simplexLinkMode.set(mode.name) }
+  )
   val experimentalCalls = mkBoolPreference(SHARED_PREFS_EXPERIMENTAL_CALLS, false)
   val chatArchiveName = mkStrPreference(SHARED_PREFS_CHAT_ARCHIVE_NAME, null)
   val chatArchiveTime = mkDatePreference(SHARED_PREFS_CHAT_ARCHIVE_TIME, null)
@@ -181,6 +203,7 @@ class AppPreferences(val context: Context) {
     private const val SHARED_PREFS_PRIVACY_ACCEPT_IMAGES = "PrivacyAcceptImages"
     private const val SHARED_PREFS_PRIVACY_TRANSFER_IMAGES_INLINE = "PrivacyTransferImagesInline"
     private const val SHARED_PREFS_PRIVACY_LINK_PREVIEWS = "PrivacyLinkPreviews"
+    private const val SHARED_PREFS_PRIVACY_SIMPLEX_LINK_MODE = "PrivacySimplexLinkMode"
     private const val SHARED_PREFS_EXPERIMENTAL_CALLS = "ExperimentalCalls"
     private const val SHARED_PREFS_CHAT_ARCHIVE_NAME = "ChatArchiveName"
     private const val SHARED_PREFS_CHAT_ARCHIVE_TIME = "ChatArchiveTime"

apps/android/app/src/main/java/chat/simplex/app/views/chat/item/TextItemView.kt

@@ -84,7 +84,7 @@ fun MarkdownText (
               hasLinks = true
               val ftStyle = ft.format.style
               withAnnotation(tag = "URL", annotation = link) {
-                withStyle(ftStyle) { append(ft.text) }
+                withStyle(ftStyle) { append(ft.viewText) }
               }
             } else {
               withStyle(ft.format.style) { append(ft.text) }

apps/android/app/src/main/res/values-de/strings.xml

@@ -41,6 +41,12 @@
   <string name="description_via_one_time_link">über einen Einmal-Link</string>
   <string name="description_via_one_time_link_incognito">Inkognito über einen Einmal-Link</string>
 
+  <!-- FormattedText, SimpleX links - ChatModel.kt -->
+  <string name="simplex_link_contact">SimpleX Kontaktadressen-Link</string>
+  <string name="simplex_link_invitation">SimpleX Einmal-Link</string>
+  <string name="simplex_link_group">SimpleX Gruppen-Link</string>
+  <string name="simplex_link_connection">über <xliff:g id="serverHost" example="smp.simplex.im">%1$s</xliff:g></string>
+
   <!-- SimpleXAPI.kt -->
   <string name="error_saving_smp_servers">Fehler beim Speichern der SMP-Server</string>
   <string name="ensure_smp_server_address_are_correct_format_and_unique">Stellen Sie sicher, dass die SMP-Server Adressen das richtige Format haben, zeilenweise angeordnet und nicht kopiert sind.</string>

apps/android/app/src/main/res/values-ru/strings.xml

@@ -41,6 +41,12 @@
     <string name="description_via_one_time_link">через одноразовую ссылку</string>
     <string name="description_via_one_time_link_incognito">инкогнито через одноразовую ссылку</string>
 
+    <!-- FormattedText, SimpleX links - ChatModel.kt -->
+    <string name="simplex_link_contact">SimpleX ссылка-контакт</string>
+    <string name="simplex_link_invitation">SimpleX одноразовая ссылка</string>
+    <string name="simplex_link_group">SimpleX ссылка группы</string>
+    <string name="simplex_link_connection">через <xliff:g id="serverHost" example="smp.simplex.im">%1$s</xliff:g></string>
+
     <!-- SimpleXAPI.kt -->
     <string name="error_saving_smp_servers">Ошибка при сохранении SMP серверов</string>
     <string name="ensure_smp_server_address_are_correct_format_and_unique">Пожалуйста, проверьте, что адреса SMP серверов имеют правильный формат, каждый адрес на отдельной строке и не повторяется.</string>

apps/android/app/src/main/res/values/strings.xml

@@ -41,6 +41,12 @@
   <string name="description_via_one_time_link">via one-time link</string>
   <string name="description_via_one_time_link_incognito">incognito via one-time link</string>
 
+  <!-- FormattedText, SimpleX links - ChatModel.kt -->
+  <string name="simplex_link_contact">SimpleX contact address</string>
+  <string name="simplex_link_invitation">SimpleX 1-time invitation</string>
+  <string name="simplex_link_group">SimpleX group link</string>
+  <string name="simplex_link_connection">via <xliff:g id="serverHost" example="smp.simplex.im">%1$s</xliff:g></string>
+
   <!-- SimpleXAPI.kt -->
   <string name="error_saving_smp_servers">Error saving SMP servers</string>
   <string name="ensure_smp_server_address_are_correct_format_and_unique">Make sure SMP server addresses are in correct format, line separated and are not duplicated.</string>