From cf909afc60dd6e36a7cebcdec3089bf34768382b Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Fri, 19 Aug 2016 21:46:47 +0200 Subject: check for rare null pointer platform bug in share intent handling --- src/main/java/eu/siacs/conversations/ui/ConversationActivity.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java index 11ba7c71..d57cc53e 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java @@ -1268,9 +1268,11 @@ public class ConversationActivity extends XmppActivity } Uri uri = intent.getData(); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2 && uri == null) { - ClipData clipData = intent.getClipData(); - for (int i = 0; i < clipData.getItemCount(); ++i) { - uris.add(clipData.getItemAt(i).getUri()); + final ClipData clipData = intent.getClipData(); + if (clipData != null) { + for (int i = 0; i < clipData.getItemCount(); ++i) { + uris.add(clipData.getItemAt(i).getUri()); + } } } else { uris.add(uri); -- cgit v1.2.3