1 files changed, 35 insertions, 0 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationActivity.java b/src/main/java/de/pixart/messenger/ui/ConversationActivity.java
index 501a70961..32689ca7b 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationActivity.java
@@ -63,6 +63,7 @@ import de.pixart.messenger.ui.interfaces.OnConversationsListItemUpdated;
 import de.pixart.messenger.ui.util.PendingItem;
 import de.pixart.messenger.xmpp.OnUpdateBlocklist;
 
+import static de.pixart.messenger.ui.ConversationFragment.REQUEST_DECRYPT_PGP;
 import static de.pixart.messenger.ui.SettingsActivity.USE_BUNDLED_EMOJIS;
 
 public class ConversationActivity extends XmppActivity implements OnConversationSelected, OnConversationArchived, OnConversationsListItemUpdated, OnConversationRead, XmppConnectionService.OnAccountUpdate, XmppConnectionService.OnConversationUpdate, XmppConnectionService.OnRosterUpdate, OnUpdateBlocklist, XmppConnectionService.OnShowErrorToast {
@@ -199,6 +200,40 @@ public class ConversationActivity extends XmppActivity implements OnConversation
     }
 
     @Override
+    public void onActivityResult(int requestCode, int resultCode, final Intent data) {
+        Log.d(Config.LOGTAG, "on activity result");
+        if (resultCode == RESULT_OK) {
+            handlePositiveActivityResult(requestCode, data);
+        } else {
+            handleNegativeActivityResult(requestCode);
+        }
+    }
+
+    private void handleNegativeActivityResult(int requestCode) {
+        switch (requestCode) {
+            case REQUEST_DECRYPT_PGP:
+                Conversation conversation = ConversationFragment.getConversationReliable(this);
+                if (conversation == null) {
+                    break;
+                }
+                conversation.getAccount().getPgpDecryptionService().giveUpCurrentDecryption();
+                break;
+        }
+    }
+
+    private void handlePositiveActivityResult(int requestCode, final Intent data) {
+        switch (requestCode) {
+            case REQUEST_DECRYPT_PGP:
+                Conversation conversation = ConversationFragment.getConversationReliable(this);
+                if (conversation == null) {
+                    break;
+                }
+                conversation.getAccount().getPgpDecryptionService().continueDecryption(data);
+                break;
+        }
+    }
+
+    @Override
     protected void onCreate(final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         new EmojiService(this).init(useBundledEmoji());