gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-07-15 16:55:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2018-08-16 12:19:01 +02:00
parent 1d2f9843f9
commit 4fb4df3221
4 changed files with 4 additions and 4 deletions

2
app/src/main/java/com/nextcloud/talk/adapters/messages/MagicIncomingTextMessageViewHolder.java
View File

@ -132,7 +132,7 @@ public class MagicIncomingTextMessageViewHolder
if (messageParameters != null && messageParameters.size() > 0) { if (messageParameters != null && messageParameters.size() > 0) {
for (String key : messageParameters.keySet()) { for (String key : messageParameters.keySet()) {
Map<String, String> individualHashMap = message.getMessageParameters().get(key); Map<String, String> individualHashMap = message.getMessageParameters().get(key);
if (individualHashMap.get("type").equals("user")) { if (individualHashMap.get("type").equals("user") || individualHashMap.get("type").equals("guest")) {
int color; int color;
if (individualHashMap.get("id").equals(message.getActiveUserId())) { if (individualHashMap.get("id").equals(message.getActiveUserId())) {

2
app/src/main/java/com/nextcloud/talk/adapters/messages/MagicOutcomingTextMessageViewHolder.java
View File

@ -88,7 +88,7 @@ public class MagicOutcomingTextMessageViewHolder extends MessageHolders.Outcomin
if (messageParameters != null && messageParameters.size() > 0) { if (messageParameters != null && messageParameters.size() > 0) {
for (String key : messageParameters.keySet()) { for (String key : messageParameters.keySet()) {
Map<String, String> individualHashMap = message.getMessageParameters().get(key); Map<String, String> individualHashMap = message.getMessageParameters().get(key);
if (individualHashMap.get("type").equals("user")) { if (individualHashMap.get("type").equals("user") || individualHashMap.get("type").equals("guest")) {
if (!individualHashMap.get("id").equals(message.getActiveUserId())) { if (!individualHashMap.get("id").equals(message.getActiveUserId())) {
messageString = DisplayUtils.searchAndColor(messageText.getText().toString(), messageString = DisplayUtils.searchAndColor(messageText.getText().toString(),
messageString, "@" + individualHashMap.get("name"), NextcloudTalkApplication messageString, "@" + individualHashMap.get("name"), NextcloudTalkApplication

2
app/src/main/java/com/nextcloud/talk/adapters/messages/MagicSystemMessageViewHolder.java
View File

@ -57,7 +57,7 @@ public class MagicSystemMessageViewHolder extends MessageHolders.IncomingTextMes
if (message.getMessageParameters() != null && message.getMessageParameters().size() > 0) { if (message.getMessageParameters() != null && message.getMessageParameters().size() > 0) {
for (String key : message.getMessageParameters().keySet()) { for (String key : message.getMessageParameters().keySet()) {
Map<String, String> individualHashMap = message.getMessageParameters().get(key); Map<String, String> individualHashMap = message.getMessageParameters().get(key);
if (individualHashMap.get("type").equals("user")) { if (individualHashMap.get("type").equals("user") || individualHashMap.get("type").equals("guest")) {
int color; int color;
if (individualHashMap.get("id").equals(message.getActiveUserId())) { if (individualHashMap.get("id").equals(message.getActiveUserId())) {

2
app/src/main/java/com/nextcloud/talk/models/json/chat/ChatUtils.java
View File

@ -28,7 +28,7 @@ public class ChatUtils {
if (messageParameters != null && messageParameters.size() > 0) { if (messageParameters != null && messageParameters.size() > 0) {
for (String key : messageParameters.keySet()) { for (String key : messageParameters.keySet()) {
HashMap<String, String> individualHashMap = messageParameters.get(key); HashMap<String, String> individualHashMap = messageParameters.get(key);
if (individualHashMap.get("type").equals("user")) { if (individualHashMap.get("type").equals("user") || individualHashMap.get("type").equals("guest")) {
message = message.replaceAll("\\{" + key + "\\}", "@" + message = message.replaceAll("\\{" + key + "\\}", "@" +
messageParameters.get(key).get("name")); messageParameters.get(key).get("name"));
} }