From cb0fefa74d336e7a33b3b13c7177bc2764c0a989 Mon Sep 17 00:00:00 2001
From: ariskotsomitopoulos <aris.kotsomitopoulos@gmail.com>
Date: Thu, 4 Nov 2021 09:33:32 +0200
Subject: [PATCH] Add changelog file

---
 .../sdk/api/session/events/model/RelationType.kt      |  3 ++-
 .../session/room/relation/DefaultRelationService.kt   |  5 ++++-
 .../room/threads/detail/RoomThreadDetailFragment.kt   |  2 +-
 .../main/res/layout/fragment_room_thread_detail.xml   | 11 +++++------
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/RelationType.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/RelationType.kt
index 653798c29c..6546258766 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/RelationType.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/RelationType.kt
@@ -29,7 +29,8 @@ object RelationType {
     const val REFERENCE = "m.reference"
 
     /** Lets you define an event which is a reply to an existing event.*/
-    const val THREAD = "m.thread"
+//    const val THREAD = "m.thread"
+    const val THREAD = "io.element.thread"
 
     /** Lets you define an event which adds a response to an existing event.*/
     const val RESPONSE = "org.matrix.response"
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/DefaultRelationService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/DefaultRelationService.kt
index b3afc6ad46..7dec4ab3de 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/DefaultRelationService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/DefaultRelationService.kt
@@ -56,7 +56,7 @@ internal class DefaultRelationService @AssistedInject constructor(
         private val timelineEventMapper: TimelineEventMapper,
         @SessionDatabase private val monarchy: Monarchy,
         private val taskExecutor: TaskExecutor) :
-    RelationService {
+        RelationService {
 
     @AssistedFactory
     interface Factory {
@@ -161,6 +161,9 @@ internal class DefaultRelationService @AssistedInject constructor(
 
     override fun replyInThread(eventToReplyInThread: TimelineEvent, replyInThreadText: CharSequence, autoMarkdown: Boolean): Cancelable? {
         val event = eventFactory.createThreadTextEvent(eventToReplyInThread, TextContent(replyInThreadText.toString()))
+                .also {
+                    saveLocalEcho(it)
+                }
         return eventSenderProcessor.postEvent(event, cryptoSessionInfoProvider.isRoomEncrypted(roomId))
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/threads/detail/RoomThreadDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/threads/detail/RoomThreadDetailFragment.kt
index 3332d7caa0..532c67aaf8 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/threads/detail/RoomThreadDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/threads/detail/RoomThreadDetailFragment.kt
@@ -47,7 +47,7 @@ class RoomThreadDetailFragment @Inject constructor(
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         initTextComposer()
-        views.testTextVeiwddasda.text = "${roomThreadDetailArgs.eventId}  --  ${roomThreadDetailArgs.roomId}"
+//        views.testTextVeiwddasda.text = "${roomThreadDetailArgs.eventId}  --  ${roomThreadDetailArgs.roomId}"
     }
 
     private fun initTextComposer(){
diff --git a/vector/src/main/res/layout/fragment_room_thread_detail.xml b/vector/src/main/res/layout/fragment_room_thread_detail.xml
index 48e4896730..cadc819d28 100644
--- a/vector/src/main/res/layout/fragment_room_thread_detail.xml
+++ b/vector/src/main/res/layout/fragment_room_thread_detail.xml
@@ -6,12 +6,11 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <TextView
-        android:id="@+id/testTextVeiwddasda"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/room_threads_filter"
-        android:textSize="25sp"
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/roomThreadDetailRecyclerView"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:overScrollMode="always"
         app:layout_constraintBottom_toTopOf="@id/roomThreadDetailTextComposerView"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"