Don't blindly set media deleted flag on all retracted

Stephen Paul Weber created 2 years ago

Since this causes it to render as if it had a deleted file, even if it
never had a file.

Change summary

src/main/java/eu/siacs/conversations/parser/MessageParser.java    | 1 
src/main/java/eu/siacs/conversations/persistance/FileBackend.java | 1 
src/main/java/eu/siacs/conversations/ui/ConversationFragment.java | 2 -
3 files changed, 1 insertion(+), 3 deletions(-)

Detailed changes

src/main/java/eu/siacs/conversations/parser/MessageParser.java

@@ -783,7 +783,6 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
                                 }
                                 replacedMessage.clearPayloads();
                                 replacedMessage.setFileParams(null);
-                                replacedMessage.setDeleted(true);
                                 replacedMessage.addPayload(replaceElement);
                             }
                             if (replacedMessage.getServerMsgId() == null || message.getServerMsgId() != null) {

src/main/java/eu/siacs/conversations/persistance/FileBackend.java

@@ -532,6 +532,7 @@ public class FileBackend {
     public boolean deleteFile(Message message) {
         File file = getFile(message);
         if (file.delete()) {
+            message.setDeleted(true);
             updateMediaScanner(file);
             return true;
         } else {

src/main/java/eu/siacs/conversations/ui/ConversationFragment.java

@@ -1815,7 +1815,6 @@ public class ConversationFragment extends XmppFragment
                         File f = activity.xmppConnectionService.getFileBackend().getFile(selectedMessage);
                         activity.xmppConnectionService.blockMedia(f);
                         activity.xmppConnectionService.getFileBackend().deleteFile(selectedMessage);
-                        selectedMessage.setDeleted(true);
                         activity.xmppConnectionService.evictPreview(f);
                         activity.xmppConnectionService.updateMessage(selectedMessage, false);
                         activity.onConversationsListItemUpdated();
@@ -2679,7 +2678,6 @@ public class ConversationFragment extends XmppFragment
                         }
                     }
                     if (activity.xmppConnectionService.getFileBackend().deleteFile(message)) {
-                        message.setDeleted(true);
                         activity.xmppConnectionService.evictPreview(activity.xmppConnectionService.getFileBackend().getFile(message));
                         activity.xmppConnectionService.updateMessage(message, false);
                         activity.onConversationsListItemUpdated();