aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/crypto
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-06-13 19:06:09 +0200
committerDaniel Gultsch <daniel@gultsch.de>2016-06-13 19:06:09 +0200
commit39ad426ca9afdf0a3c2fbc49cdde5ec7fd157f42 (patch)
tree6d9f12bb652eaf9b1a45e3a2004555d323eb01a4 /src/main/java/eu/siacs/conversations/crypto
parent40f81f19dfbfd806a604012fc1aa2eafb4e10cfe (diff)
remove messages from decryption queue when trimming a conversation
Diffstat (limited to 'src/main/java/eu/siacs/conversations/crypto')
-rw-r--r--src/main/java/eu/siacs/conversations/crypto/PgpDecryptionService.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/main/java/eu/siacs/conversations/crypto/PgpDecryptionService.java b/src/main/java/eu/siacs/conversations/crypto/PgpDecryptionService.java
index 2bc270c1..0a34ba17 100644
--- a/src/main/java/eu/siacs/conversations/crypto/PgpDecryptionService.java
+++ b/src/main/java/eu/siacs/conversations/crypto/PgpDecryptionService.java
@@ -50,6 +50,10 @@ public class PgpDecryptionService {
continueDecryption();
}
+ public synchronized void discard(List<Message> discards) {
+ this.messages.removeAll(discards);
+ }
+
protected synchronized void decryptNext() {
if (pendingIntent == null
&& getOpenPgpApi() != null