diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java index d3ad4655f..8256b5c4a 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java @@ -395,15 +395,18 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn if( type == RetrieveFeedsAsyncTask.Type.CONVERSATION ){ List conversations = apiResponse.getConversations(); List statusesConversations = new ArrayList<>(); - if( conversations != null) - for( Conversation conversation: conversations) { - Status status = conversation.getLast_status(); - status.setConversationId(conversation.getId()); - List ppConversation = new ArrayList<>(); - for (Account account : conversation.getAccounts()) - ppConversation.add(account.getAvatar()); - status.setConversationProfilePicture(ppConversation); - statusesConversations.add(status); + if( conversations != null) { + for (Conversation conversation : conversations) { + Status status = conversation.getLast_status(); + if (status != null) { + status.setConversationId(conversation.getId()); + List ppConversation = new ArrayList<>(); + for (Account account : conversation.getAccounts()) + ppConversation.add(account.getAvatar()); + status.setConversationProfilePicture(ppConversation); + } + statusesConversations.add(status); + } } apiResponse.setStatuses(statusesConversations); }