diff options
author | Christian Schneppe <christian@pix-art.de> | 2019-09-13 21:38:18 +0200 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2019-09-13 21:38:18 +0200 |
commit | eb34cdc3e350a50ce98959bbf05f83813a6c2e12 (patch) | |
tree | e6257be6472dfb8bf6a91ac3c6ab52dfd3614bf8 /src/main/java/de/pixart/messenger/ui | |
parent | 1b45c333933f9e847439adfa6220ee4cb88ea7b9 (diff) |
keep track of previously edited ids
Diffstat (limited to 'src/main/java/de/pixart/messenger/ui')
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/ConversationFragment.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java index 924585ea4..859ef132f 100644 --- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java +++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java @@ -873,7 +873,8 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke } else { message = conversation.getCorrectingMessage(); message.setBody(body); - message.setEdited(message.getUuid()); + message.putEdited(message.getUuid(), message.getServerMsgId()); + message.setServerMsgId(null); message.setUuid(UUID.randomUUID().toString()); } switch (conversation.getNextEncryption()) { @@ -1886,7 +1887,8 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke this.conversation.setCorrectingMessage(finalMessage); Message deletedmessage = conversation.getCorrectingMessage(); deletedmessage.setBody(getString(R.string.message_deleted)); - deletedmessage.setEdited(deletedmessage.getUuid()); + deletedmessage.putEdited(deletedmessage.getUuid(), deletedmessage.getServerMsgId()); + deletedmessage.setServerMsgId(null); deletedmessage.setUuid(UUID.randomUUID().toString()); sendMessage(deletedmessage); activity.xmppConnectionService.deleteMessage(conversation, deletedmessage); |