diff --git a/TCHAP_CHANGES.md b/TCHAP_CHANGES.md
index 37038e3b05..d445f6d6a4 100644
--- a/TCHAP_CHANGES.md
+++ b/TCHAP_CHANGES.md
@@ -1,3 +1,14 @@
+Changes in Tchap 2.13.2 (2024-08-01)
+====================================
+
+Features ✨
+----------
+ - Activation des appels vidéos pour Finances. ([#1092](https://github.com/tchapgouv/tchap-android/issues/1092))
+
+Improvements 🙌
+--------------
+ - Amélioration du parcours de signalement de contenu. ([#1083](https://github.com/tchapgouv/tchap-android/issues/1083))
+
Changes in Tchap 2.13.1 (2024-07-31)
====================================
diff --git a/towncrier.toml b/towncrier.toml
index dda34dc633..ef95bd7173 100644
--- a/towncrier.toml
+++ b/towncrier.toml
@@ -1,5 +1,5 @@
[tool.towncrier]
- version = "2.13.1"
+ version = "2.13.2"
directory = "changelog.d"
filename = "TCHAP_CHANGES.md"
name = "Changes in Tchap"
diff --git a/vector-app/build.gradle b/vector-app/build.gradle
index 74e083e1d4..8bad1ad7d2 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 = 1
+ext.versionPatch = 2
static def getGitTimestamp() {
def cmd = 'git show -s --format=%ct'
diff --git a/vector-app/proguard-rules.pro b/vector-app/proguard-rules.pro
index 6e8afc44e3..ae6cf6ee26 100644
--- a/vector-app/proguard-rules.pro
+++ b/vector-app/proguard-rules.pro
@@ -85,6 +85,7 @@
-dontwarn com.google.appengine.api.urlfetch.**
-dontwarn com.google.common.io.LimitInputStream
-dontwarn com.google.firebase.analytics.connector.AnalyticsConnector
+-dontwarn com.google.j2objc.annotations.** # TCHAP guava rule
-dontwarn com.google.javascript.jscomp.**
-dontwarn com.likethesalad.android.templates.provider.api.TemplatesProvider
-dontwarn com.yahoo.platform.yui.compressor.**
diff --git a/vector-config/src/tchap/res/values/config-features.xml b/vector-config/src/tchap/res/values/config-features.xml
index 9990fc02d7..6be4c68bd5 100755
--- a/vector-config/src/tchap/res/values/config-features.xml
+++ b/vector-config/src/tchap/res/values/config-features.xml
@@ -7,5 +7,6 @@
- agent.dinum.tchap.gouv.fr
+ - agent.finances.tchap.gouv.fr
diff --git a/vector/build.gradle b/vector/build.gradle
index 511c4b9df3..f4ccce5425 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -278,14 +278,16 @@ dependencies {
implementation "androidx.emoji2:emoji2:1.3.0"
// TCHAP Manage jitsi lib
+ // Guava
+ implementation('com.google.guava:guava:33.2.1-android')
// WebRTC
withdmvoipImplementation('com.github.tchapgouv:webrtc:124.2.0')
- withdmvoipImplementation('com.google.guava:guava:33.2.1-android')
// Jitsi
withvoipApi('org.jitsi.react:jitsi-meet-sdk:8.1.1') {
exclude group: 'com.google.firebase'
exclude group: 'com.google.android.gms'
exclude group: 'com.android.installreferrer'
+ exclude group: 'com.android.guava'
// Exclude jitsi's android-scalablevideoview fork's support library
// The library exports a jetified artifact but doesn't remove the support library dependency
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/EventSharedAction.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/EventSharedAction.kt
index 0645ffc591..2da3a25877 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/EventSharedAction.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/EventSharedAction.kt
@@ -95,7 +95,7 @@ sealed class EventSharedAction(
EventSharedAction(CommonStrings.report_content_inappropriate, R.drawable.ic_report_inappropriate)
data class ReportContentCustom(val eventId: String, val senderId: String?) :
- EventSharedAction(CommonStrings.report_content_custom, R.drawable.ic_report_custom)
+ EventSharedAction(CommonStrings.report_content, R.drawable.ic_flag) // TCHAP Use custom report content by default.
data class IgnoreUser(val senderId: String?) :
EventSharedAction(CommonStrings.message_ignore_user, R.drawable.ic_alert_triangle, true)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
index ea15154698..c3141b6d1f 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
@@ -424,17 +424,19 @@ class MessageActionsViewModel @AssistedInject constructor(
if (session.myUserId != timelineEvent.root.senderId) {
// not sent by me
if (timelineEvent.root.isContentReportable()) {
- add(EventSharedAction.ReportContent(eventId, timelineEvent.root.senderId))
+ // TCHAP Use custom report content by default.
+ add(EventSharedAction.ReportContentCustom(eventId, timelineEvent.root.senderId))
}
add(EventSharedAction.Separator)
add(EventSharedAction.IgnoreUser(timelineEvent.root.senderId))
- add(
- EventSharedAction.ReportUser(
- eventId = eventId,
- senderId = timelineEvent.root.senderId,
- )
- )
+ // TCHAP Hide user report feature in event action list.
+// add(
+// EventSharedAction.ReportUser(
+// eventId = eventId,
+// senderId = timelineEvent.root.senderId,
+// )
+// )
}
}
diff --git a/vector/src/main/res/drawable/ic_report_custom.xml b/vector/src/main/res/drawable/ic_report_custom.xml
deleted file mode 100644
index 8e97c4bfb5..0000000000
--- a/vector/src/main/res/drawable/ic_report_custom.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-