Merge branch 'release/2.11.11'

tchapgouv · Jun 24, 2024 · 0e8ad26 · 0e8ad26
2 parents 95c640c + fe8e89a
commit 0e8ad26
Show file tree

Hide file tree

Showing 11 changed files with 38 additions and 26 deletions.
diff --git a/TCHAP_CHANGES.md b/TCHAP_CHANGES.md
@@ -1,14 +1,21 @@
+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)
 =====================================
 
 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
@@ -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
@@ -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
@@ -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/...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
             )
         }
     }

diff --git a/vector/src/withdmvoip/java/im/vector/app/features/call/webrtc/WebRtcCall.kt b/vector/src/withdmvoip/java/im/vector/app/features/call/webrtc/WebRtcCall.kt
@@ -295,8 +295,6 @@ class WebRtcCall(
                                     .builder(uri)
                                     .setUsername(server.username)
                                     .setPassword(server.password)
-                                    // TCHAP bypass SSL verification. See https://groups.google.com/g/discuss-webrtc/c/4MmARU0XYqc/m/QppVNJiEAAAJ
-                                    .setTlsCertPolicy(PeerConnection.TlsCertPolicy.TLS_CERT_POLICY_INSECURE_NO_CHECK)
                                     .createIceServer()
                     )
                 }