From 90aa8c5762aa5649770423d854b9cfc48afbf5b7 Mon Sep 17 00:00:00 2001 From: LucasGGamerM Date: Thu, 2 Feb 2023 13:35:44 -0300 Subject: [PATCH] Clicking on filtered items will show them like expected (It previously showed another warning when you clicked it) --- .../joinmastodon/android/fragments/StatusListFragment.java | 1 + .../android/ui/displayitems/StatusDisplayItem.java | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java index a9ce3120e..c4a2c1cba 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java @@ -56,6 +56,7 @@ public abstract class StatusListFragment extends BaseStatusListFragment{ Status status=getContentStatusByID(id); if(status==null) return; + status.filterRevealed = true; Bundle args=new Bundle(); args.putString("account", accountID); args.putParcelable("status", Parcels.wrap(status)); diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java index 597c201d6..9d5eca9b6 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java @@ -104,7 +104,10 @@ public abstract class StatusDisplayItem{ List filters=AccountSessionManager.getInstance().getAccount(accountID).wordFilters.stream().filter(f->f.context.contains(Filter.FilterContext.HOME)).collect(Collectors.toList()); StatusFilterPredicate filterPredicate = new StatusFilterPredicate(filters); - statusForContent.filterRevealed = filterPredicate.testWithWarning(status); + if(!statusForContent.filterRevealed){ + statusForContent.filterRevealed = filterPredicate.testWithWarning(status); + } + if(status.reblog!=null){ boolean isOwnPost = AccountSessionManager.getInstance().isSelf(fragment.getAccountID(), status.account);