Merge branch 'release/2.13.9'

tchapgouv · Nov 12, 2024 · f4fe963 · f4fe963
2 parents cf54519 + 2a1dfbe
commit f4fe963
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 15 deletions.
diff --git a/TCHAP_CHANGES.md b/TCHAP_CHANGES.md
@@ -1,3 +1,10 @@
+Changes in Tchap 2.13.9 (2024-11-12)
+====================================
+
+Bugfixes 🐛
+----------
+ - Correction du crash sur Android 14 quand on reçoit un appel sur Tchap. ([#1126](https://github.com/tchapgouv/tchap-android/issues/1126))
+
 Changes in Tchap 2.13.8 (2024-10-31)
 ====================================
 

diff --git a/towncrier.toml b/towncrier.toml
@@ -1,5 +1,5 @@
 [tool.towncrier]
-    version = "2.13.8"
+    version = "2.13.9"
     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 = 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 = 8
+ext.versionPatch = 9
 
 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
@@ -3,12 +3,11 @@
     <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>
         <item>agent.education.tchap.gouv.fr</item>
         <item>agent.tchap.gouv.fr</item>
-        <item>agent.intradef.tchap.gouv.fr</item>
     </string-array>
 </resources>
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
@@ -181,11 +181,8 @@ class CallAndroidService : VectorAndroidService() {
                 title = callInformation.opponentMatrixItem?.getBestName() ?: callInformation.opponentUserId,
                 fromBg = fromBg
         )
-        if (knownCalls.isEmpty()) {
-            startForegroundCompat(callId.hashCode(), notification)
-        } else {
-            notificationManager.notify(callId.hashCode(), notification)
-        }
+        // TCHAP fix crash when a call incoming on Androd 14 and higher
+        notificationManager.notify(callId.hashCode(), notification)
         knownCalls[callId] = callInformation
     }
 
@@ -202,7 +199,8 @@ class CallAndroidService : VectorAndroidService() {
         }
         val notification = notificationUtils.buildCallEndedNotification(false)
         val notificationId = callId.hashCode()
-        startForegroundCompat(notificationId, notification)
+        // TCHAP fix crash when a call incoming on Androd 14 and higher
+        notificationManager.notify(notificationId, notification)
         if (knownCalls.isEmpty()) {
             Timber.tag(loggerTag.value).v("No more call, stop the service")
             stopForegroundCompat()
@@ -260,11 +258,8 @@ class CallAndroidService : VectorAndroidService() {
                 call = call,
                 title = callInformation.opponentMatrixItem?.getBestName() ?: callInformation.opponentUserId
         )
-        if (knownCalls.isEmpty()) {
-            startForegroundCompat(callId.hashCode(), notification)
-        } else {
-            notificationManager.notify(callId.hashCode(), notification)
-        }
+        // TCHAP fix crash when a call incoming on Androd 14 and higher
+        startForegroundCompat(callId.hashCode(), notification)
         knownCalls[callId] = callInformation
     }