core: allow to add short link to existing contact link (#5940)

2026-08-29 03:18:37 +00:00 · 2025-05-23 13:16:12 +00:00
parent e8968653ef
commit 6acd239339
12 changed files with 239 additions and 50 deletions
@@ -1570,6 +1570,14 @@ object ChatController {
    return null
  }

+  suspend fun apiAddShortLinkMyAddress(rh: Long?): UserContactLinkRec? {
+    val userId = kotlin.runCatching { currentUserId("apiAddShortLinkMyAddress") }.getOrElse { return null }
+    val r = sendCmd(rh, CC.ApiAddShortLinkMyAddress(userId))
+    if (r is API.Result && r.res is CR.UserContactLink) return r.res.contactLink
+    Log.e(TAG, "apiAddShortLinkMyAddress bad response: ${r.responseType} ${r.details}")
+    return null
+  }
+
  suspend fun userAddressAutoAccept(rh: Long?, autoAccept: AutoAccept?): UserContactLinkRec? {
    val userId = kotlin.runCatching { currentUserId("userAddressAutoAccept") }.getOrElse { return null }
    val r = sendCmd(rh, CC.ApiAddressAutoAccept(userId, autoAccept))
@@ -2016,6 +2024,13 @@ object ChatController {
    return null
  }

+  suspend fun apiAddShortLinkGroupLink(rh: Long?, groupId: Long): Pair<CreatedConnLink, GroupMemberRole>? {
+    val r = sendCmd(rh, CC.APIAddShortLinkGroupLink(groupId))
+    if (r is API.Result && r.res is CR.GroupLink) return r.res.connLinkContact to r.res.memberRole
+    Log.e(TAG, "apiAddShortLinkGroupLink bad response: ${r.responseType} ${r.details}")
+    return null
+  }
+
  suspend fun apiCreateMemberContact(rh: Long?, groupId: Long, groupMemberId: Long): Contact? {
    val r = sendCmd(rh, CC.APICreateMemberContact(groupId, groupMemberId))
    if (r is API.Result && r.res is CR.NewMemberContact) return r.res.contact
@@ -3368,6 +3383,7 @@ sealed class CC {
  class APIGroupLinkMemberRole(val groupId: Long, val memberRole: GroupMemberRole): CC()
  class APIDeleteGroupLink(val groupId: Long): CC()
  class APIGetGroupLink(val groupId: Long): CC()
+  class APIAddShortLinkGroupLink(val groupId: Long): CC()
  class APICreateMemberContact(val groupId: Long, val groupMemberId: Long): CC()
  class APISendMemberContactInvitation(val contactId: Long, val mc: MsgContent): CC()
  class APITestProtoServer(val userId: Long, val server: String): CC()
@@ -3422,6 +3438,7 @@ sealed class CC {
  class ApiCreateMyAddress(val userId: Long, val short: Boolean): CC()
  class ApiDeleteMyAddress(val userId: Long): CC()
  class ApiShowMyAddress(val userId: Long): CC()
+  class ApiAddShortLinkMyAddress(val userId: Long): CC()
  class ApiSetProfileAddress(val userId: Long, val on: Boolean): CC()
  class ApiAddressAutoAccept(val userId: Long, val autoAccept: AutoAccept?): CC()
  class ApiGetCallInvitations: CC()
@@ -3555,6 +3572,7 @@ sealed class CC {
    is APIGroupLinkMemberRole -> "/_set link role #$groupId ${memberRole.name.lowercase()}"
    is APIDeleteGroupLink -> "/_delete link #$groupId"
    is APIGetGroupLink -> "/_get link #$groupId"
+    is APIAddShortLinkGroupLink -> "/_short link #$groupId"
    is APICreateMemberContact -> "/_create member contact #$groupId $groupMemberId"
    is APISendMemberContactInvitation -> "/_invite member contact @$contactId ${mc.cmdString}"
    is APITestProtoServer -> "/_server test $userId $server"
@@ -3609,6 +3627,7 @@ sealed class CC {
    is ApiCreateMyAddress -> "/_address $userId short=${onOff(short)}"
    is ApiDeleteMyAddress -> "/_delete_address $userId"
    is ApiShowMyAddress -> "/_show_address $userId"
+    is ApiAddShortLinkMyAddress -> "/_short_link_address $userId"
    is ApiSetProfileAddress -> "/_profile_address $userId ${onOff(on)}"
    is ApiAddressAutoAccept -> "/_auto_accept $userId ${AutoAccept.cmdString(autoAccept)}"
    is ApiAcceptContact -> "/_accept incognito=${onOff(incognito)} $contactReqId"
@@ -3720,6 +3739,7 @@ sealed class CC {
    is APIGroupLinkMemberRole -> "apiGroupLinkMemberRole"
    is APIDeleteGroupLink -> "apiDeleteGroupLink"
    is APIGetGroupLink -> "apiGetGroupLink"
+    is APIAddShortLinkGroupLink -> "apiAddShortLinkGroupLink"
    is APICreateMemberContact -> "apiCreateMemberContact"
    is APISendMemberContactInvitation -> "apiSendMemberContactInvitation"
    is APITestProtoServer -> "testProtoServer"
@@ -3774,6 +3794,7 @@ sealed class CC {
    is ApiCreateMyAddress -> "apiCreateMyAddress"
    is ApiDeleteMyAddress -> "apiDeleteMyAddress"
    is ApiShowMyAddress -> "apiShowMyAddress"
+    is ApiAddShortLinkMyAddress -> "apiAddShortLinkMyAddress"
    is ApiSetProfileAddress -> "apiSetProfileAddress"
    is ApiAddressAutoAccept -> "apiAddressAutoAccept"
    is ApiAcceptContact -> "apiAcceptContact"
@@ -49,6 +49,18 @@ fun GroupLinkView(
      creatingLink = false
    }
  }
+  fun addShortLink() {
+    creatingLink = true
+    withBGApi {
+      val link = chatModel.controller.apiAddShortLinkGroupLink(rhId, groupInfo.groupId)
+      if (link != null) {
+        groupLink = link.first
+        groupLinkMemberRole.value = link.second
+        onGroupLinkUpdated?.invoke(link)
+      }
+      creatingLink = false
+    }
+  }
  LaunchedEffect(Unit) {
    if (groupLink == null && !creatingLink) {
      createLink()
@@ -60,6 +72,7 @@ fun GroupLinkView(
    groupLinkMemberRole,
    creatingLink,
    createLink = ::createLink,
+    addShortLink = ::addShortLink,
    updateLink = {
      val role = groupLinkMemberRole.value
      if (role != null) {
@@ -105,6 +118,7 @@ fun GroupLinkLayout(
  groupLinkMemberRole: MutableState<GroupMemberRole?>,
  creatingLink: Boolean,
  createLink: () -> Unit,
+  addShortLink: () -> Unit,
  updateLink: () -> Unit,
  deleteLink: () -> Unit,
  creatingGroup: Boolean = false,
@@ -182,12 +196,26 @@ fun GroupLinkLayout(
            )
          }
        }
+        if (groupLink.connShortLink == null && appPreferences.privacyShortLinks.get()) {
+          AddShortLinkButton(addShortLink)
+        }
      }
    }
    SectionBottomSpacer()
  }
 }

+@Composable
+private fun AddShortLinkButton(onClick: () -> Unit) {
+  SettingsActionItem(
+    painterResource(MR.images.ic_add),
+    stringResource(MR.strings.add_short_link),
+    onClick,
+    iconColor = MaterialTheme.colors.primary,
+    textColor = MaterialTheme.colors.primary,
+  )
+}
+
@Composable
 private fun RoleSelectionRow(groupInfo: GroupInfo, selectedRole: MutableState<GroupMemberRole?>, enabled: Boolean = true) {
  Row(
@@ -43,6 +43,7 @@ fun UserAddressView(
  KeyChangeEffect(user.value?.remoteHostId, user.value?.userId) {
    close()
  }
+
  fun setProfileAddress(on: Boolean) {
    progressIndicator = true
    withBGApi {
@@ -81,6 +82,17 @@ fun UserAddressView(
    }
  }

+  fun addShortLink() {
+    withBGApi {
+      progressIndicator = true
+      val userAddress = chatModel.controller.apiAddShortLinkMyAddress(user.value?.remoteHostId)
+      if (userAddress != null) {
+        chatModel.userAddress.value = userAddress
+      }
+      progressIndicator = false
+    }
+  }
+
  LaunchedEffect(autoCreateAddress) {
    if (chatModel.userAddress.value == null && autoCreateAddress) {
      createAddress()
@@ -95,6 +107,7 @@ fun UserAddressView(
      userAddress = userAddress.value,
      shareViaProfile,
      createAddress = { createAddress() },
+      addShortLink = { addShortLink() },
      learnMore = {
        ModalManager.start.showModal {
          UserAddressLearnMore()
@@ -169,6 +182,7 @@ private fun UserAddressLayout(
  userAddress: UserContactLinkRec?,
  shareViaProfile: MutableState<Boolean>,
  createAddress: () -> Unit,
+  addShortLink: () -> Unit,
  learnMore: () -> Unit,
  share: (String) -> Unit,
  sendEmail: (UserContactLinkRec) -> Unit,
@@ -211,6 +225,9 @@ private fun UserAddressLayout(
          // ShareViaEmailButton { sendEmail(userAddress) }
          BusinessAddressToggle(autoAcceptState) { saveAas(autoAcceptState.value, autoAcceptStateSaved) }
          AddressSettingsButton(user, userAddress, shareViaProfile, setProfileAddress, saveAas)
+          if (userAddress.connLinkContact.connShortLink == null && appPreferences.privacyShortLinks.get()) {
+            AddShortLinkButton(addShortLink)
+          }

          if (autoAcceptState.value.business) {
            SectionTextFooter(stringResource(MR.strings.add_your_team_members_to_conversations))
@@ -248,6 +265,17 @@ private fun CreateAddressButton(onClick: () -> Unit) {
  )
 }

+@Composable
+private fun AddShortLinkButton(onClick: () -> Unit) {
+  SettingsActionItem(
+    painterResource(MR.images.ic_add),
+    stringResource(MR.strings.add_short_link),
+    onClick,
+    iconColor = MaterialTheme.colors.primary,
+    textColor = MaterialTheme.colors.primary,
+  )
+}
+
@Composable
 private fun CreateOneTimeLinkButton() {
  val closeAll = { ModalManager.start.closeModals() }
@@ -559,6 +587,7 @@ fun PreviewUserAddressLayoutNoAddress() {
      user = User.sampleData,
      userAddress = null,
      createAddress = {},
+      addShortLink = {},
      share = { _ -> },
      deleteAddress = {},
      saveAas = { _, _ -> },
@@ -592,6 +621,7 @@ fun PreviewUserAddressLayoutAddressCreated() {
      user = User.sampleData,
      userAddress = UserContactLinkRec(CreatedConnLink("https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23MCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%3D", null)),
      createAddress = {},
+      addShortLink = {},
      share = { _ -> },
      deleteAddress = {},
      saveAas = { _, _ -> },
@@ -1058,6 +1058,7 @@
  <string name="address_settings">Address settings</string>
  <string name="business_address">Business address</string>
  <string name="add_your_team_members_to_conversations">Add your team members to the conversations.</string>
+  <string name="add_short_link">Add short link</string>

  <!-- CreateSimpleXAddress.kt -->
  <string name="continue_to_next_step">Continue</string>