Feature/community link handling

app/src/main/java/org/session/libsession/database/StorageProtocol.kt

@@ -112,7 +112,6 @@ interface StorageProtocol {
     fun addClosedGroupEncryptionKeyPair(encryptionKeyPair: ECKeyPair, groupPublicKey: String, timestamp: Long)
     fun removeAllClosedGroupEncryptionKeyPairs(groupPublicKey: String)
 
-    fun isLegacyClosedGroup(publicKey: String): Boolean
     fun getClosedGroupEncryptionKeyPairs(groupPublicKey: String): MutableList<ECKeyPair>
     fun getLatestClosedGroupEncryptionKeyPair(groupPublicKey: String): ECKeyPair?
     fun updateFormationTimestamp(groupID: String, formationTimestamp: Long)

app/src/main/java/org/session/libsignal/database/LokiAPIDatabaseProtocol.kt

@@ -22,7 +22,6 @@ interface LokiAPIDatabaseProtocol {
     fun setOpenGroupPublicKey(server: String, newValue: String)
     fun getClosedGroupEncryptionKeyPairs(groupPublicKey: String): List<ECKeyPair>
     fun getLatestClosedGroupEncryptionKeyPair(groupPublicKey: String): ECKeyPair?
-    fun isClosedGroup(groupPublicKey: String): Boolean
     fun getForkInfo(): ForkInfo
     fun setForkInfo(forkInfo: ForkInfo)
     fun migrateLegacyOpenGroup(legacyServerId: String, newServerId: String)

app/src/main/java/org/session/libsignal/utilities/AccountId.kt

@@ -50,5 +50,7 @@ data class AccountId(
                 null
             }
         }
+
+        fun hasValidLength(candidate: String) = candidate.length == 66
     }
 }

app/src/main/java/org/thoughtcrime/securesms/InputBarDialogs.kt

@@ -3,8 +3,8 @@ package org.thoughtcrime.securesms
 
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.runtime.Composable
-import org.thoughtcrime.securesms.ui.AlertDialog
-import org.thoughtcrime.securesms.ui.DialogButtonData
+import org.thoughtcrime.securesms.ui.dialog.AlertDialog
+import org.thoughtcrime.securesms.ui.dialog.DialogButtonData
 import org.thoughtcrime.securesms.ui.GetString
 import org.thoughtcrime.securesms.ui.LongMessageProCTA
 import org.thoughtcrime.securesms.ui.components.annotatedStringResource

app/src/main/java/org/thoughtcrime/securesms/InputbarViewModel.kt

@@ -12,7 +12,7 @@ import org.session.libsession.utilities.StringSubstitutionConstants.LIMIT_KEY
 import org.thoughtcrime.securesms.database.RecipientRepository
 import org.thoughtcrime.securesms.pro.ProStatus
 import org.thoughtcrime.securesms.pro.ProStatusManager
-import org.thoughtcrime.securesms.ui.SimpleDialogData
+import org.thoughtcrime.securesms.ui.dialog.SimpleDialogData
 import org.thoughtcrime.securesms.util.NumberUtil
 
 // the amount of character left at which point we should show an indicator

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt

@@ -143,7 +143,7 @@ import org.thoughtcrime.securesms.components.TypingStatusSender
 import org.thoughtcrime.securesms.components.emoji.RecentEmojiPageModel
 import org.thoughtcrime.securesms.conversation.v2.ConversationReactionOverlay.OnActionSelectedListener
 import org.thoughtcrime.securesms.conversation.v2.ConversationReactionOverlay.OnReactionSelectedListener
-import org.thoughtcrime.securesms.conversation.v2.ConversationViewModel.Commands.ShowOpenUrlDialog
+import org.thoughtcrime.securesms.conversation.v2.ConversationViewModel.Commands.HandleLink
 import org.thoughtcrime.securesms.conversation.v2.MessageDetailActivity.Companion.ON_COPY
 import org.thoughtcrime.securesms.conversation.v2.MessageDetailActivity.Companion.ON_DELETE
 import org.thoughtcrime.securesms.conversation.v2.MessageDetailActivity.Companion.ON_REPLY
@@ -562,7 +562,7 @@ class ConversationActivityV2 : ScreenLockActionBarActivity(), InputBarDelegate,
     }
     // endregion
 
