aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/de')
-rw-r--r--src/main/java/de/pixart/messenger/ui/ConversationFragment.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
index ccb3cc59c..253d27433 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
@@ -1022,7 +1022,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
}
break;
case ATTACHMENT_CHOICE_TAKE_FROM_CAMERA:
- Uri takePhotoUri = pendingTakePhotoUri.pop();
+ final Uri takePhotoUri = pendingTakePhotoUri.pop();
if (takePhotoUri != null) {
attachPhotoToConversation(conversation, takePhotoUri);
} else {
@@ -1032,7 +1032,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
case ATTACHMENT_CHOICE_CHOOSE_FILE:
case ATTACHMENT_CHOICE_RECORD_VOICE:
final List<Uri> fileUris = AttachmentTool.extractUriFromIntent(data);
- String type = data.getType();
+ final String type = data == null ? null : data.getType();
final PresenceSelector.OnPresenceSelected callback = () -> {
for (Iterator<Uri> i = fileUris.iterator(); i.hasNext(); i.remove()) {
Log.d(Config.LOGTAG, "ConversationsActivity.onActivityResult() - attaching file to conversations. CHOOSE_FILE/RECORD_VOICE");