fix null pointer exception

closes sk22#539

mastodon/build.gradle

@@ -15,8 +15,8 @@ android {
 		applicationId "org.joinmastodon.android.sk"
 		minSdk 23
 		targetSdk 33
-		versionCode 83
-		versionName "1.2.2+fork.83"
+		versionCode 86
+		versionName "1.2.3+fork.86"
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         resourceConfigurations += ['ar-rSA', 'ar-rDZ', 'be-rBY', 'bn-rBD', 'bs-rBA', 'ca-rES', 'cs-rCZ', 'da-rDK', 'de-rDE', 'el-rGR', 'es-rES', 'eu-rES', 'fa-rIR', 'fi-rFI', 'fil-rPH', 'fr-rFR', 'ga-rIE', 'gd-rGB', 'gl-rES', 'hi-rIN', 'hr-rHR', 'hu-rHU', 'hy-rAM', 'ig-rNG', 'in-rID', 'is-rIS', 'it-rIT', 'iw-rIL', 'ja-rJP', 'kab', 'ko-rKR', 'my-rMM', 'nl-rNL', 'no-rNO', 'oc-rFR', 'pl-rPL', 'pt-rBR', 'pt-rPT', 'ro-rRO', 'ru-rRU', 'si-rLK', 'sl-rSI', 'sv-rSE', 'th-rTH', 'tr-rTR', 'uk-rUA', 'ur-rIN', 'vi-rVN', 'zh-rCN', 'zh-rTW']
     }

mastodon/src/androidTest/java/org/joinmastodon/android/fragments/ThreadFragmentTest.java

@@ -0,0 +1,90 @@
+package org.joinmastodon.android.fragments;
+
+import static org.junit.Assert.*;
+
+import android.util.Pair;
+
+import org.joinmastodon.android.model.Status;
+import org.joinmastodon.android.model.StatusContext;
+import org.junit.Test;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class ThreadFragmentTest {
+
+	private Status fakeStatus(String id, String inReplyTo) {
+		Status status = Status.ofFake(id, null, null);
+		status.inReplyToId = inReplyTo;
+		return status;
+	}
+
+	@Test
+	public void countAncestryLevels() {
+		StatusContext context = new StatusContext();
+		context.ancestors = List.of(
+				fakeStatus("oldest ancestor", null),
+				fakeStatus("younger ancestor", "oldest ancestor")
+		);
+		context.descendants = List.of(
+				fakeStatus("first reply", "main status"),
+				fakeStatus("reply to first reply", "first reply"),
+				fakeStatus("third level reply", "reply to first reply"),
+				fakeStatus("another reply", "main status")
+		);
+		List<Pair<String, Integer>> actual =
+				ThreadFragment.countAncestryLevels("main status", context);
+
+		List<Pair<String, Integer>> expected = List.of(
+				Pair.create("oldest ancestor", -2),
+				Pair.create("younger ancestor", -1),
+				Pair.create("main status", 0),
+				Pair.create("first reply", 1),
+				Pair.create("reply to first reply", 2),
+				Pair.create("third level reply", 3),
+				Pair.create("another reply", 1)
+		);
+		assertEquals(
+				"status ids are in the right order",
+				expected.stream().map(p -> p.first).collect(Collectors.toList()),
+				actual.stream().map(p -> p.first).collect(Collectors.toList())
+		);
+		assertEquals(
+				"counted levels match",
+				expected.stream().map(p -> p.second).collect(Collectors.toList()),
+				actual.stream().map(p -> p.second).collect(Collectors.toList())
+		);
+	}
+
+	@Test
+	public void sortStatusContext() {
+		StatusContext context = new StatusContext();
+		context.ancestors = List.of(
+				fakeStatus("younger ancestor", "oldest ancestor"),
+				fakeStatus("oldest ancestor", null)
+		);
+		context.descendants = List.of(
+				fakeStatus("reply to first reply", "first reply"),
+				fakeStatus("third level reply", "reply to first reply"),
+				fakeStatus("first reply", "main status"),
+				fakeStatus("another reply", "main status")
+		);
+
+		ThreadFragment.sortStatusContext(
+				fakeStatus("main status", "younger ancestor"),
+				context
+		);
+		List<Status> expectedAncestors = List.of(
+				fakeStatus("oldest ancestor", null),
+				fakeStatus("younger ancestor", "oldest ancestor")
+		);
+		List<Status> expectedDescendants = List.of(
+				fakeStatus("first reply", "main status"),
+				fakeStatus("reply to first reply", "first reply"),
+				fakeStatus("third level reply", "reply to first reply"),
+				fakeStatus("another reply", "main status")
+		);
+
+		// TODO: ??? i have no idea how this code works. it certainly doesn't return what i'd expect
+	}
+}

mastodon/src/androidTest/java/org/joinmastodon/android/utils/StatusFilterPredicateTest.java

@@ -0,0 +1,81 @@
+package org.joinmastodon.android.utils;
+
+import static org.joinmastodon.android.model.Filter.FilterAction.*;
+import static org.joinmastodon.android.model.Filter.FilterContext.*;
+import static org.junit.Assert.*;
+
+import org.joinmastodon.android.model.Filter;
+import org.joinmastodon.android.model.Status;
+import org.junit.Test;
+
+import java.time.Instant;
+import java.util.EnumSet;
+import java.util.List;
+
+public class StatusFilterPredicateTest {
+
+    private static final Filter hideMeFilter = new Filter(), warnMeFilter = new Filter();
+    private static final List<Filter> allFilters = List.of(hideMeFilter, warnMeFilter);
+
+    private static final Status
+            hideInHomePublic = Status.ofFake(null, "hide me, please", Instant.now()),
+            warnInHomePublic = Status.ofFake(null, "display me with a warning", Instant.now());
+
+    static {
+        hideMeFilter.phrase = "hide me";
+        hideMeFilter.filterAction = HIDE;
+        hideMeFilter.context = EnumSet.of(PUBLIC, HOME);
+
+        warnMeFilter.phrase = "warning";
+        warnMeFilter.filterAction = WARN;
+        warnMeFilter.context = EnumSet.of(PUBLIC, HOME);
+    }
+
+    @Test
+    public void testHide() {
+        assertFalse("should not pass because matching filter applies to given context",
+                new StatusFilterPredicate(allFilters, HOME).test(hideInHomePublic));
+    }
+
+    @Test
+    public void testHideRegardlessOfContext() {
+        assertTrue("filters without context should always pass",
+                new StatusFilterPredicate(allFilters, null).test(hideInHomePublic));
+    }
+
+    @Test
+    public void testHideInDifferentContext() {
+        assertTrue("should pass because matching filter does not apply to given context",
+                new StatusFilterPredicate(allFilters, THREAD).test(hideInHomePublic));
+    }
+
+    @Test
+    public void testHideWithWarningText() {
+        assertTrue("should pass because matching filter is for warnings",
+                new StatusFilterPredicate(allFilters, HOME).test(warnInHomePublic));
+    }
+
+    @Test
+    public void testWarn() {
+        assertFalse("should not pass because filter applies to given context",
+                new StatusFilterPredicate(allFilters, HOME, WARN).test(warnInHomePublic));
+    }
+
+    @Test
+    public void testWarnRegardlessOfContext() {
+        assertTrue("filters without context should always pass",
+                new StatusFilterPredicate(allFilters, null, WARN).test(warnInHomePublic));
+    }
+
+    @Test
+    public void testWarnInDifferentContext() {
+        assertTrue("should pass because filter does not apply to given context",
+                new StatusFilterPredicate(allFilters, THREAD, WARN).test(warnInHomePublic));
+    }
+
+    @Test
+    public void testWarnWithHideText() {
+        assertTrue("should pass because matching filter is for hiding",
+                new StatusFilterPredicate(allFilters, HOME, WARN).test(hideInHomePublic));
+    }
+}

mastodon/src/main/AndroidManifest.xml

@@ -38,6 +38,22 @@
 				<category android:name="android.intent.category.LAUNCHER"/>
 			</intent-filter>
 		</activity>
+		<activity
+			android:name=".PanicResponderActivity"
+			android:exported="true"
+			android:launchMode="singleInstance"
+			android:noHistory="true"
+			android:theme="@android:style/Theme.NoDisplay">
+			<intent-filter>
+				<action android:name="info.guardianproject.panic.action.TRIGGER" />
+
+				<category android:name="android.intent.category.DEFAULT" />
+			</intent-filter>
+		</activity>
+		<activity
+			android:name=".ExitActivity"
+			android:exported="false"
+			android:theme="@android:style/Theme.NoDisplay" />
 		<activity android:name=".OAuthActivity" android:exported="true" android:configChanges="orientation|screenSize" android:launchMode="singleTask">
 			<intent-filter>
 				<action android:name="android.intent.action.VIEW"/>
@@ -46,7 +62,8 @@
 				<data android:scheme="megalodon-android-auth" android:host="callback"/>
 			</intent-filter>
 		</activity>
-		<activity android:name=".ExternalShareActivity" android:exported="true" android:configChanges="orientation|screenSize" android:windowSoftInputMode="adjustResize">
+		<activity android:name=".ExternalShareActivity" android:exported="true" android:configChanges="orientation|screenSize" android:windowSoftInputMode="adjustResize"
+			android:theme="@style/TransparentDialog">
 			<intent-filter>
 				<action android:name="android.intent.action.SEND"/>
 				<category android:name="android.intent.category.DEFAULT"/>

mastodon/src/main/assets/blocks.tsv

@@ -1,89 +0,0 @@
-#	lists.d Mastodon Blocklist	(c) 2022 Greyhat Academy	LICENSED  UNDER: CC-BY-NC-SA 4.0
-#	https://raw.githubusercontent.com/greyhat-academy/lists.d/main/mastodon.domains.block.list.tsv
-#	This list contains domains of toxic mastodon instances
-#	Last-Modified:	1672044500
-
-#	gab - a neonazi social network
-gab.ai
-gab.com
-gab.protohype.net
-
-#	consequence-free speech
-social.unzensiert.to
-freeatlantis.com
-
-#	reactionary bigotry and hatespeech against marginalized groups
-poa.st
-freespeechextremist.com
-rdrama.cc
-outpoa.st
-anime.website
-gameliberty.club
-social.byoblu.com
-yggdrasil.social
-smuglo.li
-dogeposting.social
-unsafe.space
-freezepeach.xyz
-
-#	+ CSAM
-rojogato.com
-
-#	antivaxxer shitposting & fearmongering
-shadowsocial.org
-
-#	Kiwifarms
-kiwifarms.net
-kiwifarms.cc
-kiwifarms.is
-kiwifarms.pleroma.net
-
-
-# https://mastodon.art/@Curator/109649354849593592
-
-poa.st antisemitic racist homophobic
-nicecrew.digital antisemitic
-beefyboys.win antisemitic racist homophobic harassment
-cawfee.club antisemitic racist homophobic
-comfyboy.club antisemitic racist homophobic
-freespeechextremist.com racist homophobic
-cum.salon racist misogynist
-bae.st racist
-natehiggers.online racist
-rapemeat.solutions misogynist
-rapist.town misogynist
-rapefeminists.network misogynist
-kiwifarms.cc harassment
-noagendasocial.com noagenda
-posting.lolicon.rocks underage
-urchan.org harassment homophobic racist
-ryona.agency harassment
-yggdrasil.social antisemitic homophobic racist
-genderheretics.xyz transphobic
-baraag.net underage
-lolison.top underage
-shota.house underage
-shota.social underage
-aethy.com underage
-taullo.social underage
-childpawn.shop underage
-posting.lolicon.rocks underage
-loli.best underage
-gothloli.club underage
-smuglo.li underage
-youjo.love underage
-pedo.school underage
-lolison.network underage
-freak.university underage
-mirr0r.city underage
-xhais.love underage
-refusal.biz underage
-refusal.llc underage
-mirr0r.city underage
-nnia.space underage
-ignorelist.com malicious
-repl.co malicious
-
-# custom
-
-pawoo.net csam

mastodon/src/main/assets/blocks.txt

@@ -0,0 +1,171 @@
+13bells.com
+4aem.com
+aethy.com
+anime.website
+annihilation.social
+anon-kenkai.com
+asbestos.cafe
+bae.st
+bajax.us
+banepo.st
+baraag.net
+beefyboys.win
+beepboop.ga
+berserker.town
+bikeshed.party
+boks.moe
+brainsoap.net
+breastmilk.club
+brighteon.social
+cawfee.club
+clew.lol
+clubcyberia.co
+collapsitarian.io
+comfyboy.club
+contrapointsfan.club
+cum.camp
+cum.salon
+cybercriminal.eu
+darknight-coffee.org
+dembased.xyz
+desupost.soy
+detroitriotcity.com
+eatthebugs.social
+eientei.org
+elementality.org
+eveningzoo.club
+firedragonstudios.com
+firefaithfellowship.com
+fluf.club
+foxfam.club
+freak.university
+freeatlantis.com
+freecumextremist.com
+freedomstrike.org
+freesoftwareextremist.com
+freespeech.group
+freespeechextremist.com
+freetalklive.com
+froth.zone
+fulltermprivacy.com
+gameliberty.club
+gearlandia.haus
+genderheretics.xyz
+geofront.rocks
+gleasonator.com
+glee.li
+glindr.org
+goyim.app
+goyslop.cafe
+haeder.net
+handholding.io
+hidamari.apartments
+hitchhiker.social
+hunk.city
+iddqd.social
+intkos.link
+justicewarrior.social
+kawa-kun.com
+kitsunemimi.club
+kiwifarms.cc
+kompost.cz
+kurosawa.moe
+leafposter.club
+leftychan.net
+lewdieheaven.com
+liberdon.com
+ligma.pro
+lizards.live
+lolicon.rocks
+lolison.top
+lovingexpressions.net
+lucasvl.nl
+mahodou.moe
+makemysarcophagus.com
+maladaptive.art
+masochi.st
+mastinator.com
+merovingian.club
+midwaytrades.com
+mirr0r.city
+moa.st
+mouse.services
+mugicha.club
+narrativerry.xyz
+natehiggers.online
+neckbeard.xyz
+needs.vodka
+neenster.org
+nicecrew.digital
+nnia.space
+noagendasocial.com
+noagendasocial.nl
+noagendatube.com
+nobodyhasthe.biz
+nukem.biz
+obo.sh
+onionfarms.org
+outpoa.st
+pawlicker.com
+pawoo.net
+pedo.school
+piazza.today
+pibvt.net
+pieville.net
+pisskey.io
+plagu.ee
+pmth.us
+poa.st
+poast.org
+poast.tv
+poster.place
+prospeech.space
+quodverum.com
+rakket.app
+rapemeat.solutions
+rdrama.cc
+rebelbase.site
+retardedniggers.forsale
+rojogato.com
+ryona.agency
+schwartzwelt.xyz
+seal.cafe
+shigusegubu.club
+shitpost.cloud
+shitposter.club
+shota.house
+silliness.observer
+skinheads.eu
+skinheads.io
+skinheads.social
+skinheads.uk
+skippers-bin.com
+skyshanty.xyz
+slash.cl
+sleepy.cafe
+smuglo.li
+sneed.social
+sonichu.com
+spinster.xyz
+springbo.cc
+starnix.network
+stereophonic.space
+strelizia.net
+syspxl.xyz
+tastingtraffic.net
+teci.world
+theapex.social
+thepostearthdestination.com
+tkammer.de
+trumpislovetrumpis.life
+truthsocial.co.in
+urchan.org
+varishangout.net
+whinge.house
+whinge.town
+wideboys.org
+wolfgirl.bar
+xn--p1abe3d.xn--80asehdb
+yggdrasil.social
+youjo.love
+zztails.gay

mastodon/src/main/java/org/joinmastodon/android/ExitActivity.java

@@ -0,0 +1,24 @@
+package org.joinmastodon.android;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+
+public class ExitActivity extends Activity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        finishAndRemoveTask();
+    }
+
+    public static void exit(Context context) {
+        Intent intent = new Intent(context, ExitActivity.class);
+        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
+        context.startActivity(intent);
+    }
+
+}

mastodon/src/main/java/org/joinmastodon/android/ExternalShareActivity.java

@@ -3,7 +3,6 @@ package org.joinmastodon.android;
 import android.app.Fragment;
 import android.content.ClipData;
 import android.content.Intent;
-import android.graphics.drawable.ColorDrawable;
 import android.net.Uri;
 import android.os.Bundle;
 import android.text.TextUtils;
@@ -12,6 +11,7 @@ import android.widget.Toast;
 import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.ComposeFragment;
+import org.joinmastodon.android.ui.AccountSwitcherSheet;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.jsoup.internal.StringUtil;
 
@@ -28,18 +28,34 @@ public class ExternalShareActivity extends FragmentStackActivity{
 		UiUtils.setUserPreferredTheme(this);
 		super.onCreate(savedInstanceState);
 		if(savedInstanceState==null){
+
+			String text = getIntent().getStringExtra(Intent.EXTRA_TEXT);
+			boolean isMastodonURL = UiUtils.looksLikeMastodonUrl(text);
+
 			List<AccountSession> sessions=AccountSessionManager.getInstance().getLoggedInAccounts();
 			if(sessions.isEmpty()){
 				Toast.makeText(this, R.string.err_not_logged_in, Toast.LENGTH_SHORT).show();
 				finish();
-			}else if(sessions.size()==1){
+			}else if(sessions.size()==1 && !isMastodonURL){
 				openComposeFragment(sessions.get(0).getID());
 			}else{
-				getWindow().setBackgroundDrawable(new ColorDrawable(0xff000000));
-				UiUtils.pickAccount(this, null, R.string.choose_account, 0,
-						session -> openComposeFragment(session.getID()),
-						b -> b.setOnCancelListener(d -> finish())
-				);
+				new AccountSwitcherSheet(this, null, true, isMastodonURL, (accountId, open) -> {
+					if (open) {
+						UiUtils.lookupURL(this, accountId, text, false, (clazz, args) -> {
+							if (clazz == null) {
+								finish();
+								return;
+							}
+							args.putString("fromExternalShare", clazz.getSimpleName());
+							Intent intent = new Intent(this, MainActivity.class);
+							intent.putExtras(args);
+							finish();
+							startActivity(intent);
+						});
+					} else {
+						openComposeFragment(accountId);
+					}
+				}).show();
 			}
 		}
 	}

mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java

@@ -8,6 +8,7 @@ import android.content.SharedPreferences;
 import com.google.gson.JsonSyntaxException;
 import com.google.gson.reflect.TypeToken;
 
+import org.joinmastodon.android.model.ContentType;
 import org.joinmastodon.android.model.TimelineDefinition;
 
 import java.lang.reflect.Type;
