diff --git a/TCHAP_CHANGES.md b/TCHAP_CHANGES.md index b656acc76e..7c3aeef4d9 100644 --- a/TCHAP_CHANGES.md +++ b/TCHAP_CHANGES.md @@ -1,3 +1,14 @@ +Changes in Tchap 2.11.11 (2024-06-24) +===================================== + +Improvements 🙌 +-------------- + - Support des appels audio sur les appareils Néo. ([#1055](https://github.com/tchapgouv/tchap-android/issues/1055)) + +Bugfixes 🐛 +---------- + - Ajout d'un lien par défaut pour les salons sans alias accessibles par lien. ([#1040](https://github.com/tchapgouv/tchap-android/issues/1040)) + Changes in Tchap 2.11.10 (2024-06-18) ===================================== @@ -5,10 +16,6 @@ In development 🚧 ---------------- - Fix webrtc SSL connection ([#1071](https://github.com/tchapgouv/tchap-android/issues/1071)) -Changes in Tchap 2.11.10 (2024-06-18) -===================================== - -No significant changes. Changes in Tchap 2.11.9 (2024-06-18) ==================================== diff --git a/towncrier.toml b/towncrier.toml index c8dbf5cf24..c68d5f538b 100644 --- a/towncrier.toml +++ b/towncrier.toml @@ -1,5 +1,5 @@ [tool.towncrier] - version = "2.11.10" + version = "2.11.11" directory = "changelog.d" filename = "TCHAP_CHANGES.md" name = "Changes in Tchap" diff --git a/vector-app/build.gradle b/vector-app/build.gradle index 714925f1a8..3ee91a5fbd 100644 --- a/vector-app/build.gradle +++ b/vector-app/build.gradle @@ -37,7 +37,7 @@ ext.versionMinor = 11 // Note: even values are reserved for regular release, odd values for hotfix release. // When creating a hotfix, you should decrease the value, since the current value // is the value for the next regular release. -ext.versionPatch = 10 +ext.versionPatch = 11 static def getGitTimestamp() { def cmd = 'git show -s --format=%ct' diff --git a/vector/build.gradle b/vector/build.gradle index 594b22dfe2..c25eb8db19 100644 --- a/vector/build.gradle +++ b/vector/build.gradle @@ -272,7 +272,7 @@ dependencies { // TCHAP Manage jitsi lib // WebRTC - withdmvoipImplementation('com.github.tchapgouv:webrtc:124.1.3') + withdmvoipImplementation('com.github.tchapgouv:webrtc:124.2.0') // Jitsi withvoipApi('org.jitsi.react:jitsi-meet-sdk:8.1.1') { exclude group: 'com.google.firebase' diff --git a/vector/src/main/java/fr/gouv/tchap/features/roomprofile/settings/linkaccess/TchapRoomLinkAccessController.kt b/vector/src/main/java/fr/gouv/tchap/features/roomprofile/settings/linkaccess/TchapRoomLinkAccessController.kt index 5acb9d5885..53b8ce21af 100644 --- a/vector/src/main/java/fr/gouv/tchap/features/roomprofile/settings/linkaccess/TchapRoomLinkAccessController.kt +++ b/vector/src/main/java/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/vector/src/main/java/fr/gouv/tchap/features/roomprofile/settings/linkaccess/TchapRoomLinkAccessFragment.kt b/vector/src/main/java/fr/gouv/tchap/features/roomprofile/settings/linkaccess/TchapRoomLinkAccessFragment.kt index 0df9d66783..78f7583b5a 100644 --- a/vector/src/main/java/fr/gouv/tchap/features/roomprofile/settings/linkaccess/TchapRoomLinkAccessFragment.kt +++ b/vector/src/main/java/fr/gouv/tchap/features/roomprofile/settings/linkaccess/TchapRoomLinkAccessFragment.kt @@ -97,9 +97,9 @@ class TchapRoomLinkAccessFragment : VectorBaseFragment 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) } } @@ -107,9 +107,9 @@ class TchapRoomLinkAccessFragment : VectorBaseFragment