From 8d5a7c79da566336230a1d59919f7ba769e08d9d Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Tue, 1 May 2018 15:16:10 +0200 Subject: [PATCH] fixed crash with samsung recorder --- .../eu/siacs/conversations/ui/ConversationFragment.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java index 912183fea..183af8ea3 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java @@ -793,14 +793,14 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke selectPresenceToAttachFile(choice); break; case ATTACHMENT_CHOICE_CHOOSE_IMAGE: - List imageUris = AttachmentTool.extractUriFromIntent(data); + final List imageUris = AttachmentTool.extractUriFromIntent(data); for (Iterator i = imageUris.iterator(); i.hasNext(); i.remove()) { Log.d(Config.LOGTAG, "ConversationsActivity.onActivityResult() - attaching image to conversations. CHOOSE_IMAGE"); attachImageToConversation(conversation, i.next()); } break; case ATTACHMENT_CHOICE_TAKE_PHOTO: - Uri takePhotoUri = pendingTakePhotoUri.pop(); + final Uri takePhotoUri = pendingTakePhotoUri.pop(); if (takePhotoUri != null) { attachImageToConversation(conversation, takePhotoUri); } else { @@ -811,7 +811,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke case ATTACHMENT_CHOICE_RECORD_VIDEO: case ATTACHMENT_CHOICE_RECORD_VOICE: final List fileUris = AttachmentTool.extractUriFromIntent(data); - String type = data.getType(); + final String type = data == null ? null : data.getType(); final PresenceSelector.OnPresenceSelected callback = () -> { for (Iterator i = fileUris.iterator(); i.hasNext(); i.remove()) { Log.d(Config.LOGTAG, "ConversationsActivity.onActivityResult() - attaching file to conversations. CHOOSE_FILE/RECORD_VOICE/RECORD_VIDEO");