@@ -53,10 +54,13 @@ public class GlobalUserPreferences{
 
 	private final static Type recentLanguagesType = new TypeToken<Map<String, List<String>>>() {}.getType();
 	private final static Type pinnedTimelinesType = new TypeToken<Map<String, List<TimelineDefinition>>>() {}.getType();
+	private final static Type accountsDefaultContentTypesType = new TypeToken<Map<String, ContentType>>() {}.getType();
 	public static Map<String, List<String>> recentLanguages;
 	public static Map<String, List<TimelineDefinition>> pinnedTimelines;
 	public static Set<String> accountsWithLocalOnlySupport;
 	public static Set<String> accountsInGlitchMode;
+	public static Set<String> accountsWithContentTypesEnabled;
+	public static Map<String, ContentType> accountsDefaultContentTypes;
 
 	/**
 	 * Pleroma
@@ -73,6 +77,16 @@ public class GlobalUserPreferences{
 		catch (JsonSyntaxException ignored) { return orElse; }
 	}
 
+	public static void removeAccount(String accountId) {
+		recentLanguages.remove(accountId);
+		pinnedTimelines.remove(accountId);
+		accountsInGlitchMode.remove(accountId);
+		accountsWithLocalOnlySupport.remove(accountId);
+		accountsWithContentTypesEnabled.remove(accountId);
+		accountsDefaultContentTypes.remove(accountId);
+		save();
+	}
+
 	public static void load(){
 		SharedPreferences prefs=getPrefs();
 		playGifs=prefs.getBoolean("playGifs", true);
@@ -111,6 +125,8 @@ public class GlobalUserPreferences{
 		accountsWithLocalOnlySupport=prefs.getStringSet("accountsWithLocalOnlySupport", new HashSet<>());
 		accountsInGlitchMode=prefs.getStringSet("accountsInGlitchMode", new HashSet<>());
 		replyVisibility=prefs.getString("replyVisibility", null);
+		accountsWithContentTypesEnabled=prefs.getStringSet("accountsWithContentTypesEnabled", new HashSet<>());
+		accountsDefaultContentTypes=fromJson(prefs.getString("accountsDefaultContentTypes", null), accountsDefaultContentTypesType, new HashMap<>());
 
 		try {
 			color=ColorPreference.valueOf(prefs.getString("color", ColorPreference.PINK.name()));
@@ -158,6 +174,8 @@ public class GlobalUserPreferences{
 				.putStringSet("accountsWithLocalOnlySupport", accountsWithLocalOnlySupport)
 				.putStringSet("accountsInGlitchMode", accountsInGlitchMode)
 				.putString("replyVisibility", replyVisibility)
+				.putStringSet("accountsWithContentTypesEnabled", accountsWithContentTypesEnabled)
+				.putString("accountsDefaultContentTypes", gson.toJson(accountsDefaultContentTypes))
 				.apply();
 	}
 
@@ -178,4 +196,3 @@ public class GlobalUserPreferences{
 		DARK
 	}
 }
-

mastodon/src/main/java/org/joinmastodon/android/MainActivity.java

@@ -2,11 +2,14 @@ package org.joinmastodon.android;
 
 import android.Manifest;
 import android.app.Fragment;
+import android.app.assist.AssistContent;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
+import android.view.View;
+import android.widget.FrameLayout;
 
 import org.joinmastodon.android.api.ObjectValidationException;
 import org.joinmastodon.android.api.session.AccountSession;
@@ -20,12 +23,13 @@ import org.joinmastodon.android.fragments.onboarding.CustomWelcomeFragment;
 import org.joinmastodon.android.model.Notification;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.updater.GithubSelfUpdater;
+import org.joinmastodon.android.utils.ProvidesAssistContent;
 import org.parceler.Parcels;
 
 import androidx.annotation.Nullable;
 import me.grishka.appkit.FragmentStackActivity;
 
-public class MainActivity extends FragmentStackActivity{
+public class MainActivity extends FragmentStackActivity implements ProvidesAssistContent {
 	@Override
 	protected void onCreate(@Nullable Bundle savedInstanceState){
 		UiUtils.setUserPreferredTheme(this);
@@ -35,10 +39,18 @@ public class MainActivity extends FragmentStackActivity{
 			if(AccountSessionManager.getInstance().getLoggedInAccounts().isEmpty()){
 				showFragmentClearingBackStack(new CustomWelcomeFragment());
 			}else{
-				AccountSessionManager.getInstance().maybeUpdateLocalInfo();
 				AccountSession session;
 				Bundle args=new Bundle();
 				Intent intent=getIntent();
+				if(intent.hasExtra("fromExternalShare")) {
+					AccountSessionManager.getInstance()
+							.setLastActiveAccountID(intent.getStringExtra("account"));
+					AccountSessionManager.getInstance().maybeUpdateLocalInfo(
+							AccountSessionManager.getInstance().getLastActiveAccount());
+					showFragmentForExternalShare(intent.getExtras());
+					return;
+				}
+
 				boolean fromNotification = intent.getBooleanExtra("fromNotification", false);
 				boolean hasNotification = intent.hasExtra("notification");
 				if(fromNotification){
@@ -52,6 +64,7 @@ public class MainActivity extends FragmentStackActivity{
 				}else{
 					session=AccountSessionManager.getInstance().getLastActiveAccount();
 				}
+				AccountSessionManager.getInstance().maybeUpdateLocalInfo(session);
 				args.putString("account", session.getID());
 				Fragment fragment=session.activated ? new HomeFragment() : new AccountActivationFragment();
 				fragment.setArguments(args);
@@ -75,11 +88,12 @@ public class MainActivity extends FragmentStackActivity{
 	@Override
 	protected void onNewIntent(Intent intent){
 		super.onNewIntent(intent);
-		if(intent.getBooleanExtra("fromNotification", false)){
+		AccountSessionManager.getInstance().maybeUpdateLocalInfo();
+		if (intent.hasExtra("fromExternalShare")) showFragmentForExternalShare(intent.getExtras());
+		else if (intent.getBooleanExtra("fromNotification", false)) {
 			String accountID=intent.getStringExtra("accountID");
-			AccountSession accountSession;
 			try{
-				accountSession=AccountSessionManager.getInstance().getAccount(accountID);
+				AccountSessionManager.getInstance().getAccount(accountID);
 			}catch(IllegalStateException x){
 				return;
 			}
@@ -124,6 +138,19 @@ public class MainActivity extends FragmentStackActivity{
 		showFragment(fragment);
 	}
 
+	private void showFragmentForExternalShare(Bundle args) {
+		String clazz = args.getString("fromExternalShare");
+		Fragment fragment = switch (clazz) {
+			case "ThreadFragment" -> new ThreadFragment();
+			case "ProfileFragment" -> new ProfileFragment();
+			default -> null;
+		};
+		if (fragment == null) return;
+		args.putBoolean("_can_go_back", true);
+		fragment.setArguments(args);
+		showFragment(fragment);
+	}
+
 	private void showCompose(){
 		AccountSession session=AccountSessionManager.getInstance().getLastActiveAccount();
 		if(session==null || !session.activated)
@@ -153,18 +180,40 @@ public class MainActivity extends FragmentStackActivity{
 				(fragmentContainers.get(fragmentContainers.size() - 1)).getId()
 		);
 		Bundle currentArgs = currentFragment.getArguments();
-		if (this.fragmentContainers.size() == 1
-				&& currentArgs != null
-				&& currentArgs.getBoolean("_can_go_back", false)
-				&& currentArgs.containsKey("account")) {
+		if (fragmentContainers.size() != 1
+				|| currentArgs == null
+				|| !currentArgs.getBoolean("_can_go_back", false)) {
+			super.onBackPressed();
+			return;
+		}
+		if (currentArgs.getBoolean("_finish_on_back", false)) {
+			finish();
+		} else if (currentArgs.containsKey("account")) {
 			Bundle args = new Bundle();
 			args.putString("account", currentArgs.getString("account"));
-			args.putString("tab", "notifications");
+			if (getIntent().getBooleanExtra("fromNotification", false)) {
+				args.putString("tab", "notifications");
+			}
 			Fragment fragment=new HomeFragment();
 			fragment.setArguments(args);
 			showFragmentClearingBackStack(fragment);
-		} else {
-			super.onBackPressed();
 		}
 	}
+
+	public Fragment getCurrentFragment() {
+		for (int i = fragmentContainers.size() - 1; i >= 0; i--) {
+			FrameLayout fl = fragmentContainers.get(i);
+			if (fl.getVisibility() == View.VISIBLE) {
+				return getFragmentManager().findFragmentById(fl.getId());
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public void onProvideAssistContent(AssistContent assistContent) {
+		super.onProvideAssistContent(assistContent);
+		Fragment fragment = getCurrentFragment();
+		if (fragment != null) callFragmentToProvideAssistContent(fragment, assistContent);
+	}
 }

mastodon/src/main/java/org/joinmastodon/android/PanicResponderActivity.java

@@ -0,0 +1,49 @@
+package org.joinmastodon.android;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+
+import org.joinmastodon.android.api.requests.oauth.RevokeOauthToken;
+import org.joinmastodon.android.api.session.AccountSession;
+import org.joinmastodon.android.api.session.AccountSessionManager;
+
+import me.grishka.appkit.api.Callback;
+import me.grishka.appkit.api.ErrorResponse;
+
+
+public class PanicResponderActivity extends Activity {
+    public static final String PANIC_TRIGGER_ACTION = "info.guardianproject.panic.action.TRIGGER";
+
+    @Override
+    protected void onCreate(final Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        final Intent intent = getIntent();
+        if (intent != null && PANIC_TRIGGER_ACTION.equals(intent.getAction())) {
+            AccountSessionManager.getInstance().getLoggedInAccounts().forEach(accountSession -> logOut(accountSession.getID()));
+            ExitActivity.exit(this);
+        }
+        finishAndRemoveTask();
+    }
+
+    private void logOut(String accountID){
+        AccountSession session=AccountSessionManager.getInstance().getAccount(accountID);
+        new RevokeOauthToken(session.app.clientId, session.app.clientSecret, session.token.accessToken)
+                .setCallback(new Callback<>(){
+                    @Override
+                    public void onSuccess(Object result){
+                        onLoggedOut(accountID);
+                    }
+
+                    @Override
+                    public void onError(ErrorResponse error){
+                        onLoggedOut(accountID);
+                    }
+                })
+                .exec(accountID);
+    }
+
+    private void onLoggedOut(String accountID){
+        AccountSessionManager.getInstance().removeAccount(accountID);
+    }
+}

mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java

@@ -25,6 +25,7 @@ import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.events.NotificationReceivedEvent;
 import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.model.Mention;
 import org.joinmastodon.android.model.NotificationAction;
 import org.joinmastodon.android.model.Preferences;
 import org.joinmastodon.android.model.PushNotification;
@@ -33,6 +34,7 @@ import org.joinmastodon.android.model.StatusPrivacy;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.parceler.Parcels;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Random;
@@ -273,8 +275,23 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 		}
 		CharSequence input = remoteInput.getCharSequence(ACTION_KEY_TEXT_REPLY);
 
+		// copied from ComposeFragment - TODO: generalize?
+		ArrayList<String> mentions=new ArrayList<>();
+		Status status = notification.status;
+		String ownID=AccountSessionManager.getInstance().getAccount(accountID).self.id;
+		if(!status.account.id.equals(ownID))
+			mentions.add('@'+status.account.acct);
+		for(Mention mention:status.mentions){
+			if(mention.id.equals(ownID))
+				continue;
+			String m='@'+mention.acct;
+			if(!mentions.contains(m))
+				mentions.add(m);
+		}
+		String initialText=mentions.isEmpty() ? "" : TextUtils.join(" ", mentions)+" ";
+
 		CreateStatus.Request req=new CreateStatus.Request();
-		req.status = input.toString();
+		req.status = initialText + input.toString();
 		req.language = preferences.postingDefaultLanguage;
 		req.visibility = preferences.postingDefaultVisibility;
 		req.inReplyToId = notification.status.id;
@@ -282,7 +299,7 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 			req.spoilerText = "re: " + notification.status.spoilerText;
 		}
 
-		new CreateStatus(req, UUID.randomUUID().toString()).setCallback(new Callback<Status>() {
+		new CreateStatus(req, UUID.randomUUID().toString()).setCallback(new Callback<>() {
 			@Override
 			public void onSuccess(Status status) {
 				NotificationManager notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);

mastodon/src/main/java/org/joinmastodon/android/api/CacheController.java

@@ -19,7 +19,6 @@ import org.joinmastodon.android.model.CacheablePaginatedResponse;
 import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.model.Notification;
-import org.joinmastodon.android.model.PaginatedResponse;
 import org.joinmastodon.android.model.SearchResult;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.utils.StatusFilterPredicate;
@@ -74,10 +73,8 @@ public class CacheController{
 								int flags=cursor.getInt(1);
 								status.hasGapAfter=((flags & POST_FLAG_GAP_AFTER)!=0);
 								newMaxID=status.id;
-								for(Filter filter:filters){
-									if(filter.matches(status))
-										continue outer;
-								}
+								if (!new StatusFilterPredicate(filters, Filter.FilterContext.HOME).test(status))
+									continue outer;
 								result.add(status);
 							}while(cursor.moveToNext());
 							String _newMaxID=newMaxID;
@@ -92,7 +89,7 @@ public class CacheController{
 						.setCallback(new Callback<>(){
 							@Override
 							public void onSuccess(List<Status> result){
-								callback.onSuccess(new CacheablePaginatedResponse<>(result.stream().filter(new StatusFilterPredicate(filters)).collect(Collectors.toList()), result.isEmpty() ? null : result.get(result.size()-1).id, false));
+								callback.onSuccess(new CacheablePaginatedResponse<>(result.stream().filter(new StatusFilterPredicate(filters, Filter.FilterContext.HOME)).collect(Collectors.toList()), result.isEmpty() ? null : result.get(result.size()-1).id, false));
 								putHomeTimeline(result, maxID==null);
 							}
 
@@ -148,10 +145,8 @@ public class CacheController{
 								ntf.postprocess();
 								newMaxID=ntf.id;
 								if(ntf.status!=null){
-									for(Filter filter:filters){
-										if(filter.matches(ntf.status))
-											continue outer;
-									}
+									if (!new StatusFilterPredicate(filters, Filter.FilterContext.NOTIFICATIONS).test(ntf.status))
+										continue outer;
 								}
 								result.add(ntf);
 							}while(cursor.moveToNext());
@@ -164,17 +159,13 @@ public class CacheController{
 					}
 				}
 				Instance instance=AccountSessionManager.getInstance().getInstanceInfo(accountSession.domain);
-				new GetNotifications(maxID, count, onlyPosts ? EnumSet.of(Notification.Type.STATUS) : onlyMentions ? EnumSet.of(Notification.Type.MENTION): EnumSet.allOf(Notification.Type.class), instance.pleroma != null)
+				new GetNotifications(maxID, count, onlyPosts ? EnumSet.of(Notification.Type.STATUS) : onlyMentions ? EnumSet.of(Notification.Type.MENTION): EnumSet.allOf(Notification.Type.class), instance.isAkkoma())
 						.setCallback(new Callback<>(){
 							@Override
 							public void onSuccess(List<Notification> result){
 								callback.onSuccess(new CacheablePaginatedResponse<>(result.stream().filter(ntf->{
 									if(ntf.status!=null){
-										for(Filter filter:filters){
-											if(filter.matches(ntf.status)){
-												return false;
-											}
-										}
+										return new StatusFilterPredicate(filters, Filter.FilterContext.NOTIFICATIONS).test(ntf.status);
 									}
 									return true;
 								}).collect(Collectors.toList()), result.isEmpty() ? null : result.get(result.size()-1).id, false));

mastodon/src/main/java/org/joinmastodon/android/api/MastodonAPIController.java

@@ -28,6 +28,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -51,7 +52,9 @@ public class MastodonAPIController{
 			.registerTypeAdapter(Status.class, new Status.StatusDeserializer())
 			.create();
 	private static WorkerThread thread=new WorkerThread("MastodonAPIController");
-	private static OkHttpClient httpClient=new OkHttpClient.Builder().build();
+	private static OkHttpClient httpClient=new OkHttpClient.Builder()
+			.readTimeout(5, TimeUnit.MINUTES)
+			.build();
 
 	private AccountSession session;
 	private static List<String> badDomains = new ArrayList<>();
@@ -60,7 +63,7 @@ public class MastodonAPIController{
 		thread.start();
 		try {
 			final BufferedReader reader = new BufferedReader(new InputStreamReader(
-					MastodonApp.context.getAssets().open("blocks.tsv")
+					MastodonApp.context.getAssets().open("blocks.txt")
 			));
 			String line;
 			while ((line = reader.readLine()) != null) {
@@ -91,7 +94,7 @@ public class MastodonAPIController{
 				Request.Builder builder=new Request.Builder()
 						.url(req.getURL().toString())
 						.method(req.getMethod(), req.getRequestBody())
-						.header("User-Agent", "MastodonAndroid/"+BuildConfig.VERSION_NAME);
+						.header("User-Agent", "MegalodonAndroid/"+BuildConfig.VERSION_NAME);
 
 				String token=null;
 				if(session!=null)

mastodon/src/main/java/org/joinmastodon/android/api/requests/notifications/PleromaMarkNotificationsRead.java

@@ -0,0 +1,30 @@
+package org.joinmastodon.android.api.requests.notifications;
+
+import android.text.TextUtils;
+
+import com.google.gson.reflect.TypeToken;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.model.Notification;
+
+import java.util.List;
+
+import okhttp3.MultipartBody;
+import okhttp3.RequestBody;
+
+public class PleromaMarkNotificationsRead extends MastodonAPIRequest<List<Notification>> {
+    private String maxID;
+    public PleromaMarkNotificationsRead(String maxID) {
+        super(HttpMethod.POST, "/pleroma/notifications/read", new TypeToken<>(){});
+        this.maxID = maxID;
+    }
+
+    @Override
+    public RequestBody getRequestBody() {
+        MultipartBody.Builder builder=new MultipartBody.Builder()
+                .setType(MultipartBody.FORM);
+        if(!TextUtils.isEmpty(maxID))
+            builder.addFormDataPart("max_id", maxID);
+        return builder.build();
+    }
+}

mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/CreateStatus.java

@@ -1,6 +1,7 @@
 package org.joinmastodon.android.api.requests.statuses;
 
 import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.model.ContentType;
 import org.joinmastodon.android.model.ScheduledStatus;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.model.StatusPrivacy;
@@ -46,6 +47,7 @@ public class CreateStatus extends MastodonAPIRequest<Status>{
 		public String language;
 
 		public String quoteId;
+		public ContentType contentType;
 
 		public static class Poll{
 			public ArrayList<String> options=new ArrayList<>();

mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/GetStatusSourceText.java

@@ -2,17 +2,22 @@ package org.joinmastodon.android.api.requests.statuses;
 
 import org.joinmastodon.android.api.AllFieldsAreRequired;
 import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.api.RequiredField;
 import org.joinmastodon.android.model.BaseModel;
+import org.joinmastodon.android.model.ContentType;
 
 public class GetStatusSourceText extends MastodonAPIRequest<GetStatusSourceText.Response>{
 	public GetStatusSourceText(String id){
 		super(HttpMethod.GET, "/statuses/"+id+"/source", Response.class);
 	}
 
-	@AllFieldsAreRequired
 	public static class Response extends BaseModel{
+		@RequiredField
 		public String id;
+		@RequiredField
 		public String text;
+		@RequiredField
 		public String spoilerText;
+		public ContentType contentType;
 	}
 }

mastodon/src/main/java/org/joinmastodon/android/api/requests/timelines/GetBubbleTimeline.java

@@ -0,0 +1,23 @@
+package org.joinmastodon.android.api.requests.timelines;
+
+import android.text.TextUtils;
+
+import com.google.gson.reflect.TypeToken;
+
+import org.joinmastodon.android.GlobalUserPreferences;
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.model.Status;
+
+import java.util.List;
+
+public class GetBubbleTimeline extends MastodonAPIRequest<List<Status>> {
+    public GetBubbleTimeline(String maxID, int limit) {
+        super(HttpMethod.GET, "/timelines/bubble", new TypeToken<>(){});
+        if(!TextUtils.isEmpty(maxID))
+            addQueryParameter("max_id", maxID);
+        if(limit>0)
+            addQueryParameter("limit", limit+"");
+        if(GlobalUserPreferences.replyVisibility != null)
+            addQueryParameter("reply_visibility", GlobalUserPreferences.replyVisibility);
+    }
+}

mastodon/src/main/java/org/joinmastodon/android/api/requests/timelines/GetHashtagTimeline.java

@@ -2,6 +2,7 @@ package org.joinmastodon.android.api.requests.timelines;
 
 import com.google.gson.reflect.TypeToken;
 
+import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.Status;
 
@@ -16,5 +17,7 @@ public class GetHashtagTimeline extends MastodonAPIRequest<List<Status>>{
 			addQueryParameter("min_id", minID);
 		if(limit>0)
 			addQueryParameter("limit", ""+limit);
+		if(GlobalUserPreferences.replyVisibility != null)
+			addQueryParameter("reply_visibility", GlobalUserPreferences.replyVisibility);
 	}
 }

mastodon/src/main/java/org/joinmastodon/android/api/requests/timelines/GetListTimeline.java

@@ -2,6 +2,7 @@ package org.joinmastodon.android.api.requests.timelines;
 
 import com.google.gson.reflect.TypeToken;
 
+import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.Status;
 
@@ -18,5 +19,7 @@ public class GetListTimeline extends MastodonAPIRequest<List<Status>> {
             addQueryParameter("limit", ""+limit);
         if(sinceID!=null)
             addQueryParameter("since_id", sinceID);
+        if(GlobalUserPreferences.replyVisibility != null)
+            addQueryParameter("reply_visibility", GlobalUserPreferences.replyVisibility);
     }
 }

mastodon/src/main/java/org/joinmastodon/android/api/requests/timelines/GetPublicTimeline.java

@@ -4,6 +4,7 @@ import android.text.TextUtils;
 
 import com.google.gson.reflect.TypeToken;
 
+import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.Status;
 
@@ -20,5 +21,7 @@ public class GetPublicTimeline extends MastodonAPIRequest<List<Status>>{
 			addQueryParameter("max_id", maxID);
 		if(limit>0)
 			addQueryParameter("limit", limit+"");
+		if(GlobalUserPreferences.replyVisibility != null)
+			addQueryParameter("reply_visibility", GlobalUserPreferences.replyVisibility);
 	}
 }

mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSession.java

@@ -1,5 +1,7 @@
 package org.joinmastodon.android.api.session;
 
+import android.net.Uri;
+
 import org.joinmastodon.android.api.CacheController;
 import org.joinmastodon.android.api.MastodonAPIController;
 import org.joinmastodon.android.api.PushSubscriptionManager;
@@ -7,6 +9,7 @@ import org.joinmastodon.android.api.StatusInteractionController;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Application;
 import org.joinmastodon.android.model.Filter;
+import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.model.Markers;
 import org.joinmastodon.android.model.Preferences;
 import org.joinmastodon.android.model.PushSubscription;
@@ -14,6 +17,7 @@ import org.joinmastodon.android.model.Token;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 
 public class AccountSession{
 	public Token token;
@@ -87,4 +91,15 @@ public class AccountSession{
 			pushSubscriptionManager=new PushSubscriptionManager(getID());
 		return pushSubscriptionManager;
 	}
+
+	public Optional<Instance> getInstance() {
+		return Optional.ofNullable(AccountSessionManager.getInstance().getInstanceInfo(domain));
+	}
+
+	public Uri getInstanceUri() {
+		return new Uri.Builder()
+				.scheme("https")
+				.authority(getInstance().map(i -> i.normalizedUri).orElse(domain))
+				.build();
+	}
 }

mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSessionManager.java

@@ -15,6 +15,7 @@ import android.util.Log;
 
 import org.joinmastodon.android.BuildConfig;
 import org.joinmastodon.android.E;
+import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.MainActivity;
 import org.joinmastodon.android.MastodonApp;
 import org.joinmastodon.android.R;
@@ -110,6 +111,12 @@ public class AccountSessionManager{
 		sessions.put(session.getID(), session);
 		lastActiveAccountID=session.getID();
 		writeAccountsFile();
+
+		// write initial instance info to file immediately to avoid sessions without instance info
+		InstanceInfoStorageWrapper wrapper = new InstanceInfoStorageWrapper();
+		wrapper.instance = instance;
+		MastodonAPIController.runInBackground(()->writeInstanceInfoFile(wrapper, instance.uri));
+
 		updateMoreInstanceInfo(instance, instance.uri);
 		if(PushSubscriptionManager.arePushNotificationsAvailable()){
 			session.getPushSubscriptionManager().registerAccountForPush(null);
@@ -118,14 +125,16 @@ public class AccountSessionManager{
 	}
 
 	public synchronized void writeAccountsFile(){
-		File file=new File(MastodonApp.context.getFilesDir(), "accounts.json");
+		File tmpFile = new File(MastodonApp.context.getFilesDir(), "accounts.json~");
+		File file = new File(MastodonApp.context.getFilesDir(), "accounts.json");
 		try{
-			try(FileOutputStream out=new FileOutputStream(file)){
+			try(FileOutputStream out=new FileOutputStream(tmpFile)){
 				SessionsStorageWrapper w=new SessionsStorageWrapper();
 				w.accounts=new ArrayList<>(sessions.values());
 				OutputStreamWriter writer=new OutputStreamWriter(out, StandardCharsets.UTF_8);
 				MastodonAPIController.gson.toJson(w, writer);
 				writer.flush();
+				if (!tmpFile.renameTo(file)) Log.e(TAG, "Error renaming " + tmpFile.getPath() + " to " + file.getPath());
 			}
 		}catch(IOException x){
 			Log.e(TAG, "Error writing accounts file", x);
@@ -178,6 +187,7 @@ public class AccountSessionManager{
 		AccountSession session=getAccount(id);
 		session.getCacheController().closeDatabase();
 		MastodonApp.context.deleteDatabase(id+".db");
+		GlobalUserPreferences.removeAccount(id);
 		sessions.remove(id);
 		if(lastActiveAccountID.equals(id)){
 			if(sessions.isEmpty())
@@ -248,31 +258,35 @@ public class AccountSessionManager{
 	}
 
 	public void maybeUpdateLocalInfo(){
+		maybeUpdateLocalInfo(null);
+	}
+
+	public void maybeUpdateLocalInfo(AccountSession activeSession){
 		long now=System.currentTimeMillis();
 		HashSet<String> domains=new HashSet<>();
 		for(AccountSession session:sessions.values()){
 			domains.add(session.domain.toLowerCase());
-//			if(now-session.infoLastUpdated>24L*3600_000L){
-			updateSessionPreferences(session);
-			updateSessionLocalInfo(session);
-//			}
-//			if(now-session.filtersLastUpdated>3600_000L){
-			updateSessionWordFilters(session);
-//			}
+			if(now-session.infoLastUpdated>24L*3600_000L || session == activeSession){
+				updateSessionPreferences(session);
+				updateSessionLocalInfo(session);
+			}
+			if(now-session.filtersLastUpdated>3600_000L || session == activeSession){
+				updateSessionWordFilters(session);
+			}
 			updateSessionMarkers(session);
 		}
 		if(loadedInstances){
-			maybeUpdateCustomEmojis(domains);
+			maybeUpdateCustomEmojis(domains, activeSession != null ? activeSession.domain : null);
 		}
 	}
 
-	private void maybeUpdateCustomEmojis(Set<String> domains){
+	private void maybeUpdateCustomEmojis(Set<String> domains, String activeDomain){
 		long now=System.currentTimeMillis();
 		for(String domain:domains){
-//			Long lastUpdated=instancesLastUpdated.get(domain);
-//			if(lastUpdated==null || now-lastUpdated>24L*3600_000L){
-			updateInstanceInfo(domain);
-//			}
+			Long lastUpdated=instancesLastUpdated.get(domain);
+			if(lastUpdated==null || now-lastUpdated>24L*3600_000L || domain.equals(activeDomain)){
+				updateInstanceInfo(domain);
+			}
 		}
 	}
 
@@ -400,7 +414,9 @@ public class AccountSessionManager{
 
 					@Override
 					public void onError(ErrorResponse error){
-
+						InstanceInfoStorageWrapper wrapper=new InstanceInfoStorageWrapper();
+						wrapper.instance = instance;
+						MastodonAPIController.runInBackground(()->writeInstanceInfoFile(wrapper, domain));
 					}
 				})
 				.execNoAuth(domain);
@@ -411,10 +427,13 @@ public class AccountSessionManager{
 	}
 
 	private void writeInstanceInfoFile(InstanceInfoStorageWrapper emojis, String domain){
-		try(FileOutputStream out=new FileOutputStream(getInstanceInfoFile(domain))){
+		File file = getInstanceInfoFile(domain);
+		File tmpFile = new File(file.getPath() + "~");
+		try(FileOutputStream out=new FileOutputStream(tmpFile)){
 			OutputStreamWriter writer=new OutputStreamWriter(out, StandardCharsets.UTF_8);
 			MastodonAPIController.gson.toJson(emojis, writer);
 			writer.flush();
+			if (!tmpFile.renameTo(file)) Log.e(TAG, "Error renaming " + tmpFile.getPath() + " to " + file.getPath());
 		}catch(IOException x){
 			Log.w(TAG, "Error writing instance info file for "+domain, x);
 		}
@@ -434,7 +453,7 @@ public class AccountSessionManager{
 		}
 		if(!loadedInstances){
 			loadedInstances=true;
-			maybeUpdateCustomEmojis(domains);
+			maybeUpdateCustomEmojis(domains, null);
 		}
 	}
 
@@ -458,10 +477,6 @@ public class AccountSessionManager{
 		return instances.get(domain);
 	}
 
-	public Instance getInstanceInfoForAccount(String account) {
-		return AccountSessionManager.getInstance().getInstanceInfo(instance.getAccount(account).domain);
-	}
-
 	public void updateAccountInfo(String id, Account account){
 		AccountSession session=getAccount(id);
 		session.self=account;

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

@@ -1,12 +1,9 @@
 package org.joinmastodon.android.fragments;
 
 import android.app.Activity;
+import android.net.Uri;
 import android.os.Bundle;
 import android.view.View;
-import android.view.animation.TranslateAnimation;
-
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
 
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.accounts.GetAccountStatuses;
@@ -64,7 +61,12 @@ public class AccountTimelineFragment extends StatusListFragment{
 					@Override
 					public void onSuccess(List<Status> result){
 						if(getActivity()==null) return;
-						result=result.stream().filter(new StatusFilterPredicate(accountID, Filter.FilterContext.ACCOUNT)).collect(Collectors.toList());
+						AccountSessionManager asm = AccountSessionManager.getInstance();
+						result=result.stream().filter(status -> {
+							// don't hide own posts in own profile
+							if (asm.isSelf(accountID, user) && asm.isSelf(accountID, status.account)) return true;
+							else return new StatusFilterPredicate(accountID, getFilterContext()).test(status);
+						}).collect(Collectors.toList());
 						onDataLoaded(result, !result.isEmpty());
 					}
 				})
@@ -84,7 +86,8 @@ public class AccountTimelineFragment extends StatusListFragment{
 	}
 
 	protected void onStatusCreated(StatusCreatedEvent ev){
-		if(!AccountSessionManager.getInstance().isSelf(accountID, ev.status.account))
+		AccountSessionManager asm = AccountSessionManager.getInstance();
+		if(!asm.isSelf(accountID, ev.status.account) || !asm.isSelf(accountID, user))
 			return;
 		if(filter==GetAccountStatuses.Filter.PINNED) return;
 		if(filter==GetAccountStatuses.Filter.DEFAULT){
@@ -122,4 +125,19 @@ public class AccountTimelineFragment extends StatusListFragment{
 	protected void onRemoveAccountPostsEvent(RemoveAccountPostsEvent ev){
 		// no-op
 	}
+
+
+	@Override
+	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;
@@ -25,6 +26,7 @@ import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.accounts.GetAccountRelationships;
 import org.joinmastodon.android.api.requests.polls.SubmitPollVote;
+import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.events.PollUpdatedEvent;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.DisplayItemsParent;
@@ -33,6 +35,7 @@ import org.joinmastodon.android.model.Relationship;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.BetterItemAnimator;
 import org.joinmastodon.android.ui.displayitems.ExtendedFooterStatusDisplayItem;
+import org.joinmastodon.android.ui.displayitems.FooterStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.GapStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.HeaderStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.MediaGridStatusDisplayItem;
@@ -45,6 +48,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;
@@ -68,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 RecyclerFragment<T> implements PhotoViewerHost, ScrollableToTop{
+public abstract class BaseStatusListFragment<T extends DisplayItemsParent> extends RecyclerFragment<T> implements PhotoViewerHost, ScrollableToTop, HasFab, ProvidesAssistContent.ProvidesWebUri {
 	protected ArrayList<StatusDisplayItem> displayItems=new ArrayList<>();
 	protected DisplayItemsAdapter adapter;
 	protected String accountID;
@@ -129,7 +133,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){
@@ -142,6 +146,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		}
 		if(notify)
 			adapter.notifyItemRangeInserted(0, offset);
+		return offset;
 	}
 
 	protected String getMaxID(){
@@ -268,34 +273,39 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		});
 	}
 
+	@Override
 	public @Nullable View getFab() {
 		if (getParentFragment() instanceof HasFab l) return l.getFab();
 		else return fab;
 	}
 
-	public void animateFab(boolean show) {
+	@Override
+	public void showFab() {
 		View fab = getFab();
-		if (fab == null) return;
-		if (show && fab.getVisibility() != View.VISIBLE) {
-			fab.setVisibility(View.VISIBLE);
-			TranslateAnimation animate = new TranslateAnimation(
-					0,
-					0,
-					fab.getHeight() * 2,
-					0);
-			animate.setDuration(300);
-			fab.startAnimation(animate);
-		} else if (!show && fab.getVisibility() == View.VISIBLE) {
-			TranslateAnimation animate = new TranslateAnimation(
-					0,
-					0,
-					0,
-					fab.getHeight() * 2);
-			animate.setDuration(300);
-			fab.startAnimation(animate);
-			fab.setVisibility(View.INVISIBLE);
-			scrollDiff = 0;
-		}
+		if (fab == null || fab.getVisibility() == View.VISIBLE) return;
+		fab.setVisibility(View.VISIBLE);
+		TranslateAnimation animate = new TranslateAnimation(
+				0,
+				0,
+				fab.getHeight() * 2,
+				0);
+		animate.setDuration(300);
+		fab.startAnimation(animate);
+	}
+
+	@Override
+	public void hideFab() {
+		View fab = getFab();
+		if (fab == null || fab.getVisibility() != View.VISIBLE) return;
+		TranslateAnimation animate = new TranslateAnimation(
+				0,
+				0,
+				0,
+				fab.getHeight() * 2);
+		animate.setDuration(300);
+		fab.startAnimation(animate);
+		fab.setVisibility(View.INVISIBLE);
+		scrollDiff = 0;
 	}
 
 	@Override
@@ -312,10 +322,10 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 				View fab = getFab();
 				if (fab!=null && GlobalUserPreferences.autoHideFab) {
 					if (dy > 0 && fab.getVisibility() == View.VISIBLE) {
-						animateFab(false);
+						hideFab();
 					} else if (dy < 0 && fab.getVisibility() != View.VISIBLE) {
 						if (list.getChildAt(0).getTop() == 0 || scrollDiff > 400) {
-							animateFab(true);
+							showFab();
 							scrollDiff = 0;
 						} else {
 							scrollDiff += Math.abs(dy);
@@ -347,7 +357,12 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 								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);
+								int bottom = tmpRect.bottom;
+								if (holder instanceof FooterStatusDisplayItem.Holder fh
+										&& fh.getItem().hasDescendantSibling) {
+									bottom += V.dp(8);
+								}
+								outRect.bottom=Math.max(outRect.bottom, bottom);
 							}
 						}
 					}
@@ -546,6 +561,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){
@@ -557,6 +580,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		warning.getItem().status.filterRevealed = true;
 	}
 
+	@Override
 	public String getAccountID(){
 		return accountID;
 	}
@@ -690,6 +714,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{
 
@@ -751,6 +779,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().descendantLevel != 0 && ih.getItem().hasDescendantSibling) continue;
 					drawDivider(child, bottomSibling, holder, siblingHolder, parent, c, dividerPaint);
 				}
 			}

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

@@ -1,9 +1,11 @@
 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;
+import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.HeaderPaginationList;
 import org.joinmastodon.android.model.Status;
 
@@ -35,4 +37,14 @@ public class BookmarkedStatusListFragment extends StatusListFragment{
 				})
 				.exec(accountID);
 	}
+
+	@Override
+	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

@@ -91,6 +91,7 @@ import org.joinmastodon.android.events.StatusCreatedEvent;
 import org.joinmastodon.android.events.StatusUpdatedEvent;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Attachment;
+import org.joinmastodon.android.model.ContentType;
 import org.joinmastodon.android.model.Emoji;
 import org.joinmastodon.android.model.EmojiCategory;
 import org.joinmastodon.android.model.Instance;
@@ -179,8 +180,8 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 	private int charCount, charLimit, trimmedCharCount;
 
 	private Button publishButton, languageButton, scheduleTimeBtn, draftsBtn;
-	private PopupMenu languagePopup, visibilityPopup, draftOptionsPopup;
-	private ImageButton mediaBtn, pollBtn, emojiBtn, spoilerBtn, visibilityBtn, scheduleDraftDismiss;
+	private PopupMenu languagePopup, contentTypePopup, visibilityPopup, draftOptionsPopup;
+	private ImageButton mediaBtn, pollBtn, emojiBtn, spoilerBtn, visibilityBtn, scheduleDraftDismiss, contentTypeBtn;
 	private ImageView sensitiveIcon;
 	private ComposeMediaLayout attachmentsView;
 	private TextView replyText;
@@ -234,6 +235,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 	private Runnable updateUploadEtaRunnable;
 
 	private String language, encoding;
+	private ContentType contentType;
 	private MastodonLanguage.LanguageResolver languageResolver;
 
 	@Override
@@ -242,6 +244,8 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		setRetainInstance(true);
 
 		accountID=getArguments().getString("account");
+		contentType = GlobalUserPreferences.accountsDefaultContentTypes.get(accountID);
+
 		AccountSession session=AccountSessionManager.getInstance().getAccount(accountID);
 		self=session.self;
 		instanceDomain=session.domain;
@@ -259,9 +263,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"));
@@ -330,6 +331,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		emojiBtn=view.findViewById(R.id.btn_emoji);
 		spoilerBtn=view.findViewById(R.id.btn_spoiler);
 		visibilityBtn=view.findViewById(R.id.btn_visibility);
+		contentTypeBtn=view.findViewById(R.id.btn_content_type);
 		scheduleDraftView=view.findViewById(R.id.schedule_draft_view);
 		scheduleDraftText=view.findViewById(R.id.schedule_draft_text);
 		scheduleDraftDismiss=view.findViewById(R.id.schedule_draft_dismiss);
@@ -364,6 +366,10 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		visibilityBtn.setOnClickListener(v->visibilityPopup.show());
 		visibilityBtn.setOnTouchListener(visibilityPopup.getDragToOpenListener());
 
+		buildContentTypePopup(contentTypeBtn);
+		contentTypeBtn.setOnClickListener(v->contentTypePopup.show());
+		contentTypeBtn.setOnTouchListener(contentTypePopup.getDragToOpenListener());
+
 		scheduleDraftDismiss.setOnClickListener(v->updateScheduledAt(null));
 		scheduleTimeBtn.setOnClickListener(v->pickScheduledDateTime());
 
@@ -466,8 +472,10 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			}
 		}
 
-		if(editingStatus!=null && editingStatus.visibility!=null) {
-			statusVisibility=editingStatus.visibility;
+		if (savedInstanceState != null) {
+			statusVisibility = (StatusPrivacy) savedInstanceState.getSerializable("visibility");
+		} else if (editingStatus != null && editingStatus.visibility != null) {
+			statusVisibility = editingStatus.visibility;
 		} else {
 			loadDefaultStatusVisibility(savedInstanceState);
 		}
@@ -482,6 +490,20 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		}).setChecked(true);
 		visibilityPopup.getMenu().findItem(R.id.local_only).setChecked(localOnly);
 
+
+		if (savedInstanceState != null && savedInstanceState.containsKey("contentType")) {
+			contentType = (ContentType) savedInstanceState.getSerializable("contentType");
+		} else if (getArguments().containsKey("sourceContentType")) {
+			try {
+				String val = getArguments().getString("sourceContentType");
+				contentType = val == null ? null : ContentType.valueOf(val);
+			} catch (IllegalArgumentException ignored) {}
+		}
+
+		int contentTypeId = ContentType.getContentTypeRes(contentType);
+		contentTypePopup.getMenu().findItem(contentTypeId).setChecked(true);
+		contentTypeBtn.setSelected(contentTypeId != R.id.content_type_null && contentTypeId != R.id.content_type_plain);
+
 		autocompleteViewController=new ComposeAutocompleteViewController(getActivity(), accountID);
 		autocompleteViewController.setCompletionSelectedListener(this::onAutocompleteOptionSelected);
 		View autocompleteView=autocompleteViewController.getView();
@@ -518,6 +540,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			outState.putParcelableArrayList("attachments", serializedAttachments);
 		}
 		outState.putSerializable("visibility", statusVisibility);
+		outState.putSerializable("contentType", contentType);
 		if (scheduledAt != null) outState.putSerializable("scheduledAt", scheduledAt);
 		if (scheduledStatus != null) outState.putParcelable("scheduledStatus", Parcels.wrap(scheduledStatus));
 	}
@@ -907,6 +930,17 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		});
 	}
 
+	private int getContentTypeName(String id) {
+		return switch (id) {
+			case "text/plain" -> R.string.sk_content_type_plain;
+			case "text/html" -> R.string.sk_content_type_html;
+			case "text/markdown" -> R.string.sk_content_type_markdown;
+			case "text/bbcode" -> R.string.sk_content_type_bbcode;
+			case "text/x.misskeymarkdown" -> R.string.sk_content_type_mfm;
+			default -> throw new IllegalArgumentException("Invalid content type");
+		};
+	}
+
 	private void addBottomLanguage(Menu menu) {
 		if (menu.findItem(allLanguages.size()) == null) {
 			menu.add(0, allLanguages.size(), Menu.NONE, "bottom (\uD83E\uDD7A\uD83D\uDC49\uD83D\uDC48)");
@@ -1050,9 +1084,10 @@ 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;
 		req.scheduledAt = scheduledAt;
 		if(!attachments.isEmpty()){
 			req.mediaIds=attachments.stream().map(a->a.serverAttachment.id).collect(Collectors.toList());
@@ -1705,11 +1740,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;
 	}
@@ -1851,7 +1899,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);
@@ -1895,14 +1943,36 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		});
 	}
 
+	@SuppressLint("ClickableViewAccessibility")
+	private void buildContentTypePopup(View btn) {
+		contentTypePopup=new PopupMenu(getActivity(), btn);
+		contentTypePopup.inflate(R.menu.compose_content_type);
+		Menu m = contentTypePopup.getMenu();
+		ContentType.adaptMenuToInstance(m, instance);
+		if (contentType != null) m.findItem(R.id.content_type_null).setVisible(false);
+
+		contentTypePopup.setOnMenuItemClickListener(i->{
+			int id=i.getItemId();
+			if (id == R.id.content_type_null) contentType = null;
+			else if (id == R.id.content_type_plain) contentType = ContentType.PLAIN;
+			else if (id == R.id.content_type_html) contentType = ContentType.HTML;
+			else if (id == R.id.content_type_markdown) contentType = ContentType.MARKDOWN;
+			else if (id == R.id.content_type_bbcode) contentType = ContentType.BBCODE;
+			else if (id == R.id.content_type_misskey_markdown) contentType = ContentType.MISSKEY_MARKDOWN;
+			else return false;
+			btn.setSelected(id != R.id.content_type_null && id != R.id.content_type_plain);
+			i.setChecked(true);
+			return true;
+		});
+
+		if (!GlobalUserPreferences.accountsWithContentTypesEnabled.contains(accountID)) {
+			btn.setVisibility(View.GONE);
+		}
+	}
+
 	private void loadDefaultStatusVisibility(Bundle savedInstanceState) {
 		if(replyTo != null) statusVisibility = replyTo.visibility;
 
-		// A saved privacy setting from a previous compose session wins over the reply visibility
-		if(savedInstanceState !=null){
-			statusVisibility = (StatusPrivacy) savedInstanceState.getSerializable("visibility");
-		}
-
 		AccountSessionManager asm = AccountSessionManager.getInstance();
 		Preferences prefs = asm.getAccount(accountID).preferences;
 		if (prefs != null) {

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

@@ -30,8 +30,11 @@ 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.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;
@@ -164,7 +167,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));
 
@@ -190,7 +193,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,9 +1,11 @@
 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;
+import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.HeaderPaginationList;
 import org.joinmastodon.android.model.Status;
 
@@ -35,4 +37,16 @@ public class FavoritedStatusListFragment extends StatusListFragment{
 				})
 				.exec(accountID);
 	}
+
+	@Override
+	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;
@@ -148,6 +150,16 @@ public class FollowRequestsListFragment extends RecyclerFragment<FollowRequestsL
 		smoothScrollRecyclerViewToTop(list);
 	}
 
+	@Override
+	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{
 
 		public AccountsAdapter(){

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
@@ -75,6 +77,16 @@ public class FollowedHashtagsFragment extends RecyclerFragment<Hashtag> implemen
         smoothScrollRecyclerViewToTop(list);
     }
 
+    @Override
+    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>{
         @NonNull
         @Override
@@ -109,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/HasFab.java

@@ -4,4 +4,6 @@ import android.view.View;
 
 public interface HasFab {
     View getFab();
+    void showFab();
+    void hideFab();
 }

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.E;
@@ -123,7 +123,7 @@ public class HashtagTimelineFragment extends PinnableStatusListFragment {
 					@Override
 					public void onSuccess(List<Status> result){
 						if (getActivity() == null) return;
-						result=result.stream().filter(new StatusFilterPredicate(accountID, Filter.FilterContext.PUBLIC)).collect(Collectors.toList());
+						result=result.stream().filter(new StatusFilterPredicate(accountID, getFilterContext())).collect(Collectors.toList());
 						onDataLoaded(result, !result.isEmpty());
 					}
 				})
@@ -154,4 +154,14 @@ public class HashtagTimelineFragment extends PinnableStatusListFragment {
 	protected void onSetFabBottomInset(int inset){
 		((ViewGroup.MarginLayoutParams) fab.getLayoutParams()).bottomMargin=V.dp(24)+inset;
 	}
+
+	@Override
+	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.graphics.Outline;
 import android.os.Build;
 import android.os.Bundle;
@@ -16,6 +17,11 @@ import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 
+import androidx.annotation.IdRes;
+import androidx.annotation.Nullable;
+
+import com.squareup.otto.Subscribe;
+
 import org.joinmastodon.android.E;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.notifications.GetNotifications;
@@ -30,16 +36,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.api.Callback;
@@ -52,7 +55,7 @@ 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;
@@ -66,6 +69,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){
@@ -73,16 +77,21 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 		E.register(this);
 		accountID=getArguments().getString("account");
 		setTitle(R.string.sk_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);
@@ -160,6 +169,7 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 		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)
@@ -216,6 +226,13 @@ 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){
@@ -227,8 +244,10 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 		}
 		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){
@@ -255,7 +274,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()).show();
+			new AccountSwitcherSheet(getActivity(), this).show();
 			return true;
 		}
 		return false;
@@ -288,10 +307,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.pleroma != null)
+		new GetNotifications(null, 1, EnumSet.allOf(Notification.Type.class), instance.get().isAkkoma())
 				.setCallback(new Callback<>() {
 					@Override
 					public void onSuccess(List<Notification> notifications) {
@@ -328,4 +347,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;
@@ -54,6 +55,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;
@@ -71,7 +73,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, HasFab {
+public class HomeTabFragment extends MastodonToolbarFragment implements ScrollableToTop, OnBackPressedListener, HasFab, ProvidesAssistContent {
 	private static final int ANNOUNCEMENTS_RESULT = 654;
 
 	private String accountID;
@@ -106,7 +108,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();
@@ -448,10 +450,20 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab
 		updateSwitcherIcon(i);
 	}
 
+	@Override
+	public void showFab() {
+		if (fragments[pager.getCurrentItem()] instanceof BaseStatusListFragment<?> l) l.showFab();
+	}
+
+	@Override
+	public void hideFab() {
+		if (fragments[pager.getCurrentItem()] instanceof BaseStatusListFragment<?> l) l.hideFab();
+	}
+
 	private void updateSwitcherIcon(int i) {
 		timelineIcon.setImageResource(timelines[i].getIcon().iconRes);
 		timelineTitle.setText(timelines[i].getTitle(getContext()));
-		if (fragments[i] instanceof BaseStatusListFragment<?> l) l.animateFab(true);
+		showFab();
 	}
 
 	@Override
@@ -683,6 +695,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;
 
@@ -8,8 +9,6 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
 import org.joinmastodon.android.GlobalUserPreferences;
-import org.joinmastodon.android.E;
-import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.markers.SaveMarkers;
 import org.joinmastodon.android.api.requests.timelines.GetHomeTimeline;
 import org.joinmastodon.android.api.session.AccountSessionManager;
@@ -150,7 +149,7 @@ public class HomeTimelineFragment extends StatusListFragment {
 							result.get(result.size()-1).hasGapAfter=true;
 							toAdd=result;
 						}
-						StatusFilterPredicate filterPredicate=new StatusFilterPredicate(accountID, Filter.FilterContext.HOME);
+						StatusFilterPredicate filterPredicate=new StatusFilterPredicate(accountID, getFilterContext());
 						toAdd=toAdd.stream().filter(filterPredicate).collect(Collectors.toList());
 						if(!toAdd.isEmpty()){
 							prependItems(toAdd, true);
@@ -229,7 +228,7 @@ public class HomeTimelineFragment extends StatusListFragment {
 							List<StatusDisplayItem> targetList=displayItems.subList(gapPos, gapPos+1);
 							targetList.clear();
 							List<Status> insertedPosts=data.subList(gapPostIndex+1, gapPostIndex+1);
-							StatusFilterPredicate filterPredicate=new StatusFilterPredicate(accountID, Filter.FilterContext.HOME);
+							StatusFilterPredicate filterPredicate=new StatusFilterPredicate(accountID, getFilterContext());
 							for(Status s:result){
 								if(idsBelowGap.contains(s.id))
 									break;
@@ -282,4 +281,14 @@ public class HomeTimelineFragment extends StatusListFragment {
 	protected boolean shouldRemoveAccountPostsWhenUnfollowing(){
 		return true;
 	}
+
+	@Override
+	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;
 
@@ -137,7 +137,7 @@ public class ListTimelineFragment extends PinnableStatusListFragment {
                     @Override
                     public void onSuccess(List<Status> result) {
                         if (getActivity() == null) return;
-                        result=result.stream().filter(new StatusFilterPredicate(accountID, Filter.FilterContext.HOME)).collect(Collectors.toList());
+                        result=result.stream().filter(new StatusFilterPredicate(accountID, getFilterContext())).collect(Collectors.toList());
                         onDataLoaded(result, !result.isEmpty());
                     }
                 })
@@ -162,4 +162,15 @@ public class ListTimelineFragment extends PinnableStatusListFragment {
     protected void onSetFabBottomInset(int inset) {
         ((ViewGroup.MarginLayoutParams) fab.getLayoutParams()).bottomMargin=V.dp(24)+inset;
     }
+
+
+    @Override
+    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,258 +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);
-	}
-
-	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{
+public class NotificationsFragment extends MastodonToolbarFragment implements ScrollableToTop, ProvidesAssistContent {
 
 	private TabLayout tabLayout;
 	private ViewPager2 pager;
@@ -47,7 +49,6 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
 	private NotificationsListFragment allNotificationsFragment, mentionsFragment;
 
 	private String accountID;
-
 	@Override
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
@@ -227,6 +228,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

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;
@@ -151,12 +155,17 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 						loadRelationships(needRelationships);
 						maxID=result.maxID;
 
-						if(offset==0 && !result.items.isEmpty() && !result.isFromCache()){
+						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);
 							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);
+							}
 						}
 					}
 				});
@@ -263,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

@@ -20,7 +20,7 @@ public abstract class PinnableStatusListFragment extends StatusListFragment {
     @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;
@@ -31,7 +32,6 @@ import android.view.ViewOutlineProvider;
 import android.view.ViewTreeObserver;
 import android.view.WindowInsets;
 import android.view.inputmethod.InputMethodManager;
-import android.view.animation.TranslateAnimation;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.FrameLayout;
@@ -58,6 +58,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;
@@ -74,6 +75,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;
@@ -91,6 +93,7 @@ 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;
 import me.grishka.appkit.api.ErrorResponse;
@@ -110,7 +113,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;
 
@@ -137,6 +140,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 
 	private Account account;
 	private String accountID;
+	private String domain;
 	private Relationship relationship;
 	private int statusBarHeight;
 	private boolean isOwnProfile;
@@ -151,7 +155,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;
@@ -172,6 +176,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;
@@ -179,6 +184,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))
@@ -324,7 +331,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;
@@ -510,7 +517,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();
@@ -520,7 +527,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=HtmlParser.parse(account.note, account.emojis, Collections.emptyList(), Collections.emptyList(), accountID);
 		if(TextUtils.isEmpty(parsedBio)){
@@ -703,7 +710,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);
@@ -758,6 +765,16 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		return fab;
 	}
 
+	@Override
+	public void showFab() {
+		if (getFragmentForPage(pager.getCurrentItem()) instanceof HasFab fabulous) fabulous.showFab();
+	}
+
+	@Override
+	public void hideFab() {
+		if (getFragmentForPage(pager.getCurrentItem()) instanceof HasFab fabulous) fabulous.hideFab();
+	}
+
 	private void onScrollChanged(View v, int scrollX, int scrollY, int oldScrollX, int oldScrollY){
 		int topBarsH=getToolbar().getHeight()+statusBarHeight;
 		if(scrollY>avatarBorder.getTop()-topBarsH){
@@ -1149,6 +1166,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);
@@ -1179,7 +1211,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;
 			}
@@ -1296,7 +1328,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;
@@ -79,7 +80,7 @@ public class ScheduledStatusListFragment extends BaseStatusListFragment<Schedule
 
 	@Override
 	protected List<StatusDisplayItem> buildDisplayItems(ScheduledStatus s) {
-		return StatusDisplayItem.buildItems(this, s.toStatus(), accountID, s, knownAccounts, false, false, null, true);
+		return StatusDisplayItem.buildItems(this, s.toStatus(), accountID, s, knownAccounts, false, false, null, true, null);
 	}
 
 	@Override
@@ -96,6 +97,8 @@ public class ScheduledStatusListFragment extends BaseStatusListFragment<Schedule
 		args.putString("sourceText", status.text);
 		args.putString("sourceSpoiler", status.spoilerText);
 		args.putBoolean("redraftStatus", true);
+		args.putString("sourceContentType", scheduledStatus.params.contentType != null ?
+				scheduledStatus.params.contentType.name() : null);
 		setResult(true, null);
 
 		// closing this scheduled status list if another status list is opened from compose fragment
@@ -179,4 +182,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/SettingsFragment.java

@@ -7,13 +7,14 @@ import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Rect;
+import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.text.TextUtils;
 import android.util.LruCache;
 import android.util.TypedValue;
 import android.view.Gravity;
 import android.view.LayoutInflater;
+import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
@@ -48,6 +49,7 @@ import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.events.SelfUpdateStateChangedEvent;
 import org.joinmastodon.android.fragments.onboarding.InstanceRulesFragment;
+import org.joinmastodon.android.model.ContentType;
 import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.fragments.onboarding.AccountActivationFragment;
 import org.joinmastodon.android.model.PushNotification;
@@ -57,13 +59,16 @@ import org.joinmastodon.android.ui.OutlineProviders;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.ui.views.TextInputFrameLayout;
 import org.joinmastodon.android.updater.GithubSelfUpdater;
+import org.joinmastodon.android.utils.ProvidesAssistContent;
 import org.parceler.Parcels;
 
 import java.util.ArrayList;
+import java.util.Optional;
 import java.util.function.Consumer;
 
 import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -75,12 +80,13 @@ import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.utils.V;
 import me.grishka.appkit.views.UsableRecyclerView;
 
-public class SettingsFragment extends MastodonToolbarFragment{
+public class SettingsFragment extends MastodonToolbarFragment implements ProvidesAssistContent.ProvidesWebUri {
 	private UsableRecyclerView list;
 	private ArrayList<Item> items=new ArrayList<>();
 	private ThemeItem themeItem;
 	private NotificationPolicyItem notificationPolicyItem;
-	private SwitchItem showNewPostsButtonItem, glitchModeItem, compactReblogReplyLineItem;
+	private SwitchItem showNewPostsItem, glitchModeItem, compactReblogReplyLineItem;
+	private ButtonItem defaultContentTypeButtonItem;
 	private String accountID;
 	private boolean needUpdateNotificationSettings;
 	private boolean needAppRestart;
@@ -89,7 +95,9 @@ public class SettingsFragment extends MastodonToolbarFragment{
 	private ImageView themeTransitionWindowView;
 	private TextItem checkForUpdateItem, clearImageCacheItem;
 	private ImageCache imageCache;
+	private Menu contentTypeMenu;
 
+	@SuppressLint("ClickableViewAccessibility")
 	@Override
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
@@ -99,7 +107,7 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		imageCache = ImageCache.getInstance(getActivity());
 		accountID=getArguments().getString("account");
 		AccountSession session=AccountSessionManager.getInstance().getAccount(accountID);
-		Instance instance = AccountSessionManager.getInstance().getInstanceInfo(session.domain);
+		Optional<Instance> instance = session.getInstance();
 		String instanceName = UiUtils.getInstanceName(accountID);
 
 		if(GithubSelfUpdater.needSelfUpdating()){
@@ -217,7 +225,7 @@ public class SettingsFragment extends MastodonToolbarFragment{
 			GlobalUserPreferences.showReplies=i.checked;
 			GlobalUserPreferences.save();
 		}));
-		if (instance.pleroma != null) {
+		if (isInstanceAkkoma()) {
 			items.add(new ButtonItem(R.string.sk_settings_reply_visibility, R.drawable.ic_fluent_chat_24_regular, b->{
 				PopupMenu popupMenu=new PopupMenu(getActivity(), b, Gravity.CENTER_HORIZONTAL);
 				popupMenu.inflate(R.menu.reply_visibility);
@@ -239,15 +247,15 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		}));
 		items.add(new SwitchItem(R.string.sk_settings_load_new_posts, R.drawable.ic_fluent_arrow_sync_24_regular, GlobalUserPreferences.loadNewPosts, i->{
 			GlobalUserPreferences.loadNewPosts=i.checked;
-			showNewPostsButtonItem.enabled = i.checked;
+			showNewPostsItem.enabled = i.checked;
 			if (!i.checked) {
 				GlobalUserPreferences.showNewPostsButton = false;
-				showNewPostsButtonItem.checked = false;
+				showNewPostsItem.checked = false;
 			}
-			if (list.findViewHolderForAdapterPosition(items.indexOf(showNewPostsButtonItem)) instanceof SwitchViewHolder svh) svh.rebind();
+			if (list.findViewHolderForAdapterPosition(items.indexOf(showNewPostsItem)) instanceof SwitchViewHolder svh) svh.rebind();
 			GlobalUserPreferences.save();
 		}));
-		items.add(showNewPostsButtonItem = new SwitchItem(R.string.sk_settings_see_new_posts_button, R.drawable.ic_fluent_arrow_up_24_regular, GlobalUserPreferences.showNewPostsButton, i->{
+		items.add(showNewPostsItem = new SwitchItem(R.string.sk_settings_see_new_posts_button, R.drawable.ic_fluent_arrow_up_24_regular, GlobalUserPreferences.showNewPostsButton, i->{
 			GlobalUserPreferences.showNewPostsButton=i.checked;
 			GlobalUserPreferences.save();
 		}));
@@ -293,7 +301,9 @@ public class SettingsFragment extends MastodonToolbarFragment{
 			GlobalUserPreferences.save();
 			needAppRestart=true;
 		}));
-		boolean translationAvailable = instance.v2 != null && instance.v2.configuration.translation != null && instance.v2.configuration.translation.enabled;
+		boolean translationAvailable = instance
+				.map(i -> i.v2 != null && i.v2.configuration.translation != null && i.v2.configuration.translation.enabled)
+				.orElse(false);
 		items.add(new SmallTextItem(getString(translationAvailable ?
 				R.string.sk_settings_translation_availability_note_available :
 				R.string.sk_settings_translation_availability_note_unavailable, instanceName)));
@@ -318,23 +328,55 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		items.add(new TextItem(R.string.sk_settings_auth, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/auth/edit"), R.drawable.ic_fluent_open_24_regular));
 
 		items.add(new HeaderItem(instanceName));
-		items.add(new TextItem(R.string.sk_settings_rules, ()->{
-			Bundle args=new Bundle();
-			args.putParcelable("instance", Parcels.wrap(instance));
+		items.add(new TextItem(R.string.sk_settings_rules, instance.<Runnable>map(i -> () -> {
+			Bundle args = new Bundle();
+			args.putParcelable("instance", Parcels.wrap(i));
 			Nav.go(getActivity(), InstanceRulesFragment.class, args);
-		}, R.drawable.ic_fluent_task_list_ltr_24_regular));
+		}).orElse(null), R.drawable.ic_fluent_task_list_ltr_24_regular));
 		items.add(new TextItem(R.string.sk_settings_about_instance	, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/about"), R.drawable.ic_fluent_info_24_regular));
 		items.add(new TextItem(R.string.settings_tos, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/terms"), R.drawable.ic_fluent_open_24_regular));
 		items.add(new TextItem(R.string.settings_privacy_policy, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/terms"), R.drawable.ic_fluent_open_24_regular));
 		items.add(new TextItem(R.string.log_out, this::confirmLogOut, R.drawable.ic_fluent_sign_out_24_regular));
-		if (!TextUtils.isEmpty(instance.version)) items.add(new SmallTextItem(getString(R.string.sk_settings_server_version, instance.version)));
+		items.add(new SmallTextItem(instance
+				.map(i -> getString(R.string.sk_settings_server_version, i.version))
+				.orElse(getString(R.string.sk_instance_info_unavailable))));
 
 		items.add(new HeaderItem(R.string.sk_instance_features));
+		items.add(new SwitchItem(R.string.sk_settings_content_types, 0, GlobalUserPreferences.accountsWithContentTypesEnabled.contains(accountID), (i)->{
+			if (i.checked) {
+				GlobalUserPreferences.accountsWithContentTypesEnabled.add(accountID);
+				if (GlobalUserPreferences.accountsDefaultContentTypes.get(accountID) == null) {
+					GlobalUserPreferences.accountsDefaultContentTypes.put(accountID, ContentType.PLAIN);
+				}
+			} else {
+				GlobalUserPreferences.accountsWithContentTypesEnabled.remove(accountID);
+				GlobalUserPreferences.accountsDefaultContentTypes.remove(accountID);
+			}
+			if (list.findViewHolderForAdapterPosition(items.indexOf(defaultContentTypeButtonItem))
+					instanceof ButtonViewHolder bvh) bvh.rebind();
+			GlobalUserPreferences.save();
+		}));
+		items.add(new SmallTextItem(getString(R.string.sk_settings_content_types_explanation)));
+		items.add(defaultContentTypeButtonItem = new ButtonItem(R.string.sk_settings_default_content_type, 0, b->{
+			PopupMenu popupMenu=new PopupMenu(getActivity(), b, Gravity.CENTER_HORIZONTAL);
+			popupMenu.inflate(R.menu.compose_content_type);
+			popupMenu.setOnMenuItemClickListener(item -> this.onContentTypeChanged(item, b));
+			b.setOnTouchListener(popupMenu.getDragToOpenListener());
+			b.setOnClickListener(v->popupMenu.show());
+			ContentType contentType = GlobalUserPreferences.accountsDefaultContentTypes.get(accountID);
+			b.setText(getContentTypeString(contentType));
+			contentTypeMenu = popupMenu.getMenu();
+			contentTypeMenu.findItem(ContentType.getContentTypeRes(contentType)).setChecked(true);
+			instance.ifPresent(i -> ContentType.adaptMenuToInstance(contentTypeMenu, i));
+		}));
+		items.add(new SmallTextItem(getString(R.string.sk_settings_default_content_type_explanation)));
 		items.add(new SwitchItem(R.string.sk_settings_support_local_only, 0, GlobalUserPreferences.accountsWithLocalOnlySupport.contains(accountID), i->{
 			glitchModeItem.enabled = i.checked;
 			if (i.checked) {
 				GlobalUserPreferences.accountsWithLocalOnlySupport.add(accountID);
-				if (instance.pleroma == null) GlobalUserPreferences.accountsInGlitchMode.add(accountID);
+				if (!isInstanceAkkoma()) {
+					GlobalUserPreferences.accountsInGlitchMode.add(accountID);
+				}
 			} else {
 				GlobalUserPreferences.accountsWithLocalOnlySupport.remove(accountID);
 				GlobalUserPreferences.accountsInGlitchMode.remove(accountID);
@@ -500,6 +542,34 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		}
 	}
 
+	private @StringRes int getContentTypeString(@Nullable ContentType contentType) {
+		if (contentType == null) return R.string.sk_content_type_unspecified;
+		return switch (contentType) {
+			case PLAIN -> R.string.sk_content_type_plain;
+			case HTML -> R.string.sk_content_type_html;
+			case MARKDOWN -> R.string.sk_content_type_markdown;
+			case BBCODE -> R.string.sk_content_type_bbcode;
+			case MISSKEY_MARKDOWN -> R.string.sk_content_type_mfm;
+		};
+	}
+
+	private boolean onContentTypeChanged(MenuItem item, Button btn){
+		int id = item.getItemId();
+		ContentType contentType = switch (id) {
+			case R.id.content_type_plain -> ContentType.PLAIN;
+			case R.id.content_type_html -> ContentType.HTML;
+			case R.id.content_type_markdown -> ContentType.MARKDOWN;
+			case R.id.content_type_bbcode -> ContentType.BBCODE;
+			case R.id.content_type_misskey_markdown -> ContentType.MISSKEY_MARKDOWN;
+			default -> null;
+		};
+		GlobalUserPreferences.accountsDefaultContentTypes.put(accountID, contentType);
+		GlobalUserPreferences.save();
+		btn.setText(getContentTypeString(contentType));
+		item.setChecked(true);
+		return true;
+	}
+
 	private boolean onReplyVisibilityChanged(MenuItem item, Button btn){
 		String pref = null;
 		int id = item.getItemId();
@@ -672,6 +742,16 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		}
 	}
 
+	@Override
+	public Uri getWebUri(Uri.Builder base) {
+		return base.path(isInstanceAkkoma() ? "/about" : "/settings").build();
+	}
+
+	@Override
+	public String getAccountID() {
+		return accountID;
+	}
+
 	private static abstract class Item{
 		public abstract int getViewType();
 	}
@@ -1007,7 +1087,11 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		@Override
 		public void onBind(ButtonItem item){
 			text.setText(item.text);
-			icon.setImageResource(item.icon);
+			if (item.icon == 0) {
+				icon.setVisibility(View.GONE);
+			} else {
+				icon.setImageResource(item.icon);
+			}
 			item.buttonConsumer.accept(button);
 		}
 	}

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

@@ -1,11 +1,13 @@
 package org.joinmastodon.android.fragments;
 
 import android.app.Activity;
+import android.net.Uri;
 import android.os.Bundle;
 import android.view.View;
 
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.statuses.GetStatusEditHistory;
+import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.displayitems.ReblogOrReplyLineStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
@@ -23,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();
 	}
 
@@ -55,7 +57,7 @@ public class StatusEditHistoryFragment extends StatusListFragment{
 
 	@Override
 	protected List<StatusDisplayItem> buildDisplayItems(Status s){
-		List<StatusDisplayItem> items=StatusDisplayItem.buildItems(this, s, accountID, s, knownAccounts, true, false, null);
+		List<StatusDisplayItem> items=StatusDisplayItem.buildItems(this, s, accountID, s, knownAccounts, true, false, null, null);
 		int idx=data.indexOf(s);
 		if(idx>=0){
 			String date=UiUtils.DATE_TIME_FORMATTER.format(s.createdAt.atZone(ZoneId.systemDefault()));
@@ -156,4 +158,14 @@ public class StatusEditHistoryFragment extends StatusListFragment{
 	public boolean isItemEnabled(String id){
 		return false;
 	}
+
+	@Override
+	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;
 
@@ -28,15 +29,17 @@ import java.util.stream.Stream;
 import androidx.recyclerview.widget.RecyclerView;
 import me.grishka.appkit.Nav;
 
-public abstract class StatusListFragment extends BaseStatusListFragment<Status>{
+public abstract class StatusListFragment extends BaseStatusListFragment<Status> {
 	protected EventListener eventListener=new EventListener();
 
 	protected List<StatusDisplayItem> buildDisplayItems(Status s){
 		boolean addFooter = !GlobalUserPreferences.spectatorMode ||
 				(this instanceof ThreadFragment t && s.id.equals(t.mainStatus.id));
-		return StatusDisplayItem.buildItems(this, s, accountID, s, knownAccounts, false, addFooter, null, Filter.FilterContext.HOME);
+		return StatusDisplayItem.buildItems(this, s, accountID, s, knownAccounts, false, addFooter, null, getFilterContext());
 	}
 
+	protected abstract Filter.FilterContext getFilterContext();
+
 	@Override
 	protected void addAccountToKnown(Status s){
 		if(!knownAccounts.containsKey(s.account.id))
@@ -180,7 +183,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,37 +1,61 @@
 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.R;
 import org.joinmastodon.android.api.requests.statuses.GetStatusContext;
-import org.joinmastodon.android.api.session.AccountSession;
-import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.events.StatusCreatedEvent;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Filter;
-import org.joinmastodon.android.model.Instance;
 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.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.Optional;
 import java.util.stream.Collectors;
 
 import me.grishka.appkit.api.SimpleCallback;
 
-public class ThreadFragment extends StatusListFragment{
+public class ThreadFragment extends StatusListFragment implements ProvidesAssistContent {
 	protected Status mainStatus;
 
+	/**
+	 * 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<>();
+
 	@Override
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
@@ -47,13 +71,38 @@ public class ThreadFragment extends StatusListFragment{
 	@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<>();
+		for(int i = 0; i < items.size(); i++){
+			StatusDisplayItem item = items.get(i);
+
+			Optional<Pair<String, Integer>> levelForStatus =
+					levels.stream().filter(p -> p.first.equals(s.id)).findAny();
+			item.descendantLevel = levelForStatus.map(p -> p.second).orElse(0);
+			if (levelForStatus.isPresent()) {
+				int idx = levels.indexOf(levelForStatus.get());
+				item.hasDescendantSibling = (levels.size() > idx + 1)
+						&& levels.get(idx + 1).second > levelForStatus.get().second;
+				item.isDescendantSibling = (idx - 1 >= 0)
+						&& levels.get(idx - 1).second < levelForStatus.get().second;
+			}
+
+			if (item instanceof ReblogOrReplyLineStatusDisplayItem
+					&& item.isDescendantSibling
+					&& item.descendantLevel != 1) {
+				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;
 			}
+		}
+		for (int deleteThisItem : deleteTheseItems) items.remove(deleteThisItem);
+		if(s.id.equals(mainStatus.id)) {
 			items.add(new ExtendedFooterStatusDisplayItem(s.id, this, s.getContentStatus()));
 		}
 		return items;
@@ -68,36 +117,20 @@ public class ThreadFragment extends StatusListFragment{
 						if (getActivity() == null) return;
 						if(refreshing){
 							data.clear();
+							levels.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);
+
+						levels.addAll(countAncestryLevels(mainStatus.id, result));
+
 						if(footerProgress!=null)
 							footerProgress.setVisibility(View.GONE);
 						data.addAll(result.descendants);
@@ -106,7 +139,12 @@ public class ThreadFragment extends StatusListFragment{
 						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();
@@ -118,7 +156,52 @@ public class ThreadFragment extends StatusListFragment{
 				.exec(accountID);
 	}
 
-	private List<Status> getDescendantsOrdered(String id, List<Status> statuses){
+	public static List<Pair<String, Integer>> countAncestryLevels(String mainStatusID, StatusContext context) {
+		List<Pair<String, Integer>> levels = new ArrayList<>();
+
+		for (int i = 0; i < context.ancestors.size(); i++) {
+			levels.add(Pair.create(
+					context.ancestors.get(i).id,
+					-context.ancestors.size() + i // -3, -2, -1
+			));
+		}
+
+		levels.add(Pair.create(mainStatusID, 0));
+		Map<String, Integer> levelPerStatus = new HashMap<>();
+
+		// sum up the amounts of descendants per status
+		context.descendants.forEach(s -> levelPerStatus.put(s.id,
+				levelPerStatus.getOrDefault(s.inReplyToId, 0) + 1));
+		context.descendants.forEach(s ->
+				levels.add(Pair.create(s.id, levelPerStatus.get(s.id))));
+
+		return levels;
+	}
+
+	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);
@@ -130,14 +213,14 @@ public class ThreadFragment extends StatusListFragment{
 		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());
 	}
 
 	private List<Status> filterStatuses(List<Status> statuses){
-		StatusFilterPredicate statusFilterPredicate=new StatusFilterPredicate(accountID,Filter.FilterContext.THREAD);
+		StatusFilterPredicate statusFilterPredicate=new StatusFilterPredicate(accountID,getFilterContext());
 		return statuses.stream()
 				.filter(statusFilterPredicate)
 				.collect(Collectors.toList());
@@ -181,4 +264,15 @@ public class ThreadFragment extends StatusListFragment{
 	public boolean wantsLightNavigationBar(){
 		return !UiUtils.isDarkTheme();
 	}
+
+
+	@Override
+	protected Filter.FilterContext getFilterContext() {
+		return Filter.FilterContext.THREAD;
+	}
+
+	@Override
+	public Uri getWebUri(Uri.Builder base) {
+		return Uri.parse(mainStatus.url);
+	}
 }

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<>();
@@ -170,6 +173,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);
@@ -387,7 +400,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;
@@ -19,4 +20,10 @@ public class FollowerListFragment extends AccountRelatedAccountListFragment{
 	public HeaderPaginationRequest<Account> onCreateRequest(String maxID, int count){
 		return new GetAccountFollowers(account.id, maxID, count);
 	}
+
+	@Override
+	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;
@@ -19,4 +20,10 @@ public class FollowingListFragment extends AccountRelatedAccountListFragment{
 	public HeaderPaginationRequest<Account> onCreateRequest(String maxID, int count){
 		return new GetAccountFollowing(account.id, maxID, count);
 	}
+
+	@Override
+	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;
@@ -18,4 +19,12 @@ public class StatusFavoritesListFragment extends StatusRelatedAccountListFragmen
 	public HeaderPaginationRequest<Account> onCreateRequest(String maxID, int count){
 		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();
+	}
 }

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;
@@ -18,4 +19,12 @@ public class StatusReblogsListFragment extends StatusRelatedAccountListFragment{
 	public HeaderPaginationRequest<Account> onCreateRequest(String maxID, int count){
 		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();
+	}
 }

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;
@@ -27,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;
@@ -49,7 +51,7 @@ import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.utils.V;
 import me.grishka.appkit.views.UsableRecyclerView;
 
-public class DiscoverAccountsFragment extends RecyclerFragment<DiscoverAccountsFragment.AccountWrapper> implements ScrollableToTop, IsOnTop {
+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;
@@ -145,6 +147,16 @@ public class DiscoverAccountsFragment extends RecyclerFragment<DiscoverAccountsF
 		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.os.Build;
 import android.os.Bundle;
 import android.text.Editable;
@@ -19,12 +20,14 @@ import android.widget.TextView;
 
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
+import org.joinmastodon.android.fragments.HomeFragment;
 import org.joinmastodon.android.fragments.IsOnTop;
 import org.joinmastodon.android.fragments.ScrollableToTop;
 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;
@@ -36,7 +39,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, IsOnTop {
+public class DiscoverFragment extends AppKitFragment implements ScrollableToTop, OnBackPressedListener, IsOnTop, ProvidesAssistContent {
 
 	private TabLayout tabLayout;
 	private ViewPager2 pager;
@@ -49,7 +52,7 @@ 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;
@@ -117,7 +120,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();
@@ -238,7 +241,7 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 		else scrollToTop();
 	}
 
-	private void selectSearch() {
+	public void selectSearch() {
 		searchEdit.requestFocus();
 		onSearchEditFocusChanged(searchEdit, true);
 		getActivity().getSystemService(InputMethodManager.class).showSoftInput(searchEdit, 0);
@@ -272,6 +275,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
@@ -318,6 +323,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;
@@ -15,6 +19,7 @@ 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;
 
@@ -24,11 +29,11 @@ import me.grishka.appkit.api.SimpleCallback;
 import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.views.UsableRecyclerView;
 
-public class TrendingHashtagsFragment extends RecyclerFragment<Hashtag> implements ScrollableToTop, IsOnTop {
+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);
 	}
 
@@ -73,6 +78,16 @@ public class TrendingHashtagsFragment extends RecyclerFragment<Hashtag> implemen
 		return isRecyclerViewOnTop(list);
 	}
 
+	@Override
+	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>{
 		@NonNull
 		@Override
@@ -105,6 +120,14 @@ public class TrendingHashtagsFragment extends RecyclerFragment<Hashtag> implemen
 		@Override
 		public void onBind(Hashtag item){
 			title.setText('#'+item.name);
+			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;

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;
@@ -19,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;
@@ -35,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 RecyclerFragment<Card> implements ScrollableToTop, IsOnTop {
+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);
@@ -88,6 +90,16 @@ public class DiscoverNewsFragment extends RecyclerFragment<Card> implements Scro
 		return isRecyclerViewOnTop(list);
 	}
 
+	@Override
+	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{
 		public LinksAdapter(){
 			super(imgLoader);

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;
 
@@ -26,7 +27,7 @@ public class DiscoverPostsFragment extends StatusListFragment implements IsOnTop
 					@Override
 					public void onSuccess(List<Status> result){
 						if (getActivity() == null) return;
-						result=result.stream().filter(new StatusFilterPredicate(accountID, Filter.FilterContext.PUBLIC)).collect(Collectors.toList());
+						result=result.stream().filter(new StatusFilterPredicate(accountID, getFilterContext())).collect(Collectors.toList());
 						onDataLoaded(result, !result.isEmpty());
 					}
 				}).exec(accountID);
@@ -42,4 +43,14 @@ public class DiscoverPostsFragment extends StatusListFragment implements IsOnTop
 	public boolean 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,7 +26,6 @@ public class FederatedTimelineFragment extends StatusListFragment {
 		return true;
 	}
 
-
 	@Override
 	protected void doLoadData(int offset, int count){
 		currentRequest=new GetPublicTimeline(false, false, refreshing ? null : maxID, count)
@@ -35,7 +35,7 @@ public class FederatedTimelineFragment extends StatusListFragment {
 						if(!result.isEmpty())
 							maxID=result.get(result.size()-1).id;
 						if (getActivity() == null) return;
-						result=result.stream().filter(new StatusFilterPredicate(accountID, Filter.FilterContext.PUBLIC)).collect(Collectors.toList());
+						result=result.stream().filter(new StatusFilterPredicate(accountID, getFilterContext())).collect(Collectors.toList());
 						onDataLoaded(result, !result.isEmpty());
 					}
 				})
@@ -47,4 +47,14 @@ public class FederatedTimelineFragment extends StatusListFragment {
 		super.onViewCreated(view, savedInstanceState);
 		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,7 +26,6 @@ public class LocalTimelineFragment extends StatusListFragment {
 		return true;
 	}
 
-
 	@Override
 	protected void doLoadData(int offset, int count){
 		currentRequest=new GetPublicTimeline(true, false, refreshing ? null : maxID, count)
@@ -34,7 +35,7 @@ public class LocalTimelineFragment extends StatusListFragment {
 						if(!result.isEmpty())
 							maxID=result.get(result.size()-1).id;
 						if (getActivity() == null) return;
-						result=result.stream().filter(new StatusFilterPredicate(accountID, Filter.FilterContext.PUBLIC)).collect(Collectors.toList());
+						result=result.stream().filter(new StatusFilterPredicate(accountID, getFilterContext())).collect(Collectors.toList());
 						onDataLoaded(result, !result.isEmpty());
 					}
 				})
@@ -46,4 +47,14 @@ public class LocalTimelineFragment extends StatusListFragment {
 		super.onViewCreated(view, savedInstanceState);
 		bannerHelper.maybeAddBanner(contentWrap);
 	}
+
+	@Override
+	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;
@@ -15,6 +16,7 @@ import org.joinmastodon.android.fragments.IsOnTop;
 import org.joinmastodon.android.fragments.ProfileFragment;
 import org.joinmastodon.android.fragments.ThreadFragment;
 import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.Hashtag;
 import org.joinmastodon.android.model.SearchResult;
 import org.joinmastodon.android.model.SearchResults;
@@ -80,7 +82,7 @@ public class SearchFragment extends BaseStatusListFragment<SearchResult> impleme
 		return switch(s.type){
 			case ACCOUNT -> Collections.singletonList(new AccountStatusDisplayItem(s.id, this, s.account));
 			case HASHTAG -> Collections.singletonList(new HashtagStatusDisplayItem(s.id, this, s.hashtag));
-			case STATUS -> StatusDisplayItem.buildItems(this, s.status, accountID, s, knownAccounts, false, true, null);
+			case STATUS -> StatusDisplayItem.buildItems(this, s.status, accountID, s, knownAccounts, false, true, null, Filter.FilterContext.PUBLIC);
 		};
 	}
 
@@ -315,6 +317,14 @@ public class SearchFragment extends BaseStatusListFragment<SearchResult> impleme
 		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

@@ -89,13 +89,6 @@ public class AccountActivationFragment extends ToolbarFragment{
 		return !UiUtils.isDarkTheme();
 	}
 
-	@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();
@@ -110,7 +103,7 @@ public class AccountActivationFragment extends ToolbarFragment{
 
 	@Override
 	public void onToolbarNavigationClick(){
-		new AccountSwitcherSheet(getActivity()).show();
+		new AccountSwitcherSheet(getActivity(), null).show();
 	}
 
 	@Override

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

@@ -124,6 +124,7 @@ public class CustomWelcomeFragment extends InstanceCatalogFragment {
 		super.onViewCreated(view, savedInstanceState);
 		view.setBackgroundColor(UiUtils.getThemeColor(getActivity(), R.attr.colorWindowBackground));
 		list.setItemAnimator(new BetterItemAnimator());
+		((UsableRecyclerView) list).setSelector(null);
 	}
 
 	@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;
@@ -21,6 +22,7 @@ import org.joinmastodon.android.api.requests.accounts.GetAccountStatuses;
 import org.joinmastodon.android.events.FinishReportFragmentsEvent;
 import org.joinmastodon.android.fragments.StatusListFragment;
 import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.displayitems.AudioStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.HeaderStatusDisplayItem;
@@ -261,4 +263,16 @@ public class ReportAddPostsChoiceFragment extends StatusListFragment{
 	protected boolean wantsOverlaySystemNavigation(){
 		return false;
 	}
+
+	@Override
+	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;
+	}
 }

mastodon/src/main/java/org/joinmastodon/android/model/ContentType.java

@@ -0,0 +1,40 @@
+package org.joinmastodon.android.model;
+
+import android.view.Menu;
+
+import androidx.annotation.Nullable;
+
+import com.google.gson.annotations.SerializedName;
+
+import org.joinmastodon.android.R;
+
+public enum ContentType {
+	@SerializedName("text/plain")
+	PLAIN,
+	@SerializedName("text/html")
+	HTML,
+	@SerializedName("text/markdown")
+	MARKDOWN,
+	@SerializedName("text/bbcode")
+	BBCODE, // akkoma
+	@SerializedName("text/x.misskeymarkdown")
+	MISSKEY_MARKDOWN; // akkoma/*key
+
+	public static int getContentTypeRes(@Nullable ContentType contentType) {
+		return contentType == null ? R.id.content_type_null : switch(contentType) {
+			case PLAIN -> R.id.content_type_plain;
+			case HTML -> R.id.content_type_html;
+			case MARKDOWN -> R.id.content_type_markdown;
+			case BBCODE -> R.id.content_type_bbcode;
+			case MISSKEY_MARKDOWN -> R.id.content_type_misskey_markdown;
+		};
+	}
+
+	public static void adaptMenuToInstance(Menu m, Instance i) {
+		if (i.pleroma == null) {
+			// memo: change this if glitch or another mastodon fork supports bbcode or mfm
+			m.findItem(R.id.content_type_bbcode).setVisible(false);
+			m.findItem(R.id.content_type_misskey_markdown).setVisible(false);
+		}
+	}
+}

mastodon/src/main/java/org/joinmastodon/android/model/Filter.java

@@ -2,22 +2,22 @@ package org.joinmastodon.android.model;
 
 import android.text.TextUtils;
 
+import androidx.annotation.Nullable;
+
 import com.google.gson.annotations.SerializedName;
 
 import org.joinmastodon.android.api.ObjectValidationException;
-import org.joinmastodon.android.api.RequiredField;
 import org.parceler.Parcel;
 
 import java.time.Instant;
 import java.util.EnumSet;
 import java.util.List;
 import java.util.regex.Pattern;
+import java.util.stream.Stream;
 
 @Parcel
 public class Filter extends BaseModel{
-	@RequiredField
 	public String id;
-	@RequiredField
 	public String phrase;
 	public String title;
 	public transient EnumSet<FilterContext> context=EnumSet.noneOf(FilterContext.class);

mastodon/src/main/java/org/joinmastodon/android/model/FilterResult.java

@@ -1,8 +1,15 @@
 package org.joinmastodon.android.model;
 
+import org.joinmastodon.android.api.ObjectValidationException;
 import org.parceler.Parcel;
 
 @Parcel
 public class FilterResult extends BaseModel {
     public Filter filter;
+
+    @Override
+    public void postprocess() throws ObjectValidationException {
+        super.postprocess();
+        if (filter != null) filter.postprocess();
+    }
 }

mastodon/src/main/java/org/joinmastodon/android/model/Instance.java

@@ -11,6 +11,7 @@ import java.net.IDN;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 @Parcel
 public class Instance extends BaseModel{
@@ -86,6 +87,11 @@ public class Instance extends BaseModel{
 
 	public Pleroma pleroma;
 
+	public PleromaPollLimits pollLimits;
+
+	/** like uri, but always without scheme and trailing slash */
+	public transient String normalizedUri;
+
 	@Override
 	public void postprocess() throws ObjectValidationException{
 		super.postprocess();
@@ -95,6 +101,10 @@ public class Instance extends BaseModel{
 			rules=Collections.emptyList();
 		if(shortDescription==null)
 			shortDescription="";
+		// akkoma says uri is "https://example.social" while just "example.social" on mastodon
+		normalizedUri = uri
+				.replaceFirst("^https://", "")
+				.replaceFirst("/$", "");
 	}
 
 	@Override
@@ -134,6 +144,26 @@ public class Instance extends BaseModel{
 		return ci;
 	}
 
+	public boolean isAkkoma() {
+		return pleroma != null;
+	}
+
+	public boolean hasFeature(Feature feature) {
+		Optional<List<String>> pleromaFeatures = Optional.ofNullable(pleroma)
+				.map(p -> p.metadata)
+				.map(m -> m.features);
+
+		return switch (feature) {
+			case BUBBLE_TIMELINE -> pleromaFeatures
+					.map(f -> f.contains("bubble_timeline"))
+					.orElse(false);
+		};
+	}
+
+	public enum Feature {
+		BUBBLE_TIMELINE
+	}
+
 	@Parcel
 	public static class Rule{
 		public String id;
@@ -198,6 +228,28 @@ public class Instance extends BaseModel{
 
 	@Parcel
 	public static class Pleroma extends BaseModel {
-		// metadata etc
+		public Pleroma.Metadata metadata;
+
+		@Parcel
+		public static class Metadata {
+			public List<String> features;
+			public Pleroma.Metadata.FieldsLimits fieldsLimits;
+
+			@Parcel
+			public static class FieldsLimits {
+				public int maxFields;
+				public int maxRemoteFields;
+				public int nameLength;
+				public int valueLength;
+			}
+		}
+	}
+
+	@Parcel
+	public static class PleromaPollLimits {
+		public int maxExpiration;
+		public int maxOptionChars;
+		public int maxOptions;
+		public int minExpiration;
 	}
 }

mastodon/src/main/java/org/joinmastodon/android/model/ScheduledStatus.java

@@ -39,6 +39,7 @@ public class ScheduledStatus extends BaseModel implements DisplayItemsParent{
         public String idempotency;
         public String applicationId;
         public List<String> mediaIds;
+        public ContentType contentType;
     }
 
     @Parcel

mastodon/src/main/java/org/joinmastodon/android/model/Status.java

@@ -50,6 +50,8 @@ public class Status extends BaseModel implements DisplayItemsParent, Searchable{
 	public long favouritesCount;
 	public long repliesCount;
 	public Instant editedAt;
+	// might not be provided (by older mastodon servers),
+	// so megalodon will use the locally cached filters if filtered == null
 	public List<FilterResult> filtered;
 
 	public String url;
@@ -101,6 +103,9 @@ public class Status extends BaseModel implements DisplayItemsParent, Searchable{
 			card.postprocess();
 		if(reblog!=null)
 			reblog.postprocess();
+		if(filtered!=null)
+			for(FilterResult fr : filtered)
+				fr.postprocess();
 
 		spoilerRevealed=GlobalUserPreferences.alwaysExpandContentWarnings || !sensitive;
 		if (visibility.equals(StatusPrivacy.LOCAL)) localOnly = true;
@@ -177,7 +182,6 @@ public class Status extends BaseModel implements DisplayItemsParent, Searchable{
 		s.mentions = List.of();
 		s.tags = List.of();
 		s.emojis = List.of();
-		s.filtered = List.of();
 		return s;
 	}
 

mastodon/src/main/java/org/joinmastodon/android/model/TimelineDefinition.java

@@ -8,17 +8,20 @@ import androidx.annotation.DrawableRes;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 
-import org.joinmastodon.android.BuildConfig;
 import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.session.AccountSession;
+import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.HashtagTimelineFragment;
 import org.joinmastodon.android.fragments.HomeTimelineFragment;
 import org.joinmastodon.android.fragments.ListTimelineFragment;
 import org.joinmastodon.android.fragments.NotificationsListFragment;
+import org.joinmastodon.android.fragments.discover.BubbleTimelineFragment;
 import org.joinmastodon.android.fragments.discover.FederatedTimelineFragment;
 import org.joinmastodon.android.fragments.discover.LocalTimelineFragment;
 
 import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 public class TimelineDefinition {
     private TimelineType type;
@@ -58,6 +61,14 @@ public class TimelineDefinition {
         this.type = type;
     }
 
+    public boolean isCompatible(AccountSession session) {
+        return true;
+    }
+
+    public boolean wantsDefault(AccountSession session) {
+        return true;
+    }
+
     public String getTitle(Context ctx) {
         return title != null ? title : getDefaultTitle(ctx);
     }
@@ -78,6 +89,7 @@ public class TimelineDefinition {
             case POST_NOTIFICATIONS -> ctx.getString(R.string.sk_timeline_posts);
             case LIST -> listTitle;
             case HASHTAG -> hashtagName;
+            case BUBBLE -> ctx.getString(R.string.sk_timeline_bubble);
         };
     }
 
@@ -89,6 +101,7 @@ public class TimelineDefinition {
             case POST_NOTIFICATIONS -> Icon.POST_NOTIFICATIONS;
             case LIST -> Icon.LIST;
             case HASHTAG -> Icon.HASHTAG;
+            case BUBBLE -> Icon.BUBBLE;
         };
     }
 
@@ -100,6 +113,7 @@ public class TimelineDefinition {
             case LIST -> new ListTimelineFragment();
             case HASHTAG -> new HashtagTimelineFragment();
             case POST_NOTIFICATIONS -> new NotificationsListFragment();
+            case BUBBLE -> new BubbleTimelineFragment();
         };
     }
 
@@ -156,7 +170,7 @@ public class TimelineDefinition {
         return args;
     }
 
-    public enum TimelineType { HOME, LOCAL, FEDERATED, POST_NOTIFICATIONS, LIST, HASHTAG }
+    public enum TimelineType { HOME, LOCAL, FEDERATED, POST_NOTIFICATIONS, LIST, HASHTAG, BUBBLE }
 
     public enum Icon {
         HEART(R.drawable.ic_fluent_heart_24_regular, R.string.sk_icon_heart),
@@ -219,7 +233,8 @@ public class TimelineDefinition {
         FEDERATED(R.drawable.ic_fluent_earth_24_regular, R.string.sk_timeline_federated, true),
         POST_NOTIFICATIONS(R.drawable.ic_fluent_chat_24_regular, R.string.sk_timeline_posts, true),
         LIST(R.drawable.ic_fluent_people_24_regular, R.string.sk_list, true),
-        HASHTAG(R.drawable.ic_fluent_number_symbol_24_regular, R.string.sk_hashtag, true);
+        HASHTAG(R.drawable.ic_fluent_number_symbol_24_regular, R.string.sk_hashtag, true),
+        BUBBLE(R.drawable.ic_fluent_circle_24_regular, R.string.sk_timeline_bubble, true);
 
         public final int iconRes, nameRes;
         public final boolean hidden;
@@ -239,14 +254,50 @@ public class TimelineDefinition {
     public static final TimelineDefinition LOCAL_TIMELINE = new TimelineDefinition(TimelineType.LOCAL);
     public static final TimelineDefinition FEDERATED_TIMELINE = new TimelineDefinition(TimelineType.FEDERATED);
     public static final TimelineDefinition POSTS_TIMELINE = new TimelineDefinition(TimelineType.POST_NOTIFICATIONS);
+    public static final TimelineDefinition BUBBLE_TIMELINE = new TimelineDefinition(TimelineType.BUBBLE) {
+        @Override
+        public boolean isCompatible(AccountSession session) {
+            // still enabling the bubble timeline for all pleroma/akkoma instances since i know of
+            // at least one instance that supports it, but doesn't list "bubble_timeline"
+            return session.getInstance().map(Instance::isAkkoma).orElse(false);
+        }
 
-    public static final List<TimelineDefinition> DEFAULT_TIMELINES = BuildConfig.BUILD_TYPE.equals("playRelease")
-            ? List.of(HOME_TIMELINE.copy(), LOCAL_TIMELINE.copy())
-            : List.of(HOME_TIMELINE.copy(), LOCAL_TIMELINE.copy(), FEDERATED_TIMELINE.copy());
-    public static final List<TimelineDefinition> ALL_TIMELINES = List.of(
-            HOME_TIMELINE.copy(),
-            LOCAL_TIMELINE.copy(),
-            FEDERATED_TIMELINE.copy(),
-            POSTS_TIMELINE.copy()
+        @Override
+        public boolean wantsDefault(AccountSession session) {
+            return session.getInstance()
+                    .map(i -> i.hasFeature(Instance.Feature.BUBBLE_TIMELINE))
+                    .orElse(false);
+        }
+    };
+
+    public static List<TimelineDefinition> getDefaultTimelines(String accountId) {
+        AccountSession session = AccountSessionManager.getInstance().getAccount(accountId);
+        return DEFAULT_TIMELINES.stream()
+                .filter(tl -> tl.isCompatible(session) && tl.wantsDefault(session))
+                .map(TimelineDefinition::copy)
+                .collect(Collectors.toList());
+    }
+
+    public static List<TimelineDefinition> getAllTimelines(String accountId) {
+        AccountSession session = AccountSessionManager.getInstance().getAccount(accountId);
+        return ALL_TIMELINES.stream()
+                .filter(tl -> tl.isCompatible(session))
+                .map(TimelineDefinition::copy)
+                .collect(Collectors.toList());
+    }
+
+    private static final List<TimelineDefinition> DEFAULT_TIMELINES = List.of(
+            HOME_TIMELINE,
+            LOCAL_TIMELINE,
+            BUBBLE_TIMELINE,
+            FEDERATED_TIMELINE
+    );
+
+    private static final List<TimelineDefinition> ALL_TIMELINES = List.of(
+            HOME_TIMELINE,
+            LOCAL_TIMELINE,
+            FEDERATED_TIMELINE,
+            POSTS_TIMELINE,
+            BUBBLE_TIMELINE
     );
 }

mastodon/src/main/java/org/joinmastodon/android/ui/AccountSwitcherSheet.java

@@ -2,8 +2,8 @@ package org.joinmastodon.android.ui;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
+import android.app.ProgressDialog;
 import android.content.Intent;
-import android.content.res.ColorStateList;
 import android.graphics.drawable.Animatable;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
@@ -14,7 +14,7 @@ import android.view.WindowInsets;
 import android.widget.FrameLayout;
 import android.widget.ImageButton;
 import android.widget.ImageView;
-import android.widget.PopupMenu;
+import android.widget.RadioButton;
 import android.widget.TextView;
 
 import org.joinmastodon.android.GlobalUserPreferences;
@@ -23,13 +23,21 @@ import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.oauth.RevokeOauthToken;
 import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.fragments.HomeFragment;
+import org.joinmastodon.android.fragments.SplashFragment;
 import org.joinmastodon.android.fragments.onboarding.CustomWelcomeFragment;
 import org.joinmastodon.android.ui.utils.UiUtils;
+import org.joinmastodon.android.ui.views.CheckableRelativeLayout;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.function.BiConsumer;
 import java.util.stream.Collectors;
 
+import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.Callback;
@@ -49,14 +57,25 @@ import me.grishka.appkit.views.UsableRecyclerView;
 
 public class AccountSwitcherSheet extends BottomSheet{
 	private final Activity activity;
+	private final HomeFragment fragment;
+	private final BiConsumer<String, Boolean> onClick;
+	private final boolean externalShare, openInApp;
 	private UsableRecyclerView list;
 	private List<WrappedAccount> accounts;
 	private ListImageLoaderWrapper imgLoader;
 
-	public AccountSwitcherSheet(@NonNull Activity activity){
+	public AccountSwitcherSheet(@NonNull Activity activity, @Nullable HomeFragment fragment){
+		this(activity, fragment, false, false, null);
+	}
+
+	public AccountSwitcherSheet(@NonNull Activity activity, @Nullable HomeFragment fragment, boolean externalShare, boolean openInApp, BiConsumer<String, Boolean> onClick){
 		super(activity);
 		this.activity=activity;
-
+		this.fragment=fragment;
+		this.externalShare = externalShare;
+		this.openInApp = openInApp;
+		this.onClick = onClick;
+		
 		accounts=AccountSessionManager.getInstance().getLoggedInAccounts().stream().map(WrappedAccount::new).collect(Collectors.toList());
 
 		list=new UsableRecyclerView(activity);
@@ -67,41 +86,59 @@ public class AccountSwitcherSheet extends BottomSheet{
 		MergeRecyclerAdapter adapter=new MergeRecyclerAdapter();
 		View handle=new View(activity);
 		handle.setBackgroundResource(R.drawable.bg_bottom_sheet_handle);
+		handle.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, V.dp(36)));
+
 		adapter.addAdapter(new SingleViewRecyclerAdapter(handle));
+
+		if (externalShare) {
+			FrameLayout shareHeading = new FrameLayout(activity);
+			activity.getLayoutInflater().inflate(R.layout.item_external_share_heading, shareHeading);
+			((TextView) shareHeading.findViewById(R.id.title)).setText(openInApp
+					? R.string.sk_external_share_or_open_title
+					: R.string.sk_external_share_title);
+			adapter.addAdapter(new SingleViewRecyclerAdapter(shareHeading));
+
+			setOnDismissListener((d) -> activity.finish());
+		}
+
 		adapter.addAdapter(new AccountsAdapter());
-		AccountViewHolder holder=new AccountViewHolder();
-		holder.more.setVisibility(View.GONE);
-		holder.currentIcon.setVisibility(View.GONE);
-		holder.name.setText(R.string.add_account);
-		holder.avatar.setScaleType(ImageView.ScaleType.CENTER);
-		holder.avatar.setImageResource(R.drawable.ic_fluent_add_circle_24_filled);
-		holder.avatar.setImageTintList(ColorStateList.valueOf(UiUtils.getThemeColor(activity, android.R.attr.textColorPrimary)));
-		adapter.addAdapter(new ClickableSingleViewRecyclerAdapter(holder.itemView, ()->{
-			Nav.go(activity, CustomWelcomeFragment.class, null);
-			dismiss();
-		}));
+
+		if (!externalShare) {
+			adapter.addAdapter(new ClickableSingleViewRecyclerAdapter(makeSimpleListItem(R.string.add_account, R.drawable.ic_fluent_add_24_regular), () -> {
+				Nav.go(activity, CustomWelcomeFragment.class, null);
+				dismiss();
+			}));
+			// disabled in megalodon
+//			adapter.addAdapter(new ClickableSingleViewRecyclerAdapter(makeSimpleListItem(R.string.log_out_all_accounts, R.drawable.ic_fluent_person_arrow_right_24_filled), this::confirmLogOutAll));
+		}
 
 		list.setAdapter(adapter);
-		DividerItemDecoration divider=new DividerItemDecoration(activity, R.attr.colorPollVoted, .5f, 72, 16, DividerItemDecoration.NOT_FIRST);
-		divider.setDrawBelowLastItem(true);
-		list.addItemDecoration(divider);
 
 		FrameLayout content=new FrameLayout(activity);
 		content.setBackgroundResource(R.drawable.bg_bottom_sheet);
 		content.addView(list);
 		setContentView(content);
-		setNavigationBarBackground(new ColorDrawable(UiUtils.getThemeColor(activity, R.attr.colorWindowBackground)), !UiUtils.isDarkTheme());
+		setNavigationBarBackground(new ColorDrawable(UiUtils.alphaBlendColors(UiUtils.getThemeColor(activity, R.attr.colorM3Surface),
+				UiUtils.getThemeColor(activity, R.attr.colorM3Primary), 0.05f)), !UiUtils.isDarkTheme());
 	}
 
 	private void confirmLogOut(String accountID){
+		AccountSession session=AccountSessionManager.getInstance().getAccount(accountID);
 		new M3AlertDialogBuilder(activity)
-				.setTitle(R.string.log_out)
-				.setMessage(R.string.confirm_log_out)
+				.setMessage(activity.getString(R.string.confirm_log_out, session.getFullUsername()))
 				.setPositiveButton(R.string.log_out, (dialog, which) -> logOut(accountID))
 				.setNegativeButton(R.string.cancel, null)
 				.show();
 	}
 
+	private void confirmLogOutAll(){
+		new M3AlertDialogBuilder(activity)
+				.setMessage(R.string.confirm_log_out_all_accounts)
+				.setPositiveButton(R.string.log_out, (dialog, which) -> logOutAll())
+				.setNegativeButton(R.string.cancel, null)
+				.show();
+	}
+
 	private void logOut(String accountID){
 		AccountSession session=AccountSessionManager.getInstance().getAccount(accountID);
 		new RevokeOauthToken(session.app.clientId, session.app.clientSecret, session.token.accessToken)
@@ -120,9 +157,52 @@ public class AccountSwitcherSheet extends BottomSheet{
 				.exec(accountID);
 	}
 
+	private void logOutAll(){
+		final ProgressDialog progress=new ProgressDialog(activity);
+		progress.setMessage(activity.getString(R.string.loading));
+		progress.setCancelable(false);
+		progress.show();
+		ArrayList<AccountSession> sessions=new ArrayList<>(AccountSessionManager.getInstance().getLoggedInAccounts());
+		for(AccountSession session:sessions){
+			new RevokeOauthToken(session.app.clientId, session.app.clientSecret, session.token.accessToken)
+					.setCallback(new Callback<>(){
+						@Override
+						public void onSuccess(Object result){
+							AccountSessionManager.getInstance().removeAccount(session.getID());
+							sessions.remove(session);
+							if(sessions.isEmpty()){
+								progress.dismiss();
+								Nav.goClearingStack(activity, SplashFragment.class, null);
+								dismiss();
+							}
+						}
+
+						@Override
+						public void onError(ErrorResponse error){
+							AccountSessionManager.getInstance().removeAccount(session.getID());
+							sessions.remove(session);
+							if(sessions.isEmpty()){
+								progress.dismiss();
+								Nav.goClearingStack(activity, SplashFragment.class, null);
+								dismiss();
+							}
+						}
+					})
+					.exec(session.getID());
+		}
+	}
+
 	private void onLoggedOut(String accountID){
 		AccountSessionManager.getInstance().removeAccount(accountID);
-		dismiss();
+		String activeAccountID = fragment != null
+				? fragment.getAccountID()
+				: AccountSessionManager.getInstance().getLastActiveAccountID();
+		if (accountID.equals(activeAccountID)) {
+			activity.finish();
+			activity.startActivity(new Intent(activity, MainActivity.class));
+		} else {
+			dismiss();
+		}
 	}
 
 	@Override
@@ -140,6 +220,13 @@ public class AccountSwitcherSheet extends BottomSheet{
 		}
 	}
 
+	private View makeSimpleListItem(@StringRes int title, @DrawableRes int icon){
+		TextView tv=(TextView) activity.getLayoutInflater().inflate(R.layout.item_text_with_icon, list, false);
+		tv.setText(title);
+		tv.setCompoundDrawablesRelativeWithIntrinsicBounds(icon, 0, 0, 0);
+		return tv;
+	}
+
 	private class AccountsAdapter extends UsableRecyclerView.Adapter<AccountViewHolder> implements ImageLoaderRecyclerAdapter{
 		public AccountsAdapter(){
 			super(imgLoader);
@@ -173,45 +260,42 @@ public class AccountSwitcherSheet extends BottomSheet{
 		}
 	}
 
-	private class AccountViewHolder extends BindableViewHolder<AccountSession> implements ImageLoaderViewHolder, UsableRecyclerView.Clickable{
-		private final TextView name;
+	private class AccountViewHolder extends BindableViewHolder<AccountSession> implements ImageLoaderViewHolder, UsableRecyclerView.Clickable, UsableRecyclerView.LongClickable{
+		private final TextView name, username;
 		private final ImageView avatar;
-		private final ImageButton more;
-		private final View currentIcon;
-		private final PopupMenu menu;
+		private final CheckableRelativeLayout view;
+		private final View radioButton, extraBtnWrap;
+		private final ImageButton extraBtn;
 
 		public AccountViewHolder(){
 			super(activity, R.layout.item_account_switcher, list);
 			name=findViewById(R.id.name);
+			username=findViewById(R.id.username);
+			radioButton=findViewById(R.id.radiobtn);
+			radioButton.setBackground(new RadioButton(activity).getButtonDrawable());
 			avatar=findViewById(R.id.avatar);
-			more=findViewById(R.id.more);
-			currentIcon=findViewById(R.id.current);
-
-			avatar.setOutlineProvider(OutlineProviders.roundedRect(12));
+			avatar.setOutlineProvider(OutlineProviders.roundedRect(OutlineProviders.RADIUS_MEDIUM));
 			avatar.setClipToOutline(true);
-
-			menu=new PopupMenu(activity, more);
-			menu.inflate(R.menu.account_switcher);
-			menu.setOnMenuItemClickListener(item1 -> {
-				confirmLogOut(item.getID());
-				return true;
-			});
-			more.setOnClickListener(v->menu.show());
+			view=(CheckableRelativeLayout) itemView;
+			extraBtnWrap = findViewById(R.id.extra_btn_wrap);
+			extraBtn = findViewById(R.id.extra_btn);
+			extraBtn.setOnClickListener(this::onExtraBtnClick);
 		}
 
 		@SuppressLint("SetTextI18n")
 		@Override
 		public void onBind(AccountSession item){
-			name.setText("@"+item.self.username+"@"+item.domain);
-			if(AccountSessionManager.getInstance().getLastActiveAccountID().equals(item.getID())){
-				more.setVisibility(View.GONE);
-				currentIcon.setVisibility(View.VISIBLE);
-			}else{
-				more.setVisibility(View.VISIBLE);
-				currentIcon.setVisibility(View.GONE);
+			name.setText(item.self.displayName);
+			username.setText(item.getFullUsername());
+			radioButton.setVisibility(externalShare ? View.GONE : View.VISIBLE);
+			extraBtnWrap.setVisibility(externalShare && openInApp ? View.VISIBLE : View.GONE);
+			if (externalShare) view.setCheckable(false);
+			else {
+				String accountId = fragment != null
+						? fragment.getAccountID()
+						: AccountSessionManager.getInstance().getLastActiveAccountID();
+				view.setChecked(accountId.equals(item.getID()));
 			}
-			menu.getMenu().findItem(R.id.log_out).setTitle(activity.getString(R.string.log_out_account, "@"+item.self.username));
-			UiUtils.enablePopupMenuIcons(activity, menu);
 		}
 
 		@Override
@@ -226,12 +310,32 @@ public class AccountSwitcherSheet extends BottomSheet{
 			setImage(index, null);
 		}
 
+		private void onExtraBtnClick(View view) {
+			setOnDismissListener(null);
+			dismiss();
+			onClick.accept(item.getID(), true);
+		}
+
 		@Override
 		public void onClick(){
+			setOnDismissListener(null);
+			if (onClick != null) {
+				dismiss();
+				onClick.accept(item.getID(), false);
+				return;
+			}
+
 			AccountSessionManager.getInstance().setLastActiveAccountID(item.getID());
 			activity.finish();
 			activity.startActivity(new Intent(activity, MainActivity.class));
 		}
+
+		@Override
+		public boolean onLongClick(){
+			if (externalShare) return false;
+			confirmLogOut(item.getID());
+			return true;
+		}
 	}
 
 	private static class WrappedAccount{

mastodon/src/main/java/org/joinmastodon/android/ui/BetterItemAnimator.java

@@ -18,13 +18,15 @@ package org.joinmastodon.android.ui;
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.TimeInterpolator;
-import android.animation.ValueAnimator;
 import android.view.View;
 import android.view.ViewPropertyAnimator;
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.SimpleItemAnimator;
+
+import org.joinmastodon.android.ui.displayitems.MediaGridStatusDisplayItem;
+
 import me.grishka.appkit.utils.CubicBezierInterpolator;
 
 import java.util.ArrayList;
@@ -358,7 +360,14 @@ public class BetterItemAnimator extends SimpleItemAnimator{
             mChangeAnimations.add(changeInfo.oldHolder);
             oldViewAnim.translationX(changeInfo.toX - changeInfo.fromX);
             oldViewAnim.translationY(changeInfo.toY - changeInfo.fromY);
-            oldViewAnim.alpha(0).setListener(new AnimatorListenerAdapter() {
+            float alpha = 0;
+            if (holder instanceof MediaGridStatusDisplayItem.Holder mediaItemHolder) {
+                if (mediaItemHolder.isSizeUpdating()) {
+                    alpha = 1; // Image will flicker out and then in if alpha is 0
+                    mediaItemHolder.sizeUpdated();
+                }
+            }
+            oldViewAnim.alpha(alpha).setListener(new AnimatorListenerAdapter() {
                 @Override
                 public void onAnimationStart(Animator animator) {
                     dispatchChangeStarting(changeInfo.oldHolder, true);

mastodon/src/main/java/org/joinmastodon/android/ui/OutlineProviders.java

@@ -8,7 +8,15 @@ import android.view.ViewOutlineProvider;
 import me.grishka.appkit.utils.V;
 
 public class OutlineProviders{
-	private static SparseArray<ViewOutlineProvider> roundedRects=new SparseArray<>();
+	private static final SparseArray<ViewOutlineProvider> roundedRects=new SparseArray<>();
+	private static final SparseArray<ViewOutlineProvider> topRoundedRects=new SparseArray<>();
+	private static final SparseArray<ViewOutlineProvider> endRoundedRects=new SparseArray<>();
+
+	public static final int RADIUS_XSMALL=4;
+	public static final int RADIUS_SMALL=8;
+	public static final int RADIUS_MEDIUM=12;
+	public static final int RADIUS_LARGE=16;
+	public static final int RADIUS_XLARGE=28;
 
 	private OutlineProviders(){
 		//no instance
@@ -21,6 +29,12 @@ public class OutlineProviders{
 			outline.setAlpha(view.getAlpha());
 		}
 	};
+	public static final ViewOutlineProvider OVAL=new ViewOutlineProvider(){
+		@Override
+		public void getOutline(View view, Outline outline){
+			outline.setOval(0, 0, view.getWidth(), view.getHeight());
+		}
+	};
 
 	public static ViewOutlineProvider roundedRect(int dp){
 		ViewOutlineProvider provider=roundedRects.get(dp);
@@ -31,6 +45,24 @@ public class OutlineProviders{
 		return provider;
 	}
 
+	public static ViewOutlineProvider topRoundedRect(int dp){
+		ViewOutlineProvider provider=topRoundedRects.get(dp);
+		if(provider!=null)
+			return provider;
+		provider=new TopRoundRectOutlineProvider(V.dp(dp));
+		topRoundedRects.put(dp, provider);
+		return provider;
+	}
+
+	public static ViewOutlineProvider endRoundedRect(int dp){
+		ViewOutlineProvider provider=endRoundedRects.get(dp);
+		if(provider!=null)
+			return provider;
+		provider=new EndRoundRectOutlineProvider(V.dp(dp));
+		endRoundedRects.put(dp, provider);
+		return provider;
+	}
+
 	private static class RoundRectOutlineProvider extends ViewOutlineProvider{
 		private final int radius;
 
@@ -43,4 +75,34 @@ public class OutlineProviders{
 			outline.setRoundRect(0, 0, view.getWidth(), view.getHeight(), radius);
 		}
 	}
+
+	private static class TopRoundRectOutlineProvider extends ViewOutlineProvider{
+		private final int radius;
+
+		private TopRoundRectOutlineProvider(int radius){
+			this.radius=radius;
+		}
+
+		@Override
+		public void getOutline(View view, Outline outline){
+			outline.setRoundRect(0, 0, view.getWidth(), view.getHeight()+radius, radius);
+		}
+	}
+
+	private static class EndRoundRectOutlineProvider extends ViewOutlineProvider{
+		private final int radius;
+
+		private EndRoundRectOutlineProvider(int radius){
+			this.radius=radius;
+		}
+
+		@Override
+		public void getOutline(View view, Outline outline){
+			if(view.getLayoutDirection()==View.LAYOUT_DIRECTION_RTL){
+				outline.setRoundRect(-radius, 0, view.getWidth(), view.getHeight(), radius);
+			}else{
+				outline.setRoundRect(0, 0, view.getWidth()+radius, view.getHeight(), radius);
+			}
+		}
+	}
 }

mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ExtendedFooterStatusDisplayItem.java

@@ -131,6 +131,7 @@ public class ExtendedFooterStatusDisplayItem extends StatusDisplayItem{
 			Bundle args=new Bundle();
 			args.putString("account", item.parentFragment.getAccountID());
 			args.putString("id", item.status.id);
+			args.putString("url", item.status.url);
 			Nav.go(item.parentFragment.getActivity(), StatusEditHistoryFragment.class, args);
 		}
 	}

mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FileStatusDisplayItem.java

@@ -0,0 +1,64 @@
+package org.joinmastodon.android.ui.displayitems;
+
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.text.TextUtils;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.fragments.BaseStatusListFragment;
+import org.joinmastodon.android.model.Attachment;
+import org.joinmastodon.android.model.Card;
+import org.joinmastodon.android.model.Status;
+import org.joinmastodon.android.ui.drawables.BlurhashCrossfadeDrawable;
+import org.joinmastodon.android.ui.utils.UiUtils;
+
+import me.grishka.appkit.imageloader.ImageLoaderViewHolder;
+
+public class FileStatusDisplayItem extends StatusDisplayItem{
+    private final Attachment attachment;
+
+    public FileStatusDisplayItem(String parentID, BaseStatusListFragment<?> parentFragment, Attachment attachment) {
+        super(parentID, parentFragment);
+        this.attachment=attachment;
+    }
+
+    @Override
+    public Type getType() {
+        return Type.FILE;
+    }
+
+    public static class Holder extends StatusDisplayItem.Holder<FileStatusDisplayItem> {
+        private final TextView title, domain;
+
+        public Holder(Context context, ViewGroup parent) {
+            super(context, R.layout.display_item_file, parent);
+            title=findViewById(R.id.title);
+            domain=findViewById(R.id.domain);
+            findViewById(R.id.inner).setOnClickListener(this::onClick);
+        }
+
+        @Override
+        public void onBind(FileStatusDisplayItem item) {
+            Uri url = Uri.parse(getUrl());
+            title.setText(item.attachment.description != null
+                    ? item.attachment.description
+                    : url.getLastPathSegment());
+            title.setEllipsize(item.attachment.description != null ? TextUtils.TruncateAt.END : TextUtils.TruncateAt.MIDDLE);
+            domain.setText(url.getHost());
+        }
+
+        private void onClick(View v) {
+            UiUtils.openURL(itemView.getContext(), item.parentFragment.getAccountID(), getUrl());
+        }
+
+        private String getUrl() {
+            return item.attachment.remoteUrl == null ? item.attachment.url : item.attachment.remoteUrl;
+        }
+    }
+}
+

mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java

@@ -134,12 +134,20 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 			bindButton(reply, item.status.repliesCount);
 			bindButton(boost, item.status.reblogsCount);
 			bindButton(favorite, item.status.favouritesCount);
-			reply.setSelected(item.status.repliesCount > 0);
+			// in thread view, direct descendant posts display one direct reply to themselves,
+			// hence in that case displaying whether there is another reply
+			reply.setSelected(item.status.repliesCount > (item.descendantLevel > 0 ? 1 : 0));
 			boost.setSelected(item.status.reblogged);
 			favorite.setSelected(item.status.favourited);
 			bookmark.setSelected(item.status.bookmarked);
 			boost.setEnabled(item.status.visibility==StatusPrivacy.PUBLIC || item.status.visibility==StatusPrivacy.UNLISTED || item.status.visibility==StatusPrivacy.LOCAL
 					|| (item.status.visibility==StatusPrivacy.PRIVATE && item.status.account.id.equals(AccountSessionManager.getInstance().getAccount(item.accountID).self.id)));
+
+			ViewGroup.MarginLayoutParams params = (ViewGroup.MarginLayoutParams) itemView.getLayoutParams();
+			params.setMargins(params.leftMargin, params.topMargin, params.rightMargin,
+					item.descendantLevel != 0 && item.hasDescendantSibling ? V.dp(-6) : 0);
+
+			itemView.requestLayout();
 		}
 
 		private void bindButton(TextView btn, long count){

mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HashtagStatusDisplayItem.java

@@ -1,7 +1,9 @@
 package org.joinmastodon.android.ui.displayitems;
 
 import android.content.Context;
+import android.view.View;
 import android.view.ViewGroup;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import org.joinmastodon.android.R;
@@ -25,6 +27,13 @@ public class HashtagStatusDisplayItem extends StatusDisplayItem{
 	public static class Holder extends StatusDisplayItem.Holder<HashtagStatusDisplayItem>{
 		private final TextView title, subtitle;
 		private final HashtagChartView chart;
+		public static final RelativeLayout.LayoutParams
+				withHistoryParams = new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT),
+				withoutHistoryParams = new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+
+		static {
+			withoutHistoryParams.addRule(RelativeLayout.CENTER_VERTICAL, RelativeLayout.TRUE);
+		}
 
 		public Holder(Context context, ViewGroup parent){
 			super(context, R.layout.item_trending_hashtag, parent);
@@ -37,6 +46,14 @@ public class HashtagStatusDisplayItem extends StatusDisplayItem{
 		public void onBind(HashtagStatusDisplayItem _item){
 			Hashtag item=_item.tag;
 			title.setText('#'+item.name);
+			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;

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

@@ -1,11 +1,9 @@
 package org.joinmastodon.android.ui.displayitems;
 
-import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.ProgressDialog;
 import android.graphics.Outline;
 import android.graphics.Paint;
-import android.graphics.Rect;
 import android.graphics.Typeface;
 import android.graphics.drawable.Animatable;
 import android.graphics.drawable.Drawable;
@@ -24,8 +22,6 @@ import android.widget.PopupMenu;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import androidx.annotation.StringRes;
-
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.accounts.GetAccountRelationships;
@@ -36,7 +32,7 @@ import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.BaseStatusListFragment;
 import org.joinmastodon.android.fragments.ComposeFragment;
-import org.joinmastodon.android.fragments.ListTimelinesFragment;
+import org.joinmastodon.android.fragments.ListsFragment;
 import org.joinmastodon.android.fragments.NotificationsListFragment;
 import org.joinmastodon.android.fragments.ProfileFragment;
 import org.joinmastodon.android.fragments.ThreadFragment;
@@ -48,7 +44,6 @@ import org.joinmastodon.android.model.Notification;
 import org.joinmastodon.android.model.Relationship;
 import org.joinmastodon.android.model.ScheduledStatus;
 import org.joinmastodon.android.model.Status;
-import org.joinmastodon.android.model.StatusPrivacy;
 import org.joinmastodon.android.ui.text.HtmlParser;
 import org.joinmastodon.android.ui.utils.CustomEmojiHelper;
 import org.joinmastodon.android.ui.utils.UiUtils;
@@ -58,7 +53,6 @@ import java.time.Instant;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.time.format.FormatStyle;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
@@ -217,6 +211,9 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 									public void onSuccess(GetStatusSourceText.Response result){
 										args.putString("sourceText", result.text);
 										args.putString("sourceSpoiler", result.spoilerText);
+										if (result.contentType != null) {
+											args.putString("sourceContentType", result.contentType.name());
+										}
 										if (redraft) {
 											UiUtils.confirmDeletePost(item.parentFragment.getActivity(), item.parentFragment.getAccountID(), item.status, s->{
 												Nav.go(item.parentFragment.getActivity(), ComposeFragment.class, args);
@@ -280,7 +277,7 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 					args.putString("account", item.parentFragment.getAccountID());
 					args.putString("profileAccount", account.id);
 					args.putString("profileDisplayUsername", account.getDisplayUsername());
-					Nav.go(item.parentFragment.getActivity(), ListTimelinesFragment.class, args);
+					Nav.go(item.parentFragment.getActivity(), ListsFragment.class, args);
 				}
 				return true;
 			});

mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/MediaGridStatusDisplayItem.java

@@ -7,6 +7,7 @@ import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
 import android.app.Activity;
+import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.text.TextUtils;
 import android.view.View;
@@ -17,7 +18,6 @@ import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.fragments.BaseStatusListFragment;
 import org.joinmastodon.android.model.Attachment;
@@ -40,7 +40,7 @@ import me.grishka.appkit.utils.CubicBezierInterpolator;
 public class MediaGridStatusDisplayItem extends StatusDisplayItem{
 	private static final String TAG="MediaGridDisplayItem";
 
-	private final PhotoLayoutHelper.TiledLayoutResult tiledLayout;
+	private PhotoLayoutHelper.TiledLayoutResult tiledLayout;
 	private final TypedObjectPool<GridItemType, MediaAttachmentViewController> viewPool;
 	private final List<Attachment> attachments;
 	private final ArrayList<ImageLoaderRequest> requests=new ArrayList<>();
@@ -55,7 +55,7 @@ public class MediaGridStatusDisplayItem extends StatusDisplayItem{
 		for(Attachment att:attachments){
 			requests.add(new UrlImageLoaderRequest(switch(att.type){
 				case IMAGE -> att.url;
-				case VIDEO, GIFV -> att.previewUrl;
+				case VIDEO, GIFV -> att.previewUrl != null ? att.previewUrl : att.url;
 				default -> throw new IllegalStateException("Unexpected value: "+att.type);
 			}, 1000, 1000));
 		}
@@ -98,6 +98,8 @@ public class MediaGridStatusDisplayItem extends StatusDisplayItem{
 		private int altTextIndex=-1;
 		private Animator altTextAnimator;
 
+		private boolean sizeUpdating = false;
+
 		public Holder(Activity activity, ViewGroup parent){
 			super(new FrameLayoutThatOnlyMeasuresFirstChild(activity));
 			wrapper=(FrameLayout)itemView;
@@ -126,6 +128,7 @@ public class MediaGridStatusDisplayItem extends StatusDisplayItem{
 			}
 			layout.removeAllViews();
 			controllers.clear();
+
 			int i=0;
 			for(Attachment att:item.attachments){
 				MediaAttachmentViewController c=item.viewPool.obtain(switch(att.type){
@@ -158,6 +161,19 @@ public class MediaGridStatusDisplayItem extends StatusDisplayItem{
 
 		@Override
 		public void setImage(int index, Drawable drawable){
+			Rect bounds=drawable.getBounds();
+			drawable.setBounds(bounds.left, bounds.top, bounds.left+drawable.getIntrinsicWidth(), bounds.top+drawable.getIntrinsicHeight());
+			if(item.attachments.get(index).meta==null){
+				Attachment.Metadata metadata = new Attachment.Metadata();
+				metadata.width=drawable.getIntrinsicWidth();
+				metadata.height=drawable.getIntrinsicHeight();
+				item.attachments.get(index).meta=metadata;
+
+				item.tiledLayout=PhotoLayoutHelper.processThumbs(item.attachments);
+				sizeUpdating = true;
+				item.parentFragment.onImageUpdated(this, index);
+			}
+
 			controllers.get(index).setImage(drawable);
 		}
 
@@ -314,5 +330,13 @@ public class MediaGridStatusDisplayItem extends StatusDisplayItem{
 			layout.setClipChildren(clip);
 			wrapper.setClipChildren(clip);
 		}
+
+		public boolean isSizeUpdating() {
+			return sizeUpdating;
+		}
+
+		public void sizeUpdated() {
+			sizeUpdating = false;
+		}
 	}
 }

mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java

@@ -2,6 +2,7 @@ package org.joinmastodon.android.ui.displayitems;
 
 import android.app.Activity;
 import android.content.Context;
+import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.View;
@@ -9,6 +10,7 @@ import android.view.ViewGroup;
 
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.BaseStatusListFragment;
 import org.joinmastodon.android.fragments.HashtagTimelineFragment;
@@ -20,12 +22,14 @@ import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Attachment;
 import org.joinmastodon.android.model.DisplayItemsParent;
 import org.joinmastodon.android.model.Filter;
+import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.model.Notification;
 import org.joinmastodon.android.model.Poll;
 import org.joinmastodon.android.model.ScheduledStatus;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.PhotoLayoutHelper;
 import org.joinmastodon.android.ui.text.HtmlParser;
+import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.utils.StatusFilterPredicate;
 import org.parceler.Parcels;
 
@@ -45,6 +49,8 @@ public abstract class StatusDisplayItem{
 	public final BaseStatusListFragment parentFragment;
 	public boolean inset;
 	public int index;
+	public int descendantLevel;
+	public boolean hasDescendantSibling, isDescendantSibling;
 
 	public StatusDisplayItem(String parentID, BaseStatusListFragment parentFragment){
 		this.parentID=parentID;
@@ -78,21 +84,14 @@ public abstract class StatusDisplayItem{
 			case EXTENDED_FOOTER -> new ExtendedFooterStatusDisplayItem.Holder(activity, parent);
 			case MEDIA_GRID -> new MediaGridStatusDisplayItem.Holder(activity, parent);
 			case WARNING -> new WarningFilteredStatusDisplayItem.Holder(activity, parent);
+			case FILE -> new FileStatusDisplayItem.Holder(activity, parent);
 		};
 	}
 
-	public static ArrayList<StatusDisplayItem> buildItems(BaseStatusListFragment<?> fragment, Status status, String accountID, DisplayItemsParent parentObject, Map<String, Account> knownAccounts, boolean inset, boolean addFooter, Notification notification){
-		return buildItems(fragment, status, accountID, parentObject, knownAccounts, inset, addFooter, notification, false, Filter.FilterContext.HOME);
-	}
-
 	public static ArrayList<StatusDisplayItem> buildItems(BaseStatusListFragment<?> fragment, Status status, String accountID, DisplayItemsParent parentObject, Map<String, Account> knownAccounts, boolean inset, boolean addFooter, Notification notification, Filter.FilterContext filterContext){
 		return buildItems(fragment, status, accountID, parentObject, knownAccounts, inset, addFooter, notification, false, filterContext);
 	}
 
-	public static ArrayList<StatusDisplayItem> buildItems(BaseStatusListFragment<?> fragment, Status status, String accountID, DisplayItemsParent parentObject, Map<String, Account> knownAccounts, boolean inset, boolean addFooter, Notification notification, boolean disableTranslate){
-		return buildItems(fragment, status, accountID, parentObject, knownAccounts, inset, addFooter, notification, disableTranslate, Filter.FilterContext.HOME);
-	}
-
 	public static ArrayList<StatusDisplayItem> buildItems(BaseStatusListFragment<?> fragment, Status status, String accountID, DisplayItemsParent parentObject, Map<String, Account> knownAccounts, boolean inset, boolean addFooter, Notification notification, boolean disableTranslate, Filter.FilterContext filterContext){
 		String parentID=parentObject.getID();
 		ArrayList<StatusDisplayItem> items=new ArrayList<>();
@@ -102,14 +101,6 @@ public abstract class StatusDisplayItem{
 		args.putString("account", accountID);
 		ScheduledStatus scheduledStatus = parentObject instanceof ScheduledStatus ? (ScheduledStatus) parentObject : null;
 
-		List<Filter> filters = AccountSessionManager.getInstance().getAccount(accountID).wordFilters.stream()
-			.filter(f -> f.context.contains(filterContext)).collect(Collectors.toList());
-		StatusFilterPredicate filterPredicate = new StatusFilterPredicate(filters);
-
-		if(!statusForContent.filterRevealed){
-			statusForContent.filterRevealed = filterPredicate.testWithWarning(status);
-		}
-
 		ReblogOrReplyLineStatusDisplayItem replyLine = null;
 		boolean threadReply = statusForContent.inReplyToAccountId != null &&
 				statusForContent.inReplyToAccountId.equals(statusForContent.account.id);
@@ -177,14 +168,32 @@ public abstract class StatusDisplayItem{
 			items.add(replyLine);
 		}
 
+		if (statusForContent.quote != null) {
+			boolean hasQuoteInlineTag = statusForContent.content.contains("<span class=\"quote-inline\">");
+			if (!hasQuoteInlineTag) {
+				String quoteUrl = statusForContent.quote.url;
+				String quoteInline = String.format("<span class=\"quote-inline\">%sRE: <a href=\"%s\">%s</a></span>",
+						statusForContent.content.endsWith("</p>") ? "" : "<br/><br/>", quoteUrl, quoteUrl);
+				statusForContent.content += quoteInline;
+			}
+		}
 		if(!TextUtils.isEmpty(statusForContent.content))
 			items.add(new TextStatusDisplayItem(parentID, HtmlParser.parse(statusForContent.content, statusForContent.emojis, statusForContent.mentions, statusForContent.tags, accountID), fragment, statusForContent, disableTranslate));
 		else if (!GlobalUserPreferences.replyLineAboveHeader && replyLine != null)
 			replyLine.needBottomPadding=true;
 		else
 			header.needBottomPadding=true;
-		List<Attachment> imageAttachments=statusForContent.mediaAttachments.stream().filter(att->att.type.isImage()).collect(Collectors.toList());
+
+		List<Attachment> imageAttachments=statusForContent.mediaAttachments.stream()
+				.filter(att->att.type.isImage() && !att.type.equals(Attachment.Type.UNKNOWN))
+				.collect(Collectors.toList());
 		if(!imageAttachments.isEmpty()){
+			int color = UiUtils.getThemeColor(fragment.getContext(), R.attr.colorAccentLightest);
+			for (Attachment att : imageAttachments) {
+				if (att.blurhashPlaceholder == null) {
+					att.blurhashPlaceholder = new ColorDrawable(color);
+				}
+			}
 			PhotoLayoutHelper.TiledLayoutResult layout=PhotoLayoutHelper.processThumbs(imageAttachments);
 			items.add(new MediaGridStatusDisplayItem(parentID, fragment, layout, imageAttachments, statusForContent));
 		}
@@ -193,6 +202,12 @@ public abstract class StatusDisplayItem{
 				items.add(new AudioStatusDisplayItem(parentID, fragment, statusForContent, att));
 			}
 		}
+
+		statusForContent.mediaAttachments.stream()
+				.filter(att->att.type.equals(Attachment.Type.UNKNOWN))
+				.map(att -> new FileStatusDisplayItem(parentID, fragment, att))
+				.forEach(items::add);
+
 		if(statusForContent.poll!=null){
 			buildPollItems(parentID, fragment, statusForContent.poll, items);
 		}
@@ -208,8 +223,15 @@ public abstract class StatusDisplayItem{
 			item.index=i++;
 		}
 
+		Filter applyingFilter = null;
+		if (!statusForContent.filterRevealed) {
+			StatusFilterPredicate predicate = new StatusFilterPredicate(accountID, filterContext, Filter.FilterAction.WARN);
+			statusForContent.filterRevealed = predicate.test(status);
+			applyingFilter = predicate.getApplyingFilter();
+		}
+
 		ArrayList<StatusDisplayItem> result = statusForContent.filterRevealed ? items :
-				new ArrayList<>(List.of(new WarningFilteredStatusDisplayItem(parentID, fragment, statusForContent, items)));
+				new ArrayList<>(List.of(new WarningFilteredStatusDisplayItem(parentID, fragment, statusForContent, items, applyingFilter)));
 
 		if (addFooter && status.hasGapAfter && !(fragment instanceof ThreadFragment)) {
 			StatusDisplayItem gap = new GapStatusDisplayItem(parentID, fragment);
@@ -242,7 +264,8 @@ public abstract class StatusDisplayItem{
 		GAP,
 		EXTENDED_FOOTER,
 		MEDIA_GRID,
-		WARNING
+		WARNING,
+		FILE
 	}
 
 	public static abstract class Holder<T extends StatusDisplayItem> extends BindableViewHolder<T> implements UsableRecyclerView.DisableableClickable{

mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java

@@ -65,6 +65,7 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 			spoilerEmojiHelper.setText(parsedSpoilerText);
 		}
 		session = AccountSessionManager.getInstance().getAccount(parentFragment.getAccountID());
+		UiUtils.loadMaxWidth(parentFragment.getContext());
 	}
 
 	public void setTranslationShown(boolean translationShown) {
@@ -236,13 +237,33 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 			readMore.setText(item.status.textExpanded ? R.string.sk_collapse : R.string.sk_expand);
 			spaceBelowText.setVisibility(translateVisible ? View.VISIBLE : View.GONE);
 
+			// remove additional padding when (transparently padded) translate button is visible
+			int pos = getAbsoluteAdapterPosition();
+			itemView.setPadding(itemView.getPaddingLeft(), itemView.getPaddingTop(), itemView.getPaddingRight(),
+					(translateVisible &&
+							item.parentFragment.getDisplayItems().size() >= pos + 1 &&
+							item.parentFragment.getDisplayItems().get(pos + 1) instanceof FooterStatusDisplayItem)
+							? 0 : V.dp(12)
+			);
+
 			if (!GlobalUserPreferences.collapseLongPosts) {
 				textScrollView.setLayoutParams(wrapParams);
 				readMore.setVisibility(View.GONE);
 			}
 
+			// incredibly ugly workaround for https://github.com/sk22/megalodon/issues/520
+			// i am so, so sorry. FIXME
+			// attempts to use OnPreDrawListener, OnGlobalLayoutListener and .post have failed -
+			// the view didn't want to reliably update after calling .setVisibility etc :(
+			int width = parent.getWidth() != 0 ? parent.getWidth()
+					: item.parentFragment.getView().getWidth() != 0
+					? item.parentFragment.getView().getWidth()
+					: item.parentFragment.getParentFragment() != null && item.parentFragment.getParentFragment().getView().getWidth() != 0
+					? item.parentFragment.getParentFragment().getView().getWidth() // YIKES
+					: UiUtils.MAX_WIDTH;
+
 			text.measure(
-					View.MeasureSpec.makeMeasureSpec(parent.getWidth(), View.MeasureSpec.EXACTLY),
+					View.MeasureSpec.makeMeasureSpec(width, View.MeasureSpec.EXACTLY),
 					View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED));
 
 			if (GlobalUserPreferences.collapseLongPosts && !item.status.textExpandable) {

mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/WarningFilteredStatusDisplayItem.java

@@ -7,6 +7,7 @@ import android.widget.TextView;
 
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.fragments.BaseStatusListFragment;
+import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.Status;
 
 import java.util.List;
@@ -15,11 +16,13 @@ public class WarningFilteredStatusDisplayItem extends StatusDisplayItem{
 	public boolean loading;
 	public final Status status;
 	public List<StatusDisplayItem> filteredItems;
+	public Filter applyingFilter;
 
-	public WarningFilteredStatusDisplayItem(String parentID, BaseStatusListFragment<?> parentFragment, Status status, List<StatusDisplayItem> filteredItems){
+	public WarningFilteredStatusDisplayItem(String parentID, BaseStatusListFragment<?> parentFragment, Status status, List<StatusDisplayItem> filteredItems, Filter applyingFilter){
 		super(parentID, parentFragment);
 		this.status=status;
 		this.filteredItems = filteredItems;
+		this.applyingFilter = applyingFilter;
 	}
 
 	@Override
@@ -41,7 +44,7 @@ public class WarningFilteredStatusDisplayItem extends StatusDisplayItem{
 		@Override
 		public void onBind(WarningFilteredStatusDisplayItem item) {
 			filteredItems = item.filteredItems;
-			text.setText(item.parentFragment.getString(R.string.sk_filtered, item.status.filtered.get(item.status.filtered.size() -1).filter.title));
+			text.setText(item.parentFragment.getString(R.string.sk_filtered, item.applyingFilter.title));
 		}
 
 		@Override

mastodon/src/main/java/org/joinmastodon/android/ui/utils/DiscoverInfoBannerHelper.java

@@ -38,6 +38,7 @@ public class DiscoverInfoBannerHelper{
 				case LOCAL_TIMELINE -> R.string.local_timeline_info_banner;
 				case FEDERATED_TIMELINE -> R.string.sk_federated_timeline_info_banner;
 				case POST_NOTIFICATIONS -> R.string.sk_notify_posts_info_banner;
+				case BUBBLE_TIMELINE -> R.string.sk_bubble_timeline_info_banner;
 			});
 		}
 	}
@@ -63,6 +64,7 @@ public class DiscoverInfoBannerHelper{
 		LOCAL_TIMELINE,
 		FEDERATED_TIMELINE,
 		POST_NOTIFICATIONS,
-//		ACCOUNTS
+//		ACCOUNTS,
+		BUBBLE_TIMELINE
 	}
 }

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

@@ -7,6 +7,7 @@ import static org.joinmastodon.android.GlobalUserPreferences.trueBlackTheme;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.AlertDialog;
+import android.app.Fragment;
 import android.app.ProgressDialog;
 import android.content.ActivityNotFoundException;
 import android.content.ClipData;
@@ -99,6 +100,7 @@ import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.net.URL;
 import java.time.Instant;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
@@ -109,6 +111,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.function.BiConsumer;
 import java.util.function.BiPredicate;
 import java.util.function.Consumer;
 import java.util.function.Function;
@@ -633,9 +636,9 @@ public class UiUtils {
 		if (relationship.blocking) {
 			button.setText(R.string.button_blocked);
 			secondaryStyle = true;
-		} else if (relationship.blockedBy) {
-			button.setText(R.string.button_follow);
-			secondaryStyle = false;
+//		} else if (relationship.blockedBy) {
+//			button.setText(R.string.button_follow);
+//			secondaryStyle = false;
 		} else if (relationship.requested) {
 			button.setText(R.string.button_follow_pending);
 			secondaryStyle = true;
@@ -649,7 +652,8 @@ public class UiUtils {
 
 		if (keepText) button.setText(textBefore);
 
-		button.setEnabled(!relationship.blockedBy);
+//		https://github.com/sk22/megalodon/issues/526
+//		button.setEnabled(!relationship.blockedBy);
 		int attr = secondaryStyle ? R.attr.secondaryButtonStyle : android.R.attr.buttonStyle;
 		TypedArray ta = button.getContext().obtainStyledAttributes(new int[]{attr});
 		int styleRes = ta.getResourceId(0, 0);
@@ -946,8 +950,8 @@ public class UiUtils {
 
 	public static String getInstanceName(String accountID) {
 		AccountSession session = AccountSessionManager.getInstance().getAccount(accountID);
-		Instance instance = AccountSessionManager.getInstance().getInstanceInfo(session.domain);
-		return instance != null && !instance.title.isBlank() ? instance.title : session.domain;
+		Optional<Instance> instance = session.getInstance();
+		return instance.isPresent() && !instance.get().title.isBlank() ? instance.get().title : session.domain;
 	}
 
 	public static void pickAccount(Context context, String exceptFor, @StringRes int titleRes, @DrawableRes int iconRes, Consumer<AccountSession> sessionConsumer, Consumer<AlertDialog.Builder> transformDialog) {
@@ -1078,6 +1082,13 @@ public class UiUtils {
 	}
 
 	public static void openURL(Context context, String accountID, String url, boolean launchBrowser) {
+		lookupURL(context, accountID, url, launchBrowser, (clazz, args) -> {
+			if (clazz == null) return;
+			Nav.go((Activity) context, clazz, args);
+		});
+	}
+
+	public static void lookupURL(Context context, String accountID, String url, boolean launchBrowser, BiConsumer<Class<? extends Fragment>, Bundle> go) {
 		Uri uri = Uri.parse(url);
 		List<String> path = uri.getPathSegments();
 		if (accountID != null && "https".equals(uri.getScheme())) {
@@ -1089,13 +1100,14 @@ public class UiUtils {
 								Bundle args = new Bundle();
 								args.putString("account", accountID);
 								args.putParcelable("status", Parcels.wrap(result));
-								Nav.go((Activity) context, ThreadFragment.class, args);
+								go.accept(ThreadFragment.class, args);
 							}
 
 							@Override
 							public void onError(ErrorResponse error) {
 								error.showToast(context);
 								if (launchBrowser) launchWebBrowser(context, url);
+								go.accept(null, null);
 							}
 						})
 						.wrapProgress((Activity) context, R.string.loading, true,
@@ -1111,21 +1123,26 @@ public class UiUtils {
 								args.putString("account", accountID);
 								if (!results.statuses.isEmpty()) {
 									args.putParcelable("status", Parcels.wrap(results.statuses.get(0)));
-									Nav.go((Activity) context, ThreadFragment.class, args);
-								} else if (!results.accounts.isEmpty()) {
-									args.putParcelable("profileAccount", Parcels.wrap(results.accounts.get(0)));
-									Nav.go((Activity) context, ProfileFragment.class, args);
-								} else {
-									if (launchBrowser) launchWebBrowser(context, url);
-									else
-										Toast.makeText(context, R.string.sk_resource_not_found, Toast.LENGTH_SHORT).show();
+									go.accept(ThreadFragment.class, args);
+									return;
 								}
+								Optional<Account> account = results.accounts.stream()
+										.filter(a -> uri.equals(Uri.parse(a.url))).findAny();
+								if (account.isPresent()) {
+									args.putParcelable("profileAccount", Parcels.wrap(account.get()));
+									go.accept(ProfileFragment.class, args);
+									return;
+								}
+								if (launchBrowser) launchWebBrowser(context, url);
+								Toast.makeText(context, R.string.sk_resource_not_found, Toast.LENGTH_SHORT).show();
+								go.accept(null, null);
 							}
 
 							@Override
 							public void onError(ErrorResponse error) {
 								error.showToast(context);
 								if (launchBrowser) launchWebBrowser(context, url);
+								go.accept(null, null);
 							}
 						})
 						.wrapProgress((Activity) context, R.string.loading, true,
@@ -1134,7 +1151,8 @@ public class UiUtils {
 				return;
 			}
 		}
-		launchWebBrowser(context, url);
+		if (launchBrowser) launchWebBrowser(context, url);
+		go.accept(null, null);
 	}
 
 	public static void copyText(View v, String text) {

mastodon/src/main/java/org/joinmastodon/android/ui/views/CheckableRelativeLayout.java

@@ -0,0 +1,62 @@
+package org.joinmastodon.android.ui.views;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.accessibility.AccessibilityNodeInfo;
+import android.widget.Checkable;
+import android.widget.RelativeLayout;
+
+public class CheckableRelativeLayout extends RelativeLayout implements Checkable{
+	private boolean checked, checkable = true;
+	private static final int[] CHECKED_STATE_SET = {
+			android.R.attr.state_checked
+	};
+
+	public CheckableRelativeLayout(Context context){
+		this(context, null);
+	}
+
+	public CheckableRelativeLayout(Context context, AttributeSet attrs){
+		this(context, attrs, 0);
+	}
+
+	public CheckableRelativeLayout(Context context, AttributeSet attrs, int defStyle){
+		super(context, attrs, defStyle);
+	}
+
+	@Override
+	public void setChecked(boolean checked){
+		this.checked=checked;
+		refreshDrawableState();
+	}
+
+	public void setCheckable(boolean checkable) {
+		this.checkable = checkable;
+	}
+
+	@Override
+	public boolean isChecked(){
+		return checked;
+	}
+
+	@Override
+	public void toggle(){
+		setChecked(!checked);
+	}
+
+	@Override
+	protected int[] onCreateDrawableState(int extraSpace) {
+		final int[] drawableState = super.onCreateDrawableState(extraSpace + 1);
+		if (isChecked()) {
+			mergeDrawableStates(drawableState, CHECKED_STATE_SET);
+		}
+		return drawableState;
+	}
+
+	@Override
+	public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info){
+		super.onInitializeAccessibilityNodeInfo(info);
+		info.setCheckable(checkable);
+		info.setChecked(checked);
+	}
+}

mastodon/src/main/java/org/joinmastodon/android/ui/views/HeaderSubtitleLinearLayout.java

@@ -6,6 +6,8 @@ import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import me.grishka.appkit.utils.V;
+
 /**
  * A LinearLayout for TextViews. First child TextView will get truncated if it doesn't fit, remaining will always wrap content.
  */
@@ -36,7 +38,8 @@ public class HeaderSubtitleLinearLayout extends LinearLayout{
 			}
 			View first=getChildAt(0);
 			if(first instanceof TextView){
-				((TextView) first).setMaxWidth(remainingWidth);
+				// guaranteeing at least 64dp of width for the display name
+				((TextView) first).setMaxWidth(Math.max(remainingWidth, V.dp(64)));
 			}
 		}else{
 			View first=getChildAt(0);

mastodon/src/main/java/org/joinmastodon/android/utils/MastodonLanguage.java

@@ -85,7 +85,7 @@ public class MastodonLanguage {
 		private final MastodonLanguage fallbackLanguage;
 
 		public LanguageResolver(Instance instanceInfo) {
-			String fallbackLanguageTag = !instanceInfo.languages.isEmpty() ? instanceInfo.languages.get(0) : ENGLISH.languageTag;
+			String fallbackLanguageTag = (instanceInfo.languages != null && !instanceInfo.languages.isEmpty()) ? instanceInfo.languages.get(0) : ENGLISH.languageTag;
 			fallbackLanguage = allLanguages.stream()
 					.filter(l->l.languageTag.equalsIgnoreCase(fallbackLanguageTag)).findAny()
 					.orElse(ENGLISH);

mastodon/src/main/java/org/joinmastodon/android/utils/ProvidesAssistContent.java

@@ -0,0 +1,32 @@
+package org.joinmastodon.android.utils;
+
+import android.app.Fragment;
+import android.app.assist.AssistContent;
+import android.net.Uri;
+
+import org.joinmastodon.android.fragments.HasAccountID;
+
+public interface ProvidesAssistContent {
+    void onProvideAssistContent(AssistContent assistContent);
+
+    default boolean callFragmentToProvideAssistContent(Fragment fragment, AssistContent assistContent) {
+        if (fragment instanceof ProvidesAssistContent assistiveFragment) {
+            assistiveFragment.onProvideAssistContent(assistContent);
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    interface ProvidesWebUri extends ProvidesAssistContent, HasAccountID {
+        Uri getWebUri(Uri.Builder base);
+
+        default Uri.Builder getUriBuilder() {
+            return getSession().getInstanceUri().buildUpon();
+        }
+
+        default void onProvideAssistContent(AssistContent assistContent) {
+            assistContent.setWebUri(getWebUri(getUriBuilder()));
+        }
+    }
+}

mastodon/src/main/java/org/joinmastodon/android/utils/StatusFilterPredicate.java

@@ -6,54 +6,80 @@ import org.joinmastodon.android.model.Status;
 
 import java.time.Instant;
 import java.util.List;
+import java.util.Optional;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 public class StatusFilterPredicate implements Predicate<Status>{
 	private final List<Filter> filters;
+	private final Filter.FilterContext context;
+	private final Filter.FilterAction action;
+	private Filter applyingFilter;
 
-	public StatusFilterPredicate(List<Filter> filters){
-		this.filters=filters;
+	/**
+	 * @param context null makes the predicate pass automatically
+	 * @param action defines what the predicate should check:
+	 * 	             status should not be hidden or should not display with warning
+	 */
+	public StatusFilterPredicate(List<Filter> filters, Filter.FilterContext context, Filter.FilterAction action){
+		this.filters = filters;
+		this.context = context;
+		this.action = action;
 	}
 
-	public StatusFilterPredicate(String accountID, Filter.FilterContext context){
+	public StatusFilterPredicate(List<Filter> filters, Filter.FilterContext context){
+		this(filters, context, Filter.FilterAction.HIDE);
+	}
+
+	/**
+	 * @param context null makes the predicate pass automatically
+	 * @param action defines what the predicate should check:
+	 *               status should not be hidden or should not display with warning
+	 */
+	public StatusFilterPredicate(String accountID, Filter.FilterContext context, Filter.FilterAction action){
 		filters=AccountSessionManager.getInstance().getAccount(accountID).wordFilters.stream().filter(f->f.context.contains(context)).collect(Collectors.toList());
+		this.context = context;
+		this.action = action;
 	}
 
+	/**
+	 * @param context null makes the predicate pass automatically
+	 */
+	public StatusFilterPredicate(String accountID, Filter.FilterContext context){
+		this(accountID, context, Filter.FilterAction.HIDE);
+	}
+
+	/**
+	 * @return whether the status should be displayed without being hidden/warned about.
+	 *         will always return true if the context is null.
+	 *         true = display this status,
+	 *         false = filter this status
+	 */
 	@Override
 	public boolean test(Status status){
-		if(status.filtered!=null){
-			if (status.filtered.isEmpty()){
-				return true;
-			}
-			boolean matches=status.filtered.stream()
-					.map(filterResult->filterResult.filter)
-					.filter(filter->filter.expiresAt==null||filter.expiresAt.isAfter(Instant.now()))
-					.anyMatch(filter->filter.filterAction==Filter.FilterAction.HIDE);
-			return !matches;
-		}
-		for(Filter filter:filters){
-			if(filter.matches(status))
-				return false;
-		}
-		return true;
+		if (context == null) return true;
+
+		Stream<Filter> matchingFilters = status.filtered != null
+				// use server-provided per-status info (status.filtered) if available
+				? status.filtered.stream().map(f -> f.filter)
+				// or fall back to cached filters
+				: filters.stream().filter(filter -> filter.matches(status));
+
+		Optional<Filter> applyingFilter = matchingFilters
+				// discard expired filters
+				.filter(filter -> filter.expiresAt == null || filter.expiresAt.isAfter(Instant.now()))
+				// only apply filters for given context
+				.filter(filter -> filter.context.contains(context))
+				// treating filterAction = null (from filters list) as FilterAction.HIDE
+				.filter(filter -> filter.filterAction == null ? action == Filter.FilterAction.HIDE : filter.filterAction == action)
+				.findAny();
+
+		this.applyingFilter = applyingFilter.orElse(null);
+		return applyingFilter.isEmpty();
 	}
 
-	public boolean testWithWarning(Status status) {
-		if(status.filtered!=null){
-			if (status.filtered.isEmpty()){
-				return true;
-			}
-			boolean matches=status.filtered.stream()
-					.map(filterResult->filterResult.filter)
-					.filter(filter->filter.expiresAt==null||filter.expiresAt.isAfter(Instant.now()))
-					.anyMatch(filter->filter.filterAction==Filter.FilterAction.WARN);
-			return !matches;
-		}
-		for(Filter filter:filters){
-			if(filter.matches(status))
-				return false;
-		}
-		return true;
+	public Filter getApplyingFilter() {
+		return applyingFilter;
 	}
 }

mastodon/src/main/res/drawable/bg_search_button.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:color="?android:attr/colorControlHighlight">
+	<item android:drawable="@drawable/bg_search_field" />
+</ripple>

mastodon/src/main/res/drawable/ic_fluent_attach_24_regular.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M11.772,3.744C14.114,1.4 17.913,1.4 20.256,3.744C22.539,6.027 22.597,9.692 20.431,12.046L20.243,12.243L11.443,21.041L11.407,21.072C9.945,22.388 7.691,22.344 6.284,20.936C4.965,19.617 4.843,17.555 5.918,16.098C5.941,16.052 5.969,16.009 6.002,15.968L6.056,15.908L6.143,15.82L6.284,15.672L6.287,15.675L13.723,8.221C13.989,7.954 14.405,7.93 14.699,8.147L14.783,8.22C15.05,8.485 15.075,8.902 14.857,9.196L14.785,9.28L7.19,16.893C6.473,17.769 6.522,19.063 7.34,19.881C8.169,20.71 9.488,20.749 10.364,19.999L19.197,11.168C20.952,9.411 20.952,6.562 19.195,4.804C17.493,3.102 14.766,3.049 12.999,4.645L12.831,4.804L12.819,4.819L3.282,14.355C2.989,14.648 2.515,14.648 2.222,14.355C1.955,14.089 1.931,13.672 2.149,13.378L2.222,13.294L11.771,3.744L11.772,3.744Z"
+      android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>

mastodon/src/main/res/drawable/ic_fluent_share_28_regular.xml

@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="28dp" android:height="28dp" android:viewportWidth="28" android:viewportHeight="28">
+    <path android:pathData="M18.27 3.21l7.5 7.25c0.073 0.07 0.13 0.154 0.17 0.247C25.98 10.8 26 10.9 26 11c0 0.101-0.02 0.201-0.06 0.294-0.04 0.093-0.097 0.176-0.17 0.246l-7.5 7.25c-0.069 0.068-0.15 0.121-0.239 0.157-0.09 0.037-0.185 0.055-0.281 0.053-0.1 0-0.198-0.02-0.29-0.06-0.136-0.056-0.252-0.152-0.334-0.275C17.044 18.542 17 18.398 17 18.25v-3.74c-6.7 0.27-9.52 4.02-9.64 4.18-0.096 0.126-0.227 0.22-0.378 0.268-0.15 0.048-0.311 0.049-0.462 0.003-0.15-0.049-0.282-0.144-0.375-0.271C6.052 18.562 6 18.408 6 18.25c0-8.02 6.59-10.48 11-10.73V3.75c0-0.147 0.044-0.291 0.126-0.414s0.198-0.218 0.334-0.275c0.135-0.059 0.284-0.075 0.428-0.049 0.144 0.027 0.277 0.096 0.382 0.199zm0.23 10.54v2.71L24.17 11 18.5 5.52v2.73c-0.003 0.199-0.082 0.388-0.223 0.528-0.14 0.14-0.329 0.22-0.527 0.223-0.97 0-8.85 0.22-10.09 7.28 2.876-2.24 6.447-3.401 10.09-3.28 0.198 0.002 0.387 0.082 0.527 0.222s0.22 0.33 0.223 0.527zm4.223 5.473c0.14-0.14 0.329-0.22 0.527-0.223 0.198 0.003 0.387 0.083 0.527 0.223s0.22 0.33 0.223 0.527v0.5c0 1.26-0.5 2.468-1.391 3.36-0.891 0.89-2.1 1.39-3.359 1.39H7.75c-1.26 0-2.468-0.5-3.359-1.39C3.501 22.717 3 21.51 3 20.25V8.75c0-1.26 0.5-2.468 1.391-3.358C5.282 4.5 6.491 4 7.75 4h4.5c0.199 0 0.39 0.08 0.53 0.22C12.921 4.36 13 4.552 13 4.75c0 0.2-0.079 0.39-0.22 0.53-0.14 0.141-0.331 0.22-0.53 0.22h-4.5C6.889 5.503 6.064 5.846 5.455 6.455 4.845 7.065 4.503 7.89 4.5 8.751v11.5c0.003 0.86 0.346 1.686 0.955 2.295S6.889 23.498 7.75 23.5h11.5c0.861-0.002 1.686-0.345 2.295-0.954 0.61-0.61 0.952-1.434 0.955-2.296v-0.5c0.003-0.198 0.082-0.387 0.223-0.527z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>

mastodon/src/main/res/drawable/ic_fluent_text_edit_style_24_filled.xml

@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M20.063 8.445c1.256 1.258 1.255 3.295-0.002 4.551l-7.114 7.102c-0.271 0.272-0.608 0.469-0.978 0.573l-4.613 1.303c-0.57 0.162-1.094-0.373-0.92-0.94l1.387-4.543c0.107-0.354 0.3-0.675 0.562-0.936l7.124-7.112c1.258-1.256 3.297-1.255 4.554 0.002zM8.15 2.37L8.2 2.475l3.253 8.249-1.157 1.155L9.556 10H5.443l-0.995 2.52c-0.14 0.354-0.518 0.542-0.876 0.454l-0.098-0.031c-0.353-0.14-0.54-0.518-0.452-0.876l0.03-0.098 3.754-9.495C7.042 1.88 7.85 1.844 8.151 2.37zM7.503 4.792L6.036 8.5h2.928L7.503 4.792z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>