Fix crash coming back with photo
(cherry picked from commit 27d9e2c82f59e0eec003058b93ed63f9b458b8c9)
This commit is contained in:
parent
6cfd420f8f
commit
bec1acfd6d
1 changed files with 1 additions and 1 deletions
|
@ -1430,7 +1430,7 @@ public class ConversationFragment extends XmppFragment
|
||||||
break;
|
break;
|
||||||
case ATTACHMENT_CHOICE_CHOOSE_IMAGE: {
|
case ATTACHMENT_CHOICE_CHOOSE_IMAGE: {
|
||||||
final Uri takePhotoUri = pendingTakePhotoUri.pop();
|
final Uri takePhotoUri = pendingTakePhotoUri.pop();
|
||||||
if (takePhotoUri != null && data.getData() == null && data.getClipData() == null) {
|
if (takePhotoUri != null && (data == null || (data.getData() == null && data.getClipData() == null))) {
|
||||||
mediaPreviewAdapter.addMediaPreviews(
|
mediaPreviewAdapter.addMediaPreviews(
|
||||||
Attachment.of(getActivity(), takePhotoUri, Attachment.Type.IMAGE));
|
Attachment.of(getActivity(), takePhotoUri, Attachment.Type.IMAGE));
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue