Merge remote-tracking branch 'megalodon_main/main'

# Conflicts:
#	README.md
#	mastodon/build.gradle
#	mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
#	mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/model/Status.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ExtendedFooterStatusDisplayItem.java
#	mastodon/src/main/res/values-it-rIT/strings_sk.xml
#	metadata/de-DE/changelogs/83.txt
#	metadata/de-DE/changelogs/94.txt
#	metadata/en-US/changelogs/94.txt
#	metadata/es/changelogs/94.txt
#	metadata/fr/title.txt
#	metadata/my-MM/title.txt
#	metadata/my/short_description.txt
#	metadata/pt-PT/changelogs/59.txt
#	metadata/pt-PT/changelogs/61.txt
#	metadata/pt-PT/full_description.txt
#	metadata/pt-PT/short_description.txt
#	metadata/pt-PT/title.txt

mastodon/src/main/java/org/joinmastodon/android/fragments/AnnouncementsFragment.java

@@ -94,12 +94,15 @@ public class AnnouncementsFragment extends BaseStatusListFragment<Announcement>
 					@Override
 					public void onSuccess(List<Announcement> result){
 						if (getActivity() == null) return;
-						List<Announcement> unread = result.stream().filter(a -> !a.read).collect(toList());
-						List<Announcement> read = result.stream().filter(a -> a.read).collect(toList());
-						onDataLoaded(unread, true);
-						onDataLoaded(read, false);
-						if (unread.isEmpty()) setResult(true, null);
-						else unreadIDs = unread.stream().map(a -> a.id).collect(toList());
+
+						// get unread items first
+						List<Announcement> data = result.stream().filter(a -> !a.read).collect(toList());
+						if (data.isEmpty()) setResult(true, null);
+						else unreadIDs = data.stream().map(a -> a.id).collect(toList());
+
+						// append read items at the end
+						data.addAll(result.stream().filter(a -> a.read).collect(toList()));
+						onDataLoaded(data, false);
 					}
 				})
 				.exec(accountID);

mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java

@@ -1,5 +1,6 @@
 package org.joinmastodon.android.fragments;
 
+import static org.joinmastodon.android.GlobalUserPreferences.PrefixRepliesMode.*;
 import static org.joinmastodon.android.GlobalUserPreferences.recentLanguages;
 import static org.joinmastodon.android.api.requests.statuses.CreateStatus.DRAFTS_AFTER_INSTANT;
 import static org.joinmastodon.android.api.requests.statuses.CreateStatus.getDraftInstant;
