Merge branch 'develop' into feature/fix_441

This commit is contained in:
Valere 2019-08-27 04:35:17 -04:00 committed by GitHub
commit bd88d85a21
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 10 deletions

View File

@ -12,6 +12,8 @@ Other changes:

Bugfix:
- Fix text diff linebreak display (#441)
- Date change message repeats for each redaction until a normal message (#358)
- Slide-in reply icon is distorted (#423)

Translations:
-

View File

@ -191,12 +191,13 @@ class RoomMessageTouchHelperCallback(private val context: Context,
}

val y = (itemView.top + itemView.measuredHeight / 2).toFloat()
//magic numbers?
val hw = imageDrawable.intrinsicWidth / 2f
val hh = imageDrawable.intrinsicHeight / 2f
imageDrawable.setBounds(
(x - convertToPx(12) * scale).toInt(),
(y - convertToPx(11) * scale).toInt(),
(x + convertToPx(12) * scale).toInt(),
(y + convertToPx(10) * scale).toInt()
(x - hw * scale).toInt(),
(y - hh * scale).toInt(),
(x + hw * scale).toInt(),
(y + hh * scale).toInt()
)
imageDrawable.draw(canvas)
imageDrawable.alpha = 255

View File

@ -56,7 +56,8 @@ fun TimelineEvent.isDisplayable(showHiddenEvent: Boolean): Boolean {
return false
}
if (root.content.isNullOrEmpty()) {
return false
//redacted events have empty content but are displayable
return root.unsignedData?.redactedEvent != null
}
//Edits should be filtered out!
if (EventType.MESSAGE == root.type