Improve content report

changelog.d/1083.improvements

@@ -0,0 +1 @@
+Amélioration du parcours de signalement de contenu.

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"

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'

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)

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,
+//                    )
+//            )
         }
     }