@@ -806,9 +807,11 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 				if(!TextUtils.isEmpty(status.spoilerText)){
 					hasSpoiler=true;
 					spoilerEdit.setVisibility(View.VISIBLE);
-					if(GlobalUserPreferences.prefixRepliesWithRe && !status.spoilerText.startsWith("re: ")){
+					if ((GlobalUserPreferences.prefixReplies == ALWAYS
+							|| (GlobalUserPreferences.prefixReplies == TO_OTHERS && !ownID.equals(status.account.id)))
+							&& !status.spoilerText.startsWith("re: ")) {
 						spoilerEdit.setText("re: " + status.spoilerText);
-					}else{
+					} else {
 						spoilerEdit.setText(status.spoilerText);
 					}
 					spoilerBtn.setSelected(true);

mastodon/src/main/java/org/joinmastodon/android/fragments/FollowRequestsListFragment.java

@@ -255,6 +255,10 @@ public class FollowRequestsListFragment extends RecyclerFragment<FollowRequestsL
 			followersLabel.setText(getResources().getQuantityString(R.plurals.followers, (int)Math.min(999, item.account.followersCount)));
 			followingLabel.setText(getResources().getQuantityString(R.plurals.following, (int)Math.min(999, item.account.followingCount)));
 			postsLabel.setText(getResources().getQuantityString(R.plurals.posts, (int)Math.min(999, item.account.statusesCount)));
+			followersCount.setVisibility(item.account.followersCount < 0 ? View.GONE : View.VISIBLE);
+			followersLabel.setVisibility(item.account.followersCount < 0 ? View.GONE : View.VISIBLE);
+			followingCount.setVisibility(item.account.followingCount < 0 ? View.GONE : View.VISIBLE);
+			followingLabel.setVisibility(item.account.followingCount < 0 ? View.GONE : View.VISIBLE);
 			relationship=relationships.get(item.account.id);
 			if(relationship == null || !relationship.followedBy){
 				actionWrap.setVisibility(View.GONE);

mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java

@@ -41,11 +41,6 @@ public class HomeTimelineFragment extends StatusListFragment {
 		return true;
 	}
 
-	@Override
-	public String getDomain() {
-		return super.getDomain() + "/home";
-	}
-
 	@Override
 	public void onAttach(Activity activity){
 		super.onAttach(activity);
@@ -53,12 +48,13 @@ public class HomeTimelineFragment extends StatusListFragment {
 		loadData();
 	}
 
+	private boolean typeFilterPredicate(Status s) {
+		return (GlobalUserPreferences.showReplies || s.inReplyToId == null) &&
+				(GlobalUserPreferences.showBoosts || s.reblog == null);
+	}
+
 	private List<Status> filterPosts(List<Status> items) {
-		// This is the function I must use to solve the filters thing for real
-		return items.stream().filter(i ->
-				(GlobalUserPreferences.showReplies || i.inReplyToId == null) &&
-				(GlobalUserPreferences.showBoosts || i.reblog == null)
-		).collect(Collectors.toList());
+		return items.stream().filter(this::typeFilterPredicate).collect(Collectors.toList());
 	}
 
 	@Override
@@ -107,24 +103,24 @@ public class HomeTimelineFragment extends StatusListFragment {
 	@Override
 	protected void onHidden(){
 		super.onHidden();
-//		if(!data.isEmpty()){
-//			String topPostID=displayItems.get(list.getChildAdapterPosition(list.getChildAt(0))-getMainAdapterOffset()).parentID;
-//			if(!topPostID.equals(lastSavedMarkerID)){
-//				lastSavedMarkerID=topPostID;
-//				new SaveMarkers(topPostID, null)
-//						.setCallback(new Callback<>(){
-//							@Override
-//							public void onSuccess(SaveMarkers.Response result){
-//							}
-//
-//							@Override
-//							public void onError(ErrorResponse error){
-//								lastSavedMarkerID=null;
-//							}
-//						})
-//						.exec(accountID);
-//			}
-//		}
+		if(!data.isEmpty()){
+			String topPostID=displayItems.get(Math.max(0, list.getChildAdapterPosition(list.getChildAt(0))-getMainAdapterOffset())).parentID;
+			if(!topPostID.equals(lastSavedMarkerID)){
+				lastSavedMarkerID=topPostID;
+				new SaveMarkers(topPostID, null)
+						.setCallback(new Callback<>(){
+							@Override
+							public void onSuccess(SaveMarkers.Response result){
+							}
+
+							@Override
+							public void onError(ErrorResponse error){
+								lastSavedMarkerID=null;
+							}
+						})
+						.exec(accountID);
+			}
+		}
 	}
 
 	public void onStatusCreated(StatusCreatedEvent ev){
@@ -238,7 +234,7 @@ public class HomeTimelineFragment extends StatusListFragment {
 							for(Status s:result){
 								if(idsBelowGap.contains(s.id))
 									break;
-								if(filterPredicate.test(s)){
+								if(typeFilterPredicate(s) && filterPredicate.test(s)){
 									targetList.addAll(buildDisplayItems(s));
 									insertedPosts.add(s);
 								}

mastodon/src/main/java/org/joinmastodon/android/fragments/PinnedPostsListFragment.java

@@ -0,0 +1,52 @@
+package org.joinmastodon.android.fragments;
+
+import android.net.Uri;
+import android.os.Bundle;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.accounts.GetAccountStatuses;
+import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.model.Filter;
+import org.joinmastodon.android.model.Status;
+import org.parceler.Parcels;
+
+import java.util.List;
+
+import me.grishka.appkit.api.SimpleCallback;
+
+public class PinnedPostsListFragment extends StatusListFragment{
+	private Account account;
+
+	public PinnedPostsListFragment() {
+		setListLayoutId(R.layout.recycler_fragment_no_refresh);
+	}
+
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		account=Parcels.unwrap(getArguments().getParcelable("profileAccount"));
+		setTitle(R.string.posts);
+		loadData();
+	}
+
+	@Override
+	protected void doLoadData(int offset, int count){
+		new GetAccountStatuses(account.id, null, null, 100, GetAccountStatuses.Filter.PINNED)
+				.setCallback(new SimpleCallback<>(this){
+					@Override
+					public void onSuccess(List<Status> result){
+						onDataLoaded(result, false);
+					}
+				}).exec(accountID);
+	}
+
+	@Override
+	protected Filter.FilterContext getFilterContext() {
+		return Filter.FilterContext.ACCOUNT;
+	}
+
+	@Override
+	public Uri getWebUri(Uri.Builder base) {
+		return Uri.parse(account.url);
+	}
+}

mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java

@@ -134,7 +134,8 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 	private ProgressBarButton actionButton, notifyButton;
 	private ViewPager2 pager;
 	private NestedRecyclerScrollView scrollView;
-	private AccountTimelineFragment postsFragment, postsWithRepliesFragment, pinnedPostsFragment, mediaFragment;
+	private AccountTimelineFragment postsFragment, postsWithRepliesFragment, mediaFragment;
+	private PinnedPostsListFragment pinnedPostsFragment;
 //	private ProfileAboutFragment aboutFragment;
 	private TabLayout tabbar;
 	private SwipeRefreshLayout refreshLayout;
@@ -515,8 +516,14 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		if(postsFragment==null){
 			postsFragment=AccountTimelineFragment.newInstance(accountID, account, GetAccountStatuses.Filter.DEFAULT, true);
 			postsWithRepliesFragment=AccountTimelineFragment.newInstance(accountID, account, GetAccountStatuses.Filter.INCLUDE_REPLIES, false);
-			pinnedPostsFragment=AccountTimelineFragment.newInstance(accountID, account, GetAccountStatuses.Filter.PINNED, false);
 			mediaFragment=AccountTimelineFragment.newInstance(accountID, account, GetAccountStatuses.Filter.MEDIA, false);
+
+			Bundle args=new Bundle();
+			args.putString("account", accountID);
+			args.putParcelable("profileAccount", Parcels.wrap(account));
+			args.putBoolean("__is_tab", true);
+			pinnedPostsFragment=new PinnedPostsListFragment();
+			pinnedPostsFragment.setArguments(args);
 //			aboutFragment=new ProfileAboutFragment();
 			setFields(fields);
 		}
@@ -675,6 +682,9 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		followingLabel.setText(getResources().getQuantityString(R.plurals.following, (int)Math.min(999, account.followingCount)));
 		postsLabel.setText(getResources().getQuantityString(R.plurals.posts, (int)Math.min(999, account.statusesCount)));
 
+		if (account.followersCount < 0) followersBtn.setVisibility(View.GONE);
+		if (account.followingCount < 0) followingBtn.setVisibility(View.GONE);
+
 		UiUtils.loadCustomEmojiInTextView(name);
 		UiUtils.loadCustomEmojiInTextView(bio);
 

mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java

@@ -39,6 +39,7 @@ import org.joinmastodon.android.E;
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.GlobalUserPreferences.AutoRevealMode;
 import org.joinmastodon.android.GlobalUserPreferences.ColorPreference;
+import org.joinmastodon.android.GlobalUserPreferences.PrefixRepliesMode;
 import org.joinmastodon.android.MainActivity;
 import org.joinmastodon.android.MastodonApp;
 import org.joinmastodon.android.R;
@@ -221,14 +222,27 @@ public class SettingsFragment extends MastodonToolbarFragment implements Provide
 			GlobalUserPreferences.keepOnlyLatestNotification=i.checked;
 			GlobalUserPreferences.save();
 		}));
-		items.add(new SwitchItem(R.string.sk_settings_prefix_reply_cw_with_re, R.drawable.ic_fluent_arrow_reply_24_regular, GlobalUserPreferences.prefixRepliesWithRe, i->{
-			GlobalUserPreferences.prefixRepliesWithRe=i.checked;
+		items.add(new ButtonItem(R.string.sk_settings_prefix_reply_cw_with_re, R.drawable.ic_fluent_arrow_reply_24_regular, b->{
+			PopupMenu popupMenu=new PopupMenu(getActivity(), b, Gravity.CENTER_HORIZONTAL);
+			popupMenu.inflate(R.menu.settings_prefix_reply_mode);
+			popupMenu.setOnMenuItemClickListener(i -> onPrefixRepliesClick(i, b));
+			b.setOnTouchListener(popupMenu.getDragToOpenListener());
+			b.setOnClickListener(v->popupMenu.show());
+			b.setText(switch(GlobalUserPreferences.prefixReplies){
+				case TO_OTHERS -> R.string.sk_settings_prefix_replies_to_others;
+				case ALWAYS -> R.string.sk_settings_prefix_replies_always;
+				default -> R.string.sk_settings_prefix_replies_never;
+			});
 			GlobalUserPreferences.save();
 		}));
 		items.add(new SwitchItem(R.string.sk_settings_confirm_before_reblog, R.drawable.ic_fluent_checkmark_circle_24_regular, GlobalUserPreferences.confirmBeforeReblog, i->{
 			GlobalUserPreferences.confirmBeforeReblog=i.checked;
 			GlobalUserPreferences.save();
 		}));
+		items.add(new SwitchItem(R.string.sk_settings_forward_report_default, R.drawable.ic_fluent_arrow_forward_24_regular, GlobalUserPreferences.forwardReportDefault, i->{
+			GlobalUserPreferences.forwardReportDefault=i.checked;
+			GlobalUserPreferences.save();
+		}));
 		items.add(new SwitchItem(R.string.sk_settings_allow_remote_loading, R.drawable.ic_fluent_communication_24_regular, GlobalUserPreferences.allowRemoteLoading, i->{
 			GlobalUserPreferences.allowRemoteLoading=i.checked;
 			GlobalUserPreferences.save();
@@ -541,6 +555,22 @@ public class SettingsFragment extends MastodonToolbarFragment implements Provide
 		return true;
 	}
 
+	private boolean onPrefixRepliesClick(MenuItem item, Button btn) {
+		int id = item.getItemId();
+		PrefixRepliesMode mode = PrefixRepliesMode.NEVER;
+		if (id == R.id.prefix_replies_always) mode = PrefixRepliesMode.ALWAYS;
+		else if (id == R.id.prefix_replies_to_others) mode = PrefixRepliesMode.TO_OTHERS;
+		GlobalUserPreferences.prefixReplies = mode;
+
+		btn.setText(switch(GlobalUserPreferences.prefixReplies){
+			case TO_OTHERS -> R.string.sk_settings_prefix_replies_to_others;
+			case ALWAYS -> R.string.sk_settings_prefix_replies_always;
+			default -> R.string.sk_settings_prefix_replies_never;
+		});
+
+		return true;
+	}
+
 	private boolean onAutoRevealSpoilerClick(MenuItem item, Button btn) {
 		int id = item.getItemId();
 
@@ -557,12 +587,12 @@ public class SettingsFragment extends MastodonToolbarFragment implements Provide
 
 	private void onAutoRevealSpoilerChanged(Button b) {
 		if (GlobalUserPreferences.alwaysExpandContentWarnings) {
-			b.setText(R.string.sk_settings_auto_reveal_always);
+			b.setText(R.string.sk_settings_auto_reveal_anyone);
 		} else {
 			b.setText(switch(GlobalUserPreferences.autoRevealEqualSpoilers){
-				case THREADS -> R.string.sk_settings_auto_reveal_threads;
-				case DISCUSSIONS -> R.string.sk_settings_auto_reveal_discussions;
-				default -> R.string.sk_settings_auto_reveal_never;
+				case THREADS -> R.string.sk_settings_auto_reveal_author;
+				case DISCUSSIONS -> R.string.sk_settings_auto_reveal_anyone;
+				default -> R.string.sk_settings_auto_reveal_nobody;
 			});
 			if (alwaysRevealSpoilersItem.checked != GlobalUserPreferences.alwaysExpandContentWarnings) {
 				alwaysRevealSpoilersItem.checked = GlobalUserPreferences.alwaysExpandContentWarnings;

mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java

@@ -178,13 +178,29 @@ public abstract class StatusListFragment extends BaseStatusListFragment<Status>
 	protected void removeStatus(Status status){
 		data.remove(status);
 		preloadedData.remove(status);
-		int index=-1;
+		int index=-1, ancestorFirstIndex = -1, ancestorLastIndex = -1;
 		for(int i=0;i<displayItems.size();i++){
-			if(status.id.equals(displayItems.get(i).parentID)){
+			StatusDisplayItem item = displayItems.get(i);
+			if(status.id.equals(item.parentID)){
 				index=i;
 				break;
 			}
+			if (item.parentID.equals(status.inReplyToId)) {
+				if (ancestorFirstIndex == -1) ancestorFirstIndex = i;
+				ancestorLastIndex = i;
+			}
 		}
+
+		// did we find an ancestor that is also the status' neighbor?
+		if (ancestorFirstIndex >= 0 && ancestorLastIndex == index - 1) {
+			for (int i = ancestorFirstIndex; i <= ancestorLastIndex; i++) {
+				StatusDisplayItem item = displayItems.get(i);
+				// update ancestor to have no descendant anymore
+				if (item.parentID.equals(status.inReplyToId)) item.hasDescendantNeighbor = false;
+			}
+			adapter.notifyItemRangeChanged(ancestorFirstIndex, ancestorLastIndex - ancestorFirstIndex + 1);
+		}
+
 		if(index==-1)
 			return;
 		int lastIndex;

mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java

@@ -52,7 +52,8 @@ import me.grishka.appkit.utils.V;
 public class ThreadFragment extends StatusListFragment implements ProvidesAssistContent {
 	protected Status mainStatus, updatedStatus;
 	private final HashMap<String, NeighborAncestryInfo> ancestryMap = new HashMap<>();
-	protected boolean contextInitiallyRendered;
+	private StatusContext result;
+	protected boolean contextInitiallyRendered, transitionFinished;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState){
@@ -105,13 +106,20 @@ public class ThreadFragment extends StatusListFragment implements ProvidesAssist
 					footer.hideCounts=true;
 			}
 		}
+    
 		for (int deleteThisItem : deleteTheseItems) itemsToModify.remove(deleteThisItem);
 		if(s.id.equals(mainStatus.id)) {
-			items.add(new ExtendedFooterStatusDisplayItem(s.id, this, getAccountID(), s.getContentStatus()));
+			items.add(new ExtendedFooterStatusDisplayItem(s.id, this, accountID, s.getContentStatus()));
 		}
 		return items;
 	}
 
+	@Override
+	public void onTransitionFinished() {
+		transitionFinished = true;
+		maybeApplyContext();
+	}
+
 	@Override
 	protected void doLoadData(int offset, int count){
 		if (refreshing) loadMainStatus();
@@ -119,72 +127,8 @@ public class ThreadFragment extends StatusListFragment implements ProvidesAssist
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(StatusContext result){
-						if (getContext() == null) return;
-						Map<String, Status> oldData = null;
-						if(refreshing){
-							oldData = new HashMap<>(data.size());
-							for (Status s : data) oldData.put(s.id, s);
-							data.clear();
-							ancestryMap.clear();
-							displayItems.clear();
-							data.add(mainStatus);
-							onAppendItems(Collections.singletonList(mainStatus));
-						}
-
-						// TODO: figure out how this code works
-						if(isInstanceAkkoma()) sortStatusContext(mainStatus, result);
-
-						result.descendants=filterStatuses(result.descendants);
-						result.ancestors=filterStatuses(result.ancestors);
-
-						for (NeighborAncestryInfo i : mapNeighborhoodAncestry(mainStatus, result)) {
-							ancestryMap.put(i.status.id, i);
-						}
-
-						if(footerProgress!=null)
-							footerProgress.setVisibility(View.GONE);
-						data.addAll(result.descendants);
-						int prevCount=displayItems.size();
-						onAppendItems(result.descendants);
-						int count=displayItems.size();
-						if(!refreshing)
-							adapter.notifyItemRangeInserted(prevCount, count-prevCount);
-						int prependedCount = prependItems(result.ancestors, !refreshing);
-						if (prependedCount > 0 && displayItems.get(prependedCount) instanceof ReblogOrReplyLineStatusDisplayItem) {
-							displayItems.remove(prependedCount);
-							adapter.notifyItemRemoved(prependedCount);
-							count--;
-						}
-
-						for (Status s : data) {
-							Status oldStatus = oldData == null ? null : oldData.get(s.id);
-							// restore previous spoiler/filter revealed states when refreshing
-							if (oldStatus != null) {
-								s.spoilerRevealed = oldStatus.spoilerRevealed;
-								s.filterRevealed = oldStatus.filterRevealed;
-							} else if (GlobalUserPreferences.autoRevealEqualSpoilers != AutoRevealMode.NEVER &&
-									s.spoilerText != null &&
-									s.spoilerText.equals(mainStatus.spoilerText) &&
-									mainStatus.spoilerRevealed) {
-								if (GlobalUserPreferences.autoRevealEqualSpoilers == AutoRevealMode.DISCUSSIONS || Objects.equals(mainStatus.account.id, s.account.id)) {
-									s.spoilerRevealed = true;
-								}
-							}
-						}
-
-						dataLoaded();
-						if(refreshing){
-							refreshDone();
-							adapter.notifyDataSetChanged();
-						}
-						list.scrollToPosition(displayItems.size()-count);
-
-						// no animation is going to happen, so proceeding to apply right now
-						if (data.size() == 1) {
-							contextInitiallyRendered = true;
-							// for the case that the main status has already finished loading
-							maybeApplyMainStatus();
-						}
+						ThreadFragment.this.result = result;
+						maybeApplyContext();
 					}
 				})
 				.exec(accountID);
@@ -207,6 +151,77 @@ public class ThreadFragment extends StatusListFragment implements ProvidesAssist
 				}).exec(accountID);
 	}
 
+	protected void maybeApplyContext() {
+		if (!transitionFinished || result == null || getContext() == null) return;
+		Map<String, Status> oldData = null;
+		if(refreshing){
+			oldData = new HashMap<>(data.size());
+			for (Status s : data) oldData.put(s.id, s);
+			data.clear();
+			ancestryMap.clear();
+			displayItems.clear();
+			data.add(mainStatus);
+			onAppendItems(Collections.singletonList(mainStatus));
+		}
+
+		// TODO: figure out how this code works
+		if (isInstanceAkkoma()) sortStatusContext(mainStatus, result);
+
+		result.descendants=filterStatuses(result.descendants);
+		result.ancestors=filterStatuses(result.ancestors);
+
+		for (NeighborAncestryInfo i : mapNeighborhoodAncestry(mainStatus, result)) {
+			ancestryMap.put(i.status.id, i);
+		}
+
+		if(footerProgress!=null)
+			footerProgress.setVisibility(View.GONE);
+		data.addAll(result.descendants);
+		int prevCount=displayItems.size();
+		onAppendItems(result.descendants);
+		int count=displayItems.size();
+		if(!refreshing)
+			adapter.notifyItemRangeInserted(prevCount, count-prevCount);
+		int prependedCount = prependItems(result.ancestors, !refreshing);
+		if (prependedCount > 0 && displayItems.get(prependedCount) instanceof ReblogOrReplyLineStatusDisplayItem) {
+			displayItems.remove(prependedCount);
+			adapter.notifyItemRemoved(prependedCount);
+			count--;
+		}
+
+		for (Status s : data) {
+			Status oldStatus = oldData == null ? null : oldData.get(s.id);
+			// restore previous spoiler/filter revealed states when refreshing
+			if (oldStatus != null) {
+				s.spoilerRevealed = oldStatus.spoilerRevealed;
+				s.filterRevealed = oldStatus.filterRevealed;
+			} else if (GlobalUserPreferences.autoRevealEqualSpoilers != AutoRevealMode.NEVER &&
+					s.spoilerText != null &&
+					s.spoilerText.equals(mainStatus.spoilerText) &&
+					mainStatus.spoilerRevealed) {
+				if (GlobalUserPreferences.autoRevealEqualSpoilers == AutoRevealMode.DISCUSSIONS || Objects.equals(mainStatus.account.id, s.account.id)) {
+					s.spoilerRevealed = true;
+				}
+			}
+		}
+
+		dataLoaded();
+		if(refreshing){
+			refreshDone();
+			adapter.notifyDataSetChanged();
+		}
+		list.scrollToPosition(displayItems.size()-count);
+
+		// no animation is going to happen, so proceeding to apply right now
+		if (data.size() == 1) {
+			contextInitiallyRendered = true;
+			// for the case that the main status has already finished loading
+			maybeApplyMainStatus();
+		}
+
+		result = null;
+	}
+
 	protected Object maybeApplyMainStatus() {
 		if (updatedStatus == null || !contextInitiallyRendered) return null;
 
@@ -337,10 +352,60 @@ public class ThreadFragment extends StatusListFragment implements ProvidesAssist
 	}
 
 	protected void onStatusCreated(StatusCreatedEvent ev){
-		if(ev.status.inReplyToId!=null && getStatusByID(ev.status.inReplyToId)!=null){
-			data.add(ev.status);
-			onAppendItems(Collections.singletonList(ev.status));
+		if (ev.status.inReplyToId == null) return;
+		Status repliedToStatus = getStatusByID(ev.status.inReplyToId);
+		if (repliedToStatus == null) return;
+		NeighborAncestryInfo ancestry = ancestryMap.get(repliedToStatus.id);
+
+		int nextDisplayItemsIndex = -1, indexOfPreviousDisplayItem = -1;
+
+		for (int i = 0; i < displayItems.size(); i++) {
+			StatusDisplayItem item = displayItems.get(i);
+			if (repliedToStatus.id.equals(item.parentID)) {
+				// saving the replied-to status' display items index to eventually reach the last one
+				indexOfPreviousDisplayItem = i;
+				item.hasDescendantNeighbor = true;
+			} else if (indexOfPreviousDisplayItem >= 0 && nextDisplayItemsIndex == -1) {
+				// previous display item was the replied-to status' display items
+				nextDisplayItemsIndex = i;
+				// nothing left to do if there's no other reply to that status
+				if (ancestry.descendantNeighbor == null) break;
+			}
+			if (ancestry.descendantNeighbor != null && item.parentID.equals(ancestry.descendantNeighbor.id)) {
+				// existing reply shall no longer have the replied-to status as its neighbor
+				item.hasAncestoringNeighbor = false;
+			}
 		}
+
+		// fall back to inserting the item at the end
+		nextDisplayItemsIndex = nextDisplayItemsIndex >= 0 ? nextDisplayItemsIndex : displayItems.size();
+		int nextDataIndex = data.indexOf(repliedToStatus) + 1;
+
+		// if replied-to status already has another reply...
+		if (ancestry.descendantNeighbor != null) {
+			// update the reply's ancestry to remove its ancestoring neighbor (as we did above)
+			ancestryMap.get(ancestry.descendantNeighbor.id).ancestoringNeighbor = null;
+			// make sure the existing reply has a reply line
+			if (nextDataIndex < data.size() &&
+					!(displayItems.get(nextDisplayItemsIndex) instanceof ReblogOrReplyLineStatusDisplayItem)) {
+				Status nextStatus = data.get(nextDataIndex);
+				if (!nextStatus.account.id.equals(repliedToStatus.account.id)) {
+					// create reply line manually since we're not building that status' items
+					displayItems.add(nextDisplayItemsIndex, StatusDisplayItem.buildReplyLine(
+							this, nextStatus, accountID, nextStatus, repliedToStatus.account, false
+					));
+				}
+			}
+		}
+
+		// update replied-to status' ancestry
+		ancestry.descendantNeighbor = ev.status;
+
+		// add ancestry for newly created status before building its display items
+		ancestryMap.put(ev.status.id, new NeighborAncestryInfo(ev.status, null, repliedToStatus));
+		displayItems.addAll(nextDisplayItemsIndex, buildDisplayItems(ev.status));
+		data.add(nextDataIndex, ev.status);
+		adapter.notifyDataSetChanged();
 	}
 
 	@Override

mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverAccountsFragment.java

@@ -244,6 +244,10 @@ public class DiscoverAccountsFragment extends RecyclerFragment<DiscoverAccountsF
 			followersLabel.setText(getResources().getQuantityString(R.plurals.followers, (int)Math.min(999, item.account.followersCount)));
 			followingLabel.setText(getResources().getQuantityString(R.plurals.following, (int)Math.min(999, item.account.followingCount)));
 			postsLabel.setText(getResources().getQuantityString(R.plurals.posts, (int)Math.min(999, item.account.statusesCount)));
+			followersCount.setVisibility(item.account.followersCount < 0 ? View.GONE : View.VISIBLE);
+			followersLabel.setVisibility(item.account.followersCount < 0 ? View.GONE : View.VISIBLE);
+			followingCount.setVisibility(item.account.followingCount < 0 ? View.GONE : View.VISIBLE);
+			followingLabel.setVisibility(item.account.followingCount < 0 ? View.GONE : View.VISIBLE);
 			relationship=relationships.get(item.account.id);
 			if(relationship==null){
 				actionWrap.setVisibility(View.GONE);

mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportCommentFragment.java

@@ -15,6 +15,7 @@ import android.widget.TextView;
 import com.squareup.otto.Subscribe;
 
 import org.joinmastodon.android.E;
+import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.reports.SendReport;
 import org.joinmastodon.android.events.FinishReportFragmentsEvent;
@@ -39,7 +40,7 @@ public class ReportCommentFragment extends MastodonToolbarFragment{
 	private TextView forwardReportText;
 	private Switch forwardReportSwitch;
 	private EditText commentEdit;
-	private boolean forwardReport;
+	private boolean forwardReport = GlobalUserPreferences.forwardReportDefault;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState){
@@ -89,7 +90,7 @@ public class ReportCommentFragment extends MastodonToolbarFragment{
 		} else {
 			forwardReportItem.setOnClickListener(this::onForwardReportClick);
 			forwardReportText.setText(getActivity().getString(R.string.sk_forward_report_to, domain));
-			forwardReportSwitch.setChecked(forwardReport = true);
+			forwardReportSwitch.setChecked(forwardReport);
 		}
 		return view;
 	}