From 2a4cdec0201dd6aa14198bdd40ea3e4dcdf2985f Mon Sep 17 00:00:00 2001 From: Valere Date: Fri, 15 Nov 2019 11:40:05 +0100 Subject: [PATCH] klint cleaning --- .../session/room/send/LocalEchoEventFactory.kt | 13 +++++++------ .../home/room/detail/RoomDetailViewModel.kt | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/LocalEchoEventFactory.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/LocalEchoEventFactory.kt index 4b099a25be..3f47b8fff3 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/LocalEchoEventFactory.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/LocalEchoEventFactory.kt @@ -70,7 +70,8 @@ internal class LocalEchoEventFactory @Inject constructor(@UserId private val use private fun createTextContent(text: CharSequence, autoMarkdown: Boolean): TextContent { if (autoMarkdown) { - val source = transformPills(text,"[%2\$s](https://matrix.to/#/%1\$s)") ?: text.toString() + val source = transformPills(text, "[%2\$s](https://matrix.to/#/%1\$s)") + ?: text.toString() val document = parser.parse(source) val htmlText = renderer.render(document) @@ -78,9 +79,9 @@ internal class LocalEchoEventFactory @Inject constructor(@UserId private val use return TextContent(source, htmlText) } } else { - //Try to detect pills + // Try to detect pills transformPills(text, "%2\$s")?.let { - return TextContent(text.toString(),it) + return TextContent(text.toString(), it) } } @@ -88,7 +89,7 @@ internal class LocalEchoEventFactory @Inject constructor(@UserId private val use } private fun transformPills(text: CharSequence, - template : String) + template: String) : String? { val bufSB = StringBuffer() var currIndex = 0 @@ -98,9 +99,9 @@ internal class LocalEchoEventFactory @Inject constructor(@UserId private val use pills.forEachIndexed { _, urlSpan -> val start = it.getSpanStart(urlSpan) val end = it.getSpanEnd(urlSpan) - //We want to replace with the pill with a html link + // We want to replace with the pill with a html link bufSB.append(text, currIndex, start) - bufSB.append(String.format(template,urlSpan.userId,urlSpan.displayName)) + bufSB.append(String.format(template, urlSpan.userId, urlSpan.displayName)) currIndex = end } bufSB.append(text, currIndex, text.length) diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewModel.kt index b8d4ccb7c6..a264e0d06c 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewModel.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewModel.kt @@ -386,7 +386,7 @@ class RoomDetailViewModel @AssistedInject constructor(@Assisted initialState: Ro val finalText = legacyRiotQuoteText(textMsg, action.text.toString()) - //TODO check for pills? + // TODO check for pills? // TODO Refactor this, just temporary for quotes val parser = Parser.builder().build()