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
committerChristian Schneppe <christian@pix-art.de>2016-06-14 21:28:29 +0200
commit38dd084e33ea25433abc4894f46ebdded152d64c (patch)
tree54e53efb1a4415c95d8dbef9c295c2dca57abd43 /src/main/java/eu/siacs/conversations/crypto
parentaaeced4e209812f3a779dc9560105dc8d3218af5 (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 5eedee6da..13985cca7 100644
--- a/src/main/java/eu/siacs/conversations/crypto/PgpDecryptionService.java
+++ b/src/main/java/eu/siacs/conversations/crypto/PgpDecryptionService.java
@@ -57,6 +57,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