Fix crash coming back with photo

Stephen Paul Weber created

Change summary

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

Detailed changes

src/main/java/eu/siacs/conversations/ui/ConversationFragment.java 🔗 

@@ -1200,7 +1200,7 @@ public class ConversationFragment extends XmppFragment
                 break;
             case ATTACHMENT_CHOICE_CHOOSE_IMAGE: {
                 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(
                             Attachment.of(getActivity(), takePhotoUri, Attachment.Type.IMAGE));
                 }