File tree 3 files changed +7
-11
lines changed
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api
vector/src/main/java/im/vector/app/features
home/room/detail/timeline/render
3 files changed +7
-11
lines changed Original file line number Diff line number Diff line change @@ -63,7 +63,6 @@ object MatrixPatterns {
63
63
// Android does not support in URL so extract it.
64
64
private const val PERMALINK_BASE_REGEX = " https://matrix\\ .to/#/"
65
65
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()@:%_\\ +.~#?&//=]*"
67
66
const val SEP_REGEX = " /"
68
67
69
68
private val PATTERN_CONTAIN_MATRIX_TO_PERMALINK = PERMALINK_BASE_REGEX .toRegex(RegexOption .IGNORE_CASE )
Original file line number Diff line number Diff line change @@ -58,8 +58,8 @@ class EventTextRenderer @AssistedInject constructor(
58
58
* @param text the text to be rendered
59
59
*/
60
60
fun render (text : CharSequence ): CharSequence {
61
- return renderNotifyEveryone( renderPermalinks(text) )
62
- // return renderNotifyEveryone(text )
61
+ val formattedText = renderPermalinks(text)
62
+ return renderNotifyEveryone(formattedText )
63
63
}
64
64
65
65
private fun renderNotifyEveryone (text : CharSequence ): CharSequence {
Original file line number Diff line number Diff line change @@ -112,21 +112,18 @@ class PillImageSpan(
112
112
113
113
private fun createChipDrawable (): ChipDrawable {
114
114
val textPadding = context.resources.getDimension(R .dimen.pill_text_padding)
115
+ val hasRoomAvatar = matrixItem is MatrixItem .RoomItem && matrixItem.avatarUrl.isNullOrEmpty()
115
116
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 &&
118
119
(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)) -> {
120
121
ContextCompat .getDrawable(context, R .drawable.ic_permalink)
121
122
}
122
- matrixItem is MatrixItem .UserItem &&
123
- matrixItem.avatarUrl.isNullOrEmpty() &&
123
+ matrixItem is MatrixItem .UserItem && matrixItem.avatarUrl.isNullOrEmpty() &&
124
124
matrixItem.displayName == context.getString(R .string.pill_message_unknown_user) -> {
125
125
ContextCompat .getDrawable(context, R .drawable.ic_user_round)
126
126
}
127
- matrixItem is MatrixItem .RoomItem &&
128
- matrixItem.avatarUrl.isNullOrEmpty() &&
129
- matrixItem.displayName == context.getString(R .string.pill_message_from_unknown_user) -> null
130
127
else -> {
131
128
try {
132
129
avatarRenderer.getCachedDrawable(glideRequests, matrixItem)
You can’t perform that action at this time.
0 commit comments