diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsFragment.java index 755712e5c..7f0b2b6b4 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsFragment.java @@ -16,7 +16,6 @@ import android.widget.LinearLayout; import org.joinmastodon.android.E; import org.joinmastodon.android.R; import org.joinmastodon.android.api.requests.accounts.GetFollowRequests; -import org.joinmastodon.android.api.requests.accounts.GetOwnAccount; import org.joinmastodon.android.events.FollowRequestHandledEvent; import org.joinmastodon.android.model.Account; import org.joinmastodon.android.ui.SimpleViewHolder; @@ -75,16 +74,6 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc @Override public void onCreateOptionsMenu(Menu menu, MenuInflater inflater){ inflater.inflate(R.menu.notifications, menu); - - new GetOwnAccount().setCallback(new Callback<>() { - @Override - public void onSuccess(Account account) { - if (!account.locked) menu.findItem(R.id.follow_requests).setVisible(false); - } - - @Override - public void onError(ErrorResponse error) {} - }).exec(accountID); } @Override @@ -173,7 +162,7 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc new GetFollowRequests(null, null, 1).setCallback(new Callback<>() { @Override public void onSuccess(List accounts) { - getToolbar().getMenu().findItem(R.id.follow_requests).setIcon(accounts.isEmpty() ? R.drawable.ic_fluent_person_add_24_regular : R.drawable.ic_follow_requests_24_badged); + getToolbar().getMenu().findItem(R.id.follow_requests).setVisible(!accounts.isEmpty()); } @Override diff --git a/mastodon/src/main/res/menu/notifications.xml b/mastodon/src/main/res/menu/notifications.xml index 06266f432..a2a2a61db 100644 --- a/mastodon/src/main/res/menu/notifications.xml +++ b/mastodon/src/main/res/menu/notifications.xml @@ -2,7 +2,7 @@ \ No newline at end of file