-    fun showOpenUrlDialog(url: String) = viewModel.onCommand(ShowOpenUrlDialog(url))
+    fun handleLink(url: String) = viewModel.onCommand(HandleLink(url))
 
     // region Lifecycle
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -837,7 +837,7 @@ class ConversationActivityV2 : ScreenLockActionBarActivity(), InputBarDelegate,
                         val intent = ConversationSettingsActivity.createIntent(
                             context = this@ConversationActivityV2,
                             address = event.address,
-                            startDestination = ConversationV3Destination.RouteDisappearingMessages
+                            startDestination = ConversationV3Destination.RouteDisappearingMessages(event.address)
                         )
                         startActivity(intent)
                     }
@@ -1264,7 +1264,7 @@ class ConversationActivityV2 : ScreenLockActionBarActivity(), InputBarDelegate,
                             }
 
                         binding.conversationHeader.outdatedGroupBanner.setOnClickListener {
-                            showOpenUrlDialog("https://getsession.org/groups")
+                            handleLink("https://getsession.org/groups")
                         }
                     }
                 }
@@ -3194,4 +3194,4 @@ class ConversationActivityV2 : ScreenLockActionBarActivity(), InputBarDelegate,
             }
         }
     }
-}
+}

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationV2Dialogs.kt

@@ -18,28 +18,26 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import com.squareup.phrase.Phrase
 import network.loki.messenger.R
-import org.session.libsession.utilities.StringSubstitutionConstants.COMMUNITY_NAME_KEY
 import org.session.libsession.utilities.StringSubstitutionConstants.CONVERSATION_NAME_KEY
 import org.session.libsession.utilities.StringSubstitutionConstants.EMOJI_KEY
-import org.session.libsession.utilities.recipients.displayName
 import org.thoughtcrime.securesms.InputBarDialogs
 import org.thoughtcrime.securesms.InputbarViewModel
 import org.thoughtcrime.securesms.conversation.v2.ConversationViewModel.Commands.*
 import org.thoughtcrime.securesms.home.startconversation.group.CreateGroupScreen
-import org.thoughtcrime.securesms.ui.AlertDialog
-import org.thoughtcrime.securesms.ui.DialogButtonData
+import org.thoughtcrime.securesms.links.LinkType
+import org.thoughtcrime.securesms.ui.dialog.AlertDialog
+import org.thoughtcrime.securesms.ui.dialog.DialogButtonData
 import org.thoughtcrime.securesms.ui.GetString
-import org.thoughtcrime.securesms.ui.OpenURLAlertDialog
 import org.thoughtcrime.securesms.ui.RadioOption
 import org.thoughtcrime.securesms.ui.UserProfileModal
 import org.thoughtcrime.securesms.ui.components.DialogTitledRadioButton
 import org.thoughtcrime.securesms.ui.components.annotatedStringResource
+import org.thoughtcrime.securesms.ui.dialog.LinkAlertDialog
 import org.thoughtcrime.securesms.ui.theme.LocalColors
 import org.thoughtcrime.securesms.ui.theme.LocalDimensions
 import org.thoughtcrime.securesms.ui.theme.LocalType
 import org.thoughtcrime.securesms.ui.theme.PreviewTheme
 import org.thoughtcrime.securesms.ui.theme.SessionMaterialTheme
-import kotlin.text.format
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -93,13 +91,16 @@ fun ConversationV2Dialogs(
             sendCommand = sendInputBarCommand
         )
 
