gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 20:19:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

update emojis when system message arrived

Browse Source 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
Marcel Hibbe 2022-04-01 11:06:07 +02:00
parent db8c4dd18a
commit f45b48898f
No known key found for this signature in database
GPG Key ID: C793F8B59F43CE7B
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
View File

@ -2345,7 +2345,7 @@ class ChatController(args: Bundle) :
// setDeletionFlagsAndRemoveInfomessages // setDeletionFlagsAndRemoveInfomessages
if (isInfoMessageAboutDeletion(currentMessage)) { if (isInfoMessageAboutDeletion(currentMessage)) {
if (!chatMessageMap.containsKey(currentMessage.value.parentMessage.id)) { if (!chatMessageMap.containsKey(currentMessage.value.parentMessage.id)) {
// if chatMessageMap doesnt't contain message to delete (this happens when lookingIntoFuture), // if chatMessageMap doesn't contain message to delete (this happens when lookingIntoFuture),
// the message to delete has to be modified directly inside the adapter // the message to delete has to be modified directly inside the adapter
setMessageAsDeleted(currentMessage.value.parentMessage) setMessageAsDeleted(currentMessage.value.parentMessage)
} else { } else {
@ -2356,6 +2356,10 @@ class ChatController(args: Bundle) :
// delete reactions system messages // delete reactions system messages
else if (isReactionsMessage(currentMessage)) { else if (isReactionsMessage(currentMessage)) {
if (!chatMessageMap.containsKey(currentMessage.value.parentMessage.id)) {
adapter?.update(currentMessage.value.parentMessage)
}
chatMessageIterator.remove() chatMessageIterator.remove()
} }
} }

4
app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.java
View File

@ -291,7 +291,9 @@ public class ChatMessage implements MessageContentType, MessageContentType.Image
@Override @Override
public String getAvatar() { public String getAvatar() {
if (getActorType().equals("users")) { if (getActiveUser() == null) {
return null;
} else if (getActorType().equals("users")) {
return ApiUtils.getUrlForAvatar(getActiveUser().getBaseUrl(), actorId, true); return ApiUtils.getUrlForAvatar(getActiveUser().getBaseUrl(), actorId, true);
} else if (getActorType().equals("bridged")) { } else if (getActorType().equals("bridged")) {
return ApiUtils.getUrlForAvatar(getActiveUser().getBaseUrl(), "bridge-bot", return ApiUtils.getUrlForAvatar(getActiveUser().getBaseUrl(), "bridge-bot",