diff options
| author | stom79 <tschneider.ac@gmail.com> | 2018-11-21 19:12:17 +0100 |
|---|---|---|
| committer | stom79 <tschneider.ac@gmail.com> | 2018-11-21 19:12:17 +0100 |
| commit | af6798dd01e086a42ac19fb0422b1773ee3a3830 (patch) | |
| tree | fcc6cd63b8d12a79006dc8b9d679edd06bd2a67c | |
| parent | 454418d19316026a80822a228b62d614b31318f3 (diff) | |
Release 1.30.2
| -rw-r--r-- | app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java | 5 |
1 files changed, 3 insertions, 2 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 8c5f74151..2425e251d 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 @@ -626,7 +626,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct final float scale = context.getResources().getDisplayMetrics().density; Drawable imgConversation = null; if( type != RetrieveFeedsAsyncTask.Type.CONTEXT && ((status.getIn_reply_to_account_id() != null && status.getIn_reply_to_account_id().equals(status.getAccount().getId())) - ||(status.getReblog() != null && status.getReblog().getIn_reply_to_account_id() != null && status.getReblog().getIn_reply_to_account_id().equals(status.getAccount().getId())))){ + ||(status.getReblog() != null && status.getReblog().getIn_reply_to_account_id() != null && status.getReblog().getIn_reply_to_account_id().equals(status.getReblog().getAccount().getId())))){ imgConversation = ContextCompat.getDrawable(context, R.drawable.ic_conversation); imgConversation.setBounds(0,0,(int) (15 * iconSizePercent/100 * scale + 0.5f),(int) (15 * iconSizePercent/100 * scale + 0.5f)); } @@ -634,7 +634,8 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct Drawable img = ContextCompat.getDrawable(context, R.drawable.ic_repeat_head_toot); assert img != null; img.setBounds(0,0,(int) (20 * iconSizePercent/100 * scale + 0.5f),(int) (15 * iconSizePercent/100 * scale + 0.5f)); - holder.status_account_displayname.setCompoundDrawables( img, null, imgConversation, null); + holder.status_account_displayname.setCompoundDrawables( img, null, null, null); + holder.status_account_displayname_owner.setCompoundDrawables( null, null, imgConversation, null); }else{ holder.status_account_displayname.setCompoundDrawables( null, null, null, null); holder.status_account_displayname_owner.setCompoundDrawables( null, null, imgConversation, null); |