Add default permalink to access rooms by link

tchapgouv · Jun 24, 2024 · fca36c0 · fca36c0
1 parent 7e681bc
commit fca36c0
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 17 deletions.
diff --git a/changelog.d/1040.bugfix b/changelog.d/1040.bugfix
@@ -0,0 +1 @@
+Ajout d'un lien par défaut pour les salons sans alias accessibles par lien.
diff --git a/...a/fr/gouv/tchap/features/roomprofile/settings/linkaccess/TchapRoomLinkAccessController.kt b/...a/fr/gouv/tchap/features/roomprofile/settings/linkaccess/TchapRoomLinkAccessController.kt
@@ -39,7 +39,7 @@ class TchapRoomLinkAccessController @Inject constructor(
 
     interface InteractionListener {
         fun setLinkAccessEnabled(isEnabled: Boolean)
-        fun openAliasDetail(alias: String)
+        fun openAliasDetail(roomIdOrAlias: String)
     }
 
     var interactionListener: InteractionListener? = null
@@ -84,18 +84,19 @@ class TchapRoomLinkAccessController @Inject constructor(
             id("LinkAccessInfo")
             helperTextResId(
                     when {
-                        !state.isLinkAccessEnabled         -> R.string.tchap_room_settings_enable_room_access_by_link_info_off
+                        !state.isLinkAccessEnabled -> R.string.tchap_room_settings_enable_room_access_by_link_info_off
                         roomType == TchapRoomType.EXTERNAL -> R.string.tchap_room_settings_enable_room_access_by_link_info_on_with_limitation
-                        else                               -> R.string.tchap_room_settings_enable_room_access_by_link_info_on
+                        else -> R.string.tchap_room_settings_enable_room_access_by_link_info_on
                     }
             )
         }
 
-        if (state.isLinkAccessEnabled && !state.canonicalAlias.isNullOrEmpty()) {
+        if (state.isLinkAccessEnabled) {
+            val roomIdOrAlias = state.canonicalAlias ?: state.roomId
             profileActionItem {
                 id("canonicalAlias")
-                title(state.canonicalAlias)
-                listener { host.interactionListener?.openAliasDetail(state.canonicalAlias) }
+                title(roomIdOrAlias)
+                listener { host.interactionListener?.openAliasDetail(roomIdOrAlias) }
             }
         }
     }

diff --git a/...ava/fr/gouv/tchap/features/roomprofile/settings/linkaccess/TchapRoomLinkAccessFragment.kt b/...ava/fr/gouv/tchap/features/roomprofile/settings/linkaccess/TchapRoomLinkAccessFragment.kt
@@ -97,19 +97,19 @@ class TchapRoomLinkAccessFragment : VectorBaseFragment<FragmentRoomSettingGeneri
 
     private fun handleLinkAccessAction(action: TchapRoomLinkAccessBottomSheetSharedAction) {
         when (action) {
-            is TchapRoomLinkAccessBottomSheetSharedAction.CopyLink    -> handleCopy(action.permalink)
+            is TchapRoomLinkAccessBottomSheetSharedAction.CopyLink -> handleCopy(action.permalink)
             is TchapRoomLinkAccessBottomSheetSharedAction.ForwardLink -> handleForward(action.permalink)
-            is TchapRoomLinkAccessBottomSheetSharedAction.ShareLink   -> handleShare(action.permalink)
+            is TchapRoomLinkAccessBottomSheetSharedAction.ShareLink -> handleShare(action.permalink)
         }
     }
 
     override fun setLinkAccessEnabled(isEnabled: Boolean) {
         viewModel.handle(TchapRoomLinkAccessAction.SetIsEnabled(isEnabled))
     }
 
-    override fun openAliasDetail(alias: String) {
+    override fun openAliasDetail(roomIdOrAlias: String) {
         TchapRoomLinkAccessBottomSheet
-                .newInstance(alias = alias)
+                .newInstance(roomIdOrAlias = roomIdOrAlias)
                 .show(childFragmentManager, "TCHAP_ROOM_LINK_ACCESS_ACTIONS")
     }
 

diff --git a/...v/tchap/features/roomprofile/settings/linkaccess/detail/TchapRoomLinkAccessBottomSheet.kt b/...v/tchap/features/roomprofile/settings/linkaccess/detail/TchapRoomLinkAccessBottomSheet.kt
@@ -34,7 +34,7 @@ import javax.inject.Inject
 
 @Parcelize
 data class RoomAliasBottomSheetArgs(
-        val alias: String
+        val roomIdOrAlias: String
 ) : Parcelable
 
 /**
@@ -83,9 +83,9 @@ class TchapRoomLinkAccessBottomSheet :
     }
 
     companion object {
-        fun newInstance(alias: String): TchapRoomLinkAccessBottomSheet {
+        fun newInstance(roomIdOrAlias: String): TchapRoomLinkAccessBottomSheet {
             return TchapRoomLinkAccessBottomSheet().apply {
-                setArguments(RoomAliasBottomSheetArgs(alias = alias))
+                setArguments(RoomAliasBottomSheetArgs(roomIdOrAlias = roomIdOrAlias))
             }
         }
     }

diff --git a/...atures/roomprofile/settings/linkaccess/detail/TchapRoomLinkAccessBottomSheetController.kt b/...atures/roomprofile/settings/linkaccess/detail/TchapRoomLinkAccessBottomSheetController.kt
@@ -32,7 +32,7 @@ class TchapRoomLinkAccessBottomSheetController @Inject constructor() : TypedEpox
     override fun buildModels(state: TchapRoomLinkAccessBottomSheetState) {
         bottomSheetTitleItem {
             id("alias")
-            title(state.alias)
+            title(state.roomIdOrAlias)
             subTitle(state.matrixToLink)
         }
 

diff --git a/...ap/features/roomprofile/settings/linkaccess/detail/TchapRoomLinkAccessBottomSheetState.kt b/...ap/features/roomprofile/settings/linkaccess/detail/TchapRoomLinkAccessBottomSheetState.kt
@@ -19,9 +19,9 @@ package fr.gouv.tchap.features.roomprofile.settings.linkaccess.detail
 import com.airbnb.mvrx.MavericksState
 
 data class TchapRoomLinkAccessBottomSheetState(
-        val alias: String,
+        val roomIdOrAlias: String,
         val matrixToLink: String? = null
 ) : MavericksState {
 
-    constructor(args: RoomAliasBottomSheetArgs) : this(alias = args.alias)
+    constructor(args: RoomAliasBottomSheetArgs) : this(roomIdOrAlias = args.roomIdOrAlias)
 }
diff --git a/...eatures/roomprofile/settings/linkaccess/detail/TchapRoomLinkAccessBottomSheetViewModel.kt b/...eatures/roomprofile/settings/linkaccess/detail/TchapRoomLinkAccessBottomSheetViewModel.kt
@@ -25,6 +25,7 @@ import dagger.assisted.AssistedInject
 import im.vector.app.core.platform.EmptyAction
 import im.vector.app.core.platform.EmptyViewEvents
 import im.vector.app.core.platform.VectorViewModel
+import org.matrix.android.sdk.api.MatrixPatterns
 import org.matrix.android.sdk.api.session.Session
 
 class TchapRoomLinkAccessBottomSheetViewModel @AssistedInject constructor(
@@ -48,8 +49,13 @@ class TchapRoomLinkAccessBottomSheetViewModel @AssistedInject constructor(
 
     init {
         setState {
+            val permalink = if (MatrixPatterns.isRoomAlias(roomIdOrAlias)) {
+                session.permalinkService().createPermalink(roomIdOrAlias)
+            } else {
+                session.permalinkService().createRoomPermalink(roomIdOrAlias)
+            }
             copy(
-                    matrixToLink = session.permalinkService().createPermalink(alias)
+                    matrixToLink = permalink
             )
         }
     }