Merge remote-tracking branch 'megalodon_main/main'

# Conflicts:
#	mastodon/build.gradle
#	mastodon/src/main/java/org/joinmastodon/android/ExternalShareActivity.java
#	mastodon/src/main/java/org/joinmastodon/android/MainActivity.java
#	mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/EditTimelinesFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/FollowRequestsListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/FollowedHashtagsFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/FollowerListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/FollowingListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/StatusFavoritesListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/StatusReblogsListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverAccountsFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverHashtagsFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverNewsFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/discover/FederatedTimelineFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/discover/LocalTimelineFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/AccountActivationFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/model/TimelineDefinition.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/AccountSwitcherSheet.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HashtagStatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
#	mastodon/src/main/res/layout/item_account_switcher.xml
#	mastodon/src/main/res/values-ar-rDZ/strings_sk.xml
#	mastodon/src/main/res/values-es-rES/strings_sk.xml
#	mastodon/src/main/res/values-nl-rNL/strings_sk.xml
#	mastodon/src/main/res/values-pt-rPT/strings_sk.xml
#	mastodon/src/main/res/values-v31/colors.xml
#	mastodon/src/main/res/values/colors.xml
#	mastodon/src/main/res/values/styles.xml

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

@@ -1,6 +1,7 @@
 package org.joinmastodon.android.fragments;
 
 import android.app.Activity;
+import android.net.Uri;
 import android.os.Bundle;
 import android.view.View;
 
@@ -131,4 +132,13 @@ public class AccountTimelineFragment extends StatusListFragment{
 	protected Filter.FilterContext getFilterContext() {
 		return Filter.FilterContext.ACCOUNT;
 	}
+
+	@Override
+	public Uri getWebUri(Uri.Builder base) {
+		// could return different uris based on filter (e.g. media -> "/media"), but i want to
+		// return the remote url to the user, and i don't know whether i'd need to append
+		// '#media' (akkoma/pleroma) or '/media' (glitch/mastodon) since i don't know anything
+		// about the remote instance. so, just returning the base url to the user instead
+		return Uri.parse(user.url);
+	}
 }

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

@@ -3,6 +3,7 @@ package org.joinmastodon.android.fragments;
 import static java.util.stream.Collectors.toList;
 
 import android.app.Activity;
+import android.net.Uri;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.View;
@@ -103,4 +104,9 @@ public class AnnouncementsFragment extends BaseStatusListFragment<Announcement>
 				})
 				.exec(accountID);
 	}
+
+	@Override
+	public Uri getWebUri(Uri.Builder base) {
+		return isInstanceAkkoma() ? base.path("/announcements").build() : null;
+	}
 }

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

@@ -1,6 +1,7 @@
 package org.joinmastodon.android.fragments;
 
 import android.app.Activity;
+import android.app.assist.AssistContent;
 import android.content.res.Configuration;
 import android.graphics.Canvas;
 import android.graphics.Paint;
@@ -15,6 +16,7 @@ import android.text.TextPaint;
 import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.ViewTreeObserver;
 import android.view.WindowInsets;
 import android.view.animation.TranslateAnimation;
 import android.widget.ImageButton;
@@ -49,6 +51,7 @@ import org.joinmastodon.android.ui.photoviewer.PhotoViewer;
 import org.joinmastodon.android.ui.photoviewer.PhotoViewerHost;
 import org.joinmastodon.android.ui.utils.MediaAttachmentViewController;
 import org.joinmastodon.android.ui.utils.UiUtils;
+import org.joinmastodon.android.utils.ProvidesAssistContent;
 import org.joinmastodon.android.utils.TypedObjectPool;
 
 import java.util.ArrayList;
@@ -69,7 +72,7 @@ import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.utils.V;
 import me.grishka.appkit.views.UsableRecyclerView;
 
-public abstract class BaseStatusListFragment<T extends DisplayItemsParent> extends BaseRecyclerFragment<T> implements PhotoViewerHost, ScrollableToTop, HasFab, DomainDisplay{
+public abstract class BaseStatusListFragment<T extends DisplayItemsParent> extends RecyclerFragment<T> implements PhotoViewerHost, ScrollableToTop, HasFab, ProvidesAssistContent.ProvidesWebUri, DomainDisplay {
 	protected ArrayList<StatusDisplayItem> displayItems=new ArrayList<>();
 	protected DisplayItemsAdapter adapter;
 	protected String accountID;
@@ -132,7 +135,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		displayItems.clear();
 	}
 
-	protected void prependItems(List<T> items, boolean notify){
+	protected int prependItems(List<T> items, boolean notify){
 		data.addAll(0, items);
 		int offset=0;
 		for(T s:items){
@@ -145,6 +148,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		}
 		if(notify)
 			adapter.notifyItemRangeInserted(0, offset);
+		return offset;
 	}
 
 	protected String getMaxID(){
@@ -205,7 +209,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 			@Override
 			public boolean startPhotoViewTransition(int index, @NonNull Rect outRect, @NonNull int[] outCornerRadius){
 				MediaAttachmentViewController holder=findPhotoViewHolder(index);
-				if(holder!=null){
+				if(holder!=null && list!=null){
 					transitioningHolder=holder;
 					View view=transitioningHolder.photo;
 					int[] pos={0, 0};
@@ -337,6 +341,8 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 			private Rect tmpRect=new Rect();
 			@Override
 			public void getSelectorBounds(View view, Rect outRect){
+				boolean hasDescendant = false, hasAncestor = false, isWarning = false;
+				int lastIndex = -1, firstIndex = -1;
 				list.getDecoratedBoundsWithMargins(view, outRect);
 				RecyclerView.ViewHolder holder=list.getChildViewHolder(view);
 				if(holder instanceof StatusDisplayItem.Holder){
@@ -348,18 +354,40 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 					for(int i=0;i<list.getChildCount();i++){
 						View child=list.getChildAt(i);
 						holder=list.getChildViewHolder(child);
-						if(holder instanceof StatusDisplayItem.Holder){
+						if(holder instanceof StatusDisplayItem.Holder<?> h){
 							String otherID=((StatusDisplayItem.Holder<?>) holder).getItemID();
 							if(otherID.equals(id)){
+								if (firstIndex < 0) firstIndex = i;
+								lastIndex = i;
+								StatusDisplayItem item = h.getItem();
+								hasDescendant = item.hasDescendantNeighbor;
+								// no for direct descendants because main status (right above) is
+								// being displayed with an extended footer - no connected layout
+								hasAncestor = item.hasAncestoringNeighbor && !item.isDirectDescendant;
 								list.getDecoratedBoundsWithMargins(child, tmpRect);
 								outRect.left=Math.min(outRect.left, tmpRect.left);
 								outRect.top=Math.min(outRect.top, tmpRect.top);
 								outRect.right=Math.max(outRect.right, tmpRect.right);
 								outRect.bottom=Math.max(outRect.bottom, tmpRect.bottom);
+								if (holder instanceof WarningFilteredStatusDisplayItem.Holder) {
+									isWarning = true;
+								}
 							}
 						}
 					}
 				}
+				// shifting the selection box down
+				// see also: FooterStatusDisplayItem#onBind (setMargins)
+				if (isWarning || firstIndex < 0 || lastIndex < 0) return;
+				int prevIndex = firstIndex - 1, nextIndex = lastIndex + 1;
+				boolean prevIsWarning = prevIndex > 0 && prevIndex < list.getChildCount() &&
+						list.getChildViewHolder(list.getChildAt(prevIndex))
+						instanceof WarningFilteredStatusDisplayItem.Holder;
+				boolean nextIsWarning = nextIndex > 0 && nextIndex < list.getChildCount() &&
+						list.getChildViewHolder(list.getChildAt(nextIndex))
+						instanceof WarningFilteredStatusDisplayItem.Holder;
+				if (!prevIsWarning && hasAncestor) outRect.top += V.dp(4);
+				if (!nextIsWarning && hasDescendant) outRect.bottom += V.dp(4);
 			}
 		});
 		list.setItemAnimator(new BetterItemAnimator());
@@ -568,6 +596,14 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		}
 	}
 
+	public void onImageUpdated(MediaGridStatusDisplayItem.Holder holder, int index) {
+		holder.rebind();
+		MediaGridStatusDisplayItem.Holder mediaGrid = findHolderOfType(holder.getItemID(), MediaGridStatusDisplayItem.Holder.class);
+		if(mediaGrid!=null){
+			adapter.notifyItemChanged(mediaGrid.getAbsoluteAdapterPosition());
+		}
+	}
+
 	public void onGapClick(GapStatusDisplayItem.Holder item){}
 
 	public void onWarningClick(WarningFilteredStatusDisplayItem.Holder warning){
@@ -579,6 +615,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		warning.getItem().status.filterRevealed = true;
 	}
 
+	@Override
 	public String getAccountID(){
 		return accountID;
 	}
@@ -717,6 +754,10 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		return attachmentViewsPool;
 	}
 
+	@Override
+	public void onProvideAssistContent(AssistContent assistContent) {
+		assistContent.setWebUri(getWebUri(getSession().getInstanceUri().buildUpon()));
+	}
 
 	protected class DisplayItemsAdapter extends UsableRecyclerView.Adapter<BindableViewHolder<StatusDisplayItem>> implements ImageLoaderRecyclerAdapter{
 
@@ -778,6 +819,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 				RecyclerView.ViewHolder siblingHolder=parent.getChildViewHolder(bottomSibling);
 				if(holder instanceof StatusDisplayItem.Holder<?> ih && siblingHolder instanceof StatusDisplayItem.Holder<?> sh
 						&& (!ih.getItemID().equals(sh.getItemID()) || sh instanceof ExtendedFooterStatusDisplayItem.Holder) && ih.getItem().getType()!=StatusDisplayItem.Type.GAP){
+					if (!ih.getItem().isMainStatus && ih.getItem().hasDescendantNeighbor) continue;
 					drawDivider(child, bottomSibling, holder, siblingHolder, parent, c, dividerPaint);
 				}
 			}

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

@@ -1,6 +1,7 @@
 package org.joinmastodon.android.fragments;
 
 import android.app.Activity;
+import android.net.Uri;
 
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.statuses.GetBookmarkedStatuses;
@@ -41,4 +42,9 @@ public class BookmarkedStatusListFragment extends StatusListFragment{
 	protected Filter.FilterContext getFilterContext() {
 		return Filter.FilterContext.ACCOUNT;
 	}
+
+	@Override
+	public Uri getWebUri(Uri.Builder base) {
+		return base.path("/bookmarks").build();
+	}
 }

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

@@ -252,10 +252,6 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 
 		accountID=getArguments().getString("account");
 		contentType = GlobalUserPreferences.accountsDefaultContentTypes.get(accountID);
-		if (contentType == null && GlobalUserPreferences.accountsWithContentTypesEnabled.contains(accountID)) {
-			// if formatting is enabled, use plain to avoid confusing unspecified default setting
-			contentType = ContentType.PLAIN;
-		}
 
 		AccountSession session=AccountSessionManager.getInstance().getAccount(accountID);
 		self=session.self;
@@ -274,9 +270,6 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			Nav.finish(this);
 			return;
 		}
-		if(customEmojis.isEmpty()){
-			AccountSessionManager.getInstance().updateInstanceInfo(instanceDomain);
-		}
 
 		Bundle bundle = savedInstanceState != null ? savedInstanceState : getArguments();
 		if (bundle.containsKey("scheduledStatus")) scheduledStatus=Parcels.unwrap(bundle.getParcelable("scheduledStatus"));
@@ -1146,7 +1139,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		}
 		req.status=text;
 		req.localOnly=localOnly;
-		req.visibility=localOnly && instance.pleroma != null ? StatusPrivacy.LOCAL : statusVisibility;
+		req.visibility=localOnly && instance.isAkkoma() ? StatusPrivacy.LOCAL : statusVisibility;
 		req.sensitive=sensitive;
 		req.language=language;
 		req.contentType=contentType;
@@ -1800,11 +1793,24 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 				pollChanged=true;
 			updatePublishButtonState();
 		}));
-		option.edit.setFilters(new InputFilter[]{new InputFilter.LengthFilter(instance.configuration!=null && instance.configuration.polls!=null && instance.configuration.polls.maxCharactersPerOption>0 ? instance.configuration.polls.maxCharactersPerOption : 50)});
+
+		int maxCharactersPerOption = 50;
+		if(instance.configuration!=null && instance.configuration.polls!=null && instance.configuration.polls.maxCharactersPerOption>0)
+			maxCharactersPerOption = instance.configuration.polls.maxCharactersPerOption;
+		else if(instance.pollLimits!=null && instance.pollLimits.maxOptionChars>0)
+			maxCharactersPerOption = instance.pollLimits.maxOptionChars;
+		option.edit.setFilters(new InputFilter[]{new InputFilter.LengthFilter(maxCharactersPerOption)});
 
 		pollOptionsView.addView(option.view);
 		pollOptions.add(option);
-		if(pollOptions.size()==(instance.configuration!=null && instance.configuration.polls!=null && instance.configuration.polls.maxOptions>0 ? instance.configuration.polls.maxOptions : 4))
+
+		int maxPollOptions = 4;
+		if(instance.configuration!=null && instance.configuration.polls!=null && instance.configuration.polls.maxOptions>0)
+			maxPollOptions = instance.configuration.polls.maxOptions;
+		else if (instance.pollLimits!=null && instance.pollLimits.maxOptions>0)
+			maxPollOptions = instance.pollLimits.maxOptions;
+
+		if(pollOptions.size()==maxPollOptions)
 			addPollOptionBtn.setVisibility(View.GONE);
 		return option;
 	}
@@ -1961,7 +1967,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		Menu m=visibilityPopup.getMenu();
 		MenuItem localOnlyItem = visibilityPopup.getMenu().findItem(R.id.local_only);
 		boolean prefsSaysSupported = GlobalUserPreferences.accountsWithLocalOnlySupport.contains(accountID);
