Merge branch 'release/2.11.10'

tchapgouv · Jun 18, 2024 · 95c640c · 95c640c
2 parents 7b64683 + 5074f7e
commit 95c640c
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/TCHAP_CHANGES.md b/TCHAP_CHANGES.md
@@ -1,3 +1,14 @@
+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.9"
+    version = "2.11.10"
     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 = 9
+ext.versionPatch = 10
 
 static def getGitTimestamp() {
     def cmd = 'git show -s --format=%ct'

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,6 +295,8 @@ 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()
                     )
                 }