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

Merge branch 'master' into m3_redesign

Browse Source
This commit is contained in:
Grishka
2023-03-22 02:41:26 +03:00
parent 955b9a4b2b 0112bfa9c4
commit d5701c1073
5 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mastodon/src/main/AndroidManifest.xml
View File

@@ -16,6 +16,9 @@
<action android:name="android.intent.action.PROCESS_TEXT" /> <action android:name="android.intent.action.PROCESS_TEXT" />
<data android:mimeType="text/plain" /> <data android:mimeType="text/plain" />
</intent> </intent>
<intent>
<action android:name="android.intent.action.TRANSLATE" />
</intent>
</queries> </queries>
<application <application

2
mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java
View File

@@ -143,7 +143,7 @@ public abstract class StatusListFragment extends BaseStatusListFragment<Status>{
protected void onRemoveAccountPostsEvent(RemoveAccountPostsEvent ev){ protected void onRemoveAccountPostsEvent(RemoveAccountPostsEvent ev){
List<Status> toRemove=Stream.concat(data.stream(), preloadedData.stream()) List<Status> toRemove=Stream.concat(data.stream(), preloadedData.stream())
.filter(s->s.account.id.equals(ev.postsByAccountID) || (s.reblog!=null && s.reblog.account.id.equals(ev.postsByAccountID))) .filter(s->s.account.id.equals(ev.postsByAccountID) || (!ev.isUnfollow && s.reblog!=null && s.reblog.account.id.equals(ev.postsByAccountID)))
.collect(Collectors.toList()); .collect(Collectors.toList());
for(Status s:toRemove){ for(Status s:toRemove){
removeStatus(s); removeStatus(s);

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

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

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

@@ -489,7 +489,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>