diff options
author | fiaxh <github@lightrise.org> | 2015-10-15 23:21:47 +0100 |
---|---|---|
committer | fiaxh <github@lightrise.org> | 2015-10-28 19:57:11 +0000 |
commit | 29a849cb92c0dc902acd3aa54d0d2f07583bce72 (patch) | |
tree | f24dc3bfb5258c95a570d8ee54ca18b057d34602 /src/main/java/eu/siacs/conversations/ui/ConversationActivity.java | |
parent | d65273ce39ab112ba95d0b852cda6717dbf33c8c (diff) |
Decrypt PGP messages in background
Diffstat (limited to '')
-rw-r--r-- | src/main/java/eu/siacs/conversations/ui/ConversationActivity.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java index 8bd51214..1345ada5 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java @@ -1194,8 +1194,7 @@ public class ConversationActivity extends XmppActivity super.onActivityResult(requestCode, resultCode, data); if (resultCode == RESULT_OK) { if (requestCode == REQUEST_DECRYPT_PGP) { - mConversationFragment.hideSnackbar(); - mConversationFragment.updateMessages(); + mConversationFragment.onActivityResult(requestCode, resultCode, data); } else if (requestCode == ATTACHMENT_CHOICE_CHOOSE_IMAGE) { mPendingImageUris.clear(); mPendingImageUris.addAll(extractUriFromIntent(data)); @@ -1240,6 +1239,9 @@ public class ConversationActivity extends XmppActivity } else { mPendingImageUris.clear(); mPendingFileUris.clear(); + if (requestCode == ConversationActivity.REQUEST_DECRYPT_PGP) { + mConversationFragment.onActivityResult(requestCode, resultCode, data); + } } } |