From 6832bfb95c913b50e64753aa4b8d7da3a28ea86c Mon Sep 17 00:00:00 2001 From: sk Date: Mon, 29 May 2023 12:34:53 +0200 Subject: [PATCH] don't display blocked_by relationship closes sk22#526 --- .../java/org/joinmastodon/android/ui/utils/UiUtils.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java index 0d39c0ad9..ffc3c7b38 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java @@ -634,9 +634,9 @@ public class UiUtils { if (relationship.blocking) { button.setText(R.string.button_blocked); secondaryStyle = true; - } else if (relationship.blockedBy) { - button.setText(R.string.button_follow); - secondaryStyle = false; +// } else if (relationship.blockedBy) { +// button.setText(R.string.button_follow); +// secondaryStyle = false; } else if (relationship.requested) { button.setText(R.string.button_follow_pending); secondaryStyle = true; @@ -650,7 +650,8 @@ public class UiUtils { if (keepText) button.setText(textBefore); - button.setEnabled(!relationship.blockedBy); +// https://github.com/sk22/megalodon/issues/526 +// button.setEnabled(!relationship.blockedBy); int attr = secondaryStyle ? R.attr.secondaryButtonStyle : android.R.attr.buttonStyle; TypedArray ta = button.getContext().obtainStyledAttributes(new int[]{attr}); int styleRes = ta.getResourceId(0, 0);