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

Merge branch 'fix/header-follow-protected-account'

Browse Source
This commit is contained in:
sk
2023-03-20 18:28:27 +01:00
parent 6734c2b9f7 8ca33b552d
commit 054ab774d5
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java
View File

@@ -264,7 +264,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.getShortUsername()), 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, ()->{});

2
mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
View File

@@ -712,7 +712,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));
} }
} }

1
mastodon/src/main/res/values/strings.xml
View File

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