-		if (instance.pleroma != null) {
+		if (instance.isAkkoma()) {
 			m.findItem(R.id.vis_local).setVisible(true);
 		} else if (localOnly || prefsSaysSupported) {
 			localOnlyItem.setVisible(true);

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

@@ -32,9 +32,12 @@ import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.lists.GetLists;
 import org.joinmastodon.android.api.requests.tags.GetFollowedHashtags;
+import org.joinmastodon.android.api.session.AccountSession;
+import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.model.CustomLocalTimeline;
 import org.joinmastodon.android.model.Hashtag;
 import org.joinmastodon.android.model.HeaderPaginationList;
+import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.model.ListTimeline;
 import org.joinmastodon.android.model.TimelineDefinition;
 import org.joinmastodon.android.ui.DividerItemDecoration;
@@ -196,7 +199,7 @@ public class EditTimelinesFragment extends RecyclerFragment<TimelineDefinition>
         makeBackItem(listsMenu);
         makeBackItem(hashtagsMenu);
 
-        TimelineDefinition.ALL_TIMELINES.forEach(tl -> addTimelineToOptions(tl, timelinesMenu));
+        TimelineDefinition.getAllTimelines(accountID).forEach(tl -> addTimelineToOptions(tl, timelinesMenu));
         listTimelines.stream().map(TimelineDefinition::ofList).forEach(tl -> addTimelineToOptions(tl, listsMenu));
         hashtags.stream().map(TimelineDefinition::ofHashtag).forEach(tl -> addTimelineToOptions(tl, hashtagsMenu));
 
@@ -222,7 +225,7 @@ public class EditTimelinesFragment extends RecyclerFragment<TimelineDefinition>
 
     @Override
     protected void doLoadData(int offset, int count){
-        onDataLoaded(GlobalUserPreferences.pinnedTimelines.getOrDefault(accountID, TimelineDefinition.DEFAULT_TIMELINES), false);
+        onDataLoaded(GlobalUserPreferences.pinnedTimelines.getOrDefault(accountID, TimelineDefinition.getDefaultTimelines(accountID)), false);
         updateOptionsMenu();
     }
 

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

@@ -1,6 +1,7 @@
 package org.joinmastodon.android.fragments;
 
 import android.app.Activity;
+import android.net.Uri;
 
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.statuses.GetFavoritedStatuses;
@@ -41,4 +42,11 @@ public class FavoritedStatusListFragment extends StatusListFragment{
 	protected Filter.FilterContext getFilterContext() {
 		return Filter.FilterContext.ACCOUNT;
 	}
+
+	@Override
+	public Uri getWebUri(Uri.Builder base) {
+		return base.encodedPath(isInstanceAkkoma()
+				? '/' + getSession().self.username + "#favorites"
+				: "/favourites").build();
+	}
 }

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

@@ -4,6 +4,7 @@ import android.app.Activity;
 import android.graphics.Rect;
 import android.graphics.drawable.Animatable;
 import android.graphics.drawable.Drawable;
+import android.net.Uri;
 import android.os.Bundle;
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
@@ -24,6 +25,7 @@ import org.joinmastodon.android.ui.text.HtmlParser;
 import org.joinmastodon.android.ui.utils.CustomEmojiHelper;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.ui.views.ProgressBarButton;
+import org.joinmastodon.android.utils.ProvidesAssistContent;
 import org.parceler.Parcels;
 
 import java.util.Collections;
@@ -46,7 +48,7 @@ import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.utils.V;
 import me.grishka.appkit.views.UsableRecyclerView;
 
-public class FollowRequestsListFragment extends RecyclerFragment<FollowRequestsListFragment.AccountWrapper> implements ScrollableToTop{
+public class FollowRequestsListFragment extends RecyclerFragment<FollowRequestsListFragment.AccountWrapper> implements ScrollableToTop, ProvidesAssistContent.ProvidesWebUri {
 	private String accountID;
 	private Map<String, Relationship> relationships=Collections.emptyMap();
 	private GetAccountRelationships relationshipsRequest;
@@ -149,8 +151,13 @@ public class FollowRequestsListFragment extends RecyclerFragment<FollowRequestsL
 	}
 
 	@Override
-	public boolean isScrolledToTop() {
-		return list.getChildAt(0).getTop() == 0;
+	public String getAccountID() {
+		return accountID;
+	}
+
+	@Override
+	public Uri getWebUri(Uri.Builder base) {
+		return base.path(isInstanceAkkoma() ? "/friend-requests" : "/follow_requests").build();
 	}
 
 	private class AccountsAdapter extends UsableRecyclerView.Adapter<AccountViewHolder> implements ImageLoaderRecyclerAdapter{

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

@@ -1,5 +1,6 @@
 package org.joinmastodon.android.fragments;
 
+import android.net.Uri;
 import android.os.Bundle;
 import android.view.View;
 import android.view.ViewGroup;
@@ -14,14 +15,15 @@ import org.joinmastodon.android.model.Hashtag;
 import org.joinmastodon.android.model.HeaderPaginationList;
 import org.joinmastodon.android.ui.DividerItemDecoration;
 import org.joinmastodon.android.ui.utils.UiUtils;
+import org.joinmastodon.android.utils.ProvidesAssistContent;
 
 import me.grishka.appkit.api.SimpleCallback;
 import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.views.UsableRecyclerView;
 
-public class FollowedHashtagsFragment extends RecyclerFragment<Hashtag> implements ScrollableToTop {
+public class FollowedHashtagsFragment extends RecyclerFragment<Hashtag> implements ScrollableToTop, ProvidesAssistContent.ProvidesWebUri {
     private String nextMaxID;
-    private String accountId;
+    private String accountID;
 
     public FollowedHashtagsFragment() {
         super(20);
@@ -31,7 +33,7 @@ public class FollowedHashtagsFragment extends RecyclerFragment<Hashtag> implemen
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         Bundle args=getArguments();
-        accountId=args.getString("account");
+        accountID=args.getString("account");
         setTitle(R.string.sk_hashtags_you_follow);
     }
 
@@ -62,7 +64,7 @@ public class FollowedHashtagsFragment extends RecyclerFragment<Hashtag> implemen
                         onDataLoaded(result, nextMaxID!=null);
                     }
                 })
-                .exec(accountId);
+                .exec(accountID);
     }
 
     @Override
@@ -76,8 +78,13 @@ public class FollowedHashtagsFragment extends RecyclerFragment<Hashtag> implemen
     }
 
     @Override
-    public boolean isScrolledToTop() {
-        return list.getChildAt(0).getTop() == 0;
+    public String getAccountID() {
+        return accountID;
+    }
+
+    @Override
+    public Uri getWebUri(Uri.Builder base) {
+        return isInstanceAkkoma() ? null : base.path("/followed_tags").build();
     }
 
     private class HashtagsAdapter extends RecyclerView.Adapter<HashtagViewHolder>{
@@ -114,7 +121,7 @@ public class FollowedHashtagsFragment extends RecyclerFragment<Hashtag> implemen
 
         @Override
         public void onClick() {
-            UiUtils.openHashtagTimeline(getActivity(), accountId, item.name, item.following);
+            UiUtils.openHashtagTimeline(getActivity(), accountID, item.name, item.following);
         }
     }
 }

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

@@ -0,0 +1,23 @@
+package org.joinmastodon.android.fragments;
+
+import org.joinmastodon.android.api.session.AccountSession;
+import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.model.Instance;
+
+import java.util.Optional;
+
+public interface HasAccountID {
+    String getAccountID();
+
+    default AccountSession getSession() {
+        return AccountSessionManager.getInstance().getAccount(getAccountID());
+    }
+
+    default boolean isInstanceAkkoma() {
+        return getInstance().map(Instance::isAkkoma).orElse(false);
+    }
+
+    default Optional<Instance> getInstance() {
+        return getSession().getInstance();
+    }
+}

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

@@ -1,6 +1,7 @@
 package org.joinmastodon.android.fragments;
 
 import android.app.Activity;
+import android.net.Uri;
 import android.os.Bundle;
 import android.view.HapticFeedbackConstants;
 import android.view.Menu;
@@ -8,7 +9,6 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ImageButton;
 import android.widget.Toast;
 
 import org.joinmastodon.android.DomainManager;
@@ -167,4 +167,9 @@ public class HashtagTimelineFragment extends PinnableStatusListFragment {
 	protected Filter.FilterContext getFilterContext() {
 		return Filter.FilterContext.PUBLIC;
 	}
+
+	@Override
+	public Uri getWebUri(Uri.Builder base) {
+		return base.path((isInstanceAkkoma() ? "/tag/" : "/tags") + hashtag).build();
+	}
 }

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

@@ -2,6 +2,7 @@ package org.joinmastodon.android.fragments;
 
 import android.app.Fragment;
 import android.app.NotificationManager;
+import android.app.assist.AssistContent;
 import android.content.Intent;
 import android.graphics.Outline;
 import android.os.Build;
@@ -40,16 +41,13 @@ import org.joinmastodon.android.model.Notification;
 import org.joinmastodon.android.ui.AccountSwitcherSheet;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.ui.views.TabBar;
+import org.joinmastodon.android.utils.ProvidesAssistContent;
 import org.parceler.Parcels;
 
 import java.util.ArrayList;
 import java.util.EnumSet;
 import java.util.List;
-
-import androidx.annotation.IdRes;
-import androidx.annotation.Nullable;
-
-import com.squareup.otto.Subscribe;
+import java.util.Optional;
 
 import me.grishka.appkit.FragmentStackActivity;
 import me.grishka.appkit.Nav;
@@ -63,11 +61,9 @@ import me.grishka.appkit.imageloader.requests.UrlImageLoaderRequest;
 import me.grishka.appkit.utils.V;
 import me.grishka.appkit.views.FragmentRootLinearLayout;
 
-public class HomeFragment extends AppKitFragment implements OnBackPressedListener{
+public class HomeFragment extends AppKitFragment implements OnBackPressedListener, ProvidesAssistContent, HasAccountID {
 	private FragmentRootLinearLayout content;
-
 	private HomeTabFragment homeTabFragment;
-
 	private NotificationsFragment notificationsFragment;
 	private DiscoverFragment searchFragment;
 	private ProfileFragment profileFragment;
@@ -79,6 +75,7 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 	private int currentTab=R.id.tab_home;
 
 	private String accountID;
+	private boolean isPleroma;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState){
@@ -86,18 +83,21 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 		E.register(this);
 		accountID=getArguments().getString("account");
 		setTitle(R.string.mo_app_name);
+		isPleroma = AccountSessionManager.getInstance().getAccount(accountID).getInstance()
+				.map(Instance::isAkkoma)
+				.orElse(false);
 
 		if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.N)
 			setRetainInstance(true);
 
+		// TODO: clean up
 		if(savedInstanceState==null){
 			Bundle args=new Bundle();
 			args.putString("account", accountID);
-
 			homeTabFragment=new HomeTabFragment();
 			homeTabFragment.setArguments(args);
-
 			args=new Bundle(args);
+			args.putBoolean("disableDiscover", isPleroma);
 			args.putBoolean("noAutoLoad", true);
 			searchFragment=new DiscoverFragment();
 			searchFragment.setArguments(args);
@@ -149,7 +149,6 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 					.add(me.grishka.appkit.R.id.fragment_wrap, profileFragment).hide(profileFragment)
 					.commit();
 
-
 			String defaultTab=getArguments().getString("tab");
 			if("notifications".equals(defaultTab)){
 				tabBar.selectTab(R.id.tab_notifications);
@@ -170,19 +169,14 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 	@Override
 	public void onViewStateRestored(Bundle savedInstanceState){
 		super.onViewStateRestored(savedInstanceState);
-
 		if(savedInstanceState==null) return;
-
-
 		homeTabFragment=(HomeTabFragment) getChildFragmentManager().getFragment(savedInstanceState, "homeTabFragment");
-
 		searchFragment=(DiscoverFragment) getChildFragmentManager().getFragment(savedInstanceState, "searchFragment");
 		notificationsFragment=(NotificationsFragment) getChildFragmentManager().getFragment(savedInstanceState, "notificationsFragment");
 		profileFragment=(ProfileFragment) getChildFragmentManager().getFragment(savedInstanceState, "profileFragment");
 		currentTab=savedInstanceState.getInt("selectedTab");
 		tabBar.selectTab(currentTab);
 		Fragment current=fragmentForTab(currentTab);
-
 		getChildFragmentManager().beginTransaction()
 				.hide(homeTabFragment)
 				.hide(searchFragment)
@@ -190,15 +184,12 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 				.hide(profileFragment)
 				.show(current)
 				.commit();
-
 		maybeTriggerLoading(current);
 	}
 
 	@Override
 	public void onHiddenChanged(boolean hidden){
 		super.onHiddenChanged(hidden);
-		if (!hidden && fragmentForTab(currentTab) instanceof  DomainDisplay display)
-			DomainManager.getInstance().setCurrentDomain(display.getDomain());
 		fragmentForTab(currentTab).onHiddenChanged(hidden);
 	}
 
@@ -222,9 +213,7 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 			super.onApplyWindowInsets(insets.replaceSystemWindowInsets(insets.getSystemWindowInsetLeft(), 0, insets.getSystemWindowInsetRight(), insets.getSystemWindowInsetBottom()));
 		}
 		WindowInsets topOnlyInsets=insets.replaceSystemWindowInsets(0, insets.getSystemWindowInsetTop(), 0, 0);
-
 		homeTabFragment.onApplyWindowInsets(topOnlyInsets);
-
 		searchFragment.onApplyWindowInsets(topOnlyInsets);
 		notificationsFragment.onApplyWindowInsets(topOnlyInsets);
 		profileFragment.onApplyWindowInsets(topOnlyInsets);
@@ -243,34 +232,28 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 		throw new IllegalArgumentException();
 	}
 
+	public void setCurrentTab(@IdRes int tab){
+		if(tab==currentTab)
+			return;
+		tabBar.selectTab(tab);
+		onTabSelected(tab);
+	}
+
 	private void onTabSelected(@IdRes int tab){
 		Fragment newFragment=fragmentForTab(tab);
 		if(tab==currentTab){
-			if(tab == R.id.tab_search){
-				if(newFragment instanceof ScrollableToTop scrollable)
-					scrollable.scrollToTop();
-				searchFragment.selectSearch();
-				return;
-			}
-			if(newFragment instanceof ScrollableToTop scrollable)
+			if (tab == R.id.tab_search)
+				searchFragment.onSelect();
+			else if(newFragment instanceof ScrollableToTop scrollable)
 				scrollable.scrollToTop();
 			return;
 		}
-		if(tab==currentTab && tab == R.id.tab_search){
-			if(newFragment instanceof ScrollableToTop scrollable)
-				scrollable.scrollToTop();
-			return;
-		}
-
-		if (newFragment instanceof DomainDisplay display) {
-			DomainManager.getInstance().setCurrentDomain(display.getDomain());
-		}
-
 		getChildFragmentManager().beginTransaction().hide(fragmentForTab(currentTab)).show(newFragment).commit();
 		maybeTriggerLoading(newFragment);
 		if (newFragment instanceof HasFab fabulous) fabulous.showFab();
 		currentTab=tab;
 		((FragmentStackActivity)getActivity()).invalidateSystemBarColors(this);
+		if (tab == R.id.tab_search && isPleroma) searchFragment.selectSearch();
 	}
 
 	private void maybeTriggerLoading(Fragment newFragment){
@@ -297,10 +280,7 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 			for(AccountSession session:AccountSessionManager.getInstance().getLoggedInAccounts()){
 				options.add(session.self.displayName+"\n("+session.self.username+"@"+session.domain+")");
 			}
-			new AccountSwitcherSheet(getActivity(), true, true, false, accountSession -> {
-				getActivity().finish();
-				getActivity().startActivity(new Intent(getActivity(), MainActivity.class));
-			}).show();
+			new AccountSwitcherSheet(getActivity(), this).show();
 			return true;
 		}
 		if(tab==R.id.tab_search){
@@ -336,7 +316,6 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 	public void onSaveInstanceState(Bundle outState){
 		super.onSaveInstanceState(outState);
 		outState.putInt("selectedTab", currentTab);
-
 		if (homeTabFragment.isAdded()) getChildFragmentManager().putFragment(outState, "homeTabFragment", homeTabFragment);
 		if (searchFragment.isAdded()) getChildFragmentManager().putFragment(outState, "searchFragment", searchFragment);
 		if (notificationsFragment.isAdded()) getChildFragmentManager().putFragment(outState, "notificationsFragment", notificationsFragment);
@@ -345,10 +324,10 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 
 	public void updateNotificationBadge() {
 		AccountSession session = AccountSessionManager.getInstance().getAccount(accountID);
-		Instance instance = AccountSessionManager.getInstance().getInstanceInfo(session.domain);
-		if (instance == null) return;
+		Optional<Instance> instance = session.getInstance();
+		if (instance.isEmpty()) return; // avoiding incompatibility with akkoma
 
-		new GetNotifications(null, 1, EnumSet.allOf(Notification.Type.class), instance != null && instance.pleroma != null)
+		new GetNotifications(null, 1, EnumSet.allOf(Notification.Type.class), instance.get().isAkkoma())
 				.setCallback(new Callback<>() {
 					@Override
 					public void onSuccess(List<Notification> notifications) {
@@ -356,9 +335,6 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 							try {
 								long newestId = Long.parseLong(notifications.get(0).id);
 								long lastSeenId = Long.parseLong(session.markers.notifications.lastReadId);
-								System.out.println("NEWEST: " + newestId);
-								System.out.println("LAST SEEN: " + lastSeenId);
-
 								setNotificationBadge(newestId > lastSeenId);
 							} catch (Exception ignored) {
 								setNotificationBadge(false);
@@ -372,6 +348,7 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 					}
 				}).exec(accountID);
 	}
+
 	public void setNotificationBadge(boolean badge) {
 		notificationTabIcon.setImageResource(badge
 				? R.drawable.ic_fluent_alert_28_selector_badged
@@ -387,4 +364,14 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 	public void onAllNotificationsSeen(AllNotificationsSeenEvent allNotificationsSeenEvent) {
 		setNotificationBadge(false);
 	}
+
+	@Override
+	public String getAccountID() {
+		return accountID;
+	}
+
+	@Override
+	public void onProvideAssistContent(AssistContent assistContent) {
+		callFragmentToProvideAssistContent(fragmentForTab(currentTab), assistContent);
+	}
 }

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

@@ -10,6 +10,7 @@ import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.Fragment;
 import android.app.FragmentTransaction;
+import android.app.assist.AssistContent;
 import android.content.Context;
 import android.os.Build;
 import android.os.Bundle;
@@ -56,6 +57,7 @@ import org.joinmastodon.android.model.TimelineDefinition;
 import org.joinmastodon.android.ui.SimpleViewHolder;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.updater.GithubSelfUpdater;
+import org.joinmastodon.android.utils.ProvidesAssistContent;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -73,7 +75,7 @@ import me.grishka.appkit.fragments.OnBackPressedListener;
 import me.grishka.appkit.utils.CubicBezierInterpolator;
 import me.grishka.appkit.utils.V;
 
-public class HomeTabFragment extends MastodonToolbarFragment implements ScrollableToTop, OnBackPressedListener, DomainDisplay, HasFab {
+public class HomeTabFragment extends MastodonToolbarFragment implements ScrollableToTop, OnBackPressedListener, HasFab, ProvidesAssistContent {
 	private static final int ANNOUNCEMENTS_RESULT = 654;
 
 	private String accountID;
@@ -108,7 +110,7 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab
 		super.onCreate(savedInstanceState);
 		E.register(this);
 		accountID = getArguments().getString("account");
-		timelineDefinitions = GlobalUserPreferences.pinnedTimelines.getOrDefault(accountID, TimelineDefinition.DEFAULT_TIMELINES);
+		timelineDefinitions = GlobalUserPreferences.pinnedTimelines.getOrDefault(accountID, TimelineDefinition.getDefaultTimelines(accountID));
 		assert timelineDefinitions != null;
 		if (timelineDefinitions.size() == 0) timelineDefinitions = List.of(TimelineDefinition.HOME_TIMELINE);
 		count = timelineDefinitions.size();
@@ -209,10 +211,6 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab
 				if (fragments[position] instanceof BaseRecyclerFragment<?> page){
 					if(!page.loaded && !page.isDataLoading()) page.loadData();
 				}
-
-				//update recent app list url
-				if (fragments[position] instanceof DomainDisplay page)
-					DomainManager.getInstance().setCurrentDomain(page.getDomain());
 			}
 		});
 
@@ -297,14 +295,6 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab
 		}).exec(accountID);
 	}
 
-	@Override
-	public String getDomain() {
-		if (fragments[pager.getCurrentItem()] instanceof DomainDisplay page) {
-			return page.getDomain();
-		}
-		return DomainDisplay.super.getDomain();
-	}
-
 	private void onFabClick(View v){
 		if (fragments[pager.getCurrentItem()] instanceof BaseStatusListFragment<?> l) {
 			l.onFabClick(v);
@@ -722,6 +712,11 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab
 		return fab;
 	}
 
+	@Override
+	public void onProvideAssistContent(AssistContent assistContent) {
+		callFragmentToProvideAssistContent(fragments[pager.getCurrentItem()], assistContent);
+	}
+
 	private class HomePagerAdapter extends RecyclerView.Adapter<SimpleViewHolder> {
 		@NonNull
 		@Override

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

@@ -1,6 +1,7 @@
 package org.joinmastodon.android.fragments;
 
 import android.app.Activity;
+import android.net.Uri;
 import android.os.Bundle;
 import android.view.View;
 
@@ -291,4 +292,9 @@ public class HomeTimelineFragment extends StatusListFragment {
 	protected Filter.FilterContext getFilterContext() {
 		return Filter.FilterContext.HOME;
 	}
+
+	@Override
+	public Uri getWebUri(Uri.Builder base) {
+		return base.path("/").build();
+	}
 }

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

@@ -1,13 +1,13 @@
 package org.joinmastodon.android.fragments;
 
 import android.app.Activity;
+import android.net.Uri;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ImageButton;
 
 import androidx.annotation.Nullable;
 
@@ -168,4 +168,9 @@ public class ListTimelineFragment extends PinnableStatusListFragment {
     protected Filter.FilterContext getFilterContext() {
         return Filter.FilterContext.HOME;
     }
+
+    @Override
+    public Uri getWebUri(Uri.Builder base) {
+        return base.path("/lists/" + listID).build();
+    }
 }

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

@@ -1,263 +0,0 @@
-package org.joinmastodon.android.fragments;
-
-import android.os.Bundle;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.CheckBox;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.squareup.otto.Subscribe;
-
-import org.joinmastodon.android.E;
-import org.joinmastodon.android.R;
-import org.joinmastodon.android.api.MastodonAPIRequest;
-import org.joinmastodon.android.api.requests.lists.AddAccountsToList;
-import org.joinmastodon.android.api.requests.lists.CreateList;
-import org.joinmastodon.android.api.requests.lists.GetLists;
-import org.joinmastodon.android.api.requests.lists.RemoveAccountsFromList;
-import org.joinmastodon.android.events.ListDeletedEvent;
-import org.joinmastodon.android.events.ListUpdatedCreatedEvent;
-import org.joinmastodon.android.model.ListTimeline;
-import org.joinmastodon.android.ui.DividerItemDecoration;
-import org.joinmastodon.android.ui.M3AlertDialogBuilder;
-import org.joinmastodon.android.ui.views.ListTimelineEditor;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-
-import me.grishka.appkit.Nav;
-import me.grishka.appkit.api.Callback;
-import me.grishka.appkit.api.ErrorResponse;
-import me.grishka.appkit.api.SimpleCallback;
-import me.grishka.appkit.utils.BindableViewHolder;
-import me.grishka.appkit.views.UsableRecyclerView;
-
-public class ListTimelinesFragment extends RecyclerFragment<ListTimeline> implements ScrollableToTop {
-	private String accountId;
-	private String profileAccountId;
-	private final HashMap<String, Boolean> userInListBefore = new HashMap<>();
-	private final HashMap<String, Boolean> userInList = new HashMap<>();
-	private ListsAdapter adapter;
-
-	public ListTimelinesFragment() {
-		 super(10);
-	}
-
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-		 super.onCreate(savedInstanceState);
-		 Bundle args=getArguments();
-		 accountId=args.getString("account");
-		 setHasOptionsMenu(true);
-		 E.register(this);
-
-		 if(args.containsKey("profileAccount")){
-				profileAccountId=args.getString("profileAccount");
-				String profileDisplayUsername = args.getString("profileDisplayUsername");
-				setTitle(getString(R.string.sk_lists_with_user, profileDisplayUsername));
-		 } else {
-				setTitle(R.string.sk_your_lists);
-		 }
-	}
-
-	@Override
-	protected void onShown(){
-		 super.onShown();
-		 if(!getArguments().getBoolean("noAutoLoad") && !loaded && !dataLoading)
-				loadData();
-	}
-
-	@Override
-	public void onViewCreated(View view, Bundle savedInstanceState) {
-		 super.onViewCreated(view, savedInstanceState);
-		 list.addItemDecoration(new DividerItemDecoration(getActivity(), R.attr.colorPollVoted, 0.5f, 56, 16));
-	}
-
-	@Override
-	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-		 inflater.inflate(R.menu.menu_list, menu);
-	}
-
-	@Override
-	public boolean onOptionsItemSelected(MenuItem item) {
-		 if (item.getItemId() == R.id.create) {
-				ListTimelineEditor editor = new ListTimelineEditor(getContext());
-				new M3AlertDialogBuilder(getActivity())
-						 .setTitle(R.string.sk_create_list_title)
-						 .setIcon(R.drawable.ic_fluent_people_add_28_regular)
-						 .setView(editor)
-						 .setPositiveButton(R.string.sk_create, (d, which) ->
-									new CreateList(editor.getTitle(), editor.getRepliesPolicy()).setCallback(new Callback<>() {
-										 @Override
-										 public void onSuccess(ListTimeline list) {
-												data.add(0, list);
-												adapter.notifyItemRangeInserted(0, 1);
-												E.post(new ListUpdatedCreatedEvent(list.id, list.title, list.repliesPolicy));
-										 }
-
-										 @Override
-										 public void onError(ErrorResponse error) {
-												error.showToast(getContext());
-										 }
-									}).exec(accountId)
-						 )
-						 .setNegativeButton(R.string.cancel, (d, which) -> {})
-						 .show();
-		 }
-		 return true;
-	}
-
-	private void saveListMembership(String listId, boolean isMember) {
-		 userInList.put(listId, isMember);
-		 List<String> accountIdList = Collections.singletonList(profileAccountId);
-		 MastodonAPIRequest<Object> req = isMember ? new AddAccountsToList(listId, accountIdList) : new RemoveAccountsFromList(listId, accountIdList);
-		 req.setCallback(new Callback<>() {
-			 @Override
-			 public void onSuccess(Object o) {}
-
-			 @Override
-			 public void onError(ErrorResponse error) {
-				error.showToast(getContext());
-			 }
-		 }).exec(accountId);
-	}
-
-	@Override
-	protected void doLoadData(int offset, int count){
-		 userInListBefore.clear();
-		 userInList.clear();
-		 currentRequest=(profileAccountId != null ? new GetLists(profileAccountId) : new GetLists())
-					.setCallback(new SimpleCallback<>(this) {
-						 @Override
-						 public void onSuccess(List<ListTimeline> lists) {
-								if (getActivity() == null) return;
-								for (ListTimeline l : lists) userInListBefore.put(l.id, true);
-								userInList.putAll(userInListBefore);
-								if (profileAccountId == null || !lists.isEmpty()) onDataLoaded(lists, false);
-								if (profileAccountId == null) return;
-
-								currentRequest=new GetLists().setCallback(new SimpleCallback<>(ListTimelinesFragment.this) {
-									@Override
-									public void onSuccess(List<ListTimeline> allLists) {
-										if (getActivity() == null) return;
-										List<ListTimeline> newLists = new ArrayList<>();
-										for (ListTimeline l : allLists) {
-											if (lists.stream().noneMatch(e -> e.id.equals(l.id))) newLists.add(l);
-											if (!userInListBefore.containsKey(l.id)) {
-													userInListBefore.put(l.id, false);
-											}
-										}
-										userInList.putAll(userInListBefore);
-										onDataLoaded(newLists, false);
-									}
-								}).exec(accountId);
-						 }
-					})
-					.exec(accountId);
-	}
-
-	@Subscribe
-	public void onListDeletedEvent(ListDeletedEvent event) {
-		for (int i = 0; i < data.size(); i++) {
-			ListTimeline item = data.get(i);
-			if (item.id.equals(event.id)) {
-				data.remove(i);
-				adapter.notifyItemRemoved(i);
-				break;
-			}
-		}
-	}
-
-	@Subscribe
-	public void onListUpdatedCreatedEvent(ListUpdatedCreatedEvent event) {
-		for (int i = 0; i < data.size(); i++) {
-			ListTimeline item = data.get(i);
-			if (item.id.equals(event.id)) {
-				item.title = event.title;
-				item.repliesPolicy = event.repliesPolicy;
-				adapter.notifyItemChanged(i);
-				break;
-			}
-		}
-	}
-
-	@Override
-	protected RecyclerView.Adapter<ListViewHolder> getAdapter() {
-		 return adapter = new ListsAdapter();
-	}
-
-	@Override
-	public void scrollToTop() {
-		 smoothScrollRecyclerViewToTop(list);
-	}
-
-	@Override
-	public boolean isScrolledToTop() {
-		return list.getChildAt(0).getTop() == 0;
-	}
-
-	private class ListsAdapter extends RecyclerView.Adapter<ListViewHolder>{
-		 @NonNull
-		 @Override
-		 public ListViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType){
-				return new ListViewHolder();
-		 }
-
-		 @Override
-		 public void onBindViewHolder(@NonNull ListViewHolder holder, int position) {
-				holder.bind(data.get(position));
-		 }
-
-		 @Override
-		 public int getItemCount() {
-				return data.size();
-		 }
-	}
-
-	private class ListViewHolder extends BindableViewHolder<ListTimeline> implements UsableRecyclerView.Clickable{
-		 private final TextView title;
-		 private final CheckBox listToggle;
-
-		 public ListViewHolder(){
-				super(getActivity(), R.layout.item_text, list);
-				title=findViewById(R.id.title);
-				listToggle=findViewById(R.id.list_toggle);
-		 }
-
-		 @Override
-		 public void onBind(ListTimeline item) {
-				title.setText(item.title);
-				title.setCompoundDrawablesRelativeWithIntrinsicBounds(itemView.getContext().getDrawable(R.drawable.ic_fluent_people_24_regular), null, null, null);
-				if (profileAccountId != null) {
-					Boolean checked = userInList.get(item.id);
-					listToggle.setVisibility(View.VISIBLE);
-					listToggle.setChecked(userInList.containsKey(item.id) && checked != null && checked);
-					listToggle.setOnClickListener(this::onClickToggle);
-				} else {
-					listToggle.setVisibility(View.GONE);
-				}
-		 }
-
-		 private void onClickToggle(View view) {
-				saveListMembership(item.id, listToggle.isChecked());
-		 }
-
-		 @Override
-		 public void onClick() {
-				Bundle args=new Bundle();
-				args.putString("account", accountId);
-				args.putString("listID", item.id);
-				args.putString("listTitle", item.title);
-				if (item.repliesPolicy != null) args.putInt("repliesPolicy", item.repliesPolicy.ordinal());
-				Nav.go(getActivity(), ListTimelineFragment.class, args);
-		 }
-	}
-}

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

@@ -0,0 +1,270 @@
+package org.joinmastodon.android.fragments;
+
+import android.net.Uri;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.CheckBox;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.squareup.otto.Subscribe;
+
+import org.joinmastodon.android.E;
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.api.requests.lists.AddAccountsToList;
+import org.joinmastodon.android.api.requests.lists.CreateList;
+import org.joinmastodon.android.api.requests.lists.GetLists;
+import org.joinmastodon.android.api.requests.lists.RemoveAccountsFromList;
+import org.joinmastodon.android.events.ListDeletedEvent;
+import org.joinmastodon.android.events.ListUpdatedCreatedEvent;
+import org.joinmastodon.android.model.ListTimeline;
+import org.joinmastodon.android.ui.DividerItemDecoration;
+import org.joinmastodon.android.ui.M3AlertDialogBuilder;
+import org.joinmastodon.android.ui.views.ListTimelineEditor;
+import org.joinmastodon.android.utils.ProvidesAssistContent;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+
+import me.grishka.appkit.Nav;
+import me.grishka.appkit.api.Callback;
+import me.grishka.appkit.api.ErrorResponse;
+import me.grishka.appkit.api.SimpleCallback;
+import me.grishka.appkit.utils.BindableViewHolder;
+import me.grishka.appkit.views.UsableRecyclerView;
+
+public class ListsFragment extends RecyclerFragment<ListTimeline> implements ScrollableToTop, ProvidesAssistContent.ProvidesWebUri {
+	private String accountID;
+	private String profileAccountId;
+	private final HashMap<String, Boolean> userInListBefore = new HashMap<>();
+	private final HashMap<String, Boolean> userInList = new HashMap<>();
+	private ListsAdapter adapter;
+
+	public ListsFragment() {
+		super(10);
+	}
+
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		Bundle args = getArguments();
+		accountID = args.getString("account");
+		setHasOptionsMenu(true);
+		E.register(this);
+
+		if(args.containsKey("profileAccount")){
+			profileAccountId=args.getString("profileAccount");
+			String profileDisplayUsername = args.getString("profileDisplayUsername");
+			setTitle(getString(R.string.sk_lists_with_user, profileDisplayUsername));
+		} else {
+			setTitle(R.string.sk_your_lists);
+		}
+	}
+
+	@Override
+	protected void onShown(){
+		super.onShown();
+		if(!getArguments().getBoolean("noAutoLoad") && !loaded && !dataLoading)
+			loadData();
+	}
+
+	@Override
+	public void onViewCreated(View view, Bundle savedInstanceState) {
+		super.onViewCreated(view, savedInstanceState);
+		list.addItemDecoration(new DividerItemDecoration(getActivity(), R.attr.colorPollVoted, 0.5f, 56, 16));
+	}
+
+	@Override
+	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+		inflater.inflate(R.menu.menu_list, menu);
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		if (item.getItemId() == R.id.create) {
+			ListTimelineEditor editor = new ListTimelineEditor(getContext());
+			new M3AlertDialogBuilder(getActivity())
+					.setTitle(R.string.sk_create_list_title)
+					.setIcon(R.drawable.ic_fluent_people_add_28_regular)
+					.setView(editor)
+					.setPositiveButton(R.string.sk_create, (d, which) ->
+							new CreateList(editor.getTitle(), editor.getRepliesPolicy()).setCallback(new Callback<>() {
+								@Override
+								public void onSuccess(ListTimeline list) {
+									data.add(0, list);
+									adapter.notifyItemRangeInserted(0, 1);
+									E.post(new ListUpdatedCreatedEvent(list.id, list.title, list.repliesPolicy));
+								}
+
+								@Override
+								public void onError(ErrorResponse error) {
+									error.showToast(getContext());
+								}
+							}).exec(accountID)
+					)
+					.setNegativeButton(R.string.cancel, (d, which) -> {})
+					.show();
+		}
+		return true;
+	}
+
+	private void saveListMembership(String listId, boolean isMember) {
+		userInList.put(listId, isMember);
+		List<String> accountIdList = Collections.singletonList(profileAccountId);
+		MastodonAPIRequest<Object> req = isMember ? new AddAccountsToList(listId, accountIdList) : new RemoveAccountsFromList(listId, accountIdList);
+		req.setCallback(new Callback<>() {
+			@Override
+			public void onSuccess(Object o) {}
+
+			@Override
+			public void onError(ErrorResponse error) {
+				error.showToast(getContext());
+			}
+		}).exec(accountID);
+	}
+
+	@Override
+	protected void doLoadData(int offset, int count){
+		userInListBefore.clear();
+		userInList.clear();
+		currentRequest=(profileAccountId != null ? new GetLists(profileAccountId) : new GetLists())
+				.setCallback(new SimpleCallback<>(this) {
+					@Override
+					public void onSuccess(List<ListTimeline> lists) {
+						if (getActivity() == null) return;
+						for (ListTimeline l : lists) userInListBefore.put(l.id, true);
+						userInList.putAll(userInListBefore);
+						if (profileAccountId == null || !lists.isEmpty()) onDataLoaded(lists, false);
+						if (profileAccountId == null) return;
+
+						currentRequest=new GetLists().setCallback(new SimpleCallback<>(ListsFragment.this) {
+							@Override
+							public void onSuccess(List<ListTimeline> allLists) {
+								if (getActivity() == null) return;
+								List<ListTimeline> newLists = new ArrayList<>();
+								for (ListTimeline l : allLists) {
+									if (lists.stream().noneMatch(e -> e.id.equals(l.id))) newLists.add(l);
+									if (!userInListBefore.containsKey(l.id)) {
+										userInListBefore.put(l.id, false);
+									}
+								}
+								userInList.putAll(userInListBefore);
+								onDataLoaded(newLists, false);
+							}
+						}).exec(accountID);
+					}
+				})
+				.exec(accountID);
+	}
+
+	@Subscribe
+	public void onListDeletedEvent(ListDeletedEvent event) {
+		for (int i = 0; i < data.size(); i++) {
+			ListTimeline item = data.get(i);
+			if (item.id.equals(event.id)) {
+				data.remove(i);
+				adapter.notifyItemRemoved(i);
+				break;
+			}
+		}
+	}
+
+	@Subscribe
+	public void onListUpdatedCreatedEvent(ListUpdatedCreatedEvent event) {
+		for (int i = 0; i < data.size(); i++) {
+			ListTimeline item = data.get(i);
+			if (item.id.equals(event.id)) {
+				item.title = event.title;
+				item.repliesPolicy = event.repliesPolicy;
+				adapter.notifyItemChanged(i);
+				break;
+			}
+		}
+	}
+
+	@Override
+	protected RecyclerView.Adapter<ListViewHolder> getAdapter() {
+		return adapter = new ListsAdapter();
+	}
+
+	@Override
+	public void scrollToTop() {
+		smoothScrollRecyclerViewToTop(list);
+	}
+
+	@Override
+	public String getAccountID() {
+		return accountID;
+	}
+
+	@Override
+	public Uri getWebUri(Uri.Builder base) {
+		return base.path("/lists").build();
+	}
+
+	private class ListsAdapter extends RecyclerView.Adapter<ListViewHolder>{
+		@NonNull
+		@Override
+		public ListViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType){
+			return new ListViewHolder();
+		}
+
+		@Override
+		public void onBindViewHolder(@NonNull ListViewHolder holder, int position) {
+			holder.bind(data.get(position));
+		}
+
+		@Override
+		public int getItemCount() {
+			return data.size();
+		}
+	}
+
+	private class ListViewHolder extends BindableViewHolder<ListTimeline> implements UsableRecyclerView.Clickable{
+		private final TextView title;
+		private final CheckBox listToggle;
+
+		public ListViewHolder(){
+			super(getActivity(), R.layout.item_text, list);
+			title=findViewById(R.id.title);
+			listToggle=findViewById(R.id.list_toggle);
+		}
+
+		@Override
+		public void onBind(ListTimeline item) {
+			title.setText(item.title);
+			title.setCompoundDrawablesRelativeWithIntrinsicBounds(itemView.getContext().getDrawable(R.drawable.ic_fluent_people_24_regular), null, null, null);
+			if (profileAccountId != null) {
+				Boolean checked = userInList.get(item.id);
+				listToggle.setVisibility(View.VISIBLE);
+				listToggle.setChecked(userInList.containsKey(item.id) && checked != null && checked);
+				listToggle.setOnClickListener(this::onClickToggle);
+			} else {
+				listToggle.setVisibility(View.GONE);
+			}
+		}
+
+		private void onClickToggle(View view) {
+			saveListMembership(item.id, listToggle.isChecked());
+		}
+
+		@Override
+		public void onClick() {
+			Bundle args=new Bundle();
+			args.putString("account", accountID);
+			args.putString("listID", item.id);
+			args.putString("listTitle", item.title);
+			if (item.repliesPolicy != null) args.putInt("repliesPolicy", item.repliesPolicy.ordinal());
+			Nav.go(getActivity(), ListTimelineFragment.class, args);
+		}
+	}
+}

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

