sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix take photo with pending keys

This commit is contained in:
Daniel Gultsch 2017-11-06 17:27:48 +01:00
parent 894ffc6488
commit af3c9be700
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
View File

@ -1487,7 +1487,7 @@ public class ConversationActivity extends XmppActivity
this.mPendingGeoUri = null; this.mPendingGeoUri = null;
} }
} else if (requestCode == REQUEST_TRUST_KEYS_TEXT || requestCode == REQUEST_TRUST_KEYS_MENU) { } else if (requestCode == REQUEST_TRUST_KEYS_TEXT || requestCode == REQUEST_TRUST_KEYS_MENU) {
this.forbidProcessingPendings = !xmppConnectionServiceBound; this.forbidProcessingPendings = true;
if (xmppConnectionServiceBound) { if (xmppConnectionServiceBound) {
mConversationFragment.onActivityResult(requestCode, resultCode, data); mConversationFragment.onActivityResult(requestCode, resultCode, data);
this.mPostponedActivityResult = null; this.mPostponedActivityResult = null;