From ba3219d9fcc27bfd2986790b029c045cd2f7e959 Mon Sep 17 00:00:00 2001 From: Grishka Date: Mon, 29 Aug 2022 00:57:09 +0300 Subject: [PATCH] Fix #209, fix #198 --- .../android/api/requests/accounts/GetAccountStatuses.java | 4 +++- .../android/fragments/BaseStatusListFragment.java | 2 +- .../fragments/report/ReportAddPostsChoiceFragment.java | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/GetAccountStatuses.java b/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/GetAccountStatuses.java index 1668ef9d..1a02d18f 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/GetAccountStatuses.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/GetAccountStatuses.java @@ -26,6 +26,7 @@ public class GetAccountStatuses extends MastodonAPIRequest>{ addQueryParameter("exclude_replies", "true"); addQueryParameter("exclude_reblogs", "true"); } + case OWN_POSTS_AND_REPLIES -> addQueryParameter("exclude_reblogs", "true"); } } @@ -33,6 +34,7 @@ public class GetAccountStatuses extends MastodonAPIRequest>{ DEFAULT, INCLUDE_REPLIES, MEDIA, - NO_REBLOGS + NO_REBLOGS, + OWN_POSTS_AND_REPLIES } } diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java index 7cc820f9..11bae0e1 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java @@ -457,7 +457,7 @@ public abstract class BaseStatusListFragment exten status.spoilerRevealed=true; TextStatusDisplayItem.Holder text=findHolderOfType(itemID, TextStatusDisplayItem.Holder.class); if(text!=null) - adapter.notifyItemChanged(text.getAbsoluteAdapterPosition()+getMainAdapterOffset()); + adapter.notifyItemChanged(text.getAbsoluteAdapterPosition()-getMainAdapterOffset()); HeaderStatusDisplayItem.Holder header=findHolderOfType(itemID, HeaderStatusDisplayItem.Holder.class); if(header!=null) header.rebind(); diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportAddPostsChoiceFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportAddPostsChoiceFragment.java index 61377f2c..9a37ce8c 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportAddPostsChoiceFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportAddPostsChoiceFragment.java @@ -85,7 +85,7 @@ public class ReportAddPostsChoiceFragment extends StatusListFragment{ @Override protected void doLoadData(int offset, int count){ - currentRequest=new GetAccountStatuses(reportAccount.id, offset>0 ? getMaxID() : null, null, count, GetAccountStatuses.Filter.NO_REBLOGS) + currentRequest=new GetAccountStatuses(reportAccount.id, offset>0 ? getMaxID() : null, null, count, GetAccountStatuses.Filter.OWN_POSTS_AND_REPLIES) .setCallback(new SimpleCallback<>(this){ @Override public void onSuccess(List result){