From 0099d311372668f75f562fa41cb28b7107d9578f Mon Sep 17 00:00:00 2001 From: tom79 Date: Sat, 14 Dec 2019 16:28:21 +0100 Subject: [PATCH] Previews displayed twice --- app/src/main/assets/changelogs/344.txt | 3 +- .../android/drawers/StatusListAdapter.java | 30 ++++++++++++------- 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/app/src/main/assets/changelogs/344.txt b/app/src/main/assets/changelogs/344.txt index b423f0dfd..5435ba898 100644 --- a/app/src/main/assets/changelogs/344.txt +++ b/app/src/main/assets/changelogs/344.txt @@ -2,4 +2,5 @@ Added - Original & boost dates added separately Fixed -- Counter for mentions \ No newline at end of file +- Counter for mentions +- Preview images displayed twice \ No newline at end of file diff --git a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java index 163ae860c..bf5a4ce1f 100644 --- a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java @@ -3333,21 +3333,29 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct holder.status_horizontal_document_container.setVisibility(View.VISIBLE); else holder.status_document_container.setVisibility(View.VISIBLE); - if (attachments.size() == 1) { - if (!fullAttachement) - holder.status_container2.setVisibility(View.GONE); - else { - holder.status_prev1_h.setVisibility(View.VISIBLE); - holder.status_prev2_h.setVisibility(View.GONE); - holder.status_prev3_h.setVisibility(View.GONE); - holder.status_prev4_h.setVisibility(View.GONE); - holder.horizontal_second_image.setVisibility(View.GONE); - } - if (attachments.get(0).getUrl().trim().contains("missing.png")) + if (attachments.size() == 1 ) { + if ((status.getCard() == null || status.getCard().getImage() == null)) { + if (!fullAttachement) + holder.status_container2.setVisibility(View.GONE); + else { + holder.status_prev1_h.setVisibility(View.VISIBLE); + holder.status_prev2_h.setVisibility(View.GONE); + holder.status_prev3_h.setVisibility(View.GONE); + holder.status_prev4_h.setVisibility(View.GONE); + holder.horizontal_second_image.setVisibility(View.GONE); + } + if (attachments.get(0).getUrl().trim().contains("missing.png")) { + if (fullAttachement) + holder.status_horizontal_document_container.setVisibility(View.GONE); + else + holder.status_document_container.setVisibility(View.GONE); + } + }else { if (fullAttachement) holder.status_horizontal_document_container.setVisibility(View.GONE); else holder.status_document_container.setVisibility(View.GONE); + } } else if (attachments.size() == 2) { if (!fullAttachement) { holder.status_container2.setVisibility(View.VISIBLE);