narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

fixed crash with samsung recorder

Browse source
This commit is contained in:
Daniel Gultsch 2018-05-01 15:16:10 +02:00
parent d8439c72fd
commit 8d5a7c79da
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
View file

@ -793,14 +793,14 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
selectPresenceToAttachFile(choice); selectPresenceToAttachFile(choice);
break; break;
case ATTACHMENT_CHOICE_CHOOSE_IMAGE: case ATTACHMENT_CHOICE_CHOOSE_IMAGE:
List<Uri> imageUris = AttachmentTool.extractUriFromIntent(data); final List<Uri> imageUris = AttachmentTool.extractUriFromIntent(data);
for (Iterator<Uri> i = imageUris.iterator(); i.hasNext(); i.remove()) { for (Iterator<Uri> i = imageUris.iterator(); i.hasNext(); i.remove()) {
Log.d(Config.LOGTAG, "ConversationsActivity.onActivityResult() - attaching image to conversations. CHOOSE_IMAGE"); Log.d(Config.LOGTAG, "ConversationsActivity.onActivityResult() - attaching image to conversations. CHOOSE_IMAGE");
attachImageToConversation(conversation, i.next()); attachImageToConversation(conversation, i.next());
} }
break; break;
case ATTACHMENT_CHOICE_TAKE_PHOTO: case ATTACHMENT_CHOICE_TAKE_PHOTO:
Uri takePhotoUri = pendingTakePhotoUri.pop(); final Uri takePhotoUri = pendingTakePhotoUri.pop();
if (takePhotoUri != null) { if (takePhotoUri != null) {
attachImageToConversation(conversation, takePhotoUri); attachImageToConversation(conversation, takePhotoUri);
} else { } else {
@ -811,7 +811,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
case ATTACHMENT_CHOICE_RECORD_VIDEO: case ATTACHMENT_CHOICE_RECORD_VIDEO:
case ATTACHMENT_CHOICE_RECORD_VOICE: case ATTACHMENT_CHOICE_RECORD_VOICE:
final List<Uri> fileUris = AttachmentTool.extractUriFromIntent(data); final List<Uri> fileUris = AttachmentTool.extractUriFromIntent(data);
String type = data.getType(); final String type = data == null ? null : data.getType();
final PresenceSelector.OnPresenceSelected callback = () -> { final PresenceSelector.OnPresenceSelected callback = () -> {
for (Iterator<Uri> i = fileUris.iterator(); i.hasNext(); i.remove()) { for (Iterator<Uri> i = fileUris.iterator(); i.hasNext(); i.remove()) {
Log.d(Config.LOGTAG, "ConversationsActivity.onActivityResult() - attaching file to conversations. CHOOSE_FILE/RECORD_VOICE/RECORD_VIDEO"); Log.d(Config.LOGTAG, "ConversationsActivity.onActivityResult() - attaching file to conversations. CHOOSE_FILE/RECORD_VOICE/RECORD_VIDEO");