|
@@ -66,7 +66,6 @@ public class MagicSystemMessageViewHolder extends MessageHolders.IncomingTextMes
|
|
|
int pressedColor;
|
|
|
int mentionColor;
|
|
|
|
|
|
-
|
|
|
pressedColor = normalColor;
|
|
|
mentionColor = resources.getColor(R.color.textColorMaxContrast);
|
|
|
|
|
@@ -80,8 +79,13 @@ public class MagicSystemMessageViewHolder extends MessageHolders.IncomingTextMes
|
|
|
if (message.messageParameters != null && message.messageParameters.size() > 0) {
|
|
|
for (String key : message.messageParameters.keySet()) {
|
|
|
Map<String, String> individualHashMap = message.messageParameters.get(key);
|
|
|
- if (individualHashMap != null && (individualHashMap.get("type").equals("user") || individualHashMap.get("type").equals("guest") || individualHashMap.get("type").equals("call"))) {
|
|
|
- messageString = DisplayUtils.searchAndColor(messageString, "@" + individualHashMap.get("name"), mentionColor);
|
|
|
+ if (individualHashMap != null &&
|
|
|
+ (individualHashMap.get("type").equals("user") ||
|
|
|
+ individualHashMap.get("type").equals("guest") ||
|
|
|
+ individualHashMap.get("type").equals("call"))) {
|
|
|
+ messageString = DisplayUtils.searchAndColor(
|
|
|
+ messageString, "@" + individualHashMap.get("name"),
|
|
|
+ mentionColor);
|
|
|
}
|
|
|
}
|
|
|
}
|