From a7420e13e0611106d0762abae835e6524273f807 Mon Sep 17 00:00:00 2001
From: Yoan Pintas <yoan@pintas.bzh>
Date: Tue, 12 Nov 2024 17:07:32 +0100
Subject: [PATCH 1/4] Update beta (#1129)

---
 towncrier.toml                                         | 2 +-
 vector-app/build.gradle                                | 2 +-
 vector-config/src/tchap/res/values/config-features.xml | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/towncrier.toml b/towncrier.toml
index 9cf591276d..9569a7ee42 100644
--- a/towncrier.toml
+++ b/towncrier.toml
@@ -1,5 +1,5 @@
 [tool.towncrier]
-    version = "2.13.9"
+    version = "2.13.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 834f3d8869..78f9fde671 100644
--- a/vector-app/build.gradle
+++ b/vector-app/build.gradle
@@ -37,7 +37,7 @@ ext.versionMinor = 13
 // 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-config/src/tchap/res/values/config-features.xml b/vector-config/src/tchap/res/values/config-features.xml
index d84cbf38c3..6050a08f7c 100755
--- a/vector-config/src/tchap/res/values/config-features.xml
+++ b/vector-config/src/tchap/res/values/config-features.xml
@@ -3,11 +3,12 @@
     <bool name="tchap_is_cross_signing_enabled">true</bool>
     <bool name="tchap_is_key_backup_enabled">true</bool>
     <bool name="tchap_is_thread_enabled">false</bool>
-    <bool name="tchap_is_secure_backup_required">false</bool>
+    <bool name="tchap_is_secure_backup_required">true</bool>
 
     <string-array name="tchap_is_visio_supported_homeservers" translatable="false">
         <item>agent.dinum.tchap.gouv.fr</item>
         <item>agent.education.tchap.gouv.fr</item>
         <item>agent.tchap.gouv.fr</item>
+        <item>agent.intradef.tchap.gouv.fr</item>
     </string-array>
 </resources>

From d08e699716cca21ea75b828ea12b0b85a5cacb55 Mon Sep 17 00:00:00 2001
From: Yoan Pintas <yoan@pintas.bzh>
Date: Fri, 15 Nov 2024 19:17:57 +0100
Subject: [PATCH 2/4] Update access by link wording (#1131)

---
 changelog.d/1112.improvements                               | 1 +
 library/ui-strings/src/main/res/values-fr/strings_tchap.xml | 6 +++---
 library/ui-strings/src/main/res/values/strings_tchap.xml    | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)
 create mode 100644 changelog.d/1112.improvements

diff --git a/changelog.d/1112.improvements b/changelog.d/1112.improvements
new file mode 100644
index 0000000000..02492305f3
--- /dev/null
+++ b/changelog.d/1112.improvements
@@ -0,0 +1 @@
+Modification du commentaire lorsqu'on active l'accès à un salon par lien.
\ No newline at end of file
diff --git a/library/ui-strings/src/main/res/values-fr/strings_tchap.xml b/library/ui-strings/src/main/res/values-fr/strings_tchap.xml
index 3e99cbc478..87e059a5ad 100644
--- a/library/ui-strings/src/main/res/values-fr/strings_tchap.xml
+++ b/library/ui-strings/src/main/res/values-fr/strings_tchap.xml
@@ -61,9 +61,9 @@
     <string name="tchap_room_settings_room_access_by_link_disabled">Ce salon n’est pas accessible par lien</string>
     <string name="tchap_room_settings_room_access_by_link_enabled">Ce salon est accessible par lien</string>
     <string name="tchap_room_settings_enable_room_access_by_link">Activer l’accès au salon par lien</string>
-    <string name="tchap_room_settings_enable_room_access_by_link_info_off">Les autres utilisateurs seront autorisés à rejoindre ce salon à partir d’un lien</string>
-    <string name="tchap_room_settings_enable_room_access_by_link_info_on">Les autres utilisateurs peuvent rejoindre ce salon à partir du lien suivant\u00A0:</string>
-    <string name="tchap_room_settings_enable_room_access_by_link_info_on_with_limitation">Les autres utilisateurs peuvent rejoindre ce salon à partir du lien suivant (une invitation reste nécessaire pour les externes)\u00A0:</string>
+    <string name="tchap_room_settings_enable_room_access_by_link_info_off">Tous les agents disposant du lien pourront rejoindre ce salon et inviter d’autres agents</string>
+    <string name="tchap_room_settings_enable_room_access_by_link_info_on">Tous les agents disposant du lien peuvent rejoindre ce salon et inviter d’autres agents\u00A0:</string>
+    <string name="tchap_room_settings_enable_room_access_by_link_info_on_with_limitation">Tous les agents disposant du lien peuvent rejoindre ce salon et inviter d’autres agents (une invitation reste nécessaire pour les externes)\u00A0:</string>
     <string name="tchap_room_settings_room_access_by_link_forward">Transférer le lien</string>
     <string name="tchap_room_settings_room_access_by_link_share">Partager le lien</string>
 
diff --git a/library/ui-strings/src/main/res/values/strings_tchap.xml b/library/ui-strings/src/main/res/values/strings_tchap.xml
index c8d27399a3..24df4d73ff 100644
--- a/library/ui-strings/src/main/res/values/strings_tchap.xml
+++ b/library/ui-strings/src/main/res/values/strings_tchap.xml
@@ -61,9 +61,9 @@
     <string name="tchap_room_settings_room_access_by_link_disabled">This room is not accessible by link</string>
     <string name="tchap_room_settings_room_access_by_link_enabled">This room is accessible by link</string>
     <string name="tchap_room_settings_enable_room_access_by_link">Enable the room access by link</string>
-    <string name="tchap_room_settings_enable_room_access_by_link_info_off">Users will be allowed to join the room from a link</string>
-    <string name="tchap_room_settings_enable_room_access_by_link_info_on">Users can join the room from the following link:</string>
-    <string name="tchap_room_settings_enable_room_access_by_link_info_on_with_limitation">Users can join the room from the following link (an invite is still required for externals):</string>
+    <string name="tchap_room_settings_enable_room_access_by_link_info_off">All agents will be allowed to join the room from a link</string>
+    <string name="tchap_room_settings_enable_room_access_by_link_info_on">All agents can join the room from the following link:</string>
+    <string name="tchap_room_settings_enable_room_access_by_link_info_on_with_limitation">All agents can join the room from the following link (an invite is still required for externals):</string>
     <string name="tchap_room_settings_room_access_by_link_forward">Forward the link</string>
     <string name="tchap_room_settings_room_access_by_link_share">Share the link</string>
 

From 304c42647cf6c51669ec4c79d0d3f722cf3eed0a Mon Sep 17 00:00:00 2001
From: Yoan Pintas <yoan@pintas.bzh>
Date: Fri, 15 Nov 2024 19:19:03 +0100
Subject: [PATCH 3/4] Add microphone service (#1130)

---
 changelog.d/1126.bugfix                       |  1 +
 .../realmfieldnameshelper/build.gradle        |  9 +++-
 .../src/main/res/values-fr/strings.xml        |  1 +
 .../src/main/res/values/strings.xml           |  2 +
 vector/src/main/AndroidManifest.xml           |  9 +++-
 .../app/core/services/CallAndroidService.kt   |  4 ++
 .../notifications/NotificationUtils.kt        | 13 +++++
 .../app/features/call/VectorCallActivity.kt   | 42 +++++++++++++++
 .../call/audio/MicrophoneAccessService.kt     | 53 +++++++++++++++++++
 .../features/call/webrtc/WebRtcCallManager.kt | 16 +++++-
 10 files changed, 147 insertions(+), 3 deletions(-)
 create mode 100644 changelog.d/1126.bugfix
 create mode 100644 vector/src/withdmvoip/java/im/vector/app/features/call/audio/MicrophoneAccessService.kt

diff --git a/changelog.d/1126.bugfix b/changelog.d/1126.bugfix
new file mode 100644
index 0000000000..8d6ae413ba
--- /dev/null
+++ b/changelog.d/1126.bugfix
@@ -0,0 +1 @@
+Correction du crash quand on reçoit ou émet un appel sur Tchap.
\ No newline at end of file
diff --git a/library/external/realmfieldnameshelper/build.gradle b/library/external/realmfieldnameshelper/build.gradle
index 79e66702dd..8d9147e6e3 100644
--- a/library/external/realmfieldnameshelper/build.gradle
+++ b/library/external/realmfieldnameshelper/build.gradle
@@ -1,9 +1,17 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 apply plugin: 'kotlin'
 apply plugin: 'java'
 
 sourceCompatibility = versions.sourceCompat
 targetCompatibility = versions.sourceCompat
 
+kotlin {
+    compilerOptions {
+        jvmTarget = JvmTarget.JVM_17
+    }
+}
+
 dependencies {
     implementation 'com.squareup:javapoet:1.13.0'
 }
@@ -20,4 +28,3 @@ task sourcesJar(type: Jar, dependsOn: 'classes') {
 sourceSets {
     main.java.srcDirs += 'src/main/kotlin'
 }
-
diff --git a/library/ui-strings/src/main/res/values-fr/strings.xml b/library/ui-strings/src/main/res/values-fr/strings.xml
index 7334f20647..521c4d5328 100644
--- a/library/ui-strings/src/main/res/values-fr/strings.xml
+++ b/library/ui-strings/src/main/res/values-fr/strings.xml
@@ -2186,6 +2186,7 @@
     <string name="audio_call_with_participant">Appel audio avec %s</string>
     <string name="video_call_with_participant">Appel vidéo avec %s</string>
     <string name="call_ringing">Appel en cours…</string>
+    <string name="microphone_in_use_title">Microphone en cours d’utilisation</string>
     <string name="spaces">Espaces</string>
     <string name="a11y_stop_voice_message">Arrêter l’enregistrement</string>
     <string name="space_add_space_to_any_space_you_manage">Ajouter un espace à un espace que vous gérez.</string>
diff --git a/library/ui-strings/src/main/res/values/strings.xml b/library/ui-strings/src/main/res/values/strings.xml
index 978ba4530e..d85ec22e45 100644
--- a/library/ui-strings/src/main/res/values/strings.xml
+++ b/library/ui-strings/src/main/res/values/strings.xml
@@ -652,6 +652,8 @@
 
     <string name="call_remove_jitsi_widget_progress">Ending call…</string>
 
+    <string name="microphone_in_use_title">Microphone in use</string>
+
     <!-- permissions Android M -->
     <string name="permissions_rationale_popup_title">Information</string>
     <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml
index 028a23e19d..1f4eb1ef93 100644
--- a/vector/src/main/AndroidManifest.xml
+++ b/vector/src/main/AndroidManifest.xml
@@ -363,7 +363,7 @@
 
         <service
             android:name=".core.services.CallAndroidService"
-            android:foregroundServiceType="microphone|phoneCall"
+            android:foregroundServiceType="phoneCall"
             android:exported="false">
             <!-- in order to get headset button events -->
             <intent-filter>
@@ -404,6 +404,13 @@
         <!--            android:foregroundServiceType="mediaProjection"-->
         <!--            tools:targetApi="Q" />-->
 
+        <service
+            android:name=".features.call.audio.MicrophoneAccessService"
+            android:exported="false"
+            android:foregroundServiceType="microphone"
+            android:permission="android.permission.FOREGROUND_SERVICE_MICROPHONE">
+        </service>
+
         <!-- Receivers -->
 
         <receiver
diff --git a/vector/src/main/java/im/vector/app/core/services/CallAndroidService.kt b/vector/src/main/java/im/vector/app/core/services/CallAndroidService.kt
index 465e8093ec..b14c5604eb 100644
--- a/vector/src/main/java/im/vector/app/core/services/CallAndroidService.kt
+++ b/vector/src/main/java/im/vector/app/core/services/CallAndroidService.kt
@@ -31,6 +31,7 @@ import im.vector.app.core.extensions.singletonEntryPoint
 import im.vector.app.core.extensions.startForegroundCompat
 import im.vector.app.features.call.CallArgs
 import im.vector.app.features.call.VectorCallActivity
+import im.vector.app.features.call.audio.MicrophoneAccessService
 import im.vector.app.features.call.telecom.CallConnection
 import im.vector.app.features.call.webrtc.WebRtcCall
 import im.vector.app.features.call.webrtc.WebRtcCallManager
@@ -206,6 +207,9 @@ class CallAndroidService : VectorAndroidService() {
             stopForegroundCompat()
             mediaSession?.isActive = false
             myStopSelf()
+
+            // Also stop the microphone service if it is running
+            stopService(Intent(this, MicrophoneAccessService::class.java))
         }
         val wasConnected = connectedCallIds.remove(callId)
         if (!wasConnected && !terminatedCall.isOutgoing && !rejected && endCallReason != EndCallReason.ANSWERED_ELSEWHERE) {
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
index 944e4f0edf..9f7e425bd4 100755
--- a/vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
@@ -538,6 +538,19 @@ class NotificationUtils @Inject constructor(
                 .build()
     }
 
+    /**
+     * Creates a notification indicating that the microphone is currently being accessed by the application.
+     */
+    fun buildMicrophoneAccessNotification(): Notification {
+        return NotificationCompat.Builder(context, SILENT_NOTIFICATION_CHANNEL_ID)
+                .setContentTitle(stringProvider.getString(CommonStrings.microphone_in_use_title))
+                .setSmallIcon(R.drawable.ic_call_answer)
+                .setPriority(NotificationCompat.PRIORITY_LOW)
+                .setColor(ThemeUtils.getColor(context, android.R.attr.colorPrimary))
+                .setCategory(NotificationCompat.CATEGORY_CALL)
+                .build()
+    }
+
     /**
      * Creates a notification that indicates the application is initializing.
      */
diff --git a/vector/src/withdmvoip/java/im/vector/app/features/call/VectorCallActivity.kt b/vector/src/withdmvoip/java/im/vector/app/features/call/VectorCallActivity.kt
index 4480126038..483fdf8d71 100644
--- a/vector/src/withdmvoip/java/im/vector/app/features/call/VectorCallActivity.kt
+++ b/vector/src/withdmvoip/java/im/vector/app/features/call/VectorCallActivity.kt
@@ -16,12 +16,14 @@
 
 package im.vector.app.features.call
 
+import android.Manifest
 import android.app.Activity
 import android.app.KeyguardManager
 import android.app.PictureInPictureParams
 import android.content.Context
 import android.content.Intent
 import android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP
+import android.content.pm.PackageManager
 import android.graphics.Color
 import android.media.projection.MediaProjection
 import android.media.projection.MediaProjectionManager
@@ -40,6 +42,8 @@ import androidx.core.content.getSystemService
 import androidx.core.util.Consumer
 import androidx.core.view.isInvisible
 import androidx.core.view.isVisible
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.ProcessLifecycleOwner
 import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.Mavericks
 import com.airbnb.mvrx.viewModel
@@ -57,6 +61,7 @@ import im.vector.app.core.utils.PERMISSIONS_FOR_VIDEO_IP_CALL
 import im.vector.app.core.utils.checkPermissions
 import im.vector.app.core.utils.registerForPermissionsResult
 import im.vector.app.databinding.ActivityCallBinding
+import im.vector.app.features.call.audio.MicrophoneAccessService
 import im.vector.app.features.call.dialpad.CallDialPadBottomSheet
 import im.vector.app.features.call.dialpad.DialPadFragment
 import im.vector.app.features.call.transfer.CallTransferActivity
@@ -245,6 +250,43 @@ class VectorCallActivity :
         }
     }
 
+    private fun startMicrophoneService() {
+        if (ContextCompat.checkSelfPermission(this, Manifest.permission.RECORD_AUDIO)
+                == PackageManager.PERMISSION_GRANTED) {
+
+            // Only start the service if the app is in the foreground
+            if (isAppInForeground()) {
+                Timber.tag(loggerTag.value).v("Starting microphone foreground service")
+                val intent = Intent(this, MicrophoneAccessService::class.java)
+                ContextCompat.startForegroundService(this, intent)
+            } else {
+                Timber.tag(loggerTag.value).v("App is not in foreground; cannot start microphone service")
+            }
+        } else {
+            Timber.tag(loggerTag.value).v("Microphone permission not granted; cannot start service")
+        }
+    }
+
+    private fun isAppInForeground(): Boolean {
+        val appProcess = ProcessLifecycleOwner.get().lifecycle.currentState.isAtLeast(Lifecycle.State.STARTED)
+        return appProcess
+    }
+    private fun stopMicrophoneService() {
+        Timber.tag(loggerTag.value).d("Stopping MicrophoneAccessService (if needed).")
+        val intent = Intent(this, MicrophoneAccessService::class.java)
+        stopService(intent)
+    }
+
+    override fun onPause() {
+        super.onPause()
+        startMicrophoneService()
+    }
+
+    override fun onResume() {
+        super.onResume()
+        stopMicrophoneService()
+    }
+
     override fun onDestroy() {
         detachRenderersIfNeeded()
         turnScreenOffAndKeyguardOn()
diff --git a/vector/src/withdmvoip/java/im/vector/app/features/call/audio/MicrophoneAccessService.kt b/vector/src/withdmvoip/java/im/vector/app/features/call/audio/MicrophoneAccessService.kt
new file mode 100644
index 0000000000..1cf2aee737
--- /dev/null
+++ b/vector/src/withdmvoip/java/im/vector/app/features/call/audio/MicrophoneAccessService.kt
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2024 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.call.audio
+
+import android.content.Intent
+import android.os.Binder
+import android.os.IBinder
+import dagger.hilt.android.AndroidEntryPoint
+import im.vector.app.core.extensions.startForegroundCompat
+import im.vector.app.core.services.VectorAndroidService
+import im.vector.app.features.notifications.NotificationUtils
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class MicrophoneAccessService : VectorAndroidService() {
+
+    @Inject lateinit var notificationUtils: NotificationUtils
+    private val binder = LocalBinder()
+
+    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        showMicrophoneAccessNotification()
+
+        return START_STICKY
+    }
+
+    private fun showMicrophoneAccessNotification() {
+        val notificationId = System.currentTimeMillis().toInt()
+        val notification = notificationUtils.buildMicrophoneAccessNotification()
+        startForegroundCompat(notificationId, notification)
+    }
+
+    override fun onBind(intent: Intent?): IBinder {
+        return binder
+    }
+
+    inner class LocalBinder : Binder() {
+        fun getService(): MicrophoneAccessService = this@MicrophoneAccessService
+    }
+}
diff --git a/vector/src/withdmvoip/java/im/vector/app/features/call/webrtc/WebRtcCallManager.kt b/vector/src/withdmvoip/java/im/vector/app/features/call/webrtc/WebRtcCallManager.kt
index 2f01a43128..4456e7753e 100644
--- a/vector/src/withdmvoip/java/im/vector/app/features/call/webrtc/WebRtcCallManager.kt
+++ b/vector/src/withdmvoip/java/im/vector/app/features/call/webrtc/WebRtcCallManager.kt
@@ -34,6 +34,8 @@ import im.vector.app.features.call.vectorCallService
 import im.vector.app.features.session.coroutineScope
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.asCoroutineDispatcher
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.logger.LoggerTag
@@ -137,6 +139,7 @@ class WebRtcCallManager @Inject constructor(
     private val rootEglBase by lazy { EglUtils.rootEglBase }
 
     private var isInBackground: Boolean = true
+    private var syncStartedWhenInBackground: Boolean = false
 
     override fun onResume(owner: LifecycleOwner) {
         isInBackground = false
@@ -279,13 +282,15 @@ class WebRtcCallManager @Inject constructor(
             peerConnectionFactory = null
             audioManager.setMode(CallAudioManager.Mode.DEFAULT)
             // did we start background sync? so we should stop it
-            if (isInBackground) {
+            if (syncStartedWhenInBackground) {
                 if (!unifiedPushHelper.isBackgroundSync()) {
+                    Timber.tag(loggerTag.value).v("Sync started when in background, stop it")
                     currentSession?.syncService()?.stopAnyBackgroundSync()
                 } else {
                     // for fdroid we should not stop, it should continue syncing
                     // maybe we should restore default timeout/delay though?
                 }
+                syncStartedWhenInBackground = false
             }
         }
     }
@@ -388,11 +393,20 @@ class WebRtcCallManager @Inject constructor(
         if (isInBackground) {
             if (!unifiedPushHelper.isBackgroundSync()) {
                 // only for push version as fdroid version is already doing it?
+                syncStartedWhenInBackground = true
                 currentSession?.syncService()?.startAutomaticBackgroundSync(30, 0)
             } else {
                 // Maybe increase sync freq? but how to set back to default values?
             }
         }
+
+        // ensure the incoming call will not ring forever
+        sessionScope?.launch {
+            delay(2 * 60 * 1000 /* 2 minutes */)
+            if (mxCall.state is CallState.LocalRinging) {
+                onCallEnded(mxCall.callId, EndCallReason.INVITE_TIMEOUT, rejected = false)
+            }
+        }
     }
 
     override fun onCallAnswerReceived(callAnswerContent: CallAnswerContent) {

From 3fe2cb832393dcef5a6cff493f98ec78504da101 Mon Sep 17 00:00:00 2001
From: yostyle <y.pintas@gmail.com>
Date: Fri, 15 Nov 2024 19:22:44 +0100
Subject: [PATCH 4/4] Update changes

---
 TCHAP_CHANGES.md                                      | 11 +++++++++++
 changelog.d/1112.improvements                         |  1 -
 changelog.d/1126.bugfix                               |  1 -
 .../src/tchap/res/values/config-features.xml          |  2 +-
 4 files changed, 12 insertions(+), 3 deletions(-)
 delete mode 100644 changelog.d/1112.improvements
 delete mode 100644 changelog.d/1126.bugfix

diff --git a/TCHAP_CHANGES.md b/TCHAP_CHANGES.md
index 38875d0f68..94f29bc44d 100644
--- a/TCHAP_CHANGES.md
+++ b/TCHAP_CHANGES.md
@@ -1,3 +1,14 @@
+Changes in Tchap 2.13.10 (2024-11-15)
+=====================================
+
+Improvements 🙌
+--------------
+ - Modification du commentaire lorsqu'on active l'accès à un salon par lien. ([#1112](https://github.com/tchapgouv/tchap-android/issues/1112))
+
+Bugfixes 🐛
+----------
+ - Correction du crash quand on reçoit ou émet un appel sur Tchap. ([#1126](https://github.com/tchapgouv/tchap-android/issues/1126))
+
 Changes in Tchap 2.13.9 (2024-11-12)
 ====================================
 
diff --git a/changelog.d/1112.improvements b/changelog.d/1112.improvements
deleted file mode 100644
index 02492305f3..0000000000
--- a/changelog.d/1112.improvements
+++ /dev/null
@@ -1 +0,0 @@
-Modification du commentaire lorsqu'on active l'accès à un salon par lien.
\ No newline at end of file
diff --git a/changelog.d/1126.bugfix b/changelog.d/1126.bugfix
deleted file mode 100644
index 8d6ae413ba..0000000000
--- a/changelog.d/1126.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Correction du crash quand on reçoit ou émet un appel sur Tchap.
\ No newline at end of file
diff --git a/vector-config/src/tchap/res/values/config-features.xml b/vector-config/src/tchap/res/values/config-features.xml
index 6050a08f7c..3796724003 100755
--- a/vector-config/src/tchap/res/values/config-features.xml
+++ b/vector-config/src/tchap/res/values/config-features.xml
@@ -3,7 +3,7 @@
     <bool name="tchap_is_cross_signing_enabled">true</bool>
     <bool name="tchap_is_key_backup_enabled">true</bool>
     <bool name="tchap_is_thread_enabled">false</bool>
-    <bool name="tchap_is_secure_backup_required">true</bool>
+    <bool name="tchap_is_secure_backup_required">false</bool>
 
     <string-array name="tchap_is_visio_supported_homeservers" translatable="false">
         <item>agent.dinum.tchap.gouv.fr</item>