fix following protected account from header
closes mastodon#549
This commit is contained in:
parent
5e4e56bd2c
commit
8ca33b552d
|
@ -189,7 +189,7 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
|
||||||
progress.dismiss();
|
progress.dismiss();
|
||||||
}, rel->{
|
}, rel->{
|
||||||
relationship=rel;
|
relationship=rel;
|
||||||
Toast.makeText(activity, activity.getString(rel.following ? R.string.followed_user : R.string.unfollowed_user, account.getDisplayUsername()), Toast.LENGTH_SHORT).show();
|
Toast.makeText(activity, activity.getString(rel.following ? R.string.followed_user : rel.requested ? R.string.following_user_requested : R.string.unfollowed_user, account.getDisplayUsername()), Toast.LENGTH_SHORT).show();
|
||||||
});
|
});
|
||||||
}else if(id==R.id.block_domain){
|
}else if(id==R.id.block_domain){
|
||||||
UiUtils.confirmToggleBlockDomain(activity, item.parentFragment.getAccountID(), account.getDomain(), relationship!=null && relationship.domainBlocking, ()->{});
|
UiUtils.confirmToggleBlockDomain(activity, item.parentFragment.getAccountID(), account.getDomain(), relationship!=null && relationship.domainBlocking, ()->{});
|
||||||
|
|
|
@ -488,7 +488,7 @@ public class UiUtils{
|
||||||
public void onSuccess(Relationship result){
|
public void onSuccess(Relationship result){
|
||||||
resultCallback.accept(result);
|
resultCallback.accept(result);
|
||||||
progressCallback.accept(false);
|
progressCallback.accept(false);
|
||||||
if(!result.following){
|
if(!result.following && !result.requested){
|
||||||
E.post(new RemoveAccountPostsEvent(accountID, account.id, true));
|
E.post(new RemoveAccountPostsEvent(accountID, account.id, true));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -291,6 +291,7 @@
|
||||||
<string name="follow_user">Follow %s</string>
|
<string name="follow_user">Follow %s</string>
|
||||||
<string name="unfollowed_user">Unfollowed %s</string>
|
<string name="unfollowed_user">Unfollowed %s</string>
|
||||||
<string name="followed_user">You\'re now following %s</string>
|
<string name="followed_user">You\'re now following %s</string>
|
||||||
|
<string name="following_user_requested">Requested to follow %s</string>
|
||||||
<string name="open_in_browser">Open in browser</string>
|
<string name="open_in_browser">Open in browser</string>
|
||||||
<string name="hide_boosts_from_user">Hide reblogs from %s</string>
|
<string name="hide_boosts_from_user">Hide reblogs from %s</string>
|
||||||
<string name="show_boosts_from_user">Show reblogs from %s</string>
|
<string name="show_boosts_from_user">Show reblogs from %s</string>
|
||||||
|
|
Loading…
Reference in New Issue