From af3c9be7004e2e471587cbf1ad106e30ab6dfc0e Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 6 Nov 2017 17:27:48 +0100
Subject: [PATCH] fix take photo with pending keys

---
 .../java/eu/siacs/conversations/ui/ConversationActivity.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
index 7ce1c5cda..2f17b228a 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
@@ -1487,7 +1487,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;