Skip to content

Commit ed96b89

Browse files
committed
Fix lint issues
1 parent 13ac062 commit ed96b89

File tree

3 files changed

+7
-11
lines changed

3 files changed

+7
-11
lines changed

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixPatterns.kt

-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ object MatrixPatterns {
6363
// Android does not support in URL so extract it.
6464
private const val PERMALINK_BASE_REGEX = "https://matrix\\.to/#/"
6565
private const val APP_BASE_REGEX = "https://[A-Z0-9.-]+\\.[A-Z]{2,}/[A-Z]{3,}/#/room/"
66-
private const val URL_PARAMS = "\\b[-a-zA-Z0-9()@:%_\\+.~#?&//=]*"
6766
const val SEP_REGEX = "/"
6867

6968
private val PATTERN_CONTAIN_MATRIX_TO_PERMALINK = PERMALINK_BASE_REGEX.toRegex(RegexOption.IGNORE_CASE)

vector/src/main/java/im/vector/app/features/home/room/detail/timeline/render/EventTextRenderer.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ class EventTextRenderer @AssistedInject constructor(
5858
* @param text the text to be rendered
5959
*/
6060
fun render(text: CharSequence): CharSequence {
61-
return renderNotifyEveryone(renderPermalinks(text))
62-
// return renderNotifyEveryone(text)
61+
val formattedText = renderPermalinks(text)
62+
return renderNotifyEveryone(formattedText)
6363
}
6464

6565
private fun renderNotifyEveryone(text: CharSequence): CharSequence {

vector/src/main/java/im/vector/app/features/html/PillImageSpan.kt

+5-8
Original file line numberDiff line numberDiff line change
@@ -112,21 +112,18 @@ class PillImageSpan(
112112

113113
private fun createChipDrawable(): ChipDrawable {
114114
val textPadding = context.resources.getDimension(R.dimen.pill_text_padding)
115+
val hasRoomAvatar = matrixItem is MatrixItem.RoomItem && matrixItem.avatarUrl.isNullOrEmpty()
115116
val icon = when {
116-
matrixItem is MatrixItem.RoomItem &&
117-
matrixItem.avatarUrl.isNullOrEmpty() &&
117+
hasRoomAvatar && matrixItem.displayName == context.getString(R.string.pill_message_from_unknown_user) -> null
118+
hasRoomAvatar &&
118119
(matrixItem.displayName == context.getString(R.string.pill_message_in_unknown_room) ||
119-
matrixItem.displayName == context.getString(R.string.pill_message_unknown_room_or_space)) -> {
120+
matrixItem.displayName == context.getString(R.string.pill_message_unknown_room_or_space)) -> {
120121
ContextCompat.getDrawable(context, R.drawable.ic_permalink)
121122
}
122-
matrixItem is MatrixItem.UserItem &&
123-
matrixItem.avatarUrl.isNullOrEmpty() &&
123+
matrixItem is MatrixItem.UserItem && matrixItem.avatarUrl.isNullOrEmpty() &&
124124
matrixItem.displayName == context.getString(R.string.pill_message_unknown_user) -> {
125125
ContextCompat.getDrawable(context, R.drawable.ic_user_round)
126126
}
127-
matrixItem is MatrixItem.RoomItem &&
128-
matrixItem.avatarUrl.isNullOrEmpty() &&
129-
matrixItem.displayName == context.getString(R.string.pill_message_from_unknown_user) -> null
130127
else -> {
131128
try {
132129
avatarRenderer.getCachedDrawable(glideRequests, matrixItem)

0 commit comments

Comments
 (0)