@@ -2,6 +2,7 @@ package org.joinmastodon.android.fragments;
 
 import android.app.Activity;
 import android.app.Fragment;
+import android.app.assist.AssistContent;
 import android.os.Build;
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -13,6 +14,12 @@ import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.viewpager2.widget.ViewPager2;
+
+import com.squareup.otto.Subscribe;
+
 import org.joinmastodon.android.E;
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
@@ -24,12 +31,7 @@ import org.joinmastodon.android.ui.SimpleViewHolder;
 import org.joinmastodon.android.ui.tabs.TabLayout;
 import org.joinmastodon.android.ui.tabs.TabLayoutMediator;
 import org.joinmastodon.android.ui.utils.UiUtils;
-
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.viewpager2.widget.ViewPager2;
-
-import com.squareup.otto.Subscribe;
+import org.joinmastodon.android.utils.ProvidesAssistContent;
 
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.Callback;
@@ -37,7 +39,7 @@ import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.fragments.BaseRecyclerFragment;
 import me.grishka.appkit.utils.V;
 
-public class NotificationsFragment extends MastodonToolbarFragment implements ScrollableToTop, DomainDisplay{
+public class NotificationsFragment extends MastodonToolbarFragment implements ScrollableToTop, ProvidesAssistContent {
 
 	private TabLayout tabLayout;
 	private ViewPager2 pager;
@@ -47,12 +49,6 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
 	private NotificationsListFragment allNotificationsFragment, mentionsFragment, postsFragment;
 
 	private String accountID;
-
-	@Override
-	public String getDomain() {
-		return DomainDisplay.super.getDomain() + "/notifications";
-	}
-
 	@Override
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
@@ -107,6 +103,7 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
 
 		tabLayout=view.findViewById(R.id.tabbar);
 		pager=view.findViewById(R.id.pager);
+		UiUtils.reduceSwipeSensitivity(pager);
 
 		tabViews=new FrameLayout[3];
 		for(int i=0;i<tabViews.length;i++){
@@ -124,6 +121,18 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
 
 		tabLayout.setTabTextSize(V.dp(16));
 		tabLayout.setTabTextColors(UiUtils.getThemeColor(getActivity(), R.attr.colorTabInactive), UiUtils.getThemeColor(getActivity(), android.R.attr.textColorPrimary));
+		tabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
+			@Override
+			public void onTabSelected(TabLayout.Tab tab) {}
+
+			@Override
+			public void onTabUnselected(TabLayout.Tab tab) {}
+
+			@Override
+			public void onTabReselected(TabLayout.Tab tab) {
+				scrollToTop();
+			}
+		});
 
 		pager.setOffscreenPageLimit(4);
 		pager.setUserInputEnabled(!GlobalUserPreferences.disableSwipe);
@@ -145,20 +154,17 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
 			Bundle args=new Bundle();
 			args.putString("account", accountID);
 			args.putBoolean("__is_tab", true);
-			args.putBoolean("noAutoLoad", true);
 
 			allNotificationsFragment=new NotificationsListFragment();
 			allNotificationsFragment.setArguments(args);
 
 			args=new Bundle(args);
 			args.putBoolean("onlyMentions", true);
-			args.putBoolean("noAutoLoad", true);
 			mentionsFragment=new NotificationsListFragment();
 			mentionsFragment.setArguments(args);
 
 			args=new Bundle(args);
 			args.putBoolean("onlyPosts", true);
-			args.putBoolean("noAutoLoad", true);
 			postsFragment=new NotificationsListFragment();
 			postsFragment.setArguments(args);
 
@@ -190,6 +196,7 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
 		new GetFollowRequests(null, 1).setCallback(new Callback<>() {
 			@Override
 			public void onSuccess(HeaderPaginationList<Account> accounts) {
+				if (getActivity() == null) return;
 				getToolbar().getMenu().findItem(R.id.follow_requests).setVisible(!accounts.isEmpty());
 			}
 
@@ -228,6 +235,7 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
 	protected void updateToolbar(){
 		super.updateToolbar();
 		getToolbar().setOutlineProvider(null);
+		getToolbar().setOnClickListener(v->scrollToTop());
 	}
 
 	private NotificationsListFragment getFragmentForPage(int page){
@@ -239,6 +247,11 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
 		};
 	}
 
+	@Override
+	public void onProvideAssistContent(AssistContent assistContent) {
+		callFragmentToProvideAssistContent(getFragmentForPage(pager.getCurrentItem()), assistContent);
+	}
+
 	private class DiscoverPagerAdapter extends RecyclerView.Adapter<SimpleViewHolder>{
 		@NonNull
 		@Override
@@ -263,4 +276,4 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
 			return position;
 		}
 	}
-}
+}

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

