Browse Source

update emojis when system message arrived

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
Marcel Hibbe 3 năm trước cách đây
mục cha
commit
f45b48898f

+ 5 - 1
app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt

@@ -2345,7 +2345,7 @@ class ChatController(args: Bundle) :
             // setDeletionFlagsAndRemoveInfomessages
             if (isInfoMessageAboutDeletion(currentMessage)) {
                 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
                     setMessageAsDeleted(currentMessage.value.parentMessage)
                 } else {
@@ -2356,6 +2356,10 @@ class ChatController(args: Bundle) :
 
             // delete reactions system messages
             else if (isReactionsMessage(currentMessage)) {
+                if (!chatMessageMap.containsKey(currentMessage.value.parentMessage.id)) {
+                    adapter?.update(currentMessage.value.parentMessage)
+                }
+
                 chatMessageIterator.remove()
             }
         }

+ 3 - 1
app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.java

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