narayana/anotherim
narayana/anotherim
3
2
Fork 0
Code Issues 3 Pull requests Actions Packages Projects Releases 4 Wiki Activity

hrukudah #15

Closed
bodqhrohro wants to merge 30 commits from hrukudah into master
pull from: hrukudah
merge into: narayana:master
Conversation 0 Commits 30 Files changed 54 +4 -1
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit c64e0925f4 - Show all commits

5
src/main/java/eu/siacs/conversations/entities/Message.java
View file

@ -352,7 +352,10 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
} }
public String replyId() { public String replyId() {
return conversation.getMode() == Conversation.MODE_MULTI || getRemoteMsgId() == null ? getServerMsgId() : getRemoteMsgId(); if (conversation.getMode() == Conversation.MODE_MULTI) return getServerMsgId();
final String remote = getRemoteMsgId();
if (remote == null && getStatus() > STATUS_RECEIVED) return getUuid();
return remote;
} }
public Message reply() { public Message reply() {