diff options
| author | Christian Schneppe <christian@pix-art.de> | 2018-12-14 22:08:38 +0100 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2018-12-14 22:08:38 +0100 |
| commit | 99b264b37ed8bc356e897c1b97edfa5cbc3b9f40 (patch) | |
| tree | 4ffe04e07ccdfb83e87ef925b20abe5f553d4fc1 /src/main/java/de/pixart/messenger | |
| parent | 155332f65b5fc5baaaff845f2c288056d7ae12ec (diff) | |
fixed dead lock when sending pgp messages from quick reply
Diffstat (limited to 'src/main/java/de/pixart/messenger')
| -rw-r--r-- | src/main/java/de/pixart/messenger/crypto/PgpDecryptionService.java | 2 | ||||
| -rw-r--r-- | src/main/java/de/pixart/messenger/services/XmppConnectionService.java | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/main/java/de/pixart/messenger/crypto/PgpDecryptionService.java b/src/main/java/de/pixart/messenger/crypto/PgpDecryptionService.java index 857dff0d1..1c1a995a9 100644 --- a/src/main/java/de/pixart/messenger/crypto/PgpDecryptionService.java +++ b/src/main/java/de/pixart/messenger/crypto/PgpDecryptionService.java @@ -29,7 +29,7 @@ import de.pixart.messenger.utils.MimeUtils; public class PgpDecryptionService { - protected final ArrayDeque<Message> messages = new ArrayDeque(); + protected final ArrayDeque<Message> messages = new ArrayDeque<>(); protected final HashSet<Message> pendingNotifications = new HashSet<>(); private final XmppConnectionService mXmppConnectionService; private OpenPgpApi openPgpApi = null; diff --git a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java index bd68bd140..205f4db48 100644 --- a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java +++ b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java @@ -839,8 +839,6 @@ public class XmppConnectionService extends Service { getPgpEngine().encrypt(message, new UiCallback<Message>() { @Override public void success(Message message) { - message.setEncryption(Message.ENCRYPTION_DECRYPTED); - sendMessage(message); if (dismissAfterReply) { markRead((Conversation) message.getConversation(), true); } else { |