check for rare null pointer platform bug in share intent handling
This commit is contained in:
parent
da1edafd49
commit
eec2083fab
1 changed files with 20 additions and 0 deletions
|
@ -1501,6 +1501,26 @@ public class ConversationActivity extends XmppActivity
|
||||||
xmppConnectionService.getNotificationService().setOpenConversation(null);
|
xmppConnectionService.getNotificationService().setOpenConversation(null);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@SuppressLint("NewApi")
|
||||||
|
private static List<Uri> extractUriFromIntent(final Intent intent) {
|
||||||
|
List<Uri> uris = new ArrayList<>();
|
||||||
|
if (intent == null) {
|
||||||
|
return uris;
|
||||||
|
}
|
||||||
|
Uri uri = intent.getData();
|
||||||
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2 && uri == null) {
|
||||||
|
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);
|
||||||
|
}
|
||||||
|
return uris;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onActivityResult(int requestCode, int resultCode, final Intent data) {
|
protected void onActivityResult(int requestCode, int resultCode, final Intent data) {
|
||||||
super.onActivityResult(requestCode, resultCode, data);
|
super.onActivityResult(requestCode, resultCode, data);
|
||||||
|
|
Reference in a new issue