mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-03-20 21:28:45 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request from danteissaias/develop

Browse source 
Fix
This commit is contained in:
Valere 2019-07-30 17:07:22 +02:00 • committed by GitHub
commit 087cc0e6e3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions
CHANGES.md
matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model
message
MessageContent.kt
relation
ReplyToContent.kt

1
CHANGES.md
View file

@ -15,6 +15,7 @@ Bugfix:
- Edited message: link confusion when (edited) appears in body (#398) - Edited message: link confusion when (edited) appears in body (#398)
- Close detail room screen when the room is left with another client (#256) - Close detail room screen when the room is left with another client (#256)
- Clear notification for a room left on another client - Clear notification for a room left on another client
- Fix messages with empty `in_reply_to` not rendering (#447)
Translations: Translations:
- -

4
matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageContent.kt
View file

@ -29,5 +29,5 @@ interface MessageContent {
fun MessageContent?.isReply(): Boolean { fun MessageContent?.isReply(): Boolean {
return this?.relatesTo?.inReplyTo != null return this?.relatesTo?.inReplyTo?.eventId != null
} }

4
matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/relation/ReplyToContent.kt
View file

@ -21,5 +21,5 @@ import com.squareup.moshi.JsonClass
@JsonClass(generateAdapter = true) @JsonClass(generateAdapter = true)
data class ReplyToContent( data class ReplyToContent(
@Json(name = "event_id") val eventId: String @Json(name = "event_id") val eventId: String? = null
) )