From fbf2b9e9e7824fef4a3ccfea07ae824d7a1103e1 Mon Sep 17 00:00:00 2001
From: Yoan Pintas <yoan@pintas.bzh>
Date: Tue, 18 Jun 2024 16:02:10 +0200
Subject: [PATCH 1/2] bypass SSL verification in webrtc (#1071)

* bypass SSL verification in webrtc

* Add changelog
---
 changelog.d/1071.wip                                            | 1 +
 .../java/im/vector/app/features/call/webrtc/WebRtcCall.kt       | 2 ++
 2 files changed, 3 insertions(+)
 create mode 100644 changelog.d/1071.wip

diff --git a/changelog.d/1071.wip b/changelog.d/1071.wip
new file mode 100644
index 0000000000..531afa6537
--- /dev/null
+++ b/changelog.d/1071.wip
@@ -0,0 +1 @@
+Fix webrtc SSL connection
\ No newline at end of file
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
index 9c65d94a94..1d4354765a 100644
--- 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()
                     )
                 }

From 5074f7e2bae49491bcfee03941b1634c60089176 Mon Sep 17 00:00:00 2001
From: yostyle <y.pintas@gmail.com>
Date: Tue, 18 Jun 2024 16:10:31 +0200
Subject: [PATCH 2/2] Update changelog

---
 TCHAP_CHANGES.md        | 11 +++++++++++
 changelog.d/1071.wip    |  1 -
 towncrier.toml          |  2 +-
 vector-app/build.gradle |  2 +-
 4 files changed, 13 insertions(+), 3 deletions(-)
 delete mode 100644 changelog.d/1071.wip

diff --git a/TCHAP_CHANGES.md b/TCHAP_CHANGES.md
index f584368982..b656acc76e 100644
--- 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/changelog.d/1071.wip b/changelog.d/1071.wip
deleted file mode 100644
index 531afa6537..0000000000
--- a/changelog.d/1071.wip
+++ /dev/null
@@ -1 +0,0 @@
-Fix webrtc SSL connection
\ No newline at end of file
diff --git a/towncrier.toml b/towncrier.toml
index 8797c98d13..c8dbf5cf24 100644
--- 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
index ad421c80c5..714925f1a8 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 = 9
+ext.versionPatch = 10
 
 static def getGitTimestamp() {
     def cmd = 'git show -s --format=%ct'