aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
diff options
context:
space:
mode:
authorChristian Schneppe <christian.schneppe@pix-art.de>2019-10-26 19:33:26 +0200
committerChristian Schneppe <christian.schneppe@pix-art.de>2019-10-26 19:33:26 +0200
commit824ba44fd41a9e4df8a78cae4e954fcfc3b99a41 (patch)
tree995a39b0bc0e72a2834b326de7cbf00b899380ed /src/main/java/de/pixart/messenger/services/XmppConnectionService.java
parent8e2adfcfd1def2a348e8ac8410e4430c0d13c76a (diff)
don’t mark pgp encrypted files received from dino as deleted
Diffstat (limited to 'src/main/java/de/pixart/messenger/services/XmppConnectionService.java')
-rw-r--r--src/main/java/de/pixart/messenger/services/XmppConnectionService.java7
1 files changed, 7 insertions, 0 deletions
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<OnKeyStatusUpdated> mOnKeyStatusUpdated = Collections.newSetFromMap(new WeakHashMap<OnKeyStatusUpdated, Boolean>());
private final Object LISTENER_LOCK = new Object();
+ public final Set<String> 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<String> uuids = databaseBackend.markFileAsDeleted(file, isInternalFile);