From 824ba44fd41a9e4df8a78cae4e954fcfc3b99a41 Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Sat, 26 Oct 2019 19:33:26 +0200 Subject: =?UTF-8?q?don=E2=80=99t=20mark=20pgp=20encrypted=20files=20receiv?= =?UTF-8?q?ed=20from=20dino=20as=20deleted?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/de/pixart/messenger/services/XmppConnectionService.java | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/main/java/de/pixart/messenger/services/XmppConnectionService.java') diff --git a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java index b63588718..0ead8c393 100644 --- a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java +++ b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java @@ -305,6 +305,7 @@ public class XmppConnectionService extends Service { private final Set mOnKeyStatusUpdated = Collections.newSetFromMap(new WeakHashMap()); private final Object LISTENER_LOCK = new Object(); + public final Set FILENAMES_TO_IGNORE_DELETION = new HashSet<>(); private final OnBindListener mOnBindListener = new OnBindListener() { @Override @@ -2073,6 +2074,12 @@ public class XmppConnectionService extends Service { } private void markFileDeleted(final String path) { + synchronized (FILENAMES_TO_IGNORE_DELETION) { + if (FILENAMES_TO_IGNORE_DELETION.remove(path)) { + Log.d(Config.LOGTAG, "ignored deletion of " + path); + return; + } + } final File file = new File(path); final boolean isInternalFile = fileBackend.isInternalFile(file); final List uuids = databaseBackend.markFileAsDeleted(file, isInternalFile); -- cgit v1.2.3