@@ -1,6 +1,7 @@
 package org.joinmastodon.android.fragments;
 
 import android.app.Activity;
+import android.net.Uri;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.View;
@@ -10,6 +11,7 @@ import com.squareup.otto.Subscribe;
 import org.joinmastodon.android.E;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.markers.SaveMarkers;
+import org.joinmastodon.android.api.requests.notifications.PleromaMarkNotificationsRead;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.events.AllNotificationsSeenEvent;
 import org.joinmastodon.android.events.PollUpdatedEvent;
@@ -18,6 +20,8 @@ import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.CacheablePaginatedResponse;
 import org.joinmastodon.android.model.Emoji;
 import org.joinmastodon.android.model.Filter;
+import org.joinmastodon.android.model.Instance;
+import org.joinmastodon.android.model.Markers;
 import org.joinmastodon.android.model.Notification;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.displayitems.AccountCardStatusDisplayItem;
@@ -53,11 +57,6 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 		return false;
 	}
 
-	@Override
-	public String getDomain() {
-		return super.getDomain() + "/notifications";
-	}
-
 	@Override
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
@@ -156,13 +155,17 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 						loadRelationships(needRelationships);
 						maxID=result.maxID;
 
-						if(offset == 0 && !result.items.isEmpty() && !result.isFromCache() && AccountSessionManager.getInstance().getAccount(accountID).markers != null && AccountSessionManager.getInstance().getAccount(accountID).markers.notifications != null){
+						Markers markers = AccountSessionManager.getInstance().getAccount(accountID).markers;
+						if(offset==0 && !result.items.isEmpty() && !result.isFromCache() && markers != null && markers.notifications != null){
 							E.post(new AllNotificationsSeenEvent());
 							new SaveMarkers(null, result.items.get(0).id).exec(accountID);
-							if (AccountSessionManager.getInstance().getAccount(accountID).markers != null)
-								AccountSessionManager.getInstance().getAccount(accountID).markers
-										.notifications.lastReadId = result.items.get(0).id;
+							AccountSessionManager.getInstance().getAccount(accountID).markers
+									.notifications.lastReadId = result.items.get(0).id;
 							AccountSessionManager.getInstance().writeAccountsFile();
+
+							if (isInstanceAkkoma()) {
+								new PleromaMarkNotificationsRead(result.items.get(0).id).exec(accountID);
+							}
 						}
 					}
 				});
@@ -182,11 +185,8 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 	@Override
 	protected void onShown(){
 		super.onShown();
-		if(!getArguments().getBoolean("noAutoLoad") && !loaded && !dataLoading){
-			refreshing=true;
-			loadData();
-		}
-
+//		if(!getArguments().getBoolean("noAutoLoad") && !loaded && !dataLoading)
+//			loadData();
 	}
 
 	@Override
@@ -272,4 +272,11 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 		displayItems.subList(index, lastIndex).clear();
 		adapter.notifyItemRangeRemoved(index, lastIndex-index);
 	}
+
+	@Override
+	public Uri getWebUri(Uri.Builder base) {
+		return base.path(isInstanceAkkoma()
+				? "/users/" + getSession().self.username + "/interactions"
+				: "/notifications").build();
+	}
 }

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

@@ -21,7 +21,7 @@ public abstract class PinnableStatusListFragment extends StatusListFragment impl
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        pinnedTimelines = new ArrayList<>(GlobalUserPreferences.pinnedTimelines.getOrDefault(accountID, TimelineDefinition.DEFAULT_TIMELINES));
+        pinnedTimelines = new ArrayList<>(GlobalUserPreferences.pinnedTimelines.getOrDefault(accountID, TimelineDefinition.getDefaultTimelines(accountID)));
     }
 
     @Override

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

@@ -6,6 +6,7 @@ import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
 import android.app.Activity;
 import android.app.Fragment;
