From 1874fec5aa90770854e0eb1e231f7ab5da509c18 Mon Sep 17 00:00:00 2001 From: stom79 Date: Fri, 22 Dec 2017 14:46:27 +0100 Subject: [PATCH] Avoids status refresh if no card --- .../mastodon/activities/ShowConversationActivity.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowConversationActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowConversationActivity.java index c76a0564d..62eca2acc 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowConversationActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowConversationActivity.java @@ -280,9 +280,11 @@ public class ShowConversationActivity extends BaseActivity implements OnRetrieve int position = 0; for(Status status: this.statuses) { if( initialStatus.getId().equals(status.getId())) { - this.statuses.get(position).setCard(card); - initialStatus.setCard(card); - statusListAdapter.notifyItemChanged(position); + if( card != null) { + this.statuses.get(position).setCard(card); + initialStatus.setCard(card); + statusListAdapter.notifyItemChanged(position); + } return; } position++;