-        // open link confirmation
-        if(!dialogsState.openLinkDialogUrl.isNullOrEmpty()){
-            OpenURLAlertDialog(
-                url = dialogsState.openLinkDialogUrl,
+        // Link dialogs
+        if(dialogsState.urlDialog != null){
+            LinkAlertDialog(
+                data = dialogsState.urlDialog,
                 onDismissRequest = {
                     // hide dialog
-                    sendCommand(ShowOpenUrlDialog(null))
+                    sendCommand(HideOpenUrlDialog)
+                },
+                openOrJoinCommunity = {
+                    sendCommand(OpenOrJoinCommunity(it))
                 }
             )
         }
@@ -273,30 +274,6 @@ fun ConversationV2Dialogs(
             )
         }
 
-        // Join community
-        if(dialogsState.joinCommunity != null){
-            AlertDialog(
-                onDismissRequest = {
-                    // hide dialog
-                    sendCommand(HideJoinCommunityDialog)
-                },
-                title = stringResource(R.string.communityJoin),
-                text = Phrase.from(LocalContext.current, R.string.communityJoinDescription)
-                    .put(COMMUNITY_NAME_KEY, dialogsState.joinCommunity.communityName).format().toString(),
-                buttons = listOf(
-                    DialogButtonData(
-                        text = GetString(stringResource(id = R.string.join)),
-                        onClick = {
-                            sendCommand(JoinCommunity(dialogsState.joinCommunity.communityUrl))
-                        }
-                    ),
-                    DialogButtonData(
-                        GetString(stringResource(R.string.cancel))
-                    )
-                )
-            )
-        }
-
         // Attachment downloads
         if(dialogsState.attachmentDownload != null){
             AlertDialog(
@@ -333,7 +310,7 @@ fun PreviewURLDialog(){
     PreviewTheme {
         ConversationV2Dialogs(
             dialogsState = ConversationViewModel.DialogsState(
-                openLinkDialogUrl = "https://google.com"
+                urlDialog = LinkType.GenericLink("https://google.com")
             ),
             inputBarDialogsState = InputbarViewModel.InputBarDialogsState(),
             sendCommand = {},

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModel.kt

@@ -108,13 +108,15 @@ import org.thoughtcrime.securesms.database.model.GroupThreadStatus
 import org.thoughtcrime.securesms.database.model.MessageId
 import org.thoughtcrime.securesms.database.model.MessageRecord
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord
+import org.thoughtcrime.securesms.links.LinkChecker
+import org.thoughtcrime.securesms.links.LinkType
 import org.thoughtcrime.securesms.database.model.NotifyType
 import org.thoughtcrime.securesms.dependencies.ConfigFactory
 import org.thoughtcrime.securesms.groups.ExpiredGroupManager
 import org.thoughtcrime.securesms.groups.OpenGroupManager
 import org.thoughtcrime.securesms.pro.ProStatusManager
 import org.thoughtcrime.securesms.repository.ConversationRepository
-import org.thoughtcrime.securesms.ui.SimpleDialogData
+import org.thoughtcrime.securesms.ui.dialog.SimpleDialogData
 import org.thoughtcrime.securesms.ui.components.ConversationAppBarData
 import org.thoughtcrime.securesms.ui.components.ConversationAppBarPagerData
 import org.thoughtcrime.securesms.ui.getSubbedString
@@ -163,6 +165,7 @@ class ConversationViewModel @AssistedInject constructor(
     private val upmFactory: UserProfileUtils.UserProfileUtilsFactory,
     attachmentDownloadHandlerFactory: AttachmentDownloadHandler.Factory,
     private val openGroupManager: OpenGroupManager,
+    private val linkChecker: LinkChecker,
     private val attachmentDownloadJobFactory: AttachmentDownloadJob.Factory,
     private val communityApiExecutor: CommunityApiExecutor,
     private val deleteAllReactionsApiFactory: DeleteAllReactionsApi.Factory,
@@ -1209,18 +1212,36 @@ class ConversationViewModel @AssistedInject constructor(
     }
 
     fun confirmCommunityJoin(communityName: String, communityUrl: String){
-        _dialogsState.update {
-            it.copy(
-                joinCommunity = JoinCommunityDialogData(
-                    communityName = communityName,
-                    communityUrl = communityUrl
-                )
+        viewModelScope.launch {
+            val detectedLink = linkChecker.check(communityUrl) as? LinkType.CommunityLink
+            val resolvedName = communityName.takeIf { it.isNotBlank() } ?: detectedLink?.name ?: communityUrl
+            val link = detectedLink?.copy(
+                name = resolvedName,
+            ) ?: LinkType.CommunityLink(
+                url = communityUrl,
+                name = resolvedName,
+                joined = false,
+                displayType = LinkType.CommunityLink.DisplayType.CONVERSATION
             )
+
+            _dialogsState.update {
+                it.copy(
+                    urlDialog = link,
+                )
+            }
         }
     }
 
-    private fun joinCommunity(url: String){
-        val openGroup = OpenGroupUrlParser.parseUrl(url)
+    private fun openOrJoinCommunity(url: String){
+        val openGroup = try {
+            OpenGroupUrlParser.parseUrl(url)
+        } catch (_: OpenGroupUrlParser.Error) {
+            Toast.makeText(application, R.string.communityEnterUrlErrorInvalidDescription, Toast.LENGTH_SHORT)
+                .show()
+            return
+        }
+
+        _dialogsState.update { it.copy(urlDialog = null) }
 
         viewModelScope.launch {
             try {
@@ -1229,6 +1250,11 @@ class ConversationViewModel @AssistedInject constructor(
                     room = openGroup.room,
                     publicKey = openGroup.serverPublicKey,
                 )
+
+                // after joining or if already joined, open the conversation
+                _uiEvents.tryEmit(ConversationUiEvent.NavigateToConversation(
+                    address = Address.Community(openGroup.server, openGroup.room),
+                ))
             } catch (e: Exception) {
                 Log.e("", "Error joining community", e)
                 withContext(Dispatchers.Main) {
@@ -1239,6 +1265,16 @@ class ConversationViewModel @AssistedInject constructor(
         }
     }
 
+    private fun handleLink(url: String) {
+        viewModelScope.launch {
+            _dialogsState.update {
+                it.copy(
+                    urlDialog = linkChecker.check(url),
+                )
+            }
+        }
+    }
+
     /**
      * Implicitly approve the recipient.
      *
@@ -1258,9 +1294,13 @@ class ConversationViewModel @AssistedInject constructor(
 
     fun onCommand(command: Commands) {
         when (command) {
-            is Commands.ShowOpenUrlDialog -> {
+            is Commands.HandleLink -> {
+                handleLink(command.url)
+            }
+
+            Commands.HideOpenUrlDialog -> {
                 _dialogsState.update {
-                    it.copy(openLinkDialogUrl = command.url)
+                    it.copy(urlDialog = null)
                 }
             }
 
@@ -1332,14 +1372,14 @@ class ConversationViewModel @AssistedInject constructor(
                 userProfileModalUtils?.onCommand(command.upmCommand)
             }
 
-            is Commands.JoinCommunity -> {
-                joinCommunity(command.url)
+            is Commands.OpenOrJoinCommunity -> {
+                openOrJoinCommunity(command.url)
             }
 
             is Commands.HideJoinCommunityDialog -> {
                 _dialogsState.update {
                     it.copy(
-                        joinCommunity = null
+                        urlDialog = null
                     )
                 }
             }
@@ -1565,21 +1605,15 @@ class ConversationViewModel @AssistedInject constructor(
 
     data class DialogsState(
         val showSimpleDialog: SimpleDialogData? = null,
-        val openLinkDialogUrl: String? = null,
         val clearAllEmoji: ClearAllEmoji? = null,
         val deleteEveryone: DeleteForEveryoneDialogData? = null,
         val recreateGroupConfirm: Boolean = false,
         val recreateGroupData: RecreateGroupDialogData? = null,
         val userProfileModal: UserProfileModalData? = null,
-        val joinCommunity: JoinCommunityDialogData? = null,
+        val urlDialog: LinkType? = null,
         val attachmentDownload: ConfirmAttachmentDownloadDialogData? = null
     )
 
-    data class JoinCommunityDialogData(
-        val communityName: String,
-        val communityUrl: String
-    )
-
     data class ConfirmAttachmentDownloadDialogData(
         val attachment: DatabaseAttachment,
         val conversationName: String
@@ -1604,7 +1638,8 @@ class ConversationViewModel @AssistedInject constructor(
     )
 
     sealed interface Commands {
-        data class ShowOpenUrlDialog(val url: String?) : Commands
+        data class HandleLink(val url: String) : Commands
+        data object HideOpenUrlDialog : Commands
 
         data class ClearEmoji(val emoji:String, val messageId: MessageId) : Commands
 
@@ -1625,7 +1660,7 @@ class ConversationViewModel @AssistedInject constructor(
             val upmCommand: UserProfileModalCommands
         ): Commands
 
-        data class JoinCommunity(val url: String): Commands
+        data class OpenOrJoinCommunity(val url: String): Commands
         data object HideJoinCommunityDialog: Commands
 
         data class DownloadAttachments(val attachment: DatabaseAttachment): Commands

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/LinkPreviewView.kt

@@ -87,7 +87,7 @@ class LinkPreviewView : LinearLayout {
     private fun openURL() {
         val url = this.url ?: return Log.w("LinkPreviewView", "Cannot open a null URL")
         val activity = context as? ConversationActivityV2
-        activity?.showOpenUrlDialog(url)
+        activity?.handleLink(url)
     }
     // endregion
-}
+}