fix take photo with pending keys
This commit is contained in:
parent
894ffc6488
commit
af3c9be700
|
@ -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;
|
||||||
|
|
Loading…
Reference in a new issue