+import android.app.assist.AssistContent;
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.graphics.Color;
@@ -67,6 +68,7 @@ import org.joinmastodon.android.fragments.report.ReportReasonChoiceFragment;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.AccountField;
 import org.joinmastodon.android.model.Attachment;
+import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.model.Relationship;
 import org.joinmastodon.android.ui.BetterItemAnimator;
 import org.joinmastodon.android.ui.SimpleViewHolder;
@@ -83,6 +85,7 @@ import org.joinmastodon.android.ui.views.CoverImageView;
 import org.joinmastodon.android.ui.views.LinkedTextView;
 import org.joinmastodon.android.ui.views.NestedRecyclerScrollView;
 import org.joinmastodon.android.ui.views.ProgressBarButton;
+import org.joinmastodon.android.utils.ProvidesAssistContent;
 import org.parceler.Parcels;
 
 import java.time.LocalDateTime;
@@ -93,9 +96,13 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.ItemTouchHelper;
 import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import androidx.viewpager2.widget.ViewPager2;
 
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.Callback;
@@ -116,7 +123,7 @@ import me.grishka.appkit.utils.CubicBezierInterpolator;
 import me.grishka.appkit.utils.V;
 import me.grishka.appkit.views.UsableRecyclerView;
 
-public class ProfileFragment extends LoaderFragment implements OnBackPressedListener, ScrollableToTop, HasFab{
+public class ProfileFragment extends LoaderFragment implements OnBackPressedListener, ScrollableToTop, HasFab, ProvidesAssistContent.ProvidesWebUri {
 	private static final int AVATAR_RESULT=722;
 	private static final int COVER_RESULT=343;
 
@@ -146,6 +153,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 	private String note;
 	private Account account;
 	private String accountID;
+	private String domain;
 	private Relationship relationship;
 	private int statusBarHeight;
 	private boolean isOwnProfile;
@@ -160,7 +168,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 	private PhotoViewer currentPhotoViewer;
 	private boolean editModeLoading;
 
-	private static final int MAX_FIELDS=4;
+	private int maxFields = 4;
 
 	// from ProfileAboutFragment
 	public UsableRecyclerView list;
@@ -181,6 +189,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			setRetainInstance(true);
 
 		accountID=getArguments().getString("account");
+		domain=AccountSessionManager.getInstance().getAccount(accountID).domain;
 		if(getArguments().containsKey("profileAccount")){
 			account=Parcels.unwrap(getArguments().getParcelable("profileAccount"));
 			profileAccountID=account.id;
@@ -188,6 +197,8 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			loaded=true;
 			if(!isOwnProfile)
 				loadRelationship();
+			else if (isInstanceAkkoma() && getInstance().isPresent())
+				maxFields = getInstance().get().pleroma.metadata.fieldsLimits.maxFields;
 		}else{
 			profileAccountID=getArguments().getString("profileAccountID");
 			if(!getArguments().getBoolean("noAutoLoad", false))
@@ -206,14 +217,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		setHasOptionsMenu(true);
 	}
 
-	@Override
-	public void onHiddenChanged(boolean hidden) {
-		super.onHiddenChanged(hidden);
-		if (!hidden) {
-			DomainManager.getInstance().setCurrentDomain(account.url);
-		}
-	}
-
 	@Override
 	public View onCreateContentView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState){
 		View content=inflater.inflate(R.layout.fragment_profile, container, false);
@@ -396,7 +399,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		username.setOnLongClickListener(v->{
 			String usernameString=account.acct;
 			if(!usernameString.contains("@")){
-				usernameString+="@"+AccountSessionManager.getInstance().getAccount(accountID).domain;
+				usernameString+="@"+domain;
 			}
 			UiUtils.copyText(username, '@'+usernameString);
 			return true;
@@ -469,11 +472,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 
 	@Override
 	public void onRefresh(){
-		if(isInEditMode){
-			refreshing=false;
-			refreshLayout.setRefreshing(false);
-			return;
-		}
 		if(refreshing)
 			return;
 		refreshing=true;
@@ -577,12 +575,8 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 	private void bindHeaderView(){
 		setTitle(account.displayName);
 		setSubtitle(getResources().getQuantityString(R.plurals.x_posts, (int)(account.statusesCount%1000), account.statusesCount));
-		if((GlobalUserPreferences.playGifs ? account.avatar : account.avatarStatic) != null){
-			ViewImageLoader.load(avatar, null, new UrlImageLoaderRequest(GlobalUserPreferences.playGifs ? account.avatar : account.avatarStatic, V.dp(100), V.dp(100)));
-		}
-		if((GlobalUserPreferences.playGifs ? account.header : account.headerStatic) != null) {
-			ViewImageLoader.load(cover, null, new UrlImageLoaderRequest(GlobalUserPreferences.playGifs ? account.header : account.headerStatic, 1000, 1000));
-		}
+		ViewImageLoader.load(avatar, null, new UrlImageLoaderRequest(GlobalUserPreferences.playGifs ? account.avatar : account.avatarStatic, V.dp(100), V.dp(100)));
+		ViewImageLoader.load(cover, null, new UrlImageLoaderRequest(GlobalUserPreferences.playGifs ? account.header : account.headerStatic, 1000, 1000));
 		SpannableStringBuilder ssb=new SpannableStringBuilder(account.displayName);
 		HtmlParser.parseCustomEmoji(ssb, account.emojis);
 		name.setText(ssb);
@@ -610,7 +604,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			ssb.append(account.acct);
 			if(isSelf){
 				ssb.append('@');
-				ssb.append(AccountSessionManager.getInstance().getAccount(accountID).domain);
+				ssb.append(domain);
 			}
 			ssb.append(" ");
 			Drawable lock=username.getResources().getDrawable(R.drawable.ic_lock, getActivity().getTheme()).mutate();
@@ -633,7 +627,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			username.setText(ssb);
 		}else{
 			// noinspection SetTextI18n
-			username.setText('@'+account.acct+(isSelf ? ('@'+AccountSessionManager.getInstance().getAccount(accountID).domain) : ""));
+			username.setText('@'+account.acct+(isSelf ? ('@'+domain) : ""));
 		}
 		CharSequence parsedBio = null;
 		if(account.note != null){
@@ -645,8 +639,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			bio.setVisibility(View.VISIBLE);
 			bio.setText(parsedBio);
 		}
-
-
 		followersCount.setText(UiUtils.abbreviateNumber(account.followersCount));
 		followingCount.setText(UiUtils.abbreviateNumber(account.followingCount));
 		postsCount.setText(UiUtils.abbreviateNumber(account.statusesCount));
@@ -825,7 +817,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 				args.putString("profileAccount", profileAccountID);
 				args.putString("profileDisplayUsername", account.getDisplayUsername());
 			}
-			Nav.go(getActivity(), ListTimelinesFragment.class, args);
+			Nav.go(getActivity(), ListsFragment.class, args);
 		}else if(id==R.id.followed_hashtags){
 			Bundle args=new Bundle();
 			args.putString("account", accountID);
@@ -878,7 +870,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 //			aboutFragment.setNote(relationship.note, accountID, profileAccountID);
 		}
 		notifyButton.setContentDescription(getString(relationship.notifying ? R.string.sk_user_post_notifications_on : R.string.sk_user_post_notifications_off, '@'+account.username));
-		DomainManager.getInstance().setCurrentDomain(account.url);
 	}
 
 	public ImageButton getFab() {
@@ -1215,11 +1206,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		scrollView.smoothScrollTo(0, 0);
 	}
 
-	@Override
-	public boolean isScrolledToTop() {
-		return list.getChildAt(0).getTop() == 0;
-	}
-
 	private void onFollowersOrFollowingClick(View v){
 		Bundle args=new Bundle();
 		args.putString("account", accountID);
@@ -1284,6 +1270,21 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		if (adapter != null) adapter.notifyDataSetChanged();
 	}
 
+	@Override
+	public void onProvideAssistContent(AssistContent assistContent) {
+		callFragmentToProvideAssistContent(getFragmentForPage(pager.getCurrentItem()), assistContent);
+	}
+
+	@Override
+	public String getAccountID() {
+		return accountID;
+	}
+
+	@Override
+	public Uri getWebUri(Uri.Builder base) {
+		return Uri.parse(account.url);
+	}
+
 	private class MetadataAdapter extends UsableRecyclerView.Adapter<BaseViewHolder> implements ImageLoaderRecyclerAdapter {
 		public MetadataAdapter(){
 			super(imgLoader);
@@ -1314,7 +1315,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		public int getItemCount(){
 			if(isInEditMode){
 				int size=metadataListData.size();
-				if(size<MAX_FIELDS)
+				if(size<maxFields)
 					size++;
 				return size;
 			}
@@ -1448,7 +1449,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		@Override
 		public void onClick(){
 			metadataListData.add(new AccountField());
-			if(metadataListData.size()==MAX_FIELDS){ // replace this row with new row
+			if(metadataListData.size()==maxFields){ // replace this row with new row
 				adapter.notifyItemChanged(metadataListData.size()-1);
 			}else{
 				adapter.notifyItemInserted(metadataListData.size()-1);

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

@@ -1,6 +1,7 @@
 package org.joinmastodon.android.fragments;
 
 import android.app.Activity;
+import android.net.Uri;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.ImageButton;
@@ -182,4 +183,10 @@ public class ScheduledStatusListFragment extends BaseStatusListFragment<Schedule
 		}
 		return null;
 	}
+
+	@Override
+	public Uri getWebUri(Uri.Builder base) {
+		// TODO: adapt when frontends finally implement a scheduled posts list
+		return null;
+	}
 }

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

@@ -1,6 +1,7 @@
 package org.joinmastodon.android.fragments;
 
 import android.app.Activity;
+import android.net.Uri;
 import android.os.Bundle;
 import android.view.View;
 
@@ -24,13 +25,13 @@ import java.util.stream.Collectors;
 import me.grishka.appkit.api.SimpleCallback;
 
 public class StatusEditHistoryFragment extends StatusListFragment{
-	private String id;
-
+	private String id, url;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
 		id=getArguments().getString("id");
+		url=getArguments().getString("url");
 		loadData();
 	}
 
@@ -162,4 +163,9 @@ public class StatusEditHistoryFragment extends StatusListFragment{
 	protected Filter.FilterContext getFilterContext() {
 		return null;
 	}
+
+	@Override
+	public Uri getWebUri(Uri.Builder base) {
+		return Uri.parse(url);
+	}
 }

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

@@ -1,5 +1,6 @@
 package org.joinmastodon.android.fragments;
 
+import android.app.assist.AssistContent;
 import android.content.res.Configuration;
 import android.os.Bundle;
 
@@ -196,7 +197,7 @@ public abstract class StatusListFragment extends BaseStatusListFragment<Status>
 	}
 
 	@Override
-	public void onConfigurationChanged(Configuration newConfig){
+	public void onConfigurationChanged(Configuration newConfig) {
 		super.onConfigurationChanged(newConfig);
 		if (getParentFragment() instanceof HomeTabFragment home) home.updateToolbarLogo();
 	}

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

@@ -1,9 +1,13 @@
 package org.joinmastodon.android.fragments;
 
+import android.net.Uri;
 import android.os.Bundle;
+import android.util.Pair;
 import android.view.View;
 
 import org.joinmastodon.android.DomainManager;
+import androidx.annotation.NonNull;
+
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.statuses.GetStatusContext;
 import org.joinmastodon.android.api.session.AccountSession;
@@ -16,27 +20,51 @@ import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.model.StatusContext;
 import org.joinmastodon.android.ui.displayitems.ExtendedFooterStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.FooterStatusDisplayItem;
+import org.joinmastodon.android.ui.displayitems.ReblogOrReplyLineStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.TextStatusDisplayItem;
+import org.joinmastodon.android.ui.displayitems.WarningFilteredStatusDisplayItem;
 import org.joinmastodon.android.ui.text.HtmlParser;
 import org.joinmastodon.android.ui.utils.UiUtils;
+import org.joinmastodon.android.utils.ProvidesAssistContent;
 import org.joinmastodon.android.utils.StatusFilterPredicate;
 import org.parceler.Parcels;
 
+import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Deque;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import me.grishka.appkit.api.SimpleCallback;
 
-public class ThreadFragment extends StatusListFragment implements DomainDisplay{
+public class ThreadFragment extends StatusListFragment implements ProvidesAssistContent {
 	protected Status mainStatus;
 
-	@Override
-	public String getDomain() {
-		return mainStatus.url;
-	}
+	/**
+	 * lists the hierarchy of ancestors and descendants in a thread. level 0 = the main status.
+	 * e.g.
+	 * <pre>
+	 * [0] ancestor:   -2 ↰
+	 * [1] ancestor:     -1 ↰
+	 * [2] main status:     0 ↰
+	 * [3] descendant:        1 ↰
+	 * [4] descendant:          2 ↰
+	 * [5] descendant:            3
+	 * [6] descendant:        1
+	 * [7] descendant:        1 ↰
+	 * [8] descendant:          2
+	 * </pre>
+	 * confused? good. /j
+	 */
+	private final List<Pair<String, Integer>> levels = new ArrayList<>();
+	private final HashMap<String, NeighborAncestryInfo> ancestryMap = new HashMap<>();
 
 	@Override
 	public void onCreate(Bundle savedInstanceState){
@@ -48,21 +76,50 @@ public class ThreadFragment extends StatusListFragment implements DomainDisplay{
 		data.add(mainStatus);
 		onAppendItems(Collections.singletonList(mainStatus));
 		setTitle(HtmlParser.parseCustomEmoji(getString(R.string.post_from_user, mainStatus.account.displayName), mainStatus.account.emojis));
-
-		DomainManager.getInstance().setCurrentDomain(getDomain());
 	}
 
 	@Override
 	protected List<StatusDisplayItem> buildDisplayItems(Status s){
 		List<StatusDisplayItem> items=super.buildDisplayItems(s);
-		if(s.id.equals(mainStatus.id)){
-			for(StatusDisplayItem item:items){
+		// "what the fuck is a deque"? yes
+		// (it's just so the last-added item automatically comes first when looping over it)
+		Deque<Integer> deleteTheseItems = new ArrayDeque<>();
+
+		// modifying hidden filtered items if status is displayed as a warning
+		List<StatusDisplayItem> itemsToModify =
+				(items.get(0) instanceof WarningFilteredStatusDisplayItem warning)
+						? warning.filteredItems
+						: items;
+
+		for(int i = 0; i < itemsToModify.size(); i++){
+			StatusDisplayItem item = itemsToModify.get(i);
+			NeighborAncestryInfo ancestryInfo = ancestryMap.get(s.id);
+			if (ancestryInfo != null) {
+				item.setAncestryInfo(
+						ancestryInfo.hasDescendantNeighbor(),
+						ancestryInfo.hasAncestoringNeighbor(),
+						s.id.equals(mainStatus.id),
+						ancestryInfo.getAncestoringNeighbor()
+								.map(ancestor -> ancestor.id.equals(mainStatus.id))
+								.orElse(false)
+				);
+			}
+
+			if (item instanceof ReblogOrReplyLineStatusDisplayItem &&
+					(!item.isDirectDescendant && item.hasAncestoringNeighbor)) {
+				deleteTheseItems.add(i);
+			}
+
+			if(s.id.equals(mainStatus.id)){
 				if(item instanceof TextStatusDisplayItem text)
 					text.textSelectable=true;
 				else if(item instanceof FooterStatusDisplayItem footer)
 					footer.hideCounts=true;
 			}
-			items.add(new ExtendedFooterStatusDisplayItem(s.id, this, accountID, s.getContentStatus()));
+		}
+		for (int deleteThisItem : deleteTheseItems) itemsToModify.remove(deleteThisItem);
+		if(s.id.equals(mainStatus.id)) {
+			items.add(new ExtendedFooterStatusDisplayItem(s.id, this, s.getContentStatus()));
 		}
 		return items;
 	}
@@ -76,36 +133,22 @@ public class ThreadFragment extends StatusListFragment implements DomainDisplay{
 						if (getActivity() == null) return;
 						if(refreshing){
 							data.clear();
+							ancestryMap.clear();
 							displayItems.clear();
 							data.add(mainStatus);
 							onAppendItems(Collections.singletonList(mainStatus));
 						}
-						AccountSession account=AccountSessionManager.getInstance().getAccount(accountID);
-						Instance instance=AccountSessionManager.getInstance().getInstanceInfo(account.domain);
-						if(instance.pleroma != null){
-							List<String> threadIds=new ArrayList<>();
-							threadIds.add(mainStatus.id);
-							for(Status s:result.descendants){
-								if(threadIds.contains(s.inReplyToId)){
-									threadIds.add(s.id);
-								}
-							}
-							threadIds.add(mainStatus.inReplyToId);
-							for(int i=result.ancestors.size()-1; i >= 0; i--){
-								Status s=result.ancestors.get(i);
-								if(s.inReplyToId != null && threadIds.contains(s.id)){
-									threadIds.add(s.inReplyToId);
-								}
-							}
 
-							result.ancestors=result.ancestors.stream().filter(s -> threadIds.contains(s.id)).collect(Collectors.toList());
-							result.descendants=getDescendantsOrdered(mainStatus.id,
-									result.descendants.stream()
-											.filter(s -> threadIds.contains(s.id))
-											.collect(Collectors.toList()));
-						}
+						// 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);
@@ -114,7 +157,12 @@ public class ThreadFragment extends StatusListFragment implements DomainDisplay{
 						int count=displayItems.size();
 						if(!refreshing)
 							adapter.notifyItemRangeInserted(prevCount, count-prevCount);
-						prependItems(result.ancestors, !refreshing);
+						int prependedCount = prependItems(result.ancestors, !refreshing);
+						if (prependedCount > 0 && displayItems.get(prependedCount) instanceof ReblogOrReplyLineStatusDisplayItem) {
+							displayItems.remove(prependedCount);
+							adapter.notifyItemRemoved(prependedCount);
+							count--;
+						}
 						dataLoaded();
 						if(refreshing){
 							refreshDone();
@@ -126,7 +174,61 @@ public class ThreadFragment extends StatusListFragment implements DomainDisplay{
 				.exec(accountID);
 	}
 
-	private List<Status> getDescendantsOrdered(String id, List<Status> statuses){
+	public static List<NeighborAncestryInfo> mapNeighborhoodAncestry(Status mainStatus, StatusContext context) {
+		List<NeighborAncestryInfo> ancestry = new ArrayList<>();
+
+		List<Status> statuses = new ArrayList<>(context.ancestors);
+		statuses.add(mainStatus);
+		statuses.addAll(context.descendants);
+
+		int count = statuses.size();
+		for (int index = 0; index < count; index++) {
+			Status current = statuses.get(index);
+			NeighborAncestryInfo item = new NeighborAncestryInfo(current);
+
+			item.descendantNeighbor = Optional
+					.ofNullable(count > index + 1 ? statuses.get(index + 1) : null)
+					.filter(s -> s.inReplyToId.equals(current.id))
+					.orElse(null);
+
+			item.ancestoringNeighbor = Optional.ofNullable(index > 0 ? ancestry.get(index - 1) : null)
+					.filter(ancestor -> ancestor
+							.getDescendantNeighbor()
+							.map(ancestorsDescendant -> ancestorsDescendant.id.equals(current.id))
+							.orElse(false))
+					.flatMap(NeighborAncestryInfo::getStatus)
+					.orElse(null);
+
+			ancestry.add(item);
+		}
+
+		return ancestry;
+	}
+
+	public static void sortStatusContext(Status mainStatus, StatusContext context) {
+		List<String> threadIds=new ArrayList<>();
+		threadIds.add(mainStatus.id);
+		for(Status s:context.descendants){
+			if(threadIds.contains(s.inReplyToId)){
+				threadIds.add(s.id);
+			}
+		}
+		threadIds.add(mainStatus.inReplyToId);
+		for(int i=context.ancestors.size()-1; i >= 0; i--){
+			Status s=context.ancestors.get(i);
+			if(s.inReplyToId != null && threadIds.contains(s.id)){
+				threadIds.add(s.inReplyToId);
+			}
+		}
+
+		context.ancestors=context.ancestors.stream().filter(s -> threadIds.contains(s.id)).collect(Collectors.toList());
+		context.descendants=getDescendantsOrdered(mainStatus.id,
+				context.descendants.stream()
+						.filter(s -> threadIds.contains(s.id))
+						.collect(Collectors.toList()));
+	}
+
+	private static List<Status> getDescendantsOrdered(String id, List<Status> statuses){
 		List<Status> out=new ArrayList<>();
 		for(Status s:getDirectDescendants(id, statuses)){
 			out.add(s);
@@ -138,7 +240,7 @@ public class ThreadFragment extends StatusListFragment implements DomainDisplay{
 		return out;
 	}
 
-	private List<Status> getDirectDescendants(String id, List<Status> statuses){
+	private static List<Status> getDirectDescendants(String id, List<Status> statuses){
 		return statuses.stream()
 				.filter(s -> s.inReplyToId.equals(id))
 				.collect(Collectors.toList());
@@ -195,4 +297,52 @@ public class ThreadFragment extends StatusListFragment implements DomainDisplay{
 	protected Filter.FilterContext getFilterContext() {
 		return Filter.FilterContext.THREAD;
 	}
+
+	@Override
+	public Uri getWebUri(Uri.Builder base) {
+		return Uri.parse(mainStatus.url);
+	}
+
+	public static class NeighborAncestryInfo {
+		protected Status status, descendantNeighbor, ancestoringNeighbor;
+
+		public NeighborAncestryInfo(@NonNull Status status) {
+			this.status = status;
+		}
+
+		public Optional<Status> getStatus() {
+			return Optional.ofNullable(status);
+		}
+
+		public Optional<Status> getDescendantNeighbor() {
+			return Optional.ofNullable(descendantNeighbor);
+		}
+
+		public Optional<Status> getAncestoringNeighbor() {
+			return Optional.ofNullable(ancestoringNeighbor);
+		}
+
+		public boolean hasDescendantNeighbor() {
+			return getDescendantNeighbor().isPresent();
+		}
+
+		public boolean hasAncestoringNeighbor() {
+			return getAncestoringNeighbor().isPresent();
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (this == o) return true;
+			if (o == null || getClass() != o.getClass()) return false;
+			NeighborAncestryInfo that = (NeighborAncestryInfo) o;
+			return status.equals(that.status)
+					&& Objects.equals(descendantNeighbor, that.descendantNeighbor)
+					&& Objects.equals(ancestoringNeighbor, that.ancestoringNeighbor);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(status, descendantNeighbor, ancestoringNeighbor);
+		}
+	}
 }

mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/AccountRelatedAccountListFragment.java

@@ -1,5 +1,6 @@
 package org.joinmastodon.android.fragments.account_list;
 
+import android.net.Uri;
 import android.os.Bundle;
 
 import org.joinmastodon.android.model.Account;
@@ -14,4 +15,11 @@ public abstract class AccountRelatedAccountListFragment extends PaginatedAccount
 		account=Parcels.unwrap(getArguments().getParcelable("targetAccount"));
 		setTitle("@"+account.acct);
 	}
+
+	@Override
+	public Uri getWebUri(Uri.Builder base) {
+		return base.path(isInstanceAkkoma()
+				? "/users/" + account.id
+				: '@' + account.acct).build();
+	}
 }

mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/BaseAccountListFragment.java

@@ -1,6 +1,7 @@
 package org.joinmastodon.android.fragments.account_list;
 
 import android.app.ProgressDialog;
+import android.app.assist.AssistContent;
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.graphics.drawable.Animatable;
@@ -23,7 +24,8 @@ import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.accounts.GetAccountRelationships;
 import org.joinmastodon.android.api.requests.accounts.SetAccountFollowed;
 import org.joinmastodon.android.api.session.AccountSessionManager;
-import org.joinmastodon.android.fragments.ListTimelinesFragment;
+import org.joinmastodon.android.fragments.HasAccountID;
+import org.joinmastodon.android.fragments.ListsFragment;
 import org.joinmastodon.android.fragments.ProfileFragment;
 import org.joinmastodon.android.fragments.RecyclerFragment;
 import org.joinmastodon.android.fragments.report.ReportReasonChoiceFragment;
@@ -34,6 +36,7 @@ import org.joinmastodon.android.ui.OutlineProviders;
 import org.joinmastodon.android.ui.text.HtmlParser;
 import org.joinmastodon.android.ui.utils.CustomEmojiHelper;
 import org.joinmastodon.android.ui.utils.UiUtils;
+import org.joinmastodon.android.utils.ProvidesAssistContent;
 import org.parceler.Parcels;
 
 import java.util.ArrayList;
@@ -57,7 +60,7 @@ import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.utils.V;
 import me.grishka.appkit.views.UsableRecyclerView;
 
-public abstract class BaseAccountListFragment extends RecyclerFragment<BaseAccountListFragment.AccountItem> {
+public abstract class BaseAccountListFragment extends RecyclerFragment<BaseAccountListFragment.AccountItem> implements ProvidesAssistContent.ProvidesWebUri {
 	protected HashMap<String, Relationship> relationships=new HashMap<>();
 	protected String accountID;
 	protected ArrayList<APIRequest<?>> relationshipsRequests=new ArrayList<>();
@@ -175,6 +178,16 @@ public abstract class BaseAccountListFragment extends RecyclerFragment<BaseAccou
 		super.onApplyWindowInsets(insets);
 	}
 
+	@Override
+	public String getAccountID() {
+		return accountID;
+	}
+
+	@Override
+	public void onProvideAssistContent(AssistContent assistContent) {
+		assistContent.setWebUri(getWebUri(getSession().getInstanceUri().buildUpon()));
+	}
+
 	protected class AccountsAdapter extends UsableRecyclerView.Adapter<AccountViewHolder> implements ImageLoaderRecyclerAdapter{
 		public AccountsAdapter(){
 			super(imgLoader);
@@ -406,7 +419,7 @@ public abstract class BaseAccountListFragment extends RecyclerFragment<BaseAccou
 				args.putString("account", accountID);
 				args.putString("profileAccount", account.id);
 				args.putString("profileDisplayUsername", account.getDisplayUsername());
-				Nav.go(getActivity(), ListTimelinesFragment.class, args);
+				Nav.go(getActivity(), ListsFragment.class, args);
 			}
 			return true;
 		}

mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/FollowerListFragment.java

@@ -1,5 +1,6 @@
 package org.joinmastodon.android.fragments.account_list;
 
+import android.net.Uri;
 import android.os.Bundle;
 
 import org.joinmastodon.android.R;
@@ -12,7 +13,6 @@ public class FollowerListFragment extends AccountRelatedAccountListFragment{
 	@Override
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
-		targetAccount = account;
 		setSubtitle(getResources().getQuantityString(R.plurals.x_followers, (int)(account.followersCount%1000), account.followersCount));
 	}
 
@@ -22,7 +22,8 @@ public class FollowerListFragment extends AccountRelatedAccountListFragment{
 	}
 
 	@Override
-	public HeaderPaginationRequest<Account> onCreateRemoteRequest(String id, String maxID, int count){
-		return new GetAccountFollowers(id, maxID, count);
+	public Uri getWebUri(Uri.Builder base) {
+		return super.getWebUri(base).buildUpon()
+				.appendPath(isInstanceAkkoma() ? "#followers" : "/followers").build();
 	}
 }

mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/FollowingListFragment.java

@@ -1,5 +1,6 @@
 package org.joinmastodon.android.fragments.account_list;
 
+import android.net.Uri;
 import android.os.Bundle;
 
 import org.joinmastodon.android.R;
@@ -12,7 +13,6 @@ public class FollowingListFragment extends AccountRelatedAccountListFragment{
 	@Override
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
-		targetAccount = account;
 		setSubtitle(getResources().getQuantityString(R.plurals.x_following, (int)(account.followingCount%1000), account.followingCount));
 	}
 
@@ -22,7 +22,8 @@ public class FollowingListFragment extends AccountRelatedAccountListFragment{
 	}
 
 	@Override
-	public HeaderPaginationRequest<Account> onCreateRemoteRequest(String id, String maxID, int count){
-		return new GetAccountFollowing(id, maxID, count);
+	public Uri getWebUri(Uri.Builder base) {
+		return super.getWebUri(base).buildUpon()
+				.appendPath(isInstanceAkkoma() ? "#followees" : "/following").build();
 	}
 }

mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/StatusFavoritesListFragment.java

@@ -1,5 +1,6 @@
 package org.joinmastodon.android.fragments.account_list;
 
+import android.net.Uri;
 import android.os.Bundle;
 
 import org.joinmastodon.android.R;
@@ -19,6 +20,14 @@ public class StatusFavoritesListFragment extends StatusRelatedAccountListFragmen
 		return new GetStatusFavorites(status.id, maxID, count);
 	}
 
+	@Override
+	public Uri getWebUri(Uri.Builder base) {
+		Uri statusUri = super.getWebUri(base);
+		return isInstanceAkkoma()
+				? statusUri
+				: statusUri.buildUpon().appendPath("favourites").build();
+	}
+
 	@Override
 	public HeaderPaginationRequest<Account> onCreateRemoteRequest(String id, String maxID, int count) {
 		return null;

mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/StatusReblogsListFragment.java

@@ -1,5 +1,6 @@
 package org.joinmastodon.android.fragments.account_list;
 
+import android.net.Uri;
 import android.os.Bundle;
 
 import org.joinmastodon.android.R;
@@ -19,6 +20,14 @@ public class StatusReblogsListFragment extends StatusRelatedAccountListFragment{
 		return new GetStatusReblogs(status.id, maxID, count);
 	}
 
+	@Override
+	public Uri getWebUri(Uri.Builder base) {
+		Uri statusUri = super.getWebUri(base);
+		return isInstanceAkkoma()
+				? statusUri
+				: statusUri.buildUpon().appendPath("reblogs").build();
+	}
+
 	@Override
 	public HeaderPaginationRequest<Account> onCreateRemoteRequest(String id, String maxID, int count) {
 		return null;

mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/StatusRelatedAccountListFragment.java

@@ -1,5 +1,6 @@
 package org.joinmastodon.android.fragments.account_list;
 
+import android.net.Uri;
 import android.os.Bundle;
 
 import org.joinmastodon.android.model.Status;
@@ -18,4 +19,13 @@ public abstract class StatusRelatedAccountListFragment extends PaginatedAccountL
 	protected boolean hasSubtitle(){
 		return false;
 	}
+
+	@Override
+	public Uri getWebUri(Uri.Builder base) {
+		return base
+				.encodedPath(isInstanceAkkoma()
+						? "/notice/" + status.id
+						: '@' + status.account.acct + '/' + status.id)
+				.build();
+	}
 }

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

@@ -0,0 +1,61 @@
+package org.joinmastodon.android.fragments.discover;
+
+import android.net.Uri;
+import android.os.Bundle;
+import android.view.View;
+
+import org.joinmastodon.android.api.requests.timelines.GetBubbleTimeline;
+import org.joinmastodon.android.api.requests.timelines.GetPublicTimeline;
+import org.joinmastodon.android.fragments.StatusListFragment;
+import org.joinmastodon.android.model.Filter;
+import org.joinmastodon.android.model.Status;
+import org.joinmastodon.android.ui.utils.DiscoverInfoBannerHelper;
+import org.joinmastodon.android.utils.StatusFilterPredicate;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+import me.grishka.appkit.api.SimpleCallback;
+
+public class BubbleTimelineFragment extends StatusListFragment {
+    private DiscoverInfoBannerHelper bannerHelper=new DiscoverInfoBannerHelper(DiscoverInfoBannerHelper.BannerType.BUBBLE_TIMELINE);
+    private String maxID;
+
+    @Override
+    protected boolean wantsComposeButton() {
+        return true;
+    }
+
+
+    @Override
+    protected void doLoadData(int offset, int count){
+        currentRequest=new GetBubbleTimeline(refreshing ? null : maxID, count)
+                .setCallback(new SimpleCallback<>(this){
+                    @Override
+                    public void onSuccess(List<Status> result){
+                        if(!result.isEmpty())
+                            maxID=result.get(result.size()-1).id;
+                        if (getActivity() == null) return;
+                        result=result.stream().filter(new StatusFilterPredicate(accountID, getFilterContext())).collect(Collectors.toList());
+                        onDataLoaded(result, !result.isEmpty());
+                    }
+                })
+                .exec(accountID);
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState){
+        super.onViewCreated(view, savedInstanceState);
+        bannerHelper.maybeAddBanner(contentWrap);
+    }
+
+    @Override
+    protected Filter.FilterContext getFilterContext() {
+        return Filter.FilterContext.PUBLIC;
+    }
+
+    @Override
+    public Uri getWebUri(Uri.Builder base) {
+        return isInstanceAkkoma() ? base.path("/main/bubble").build() : null;
+    }
+}

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

@@ -3,6 +3,7 @@ package org.joinmastodon.android.fragments.discover;
 import android.graphics.Rect;
 import android.graphics.drawable.Animatable;
 import android.graphics.drawable.Drawable;
+import android.net.Uri;
 import android.os.Bundle;
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
@@ -15,7 +16,6 @@ import android.widget.TextView;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.accounts.GetAccountRelationships;
 import org.joinmastodon.android.api.requests.accounts.GetFollowSuggestions;
-import org.joinmastodon.android.fragments.DomainDisplay;
 import org.joinmastodon.android.fragments.IsOnTop;
 import org.joinmastodon.android.fragments.ProfileFragment;
 import org.joinmastodon.android.fragments.RecyclerFragment;
@@ -28,6 +28,7 @@ import org.joinmastodon.android.ui.text.HtmlParser;
 import org.joinmastodon.android.ui.utils.CustomEmojiHelper;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.ui.views.ProgressBarButton;
+import org.joinmastodon.android.utils.ProvidesAssistContent;
 import org.parceler.Parcels;
 
 import java.util.Collections;
@@ -51,7 +52,7 @@ import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.utils.V;
 import me.grishka.appkit.views.UsableRecyclerView;
 
-public class DiscoverAccountsFragment extends BaseRecyclerFragment<DiscoverAccountsFragment.AccountWrapper> implements ScrollableToTop, IsOnTop, DomainDisplay {
+public class DiscoverAccountsFragment extends RecyclerFragment<DiscoverAccountsFragment.AccountWrapper> implements ScrollableToTop, IsOnTop, ProvidesAssistContent.ProvidesWebUri {
 	private String accountID;
 	private Map<String, Relationship> relationships=Collections.emptyMap();
 	private GetAccountRelationships relationshipsRequest;
@@ -60,11 +61,6 @@ public class DiscoverAccountsFragment extends BaseRecyclerFragment<DiscoverAccou
 		super(20);
 	}
 
-	@Override
-	public String getDomain() {
-		return DomainDisplay.super.getDomain() + "/explore/suggestions";
-	}
-
 	@Override
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
@@ -157,6 +153,16 @@ public class DiscoverAccountsFragment extends BaseRecyclerFragment<DiscoverAccou
 		return isRecyclerViewOnTop(list);
 	}
 
+	@Override
+	public String getAccountID() {
+		return accountID;
+	}
+
+	@Override
+	public Uri getWebUri(Uri.Builder base) {
+		return isInstanceAkkoma() ? null : base.path("/explore/suggestions").build();
+	}
+
 	private class AccountsAdapter extends UsableRecyclerView.Adapter<AccountViewHolder> implements ImageLoaderRecyclerAdapter{
 
 		public AccountsAdapter(){

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

@@ -1,6 +1,7 @@
 package org.joinmastodon.android.fragments.discover;
 
 import android.app.Fragment;
+import android.app.assist.AssistContent;
 import android.app.FragmentTransaction;
 import android.os.Build;
 import android.os.Bundle;
@@ -22,13 +23,15 @@ import org.joinmastodon.android.BuildConfig;
 import org.joinmastodon.android.DomainManager;
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
-import org.joinmastodon.android.fragments.DomainDisplay;
+import org.joinmastodon.android.fragments.HomeFragment;
+import org.joinmastodon.android.fragments.IsOnTop;
 import org.joinmastodon.android.fragments.ScrollableToTop;
 import org.joinmastodon.android.fragments.ListTimelinesFragment;
 import org.joinmastodon.android.ui.SimpleViewHolder;
 import org.joinmastodon.android.ui.tabs.TabLayout;
 import org.joinmastodon.android.ui.tabs.TabLayoutMediator;
 import org.joinmastodon.android.ui.utils.UiUtils;
+import org.joinmastodon.android.utils.ProvidesAssistContent;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -40,7 +43,7 @@ import me.grishka.appkit.fragments.BaseRecyclerFragment;
 import me.grishka.appkit.fragments.OnBackPressedListener;
 import me.grishka.appkit.utils.V;
 
-public class DiscoverFragment extends AppKitFragment implements ScrollableToTop, OnBackPressedListener, DomainDisplay {
+public class DiscoverFragment extends AppKitFragment implements ScrollableToTop, OnBackPressedListener, IsOnTop, ProvidesAssistContent {
 
 	private TabLayout tabLayout;
 	private ViewPager2 pager;
@@ -53,30 +56,14 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 	private ProgressBar searchProgress;
 
 	private DiscoverPostsFragment postsFragment;
-	private TrendingHashtagsFragment hashtagsFragment;
+	private DiscoverHashtagsFragment hashtagsFragment;
 	private DiscoverNewsFragment newsFragment;
 	private DiscoverAccountsFragment accountsFragment;
 	private SearchFragment searchFragment;
-	private LocalTimelineFragment localTimelineFragment;
-	private FederatedTimelineFragment federatedTimelineFragment;
-	private ListTimelinesFragment listTimelinesFragment;
 
 	private String accountID;
 	private Runnable searchDebouncer=this::onSearchChangedDebounced;
 
-//	private final boolean noFederated = !GlobalUserPreferences.showFederatedTimeline;
-
-	@Override
-	public String getDomain() {
-		if (searchActive) {
-			return searchFragment.getDomain();
-		}
-		if (tabViews[tabLayout.getSelectedTabPosition()] instanceof DomainDisplay page) {
-			return page.getDomain();
-		}
-		return DomainDisplay.super.getDomain() + "/explore";
-	}
-
 	@Override
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
@@ -94,22 +81,9 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 		tabLayout=view.findViewById(R.id.tabbar);
 		pager=view.findViewById(R.id.pager);
 
-//		tabViews=new FrameLayout[noFederated ? 5 : 6];
 		tabViews=new FrameLayout[4];
 		for(int i=0;i<tabViews.length;i++){
 			FrameLayout tabView=new FrameLayout(getActivity());
-
-///			int switchIndex = noFederated && i > 0 ? i + 1 : i;
-//			tabView.setId(switch(switchIndex){
-//				case 0 -> R.id.discover_local_timeline;
-//				case 1 -> R.id.discover_federated_timeline;
-//				case 2 -> R.id.discover_hashtags;
-//				case 3 -> R.id.discover_posts;
-//				case 4 -> R.id.discover_news;
-//				case 5 -> R.id.discover_users;
-//				default -> throw new IllegalStateException("Unexpected value: "+switchIndex);
-//			});
-
 			tabView.setId(switch(i){
 				case 0 -> R.id.discover_hashtags;
 				case 1 -> R.id.discover_posts;
@@ -117,7 +91,6 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 				case 3 -> R.id.discover_users;
 				default -> throw new IllegalStateException("Unexpected value: "+i);
 			});
-
 			tabView.setVisibility(View.GONE);
 			view.addView(tabView); // needed so the fragment manager will have somewhere to restore the tab fragment
 			tabViews[i]=tabView;
@@ -140,13 +113,10 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 					if(!page.loaded && !page.isDataLoading())
 						page.loadData();
 				}
-
-				if (_page instanceof DomainDisplay display)
-					DomainManager.getInstance().setCurrentDomain(display.getDomain());
 			}
 		});
 
-		if(localTimelineFragment==null || hashtagsFragment==null){
+		if(hashtagsFragment==null){
 			Bundle args=new Bundle();
 			args.putString("account", accountID);
 			args.putBoolean("__is_tab", true);
@@ -154,7 +124,7 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 			postsFragment=new DiscoverPostsFragment();
 			postsFragment.setArguments(args);
 
-			hashtagsFragment=new TrendingHashtagsFragment();
+			hashtagsFragment=new DiscoverHashtagsFragment();
 			hashtagsFragment.setArguments(args);
 
 			newsFragment=new DiscoverNewsFragment();
@@ -163,27 +133,6 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 			accountsFragment=new DiscoverAccountsFragment();
 			accountsFragment.setArguments(args);
 
-			localTimelineFragment=new LocalTimelineFragment();
-			localTimelineFragment.setArguments(args);
-
-//			listTimelinesFragment=new ListTimelinesFragment();
-//			listTimelinesFragment.setArguments(args);
-//
-//			FragmentTransaction transaction = getChildFragmentManager().beginTransaction()
-//					.add(R.id.discover_posts, postsFragment)
-//					.add(R.id.discover_local_timeline, localTimelineFragment)
-//					.add(R.id.discover_hashtags, hashtagsFragment)
-//					.add(R.id.discover_news, newsFragment)
-//					.add(R.id.discover_users, accountsFragment)
-//					.add(R.id.discover_lists, listTimelinesFragment);
-//
-//			if (!noFederated) {
-//				federatedTimelineFragment=new FederatedTimelineFragment();
-//				federatedTimelineFragment.setArguments(args);
-//				transaction.add(R.id.discover_federated_timeline, federatedTimelineFragment);
-//			}
-//
-//			transaction.commit();
 
 			getChildFragmentManager().beginTransaction()
 					.add(R.id.discover_posts, postsFragment)
@@ -196,21 +145,6 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 		tabLayoutMediator=new TabLayoutMediator(tabLayout, pager, new TabLayoutMediator.TabConfigurationStrategy(){
 			@Override
 			public void onConfigureTab(@NonNull TabLayout.Tab tab, int position){
-
-//				if (noFederated && position > 0) position++;
-
-//				tab.setText(switch(position){
-//					case 0 -> R.string.local_timeline;
-//					case 1 -> R.string.sk_federated_timeline;
-//					case 2 -> R.string.sk_list_timelines;
-//					case 3 -> R.string.hashtags;
-//					case 4 -> R.string.posts;
-//					case 5 -> R.string.news;
-//					case 6 -> R.string.for_you;
-//
-//					default -> throw new IllegalStateException("Unexpected value: "+position);
-//				});
-
 				tab.setText(switch(position){
 					case 0 -> R.string.hashtags;
 					case 1 -> R.string.posts;
@@ -224,9 +158,7 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 		tabLayoutMediator.attach();
 		tabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener(){
 			@Override
-			public void onTabSelected(TabLayout.Tab tab){
-				DomainManager.getInstance().setCurrentDomain(getDomain());
-			}
+			public void onTabSelected(TabLayout.Tab tab){}
 
 			@Override
 			public void onTabUnselected(TabLayout.Tab tab){}
@@ -303,20 +235,25 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 	}
 
 	@Override
-	public boolean isScrolledToTop() {
-		if(!searchActive){
-			return ((ScrollableToTop)getFragmentForPage(pager.getCurrentItem())).isScrolledToTop();
-		}else{
-			return searchFragment.isScrolledToTop();
-		}
+	public boolean isOnTop() {
+		return searchActive ? searchFragment.isOnTop()
+				: ((IsOnTop)getFragmentForPage(pager.getCurrentItem())).isOnTop();
+	}
+
+	public void onSelect() {
+		if (isOnTop()) selectSearch();
+		else scrollToTop();
+	}
+
+	public void selectSearch() {
+		searchEdit.requestFocus();
+		onSearchEditFocusChanged(searchEdit, true);
+		getActivity().getSystemService(InputMethodManager.class).showSoftInput(searchEdit, 0);
 	}
 
 	public void loadData(){
 		if(hashtagsFragment!=null && !hashtagsFragment.loaded && !hashtagsFragment.dataLoading)
 			hashtagsFragment.loadData();
-
-//		if(localTimelineFragment!=null && !localTimelineFragment.loaded && !localTimelineFragment.dataLoading)
-//			localTimelineFragment.loadData();
 	}
 
 	private void onSearchEditFocusChanged(View v, boolean hasFocus){
@@ -342,6 +279,8 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 		searchBack.setEnabled(false);
 		searchBack.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO);
 		getActivity().getSystemService(InputMethodManager.class).hideSoftInputFromWindow(searchEdit.getWindowToken(), 0);
+		if (getArguments().getBoolean("disableDiscover"))
+			((HomeFragment) getParentFragment()).onBackPressed();
 	}
 
 	@Override
@@ -351,19 +290,6 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 	}
 
 	private Fragment getFragmentForPage(int page){
-//		if (noFederated && page > 0) page++;
-
-//		return switch(page){
-//			case 0 -> localTimelineFragment;
-//			case 1 -> federatedTimelineFragment;
-//			case 2 -> hashtagsFragment;
-//			case 3 -> postsFragment;
-//			case 4 -> newsFragment;
-//			case 5 -> accountsFragment;
-//			case 6 -> listTimelinesFragment;
-//			default -> throw new IllegalStateException("Unexpected value: "+page);
-//		};
-
 		return switch(page){
 			case 0 -> hashtagsFragment;
 			case 1 -> postsFragment;
@@ -401,6 +327,13 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 			V.setVisibilityAnimated(searchClear, visible ? View.INVISIBLE : View.VISIBLE);
 	}
 
+	@Override
+	public void onProvideAssistContent(AssistContent assistContent) {
+		callFragmentToProvideAssistContent(searchActive
+				? searchFragment
+				: getFragmentForPage(pager.getCurrentItem()), assistContent);
+	}
+
 	private class DiscoverPagerAdapter extends RecyclerView.Adapter<SimpleViewHolder>{
 		@NonNull
 		@Override

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

@@ -1,5 +1,9 @@
 package org.joinmastodon.android.fragments.discover;
 
+import static org.joinmastodon.android.ui.displayitems.HashtagStatusDisplayItem.Holder.withHistoryParams;
+import static org.joinmastodon.android.ui.displayitems.HashtagStatusDisplayItem.Holder.withoutHistoryParams;
+
+import android.net.Uri;
 import android.os.Bundle;
 import android.view.View;
 import android.view.ViewGroup;
@@ -7,7 +11,6 @@ import android.widget.TextView;
 
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.trends.GetTrendingHashtags;
-import org.joinmastodon.android.fragments.DomainDisplay;
 import org.joinmastodon.android.fragments.IsOnTop;
 import org.joinmastodon.android.fragments.RecyclerFragment;
 import org.joinmastodon.android.fragments.ScrollableToTop;
@@ -16,29 +19,24 @@ import org.joinmastodon.android.ui.DividerItemDecoration;
 import org.joinmastodon.android.ui.utils.DiscoverInfoBannerHelper;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.ui.views.HashtagChartView;
+import org.joinmastodon.android.utils.ProvidesAssistContent;
 
 import java.util.List;
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import me.grishka.appkit.api.SimpleCallback;
-import me.grishka.appkit.fragments.BaseRecyclerFragment;
 import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.views.UsableRecyclerView;
 
-public class TrendingHashtagsFragment extends BaseRecyclerFragment<Hashtag> implements ScrollableToTop, IsOnTop, DomainDisplay {
+public class DiscoverHashtagsFragment extends RecyclerFragment<Hashtag> implements ScrollableToTop, IsOnTop, ProvidesAssistContent.ProvidesWebUri {
 	private String accountID;
 	private DiscoverInfoBannerHelper bannerHelper=new DiscoverInfoBannerHelper(DiscoverInfoBannerHelper.BannerType.TRENDING_HASHTAGS);
 
-	public TrendingHashtagsFragment(){
+	public DiscoverHashtagsFragment(){
 		super(10);
 	}
 
-	@Override
-	public String getDomain() {
-		return DomainDisplay.super.getDomain() + "/explore/tags";
-	}
-
 	@Override
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
@@ -76,13 +74,18 @@ public class TrendingHashtagsFragment extends BaseRecyclerFragment<Hashtag> impl
 	}
 
 	@Override
-	public boolean isScrolledToTop() {
-		return list.getChildAt(0).getTop() == 0;
+	public boolean isOnTop() {
+		return isRecyclerViewOnTop(list);
 	}
 
 	@Override
-	public boolean isOnTop() {
-		return isRecyclerViewOnTop(list);
+	public String getAccountID() {
+		return accountID;
+	}
+
+	@Override
+	public Uri getWebUri(Uri.Builder base) {
+		return isInstanceAkkoma() ? null : base.path("/explore/tags").build();
 	}
 
 	private class HashtagsAdapter extends RecyclerView.Adapter<HashtagViewHolder>{
@@ -117,14 +120,19 @@ public class TrendingHashtagsFragment extends BaseRecyclerFragment<Hashtag> impl
 		@Override
 		public void onBind(Hashtag item){
 			title.setText('#'+item.name);
-			int numPeople = 0;
-			if(item.history != null){
-				numPeople=item.history.get(0).accounts;
-				if(item.history.size()>1)
-					numPeople+=item.history.get(1).accounts;
-				chart.setData(item.history);
+			if (item.history == null || item.history.isEmpty()) {
+				subtitle.setText(null);
+				chart.setVisibility(View.GONE);
+				title.setLayoutParams(withoutHistoryParams);
+				return;
 			}
+			chart.setVisibility(View.VISIBLE);
+			title.setLayoutParams(withHistoryParams);
+			int numPeople=item.history.get(0).accounts;
+			if(item.history.size()>1)
+				numPeople+=item.history.get(1).accounts;
 			subtitle.setText(getResources().getQuantityString(R.plurals.x_people_talking, numPeople, numPeople));
+			chart.setData(item.history);
 		}
 
 		@Override

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

@@ -1,6 +1,7 @@
 package org.joinmastodon.android.fragments.discover;
 
 import android.graphics.drawable.Drawable;
+import android.net.Uri;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.View;
@@ -10,7 +11,6 @@ import android.widget.TextView;
 
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.trends.GetTrendingLinks;
-import org.joinmastodon.android.fragments.DomainDisplay;
 import org.joinmastodon.android.fragments.IsOnTop;
 import org.joinmastodon.android.fragments.RecyclerFragment;
 import org.joinmastodon.android.fragments.ScrollableToTop;
@@ -20,6 +20,7 @@ import org.joinmastodon.android.ui.OutlineProviders;
 import org.joinmastodon.android.ui.drawables.BlurhashCrossfadeDrawable;
 import org.joinmastodon.android.ui.utils.DiscoverInfoBannerHelper;
 import org.joinmastodon.android.ui.utils.UiUtils;
+import org.joinmastodon.android.utils.ProvidesAssistContent;
 
 import java.util.Collections;
 import java.util.List;
@@ -28,7 +29,6 @@ import java.util.stream.Collectors;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import me.grishka.appkit.api.SimpleCallback;
-import me.grishka.appkit.fragments.BaseRecyclerFragment;
 import me.grishka.appkit.imageloader.ImageLoaderRecyclerAdapter;
 import me.grishka.appkit.imageloader.ImageLoaderViewHolder;
 import me.grishka.appkit.imageloader.requests.ImageLoaderRequest;
@@ -37,7 +37,7 @@ import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.utils.V;
 import me.grishka.appkit.views.UsableRecyclerView;
 
-public class DiscoverNewsFragment extends BaseRecyclerFragment<Card> implements ScrollableToTop, IsOnTop, DomainDisplay {
+public class DiscoverNewsFragment extends RecyclerFragment<Card> implements ScrollableToTop, IsOnTop, ProvidesAssistContent.ProvidesWebUri {
 	private String accountID;
 	private List<ImageLoaderRequest> imageRequests=Collections.emptyList();
 	private DiscoverInfoBannerHelper bannerHelper=new DiscoverInfoBannerHelper(DiscoverInfoBannerHelper.BannerType.TRENDING_LINKS);
@@ -46,11 +46,6 @@ public class DiscoverNewsFragment extends BaseRecyclerFragment<Card> implements
 		super(10);
 	}
 
-	@Override
-	public String getDomain() {
-		return DomainDisplay.super.getDomain() + "/explore/links";
-	}
-
 	@Override
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
@@ -91,13 +86,18 @@ public class DiscoverNewsFragment extends BaseRecyclerFragment<Card> implements
 	}
 
 	@Override
-	public boolean isScrolledToTop() {
-		return list.getChildAt(0).getTop() == 0;
+	public boolean isOnTop() {
+		return isRecyclerViewOnTop(list);
 	}
 
 	@Override
-	public boolean isOnTop() {
-		return isRecyclerViewOnTop(list);
+	public String getAccountID() {
+		return accountID;
+	}
+
+	@Override
+	public Uri getWebUri(Uri.Builder base) {
+		return isInstanceAkkoma() ? null : base.path("/explore/links").build();
 	}
 
 	private class LinksAdapter extends UsableRecyclerView.Adapter<LinkViewHolder> implements ImageLoaderRecyclerAdapter{

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

@@ -1,5 +1,6 @@
 package org.joinmastodon.android.fragments.discover;
 
+import android.net.Uri;
 import android.os.Bundle;
 import android.view.View;
 
@@ -48,9 +49,13 @@ public class DiscoverPostsFragment extends StatusListFragment implements IsOnTop
 		return isRecyclerViewOnTop(list);
 	}
 
-
 	@Override
 	protected Filter.FilterContext getFilterContext() {
 		return Filter.FilterContext.PUBLIC;
 	}
+
+	@Override
+	public Uri getWebUri(Uri.Builder base) {
+		return isInstanceAkkoma() ? null : base.path("/explore/posts").build();
+	}
 }

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

@@ -1,5 +1,6 @@
 package org.joinmastodon.android.fragments.discover;
 
+import android.net.Uri;
 import android.os.Bundle;
 import android.view.View;
 
@@ -25,12 +26,6 @@ public class FederatedTimelineFragment extends StatusListFragment {
 		return true;
 	}
 
-	@Override
-	public String getDomain() {
-		return super.getDomain() + "/public";
-	}
-
-
 	@Override
 	protected void doLoadData(int offset, int count){
 		currentRequest=new GetPublicTimeline(false, false, refreshing ? null : maxID, count)
@@ -50,11 +45,16 @@ public class FederatedTimelineFragment extends StatusListFragment {
 	@Override
 	public void onViewCreated(View view, Bundle savedInstanceState){
 		super.onViewCreated(view, savedInstanceState);
-//		bannerHelper.maybeAddBanner(contentWrap);
+		bannerHelper.maybeAddBanner(contentWrap);
 	}
 
 	@Override
 	protected Filter.FilterContext getFilterContext() {
 		return Filter.FilterContext.PUBLIC;
 	}
+
+	@Override
+	public Uri getWebUri(Uri.Builder base) {
+		return base.path(isInstanceAkkoma() ? "/main/all" : "/public").build();
+	}
 }

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

@@ -1,9 +1,11 @@
 package org.joinmastodon.android.fragments.discover;
 
+import android.net.Uri;
 import android.os.Bundle;
 import android.view.View;
 
 import org.joinmastodon.android.api.requests.timelines.GetPublicTimeline;
+import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.StatusListFragment;
 import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.Status;
@@ -24,11 +26,6 @@ public class LocalTimelineFragment extends StatusListFragment {
 		return true;
 	}
 
-	@Override
-	public String getDomain() {
-		return super.getDomain() + "/public/local";
-	}
-
 	@Override
 	protected void doLoadData(int offset, int count){
 		currentRequest=new GetPublicTimeline(true, false, refreshing ? null : maxID, count)
@@ -55,4 +52,9 @@ public class LocalTimelineFragment extends StatusListFragment {
 	protected Filter.FilterContext getFilterContext() {
 		return Filter.FilterContext.PUBLIC;
 	}
+
+	@Override
+	public Uri getWebUri(Uri.Builder base) {
+		return base.path(isInstanceAkkoma() ? "/main/public" : "/public/local").build();
+	}
 }

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

@@ -1,6 +1,7 @@
 package org.joinmastodon.android.fragments.discover;
 
 import android.app.Activity;
+import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.text.TextUtils;
@@ -11,6 +12,7 @@ import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.search.GetSearchResults;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.BaseStatusListFragment;
+import org.joinmastodon.android.fragments.IsOnTop;
 import org.joinmastodon.android.fragments.ProfileFragment;
 import org.joinmastodon.android.fragments.ThreadFragment;
 import org.joinmastodon.android.model.Account;
@@ -42,7 +44,7 @@ import me.grishka.appkit.api.SimpleCallback;
 import me.grishka.appkit.utils.MergeRecyclerAdapter;
 import me.grishka.appkit.utils.V;
 
-public class SearchFragment extends BaseStatusListFragment<SearchResult>{
+public class SearchFragment extends BaseStatusListFragment<SearchResult> implements IsOnTop {
 	private String currentQuery;
 	private List<StatusDisplayItem> prevDisplayItems;
 	private EnumSet<SearchResult.Type> currentFilter=EnumSet.allOf(SearchResult.Type.class);
@@ -57,11 +59,6 @@ public class SearchFragment extends BaseStatusListFragment<SearchResult>{
 		setLayout(R.layout.fragment_search);
 	}
 
-	@Override
-	public String getDomain() {
-		return super.getDomain() + "/search";
-	}
-
 	@Override
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
@@ -190,7 +187,7 @@ public class SearchFragment extends BaseStatusListFragment<SearchResult>{
 			return;
 		}
 		UiUtils.updateList(prevDisplayItems, displayItems, list, adapter, (i1, i2)->i1.parentID.equals(i2.parentID) && i1.index==i2.index && i1.getType()==i2.getType());
-		boolean recent=isInRecentMode();
+		boolean recent=isInRecentMode() && !displayItems.isEmpty();
 		if(recent!=headerAdapter.isVisible())
 			headerAdapter.setVisible(recent);
 		imgLoader.forceUpdateImages();
@@ -316,6 +313,19 @@ public class SearchFragment extends BaseStatusListFragment<SearchResult>{
 		}
 	}
 
+	@Override
+	public boolean isOnTop() {
+		return isRecyclerViewOnTop(list);
+	}
+
+	@Override
+	public Uri getWebUri(Uri.Builder base) {
+		Uri.Builder searchUri = base.path("/search");
+		return isInstanceAkkoma()
+				? searchUri.appendQueryParameter("query", currentQuery).build()
+				: searchUri.build();
+	}
+
 	@FunctionalInterface
 	public interface ProgressVisibilityListener{
 		void onProgressVisibilityChanged(boolean visible);

mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/AccountActivationFragment.java

@@ -23,7 +23,8 @@ import org.joinmastodon.android.api.requests.accounts.UpdateAccountCredentials;
 import org.joinmastodon.android.api.session.AccountActivationInfo;
 import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
-import org.joinmastodon.android.fragments.settings.SettingsMainFragment;
+import org.joinmastodon.android.fragments.HomeFragment;
+import org.joinmastodon.android.fragments.SettingsFragment;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.ui.AccountSwitcherSheet;
 import org.joinmastodon.android.ui.utils.UiUtils;
@@ -69,7 +70,7 @@ public class AccountActivationFragment extends ToolbarFragment{
 		openEmailBtn.setOnLongClickListener(v->{
 			Bundle args=new Bundle();
 			args.putString("account", accountID);
-			Nav.go(getActivity(), SettingsMainFragment.class, args);
+			Nav.go(getActivity(), SettingsFragment.class, args);
 			return true;
 		});
 		resendBtn=view.findViewById(R.id.btn_resend);
@@ -89,15 +90,8 @@ public class AccountActivationFragment extends ToolbarFragment{
 	}
 
 	@Override
-	public void onViewCreated(View view, Bundle savedInstanceState){
-		super.onViewCreated(view, savedInstanceState);
-		setStatusBarColor(UiUtils.getThemeColor(getActivity(), R.attr.colorM3Background));
-		view.setBackgroundColor(UiUtils.getThemeColor(getActivity(), R.attr.colorM3Background));
-	}
-
-//	@Override
 	protected void onUpdateToolbar(){
-//		super.onUpdateToolbar();
+		super.onUpdateToolbar();
 		getToolbar().setBackground(null);
 		getToolbar().setElevation(0);
 	}
@@ -109,10 +103,7 @@ public class AccountActivationFragment extends ToolbarFragment{
 
 	@Override
 	public void onToolbarNavigationClick(){
-		new AccountSwitcherSheet(getActivity(), true, true, false, accountSession -> {
-			getActivity().finish();
-			getActivity().startActivity(new Intent(getActivity(), MainActivity.class));
-		}).show();
+		new AccountSwitcherSheet(getActivity(), null).show();
 	}
 
 	@Override

mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceRulesFragment.java

@@ -2,7 +2,9 @@ package org.joinmastodon.android.fragments.onboarding;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
+import android.app.assist.AssistContent;
 import android.graphics.Typeface;
+import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.text.Html;
@@ -24,6 +26,7 @@ import org.joinmastodon.android.ui.DividerItemDecoration;
 import org.joinmastodon.android.ui.text.HtmlParser;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.utils.ElevationOnScrollListener;
+import org.joinmastodon.android.utils.ProvidesAssistContent;
 import org.parceler.Parcels;
 
 import androidx.annotation.NonNull;
@@ -38,7 +41,7 @@ import me.grishka.appkit.utils.V;
 import me.grishka.appkit.views.FragmentRootLinearLayout;
 import me.grishka.appkit.views.UsableRecyclerView;
 
-public class InstanceRulesFragment extends ToolbarFragment{
+public class InstanceRulesFragment extends ToolbarFragment implements ProvidesAssistContent {
 	private UsableRecyclerView list;
 	private MergeRecyclerAdapter adapter;
 	private Button btn;
@@ -130,6 +133,15 @@ public class InstanceRulesFragment extends ToolbarFragment{
 		}
 	}
 
+	@Override
+	public void onProvideAssistContent(AssistContent assistContent) {
+		assistContent.setWebUri(new Uri.Builder()
+				.scheme("https")
+				.authority(instance.normalizedUri)
+				.path("/about")
+				.build());
+	}
+
 	private class ItemsAdapter extends RecyclerView.Adapter<ItemViewHolder>{
 
 		@NonNull

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

@@ -5,6 +5,7 @@ import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
+import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.util.SparseIntArray;
@@ -267,4 +268,11 @@ public class ReportAddPostsChoiceFragment extends StatusListFragment{
 	protected Filter.FilterContext getFilterContext() {
 		return null;
 	}
+
+	@Override
+	public Uri getWebUri(Uri.Builder base) {
+		if (reportStatus != null) return Uri.parse(reportStatus.url);
+		if (reportAccount != null) return Uri.parse(reportAccount.url);
+		return null;
+	}
 }