From d097ee393474641d97f6c1cf1a633b14c6384b74 Mon Sep 17 00:00:00 2001 From: stom79 Date: Thu, 15 Nov 2018 07:39:35 +0100 Subject: [PATCH] Fix translate button --- .../gouv/etalab/mastodon/drawers/StatusListAdapter.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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 98a03439a..54beece93 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 @@ -913,7 +913,13 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct } } holder.status_action_container.setVisibility(View.VISIBLE); - if( ( getItemViewType(position) != COMPACT_STATUS ) && (trans_forced || (translator != Helper.TRANS_NONE && currentLocale != null && status.getLanguage() != null && !status.getLanguage().trim().equals(currentLocale)))){ + boolean differentLanguage = false; + if( status.getReblog() == null) + differentLanguage = status.getLanguage() != null && !status.getLanguage().trim().equals(currentLocale); + else + differentLanguage = status.getReblog().getLanguage() != null && !status.getReblog().getLanguage().trim().equals(currentLocale); + + if( ( getItemViewType(position) != COMPACT_STATUS ) && (trans_forced || (translator != Helper.TRANS_NONE && currentLocale != null && differentLanguage))){ if( status.getSpoiler_text() != null && status.getSpoiler_text().length() > 0) { if (status.isSpoilerShown() || getItemViewType(position) == FOCUSED_STATUS) { holder.status_translate.setVisibility(View.VISIBLE);