From ec08d3a25a0df6484e9cd57d6f511448fa86ba77 Mon Sep 17 00:00:00 2001 From: stom79 Date: Sun, 21 Jan 2018 11:34:00 +0100 Subject: [PATCH] Fixes an issue with card --- .../etalab/mastodon/drawers/StatusListAdapter.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java index fbe3bda91..d5eaa50a1 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java @@ -390,7 +390,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct @SuppressLint("SetJavaScriptEnabled") @Override - public void onBindViewHolder(final RecyclerView.ViewHolder viewHolder, final int position) { + public void onBindViewHolder(final RecyclerView.ViewHolder viewHolder, int position) { if( viewHolder.getItemViewType() == DISPLAYED_STATUS){ final ViewHolder holder = (ViewHolder) viewHolder; @@ -935,7 +935,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct @Override public void onClick(View v) { oldPosition = conversationPosition; - conversationPosition = position; + conversationPosition = holder.getAdapterPosition();; new RetrieveCardAsyncTask(context, status.getId(), StatusListAdapter.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); } }); @@ -943,7 +943,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct @Override public void onClick(View v) { oldPosition = conversationPosition; - conversationPosition = position; + conversationPosition = holder.getAdapterPosition();; new RetrieveCardAsyncTask(context, status.getId(), StatusListAdapter.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); } }); @@ -1502,10 +1502,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct @Override public void onRetrieveAccount(Card card) { - if( card == null){ - return; - } - if( conversationPosition < this.statuses.size()) + if( conversationPosition < this.statuses.size() && card != null) this.statuses.get(conversationPosition).setCard(card); if( oldPosition < this.statuses.size()) statusListAdapter.notifyItemChanged(oldPosition);