6543/BayernMessenger
1
0
Fork 0
forked from GitHub-Mirror/riotX-android
Code Issues 4 Pull Requests Releases Wiki Activity

Merge pull request #494 from vector-im/feature/fix_441

Browse Source 
Fix text diff removed linebreak
This commit is contained in:
Valere 2019-08-27 04:36:03 -04:00 committed by GitHub
commit 49d73f360e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.md
View File

@ -11,6 +11,7 @@ Other changes:
- -


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



2
vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/ViewEditHistoryEpoxyController.kt
View File

@ -113,7 +113,7 @@ class ViewEditHistoryEpoxyController(private val context: Context,
when (it.operation) { when (it.operation) {
diff_match_patch.Operation.DELETE -> { diff_match_patch.Operation.DELETE -> {
span { span {
text = it.text text = it.text.replace("\n"," ")
textColor = ContextCompat.getColor(context, R.color.vector_error_color) textColor = ContextCompat.getColor(context, R.color.vector_error_color)
textDecorationLine = "line-through" textDecorationLine = "line-through"
} }