aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2017-11-20 20:24:00 +0100
committerChristian Schneppe <christian@pix-art.de>2017-11-20 20:24:00 +0100
commitc9b4799d0ee97163e17a89425fffa8c5234379cc (patch)
tree04700661bc222b5b86ccee3a30bdafae8817fb32 /src/main/java/de
parent7381f906130403d0e9b60cab70673d246206d8fa (diff)
fix take photo with pending keys
Diffstat (limited to 'src/main/java/de')
-rw-r--r--src/main/java/de/pixart/messenger/ui/ConversationActivity.java2
1 files changed, 1 insertions, 1 deletions
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;