filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add changelog file

Browse Source
This commit is contained in:
ariskotsomitopoulos 2021-11-04 09:33:32 +02:00
parent a2a2315f9c
commit cb0fefa74d
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/RelationType.kt
View File

@ -29,7 +29,8 @@ object RelationType {
const val REFERENCE = "m.reference" const val REFERENCE = "m.reference"
/** Lets you define an event which is a reply to an existing event.*/ /** 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.*/ /** Lets you define an event which adds a response to an existing event.*/
const val RESPONSE = "org.matrix.response" const val RESPONSE = "org.matrix.response"

5
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/DefaultRelationService.kt
View File

@ -56,7 +56,7 @@ internal class DefaultRelationService @AssistedInject constructor(
private val timelineEventMapper: TimelineEventMapper, private val timelineEventMapper: TimelineEventMapper,
@SessionDatabase private val monarchy: Monarchy, @SessionDatabase private val monarchy: Monarchy,
private val taskExecutor: TaskExecutor) : private val taskExecutor: TaskExecutor) :
RelationService { RelationService {
@AssistedFactory @AssistedFactory
interface Factory { interface Factory {
@ -161,6 +161,9 @@ internal class DefaultRelationService @AssistedInject constructor(
override fun replyInThread(eventToReplyInThread: TimelineEvent, replyInThreadText: CharSequence, autoMarkdown: Boolean): Cancelable? { override fun replyInThread(eventToReplyInThread: TimelineEvent, replyInThreadText: CharSequence, autoMarkdown: Boolean): Cancelable? {
val event = eventFactory.createThreadTextEvent(eventToReplyInThread, TextContent(replyInThreadText.toString())) val event = eventFactory.createThreadTextEvent(eventToReplyInThread, TextContent(replyInThreadText.toString()))
.also {
saveLocalEcho(it)
}
return eventSenderProcessor.postEvent(event, cryptoSessionInfoProvider.isRoomEncrypted(roomId)) return eventSenderProcessor.postEvent(event, cryptoSessionInfoProvider.isRoomEncrypted(roomId))
} }

2
vector/src/main/java/im/vector/app/features/home/room/threads/detail/RoomThreadDetailFragment.kt
View File

@ -47,7 +47,7 @@ class RoomThreadDetailFragment @Inject constructor(
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState) super.onViewCreated(view, savedInstanceState)
initTextComposer() initTextComposer()
views.testTextVeiwddasda.text = "${roomThreadDetailArgs.eventId} -- ${roomThreadDetailArgs.roomId}" // views.testTextVeiwddasda.text = "${roomThreadDetailArgs.eventId} -- ${roomThreadDetailArgs.roomId}"
} }
private fun initTextComposer(){ private fun initTextComposer(){

11
vector/src/main/res/layout/fragment_room_thread_detail.xml
View File

@ -6,12 +6,11 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<TextView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/testTextVeiwddasda" android:id="@+id/roomThreadDetailRecyclerView"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="0dp"
android:text="@string/room_threads_filter" android:overScrollMode="always"
android:textSize="25sp"
app:layout_constraintBottom_toTopOf="@id/roomThreadDetailTextComposerView" app:layout_constraintBottom_toTopOf="@id/roomThreadDetailTextComposerView"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"