owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/follow-requests' into fork

Browse Source
This commit is contained in:
sk
2022-11-17 20:13:26 +01:00
parent 859468a03f fdf9417c5b
commit e514e24036
2 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsFragment.java
View File

@@ -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<Account> 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