From c9b4799d0ee97163e17a89425fffa8c5234379cc Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Mon, 20 Nov 2017 20:24:00 +0100
Subject: fix take photo with pending keys

---
 src/main/java/de/pixart/messenger/ui/ConversationActivity.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/main/java/de/pixart/messenger/ui/ConversationActivity.java b/src/main/java/de/pixart/messenger/ui/ConversationActivity.java
index 0c2b620b4..2360e2e67 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationActivity.java
@@ -1673,7 +1673,7 @@ public class ConversationActivity extends XmppActivity
                     this.mPendingGeoUri = null;
                 }
             } else if (requestCode == REQUEST_TRUST_KEYS_TEXT || requestCode == REQUEST_TRUST_KEYS_MENU) {
-                this.forbidProcessingPendings = !xmppConnectionServiceBound;
+                this.forbidProcessingPendings = true;
                 if (xmppConnectionServiceBound) {
                     mConversationFragment.onActivityResult(requestCode, resultCode, data);
                     this.mPostponedActivityResult = null;
-- 
cgit v1.2.3