From 9824b5fb569c03093a9db3235d85d209f05208a1 Mon Sep 17 00:00:00 2001 From: sk Date: Thu, 6 Apr 2023 20:24:40 +0200 Subject: [PATCH] allow boosting with every visibility closes sk22#486 --- .../ui/displayitems/FooterStatusDisplayItem.java | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java index a8cb070b0..c680b6d59 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java @@ -235,9 +235,9 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{ reblogHeader.setVisibility(item.status.reblogged ? View.GONE : View.VISIBLE); reblogAs.setVisibility(AccountSessionManager.getInstance().getLoggedInAccounts().size() > 1 ? View.VISIBLE : View.GONE); - itemPublic.setVisibility(item.status.reblogged || item.status.visibility.isLessVisibleThan(StatusPrivacy.PUBLIC) ? View.GONE : View.VISIBLE); - itemUnlisted.setVisibility(item.status.reblogged || item.status.visibility.isLessVisibleThan(StatusPrivacy.UNLISTED) ? View.GONE : View.VISIBLE); - itemFollowers.setVisibility(item.status.reblogged || item.status.visibility.isLessVisibleThan(StatusPrivacy.PRIVATE) ? View.GONE : View.VISIBLE); + itemPublic.setVisibility(item.status.reblogged ? View.GONE : View.VISIBLE); + itemUnlisted.setVisibility(item.status.reblogged ? View.GONE : View.VISIBLE); + itemFollowers.setVisibility(item.status.reblogged ? View.GONE : View.VISIBLE); Drawable checkMark = ctx.getDrawable(R.drawable.ic_fluent_checkmark_circle_20_regular); Drawable publicDrawable = ctx.getDrawable(R.drawable.ic_fluent_earth_24_regular); @@ -245,16 +245,6 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{ Drawable followersDrawable = ctx.getDrawable(R.drawable.ic_fluent_lock_closed_24_regular); StatusPrivacy defaultVisibility = session.preferences != null ? session.preferences.postingDefaultVisibility : null; - // e.g. post visibility is unlisted, but default is public - // in this case, we want to display the check mark on the most visible visibility - if (defaultVisibility != null && item.status.visibility.isLessVisibleThan(defaultVisibility)) { - for (StatusPrivacy vis : StatusPrivacy.values()) { - if (vis.equals(item.status.visibility)) { - defaultVisibility = vis; - break; - } - } - } itemPublic.setCompoundDrawablesWithIntrinsicBounds(publicDrawable, null, StatusPrivacy.PUBLIC.equals(defaultVisibility) ? checkMark : null, null); itemUnlisted.setCompoundDrawablesWithIntrinsicBounds(unlistedDrawable, null, StatusPrivacy.UNLISTED.equals(defaultVisibility) ? checkMark : null, null); itemFollowers.setCompoundDrawablesWithIntrinsicBounds(followersDrawable, null, StatusPrivacy.PRIVATE.equals(defaultVisibility) ? checkMark : null, null);