From a67f75b174e841afc70f215a37cf14f75455e5e2 Mon Sep 17 00:00:00 2001
From: tom79 <tschneider.ac@gmail.com>
Date: Mon, 4 Nov 2019 18:57:54 +0100
Subject: [PATCH] Fix issue #338

---
 .../android/drawers/StatusListAdapter.java    | 47 ++++++++++---------
 1 file changed, 26 insertions(+), 21 deletions(-)

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 3cc4060e2..b39de75ed 100644
--- a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
+++ b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
@@ -2360,29 +2360,34 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
                 holder.status_content_translated_container.setVisibility(View.GONE);
             }
 
-            switch (status.getVisibility()) {
-                case "direct":
-                    holder.status_reblog_count.setVisibility(View.GONE);
-                    holder.spark_button_reblog.setVisibility(View.GONE);
-                    break;
-                case "private":
-                    final boolean isOwner = status.getReblog() != null ? status.getReblog().getAccount().getId().equals(userId) : status.getAccount().getId().equals(userId);
-                    if (isOwner) {
-                        holder.status_reblog_count.setVisibility(View.VISIBLE);
-                        holder.spark_button_reblog.setVisibility(View.VISIBLE);
-                    } else {
+            if( status.getReblog() == null) {
+                switch (status.getVisibility()) {
+                    case "direct":
                         holder.status_reblog_count.setVisibility(View.GONE);
                         holder.spark_button_reblog.setVisibility(View.GONE);
-                    }
-                    break;
-                case "public":
-                case "unlisted":
-                    holder.status_reblog_count.setVisibility(View.VISIBLE);
-                    holder.spark_button_reblog.setVisibility(View.VISIBLE);
-                    break;
-                default:
-                    holder.status_reblog_count.setVisibility(View.VISIBLE);
-                    holder.spark_button_reblog.setVisibility(View.VISIBLE);
+                        break;
+                    case "private":
+                        final boolean isOwner = status.getReblog() != null ? status.getReblog().getAccount().getId().equals(userId) : status.getAccount().getId().equals(userId);
+                        if (isOwner) {
+                            holder.status_reblog_count.setVisibility(View.VISIBLE);
+                            holder.spark_button_reblog.setVisibility(View.VISIBLE);
+                        } else {
+                            holder.status_reblog_count.setVisibility(View.GONE);
+                            holder.spark_button_reblog.setVisibility(View.GONE);
+                        }
+                        break;
+                    case "public":
+                    case "unlisted":
+                        holder.status_reblog_count.setVisibility(View.VISIBLE);
+                        holder.spark_button_reblog.setVisibility(View.VISIBLE);
+                        break;
+                    default:
+                        holder.status_reblog_count.setVisibility(View.VISIBLE);
+                        holder.spark_button_reblog.setVisibility(View.VISIBLE);
+                }
+            }else{
+                holder.status_reblog_count.setVisibility(View.VISIBLE);
+                holder.spark_button_reblog.setVisibility(View.VISIBLE);
             }
 
             switch (status.getVisibility()) {