diff --git a/changelog.d/1126.bugfix b/changelog.d/1126.bugfix new file mode 100644 index 0000000000..5fa6a1b7bf --- /dev/null +++ b/changelog.d/1126.bugfix @@ -0,0 +1 @@ +Correction du crash sur Android 14 quand on reçoit un appel sur Tchap. \ No newline at end of file diff --git a/towncrier.toml b/towncrier.toml index 89bb42afaa..9cf591276d 100644 --- 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 index 1456ee9604..834f3d8869 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 = 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 index 6050a08f7c..a748ca7633 100755 --- a/vector-config/src/tchap/res/values/config-features.xml +++ b/vector-config/src/tchap/res/values/config-features.xml @@ -9,6 +9,5 @@ agent.dinum.tchap.gouv.fr agent.education.tchap.gouv.fr agent.tchap.gouv.fr - agent.intradef.tchap.gouv.fr 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 a4e3872e0f..465e8093ec 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 @@ -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 }