check for rare null pointer platform bug in share intent handling

This commit is contained in:
Daniel Gultsch 2016-08-19 21:46:47 +02:00
parent 2a139a4b47
commit cf909afc60
1 changed files with 5 additions and 3 deletions

View File

@ -1268,10 +1268,12 @@ 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();
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);
}