docs: add 103 changelog

Currently translated at 100.0% (98 of 98 strings)

Translation: Moshidon/values
Translate-URL: https://translate.codeberg.org/projects/moshidon/values/eo/

.github/workflows/nightly-builds.yml

@@ -3,6 +3,7 @@ name: Nightly builds
 on:
   push:
     branches: [ "master" ]
+  workflow_dispatch:
 
 jobs:
   build:
@@ -13,7 +14,7 @@ jobs:
     - name: Checkout Appkit Repo
       uses: actions/checkout@v3
       with:
-        repository: LucasGGamerM/appkit
+        repository: grishka/appkit
         
     - name: set up JDK 17
       uses: actions/setup-java@v3

FAQ.md

@@ -4,6 +4,6 @@ Q: What are the main differences between Moshidon and Megalodon?
 
 A: There are many, but the most outstanding differences are: the ability to have other server's local timeline inside the app. It can be acessed in the "Add community" option in the top right corner of the Edit timelines screen. Other outstanding features that Moshidon has are some quality of life improvements, such as notification actions and allowing for unlisted replies by default.  Most other features are pretty minor, such as profile notes directly available in the person's profile. Other features are quite minor usability and visibility improvements. All of which can be found in the settings page. 
 
-Q: Will there ever be a versjon of Moshidon for iOS? 
+Q: Will there ever be a version of Moshidon for iOS? 
 
 A: No. As android and iOS apps do not share code, it is incredibly hard to port.

README.md

@@ -16,6 +16,8 @@
 
 <a href="https://play.google.com/store/apps/details?id=org.joinmastodon.android.moshinda"><img height="50" alt="Get it on Google Play" src="img/google-play-badge.png"></a>
 &nbsp;
+<a href="https://f-droid.org/pt_BR/packages/org.joinmastodon.android.moshinda"><img height="50" alt="Get it on F-Droid" src="img/f-droid-badge.png"></a>
+&nbsp;
 <a href="https://apt.izzysoft.de/fdroid/index/apk/org.joinmastodon.android.moshinda"><img height="50" alt="Get it on IzzyOnDroid" src="img/izzy-badge.png"></a>
 
 ## Help out the project by donating at: https://github.com/sponsors/LucasGGamerM!

gradle.properties

@@ -19,4 +19,5 @@ android.useAndroidX=true
 android.enableJetifier=false
 android.defaults.buildfeatures.buildconfig=true
 android.nonTransitiveRClass=true
-android.nonFinalResIds=false
+android.nonFinalResIds=false
+org.gradle.configuration-cache=true

mastodon/build.gradle

@@ -16,8 +16,8 @@ android {
 		applicationId "org.joinmastodon.android.moshinda"
 		minSdk 23
 		targetSdk 33
-		versionCode 102
-		versionName "2.1.4+fork.102.moshinda"
+		versionCode 103
+		versionName "2.1.4+fork.103.moshinda"
 		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']
     }
@@ -81,7 +81,6 @@ android {
 			versionNameSuffix '-play'
 		}
 		githubRelease { initWith release }
-		playRelease { initWith release }
 		fdroidRelease { initWith release }
 	}
 	compileOptions {

mastodon/src/androidTest/java/org/joinmastodon/android/ui/utils/UiUtilsTest.java

@@ -257,5 +257,9 @@ public class UiUtilsTest {
 		assertEquals("* (asterisk)", UiUtils.extractPronouns(MastodonApp.context, fakeAccount(
 				makeField("pronouns", "-- * (asterisk) --")
 		)).orElseThrow());
+
+		assertEquals("they/(she?)", UiUtils.extractPronouns(MastodonApp.context, fakeAccount(
+				makeField("pronouns", "they/(she?)...")
+		)).orElseThrow());
 	}
 }

mastodon/src/main/assets/blocks.txt

@@ -1,56 +1,43 @@
 13bells.com
 1611.social
 4aem.com
+5dollah.click
 adachi.party
-anime.website
+adtension.com
 annihilation.social
 anon-kenkai.com
 asbestos.cafe
 bae.st
-bajax.us
 banepo.st
-baraag.net
 bassam.social
+battlepenguin.video
 beefyboys.win
-beepboop.ga
-berserker.town
-bikeshed.party
-boks.moe
 boymoder.biz
 brainsoap.net
 breastmilk.club
 brighteon.social
-bungle.online
+cachapa.xyz
+canary.fedinuke.example.com
+catgirl.life
 cawfee.club
+childlove.space
 clew.lol
 clubcyberia.co
-collapsitarian.io
-comfyboy.club
 contrapointsfan.club
+crucible.world
 cum.camp
 cum.salon
-darknight-coffee.org
 decayable.ink
 dembased.xyz
-desupost.soy
 detroitriotcity.com
-eatthebugs.social
+djsumdog.com
 eientei.org
-elementality.org
 eveningzoo.club
-firedragonstudios.com
-firefaithfellowship.com
 fluf.club
-foxfam.club
 freak.university
 freeatlantis.com
-freedomstrike.org
-freesoftwareextremist.com
-freespeech.group
 freespeechextremist.com
-freetalklive.com
 froth.zone
-fulltermprivacy.com
 gameliberty.club
 gearlandia.haus
 genderheretics.xyz
@@ -59,42 +46,34 @@ gleasonator.com
 glee.li
 glindr.org
 goyim.app
-goyslop.cafe
+h5q.net
 haeder.net
 handholding.io
 hitchhiker.social
-hunk.city
 iddqd.social
-intkos.link
-justicewarrior.social
-kawa-kun.com
 kitsunemimi.club
 kiwifarms.cc
-kompost.cz
 kurosawa.moe
+kyaruc.moe
 leafposter.club
-leftychan.net
 lewdieheaven.com
 liberdon.com
 ligma.pro
 lolicon.rocks
+lolison.network
 lolison.top
 lovingexpressions.net
-mahodou.moe
 makemysarcophagus.com
-maladaptive.art
 marsey.moe
-masochi.st
 mastinator.com
 merovingian.club
 midwaytrades.com
 mirr0r.city
-moa.st
+morale.ch
 mouse.services
 mugicha.club
 narrativerry.xyz
 natehiggers.online
-neckbeard.xyz
 needs.vodka
 neenster.org
 nicecrew.digital
@@ -103,18 +82,18 @@ noagendasocial.com
 noagendasocial.nl
 noagendatube.com
 nobodyhasthe.biz
-nukem.biz
-obo.sh
+norwoodzero.net
+nyanide.com
 onionfarms.org
 pawlicker.com
 pawoo.net
 pedo.school
+peervideo.club
 piazza.today
 pibvt.net
 pieville.net
 pisskey.io
 plagu.ee
-pmth.us
 poa.st
 poast.org
 poast.tv
@@ -123,17 +102,18 @@ prospeech.space
 quodverum.com
 r18.social
 rakket.app
+rapemeat.express
 rapemeat.solutions
-rdrama.cc
+rayci.st
 rebelbase.site
-retardedniggers.forsale
-rojogato.com
 ryona.agency
+sad.cab
 schwartzwelt.xyz
 seal.cafe
+shaw.app
 shigusegubu.club
 shitpost.cloud
-shota.house
+shortstacksran.ch
 silliness.observer
 skinheads.eu
 skinheads.io
@@ -148,23 +128,20 @@ sneed.social
 sonichu.com
 spinster.xyz
 springbo.cc
-starnix.network
 strelizia.net
-syspxl.xyz
 tastingtraffic.net
 teci.world
 theapex.social
+thechimp.zone
+thenobody.club
 thepostearthdestination.com
 tkammer.de
 trumpislovetrumpis.life
 truthsocial.co.in
-urchan.org
+usualsuspects.lol
 varishangout.net
-whinge.house
-whinge.town
-wideboys.org
+vtuberfan.social
 wolfgirl.bar
 xn--p1abe3d.xn--80asehdb
 yggdrasil.social
 youjo.love
-zztails.gay

mastodon/src/main/java/name/fraser/neil/plaintext/LICENSE

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

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

@@ -266,7 +266,7 @@ public class AudioPlayerService extends Service{
 	private void updateNotification(boolean dismissable, boolean removeNotification){
 		Notification.Builder bldr=new Notification.Builder(this)
 				.setSmallIcon(R.drawable.ic_ntf_logo)
-				.setContentTitle(status.account.displayName)
+				.setContentTitle(status.account.getDisplayName())
 				.setContentText(HtmlParser.strip(status.content))
 				.setOngoing(!dismissable)
 				.setShowWhen(false)
@@ -281,7 +281,7 @@ public class AudioPlayerService extends Service{
 
 		if(playerReady){
 			boolean isPlaying=player.isPlaying();
-			bldr.addAction(new Notification.Action.Builder(Icon.createWithResource(this, isPlaying ? R.drawable.ic_pause_24 : R.drawable.ic_play_24),
+			bldr.addAction(new Notification.Action.Builder(Icon.createWithResource(this, isPlaying ? R.drawable.ic_fluent_pause_24_filled : R.drawable.ic_fluent_play_24_filled),
 						getString(isPlaying ? R.string.pause : R.string.play),
 						PendingIntent.getBroadcast(this, 2, new Intent(ACTION_PLAY_PAUSE), PendingIntent.FLAG_IMMUTABLE))
 					.build());

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

@@ -32,10 +32,9 @@ public class ExternalShareActivity extends FragmentStackActivity{
 		UiUtils.setUserPreferredTheme(this);
 		super.onCreate(savedInstanceState);
 		if(savedInstanceState==null){
-
 			Optional<String> text = Optional.ofNullable(getIntent().getStringExtra(Intent.EXTRA_TEXT));
 			Optional<Pair<String, Optional<String>>> fediHandle = text.flatMap(UiUtils::parseFediverseHandle);
-			boolean isFediUrl = text.map(UiUtils::looksLikeMastodonUrl).orElse(false);
+			boolean isFediUrl = text.map(UiUtils::looksLikeFediverseUrl).orElse(false);
 			boolean isOpenable = isFediUrl || fediHandle.isPresent();
 
 			List<AccountSession> sessions=AccountSessionManager.getInstance().getLoggedInAccounts();

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

@@ -1,6 +1,7 @@
 package org.joinmastodon.android;
 
 import static org.joinmastodon.android.api.MastodonAPIController.gson;
+import static org.joinmastodon.android.api.session.AccountLocalPreferences.ColorPreference.MATERIAL3;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -13,6 +14,7 @@ import com.google.gson.JsonSyntaxException;
 import com.google.gson.reflect.TypeToken;
 
 import org.joinmastodon.android.api.session.AccountLocalPreferences;
+import org.joinmastodon.android.api.session.AccountLocalPreferences.ColorPreference;
 import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.model.ContentType;
@@ -26,8 +28,6 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import androidx.annotation.StringRes;
-
 public class GlobalUserPreferences{
 	private static final String TAG="GlobalUserPreferences";
 
@@ -42,7 +42,6 @@ public class GlobalUserPreferences{
 	public static boolean showNewPostsButton;
 	public static boolean toolbarMarquee;
 	public static boolean disableSwipe;
-	public static boolean voteButtonForSingleChoice;
 	public static boolean enableDeleteNotifications;
 	public static boolean translateButtonOpenedOnly;
 	public static boolean uniformNotificationIcon;
@@ -54,16 +53,17 @@ public class GlobalUserPreferences{
 	public static boolean collapseLongPosts;
 	public static boolean spectatorMode;
 	public static boolean autoHideFab;
-	public static boolean compactReblogReplyLine;
 	public static boolean allowRemoteLoading;
 	public static boolean forwardReportDefault;
 	public static AutoRevealMode autoRevealEqualSpoilers;
-	public static ColorPreference color;
 	public static boolean disableM3PillActiveIndicator;
 	public static boolean showNavigationLabels;
 	public static boolean displayPronounsInTimelines, displayPronounsInThreads, displayPronounsInUserListings;
 	public static boolean overlayMedia;
 	public static boolean showSuicideHelp;
+	public static boolean underlinedLinks;
+	public static ColorPreference color;
+	public static boolean likeIcon;
 
 	// MOSHIDON
 	public static boolean showDividers;
@@ -116,7 +116,6 @@ public class GlobalUserPreferences{
 		showNewPostsButton=prefs.getBoolean("showNewPostsButton", true);
 		toolbarMarquee=prefs.getBoolean("toolbarMarquee", true);
 		disableSwipe=prefs.getBoolean("disableSwipe", false);
-		voteButtonForSingleChoice=prefs.getBoolean("voteButtonForSingleChoice", true);
 		enableDeleteNotifications=prefs.getBoolean("enableDeleteNotifications", false);
 		translateButtonOpenedOnly=prefs.getBoolean("translateButtonOpenedOnly", false);
 		uniformNotificationIcon=prefs.getBoolean("uniformNotificationIcon", false);
@@ -128,7 +127,6 @@ public class GlobalUserPreferences{
 		collapseLongPosts=prefs.getBoolean("collapseLongPosts", true);
 		spectatorMode=prefs.getBoolean("spectatorMode", false);
 		autoHideFab=prefs.getBoolean("autoHideFab", true);
-		compactReblogReplyLine=prefs.getBoolean("compactReblogReplyLine", true);
 		allowRemoteLoading=prefs.getBoolean("allowRemoteLoading", true);
 		autoRevealEqualSpoilers=AutoRevealMode.valueOf(prefs.getString("autoRevealEqualSpoilers", AutoRevealMode.THREADS.name()));
 		forwardReportDefault=prefs.getBoolean("forwardReportDefault", true);
@@ -139,12 +137,14 @@ public class GlobalUserPreferences{
 		displayPronounsInUserListings=prefs.getBoolean("displayPronounsInUserListings", true);
 		overlayMedia=prefs.getBoolean("overlayMedia", false);
 		showSuicideHelp=prefs.getBoolean("showSuicideHelp", true);
+		underlinedLinks=prefs.getBoolean("underlinedLinks", true);
+		color=ColorPreference.valueOf(prefs.getString("color", MATERIAL3.name()));
+		likeIcon=prefs.getBoolean("likeIcon", false);
 
 		// MOSHIDON
 		uniformNotificationIcon=prefs.getBoolean("uniformNotificationIcon", false);
 		showDividers =prefs.getBoolean("showDividers", false);
 		relocatePublishButton=prefs.getBoolean("relocatePublishButton", true);
-		compactReblogReplyLine=prefs.getBoolean("compactReblogReplyLine", true);
 		defaultToUnlistedReplies=prefs.getBoolean("defaultToUnlistedReplies", false);
 		doubleTapToSearch =prefs.getBoolean("doubleTapToSearch", true);
 		doubleTapToSwipe =prefs.getBoolean("doubleTapToSwipe", true);
@@ -169,18 +169,11 @@ public class GlobalUserPreferences{
 					.apply();
 		}
 
-		try {
-			if(android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.S){
-				color=ColorPreference.valueOf(prefs.getString("color", ColorPreference.MATERIAL3.name()));
-			}else{
-				color=ColorPreference.valueOf(prefs.getString("color", ColorPreference.PURPLE.name()));
-			}
-		} catch (IllegalArgumentException|ClassCastException ignored) {
-			// invalid color name or color was previously saved as integer
-			color=ColorPreference.PURPLE;
-		}
-
-		if(prefs.getInt("migrationLevel", 0) < 61) migrateToUpstreamVersion61();
+		int migrationLevel=prefs.getInt("migrationLevel", BuildConfig.VERSION_CODE);
+		if(migrationLevel < 61)
+			migrateToUpstreamVersion61();
+		if(migrationLevel < BuildConfig.VERSION_CODE)
+			prefs.edit().putInt("migrationLevel", BuildConfig.VERSION_CODE).apply();
 	}
 
 	public static void save(){
@@ -210,8 +203,6 @@ public class GlobalUserPreferences{
 				.putBoolean("collapseLongPosts", collapseLongPosts)
 				.putBoolean("spectatorMode", spectatorMode)
 				.putBoolean("autoHideFab", autoHideFab)
-				.putBoolean("compactReblogReplyLine", compactReblogReplyLine)
-				.putString("color", color.name())
 				.putBoolean("allowRemoteLoading", allowRemoteLoading)
 				.putString("autoRevealEqualSpoilers", autoRevealEqualSpoilers.name())
 				.putBoolean("forwardReportDefault", forwardReportDefault)
@@ -222,12 +213,14 @@ public class GlobalUserPreferences{
 				.putBoolean("displayPronounsInUserListings", displayPronounsInUserListings)
 				.putBoolean("overlayMedia", overlayMedia)
 				.putBoolean("showSuicideHelp", showSuicideHelp)
+				.putBoolean("underlinedLinks", underlinedLinks)
+				.putString("color", color.name())
+				.putBoolean("likeIcon", likeIcon)
 
 				// MOSHIDON
 				.putBoolean("defaultToUnlistedReplies", defaultToUnlistedReplies)
 				.putBoolean("doubleTapToSearch", doubleTapToSearch)
 				.putBoolean("doubleTapToSwipe", doubleTapToSwipe)
-				.putBoolean("compactReblogReplyLine", compactReblogReplyLine)
 				.putBoolean("replyLineAboveHeader", replyLineAboveHeader)
 				.putBoolean("confirmBeforeReblog", confirmBeforeReblog)
 				.putBoolean("swapBookmarkWithBoostAction", swapBookmarkWithBoostAction)
@@ -240,11 +233,30 @@ public class GlobalUserPreferences{
 				.putBoolean("showPostsWithoutAlt", showPostsWithoutAlt)
 				.putBoolean("showMediaPreview", showMediaPreview)
 
-				.putInt("theme", theme.ordinal())
-
 				.apply();
 	}
 
+	public enum ThemePreference{
+		AUTO,
+		LIGHT,
+		DARK
+	}
+
+	public enum AutoRevealMode {
+		NEVER,
+		THREADS,
+		DISCUSSIONS
+	}
+
+	public enum PrefixRepliesMode {
+		NEVER,
+		ALWAYS,
+		TO_OTHERS
+	}
+
+
+	//region preferences migrations
+
 	private static void migrateToUpstreamVersion61(){
 		Log.d(TAG, "Migrating preferences to upstream version 61!!");
 
@@ -291,53 +303,8 @@ public class GlobalUserPreferences{
 
 			localPrefs.save();
 		}
-
-		prefs.edit().putInt("migrationLevel", 61).apply();
 	}
 
-	public enum ColorPreference{
-		MATERIAL3,
-		PURPLE,
-		PINK,
-		GREEN,
-		BLUE,
-		BROWN,
-		RED,
-		YELLOW,
-		NORD,
-		WHITE;
+	//endregion
 
-		public @StringRes int getName() {
-			return switch(this){
-				case MATERIAL3 -> R.string.sk_color_palette_material3;
-				case PINK -> R.string.sk_color_palette_pink;
-				case PURPLE -> R.string.sk_color_palette_purple;
-				case GREEN -> R.string.sk_color_palette_green;
-				case BLUE -> R.string.sk_color_palette_blue;
-				case BROWN -> R.string.sk_color_palette_brown;
-				case RED -> R.string.sk_color_palette_red;
-				case YELLOW -> R.string.sk_color_palette_yellow;
-				case NORD -> R.string.mo_color_palette_nord;
-				case WHITE -> R.string.mo_color_palette_black_and_white;
-			};
-		}
-	}
-
-	public enum ThemePreference{
-		AUTO,
-		LIGHT,
-		DARK
-	}
-
-	public enum AutoRevealMode {
-		NEVER,
-		THREADS,
-		DISCUSSIONS
-	}
-
-	public enum PrefixRepliesMode {
-		NEVER,
-		ALWAYS,
-		TO_OTHERS
-	}
 }

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

@@ -39,62 +39,46 @@ import org.joinmastodon.android.utils.ProvidesAssistContent;
 import org.parceler.Parcels;
 
 import androidx.annotation.Nullable;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.time.Instant;
+
 import me.grishka.appkit.FragmentStackActivity;
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
 
 public class MainActivity extends FragmentStackActivity implements ProvidesAssistContent {
+	private static final String TAG="MainActivity";
+
 	@Override
 	protected void onCreate(@Nullable Bundle savedInstanceState){
-		UiUtils.setUserPreferredTheme(this);
+		AccountSession session=getCurrentSession();
+		UiUtils.setUserPreferredTheme(this, session);
 		super.onCreate(savedInstanceState);
 
-		if(savedInstanceState==null){
-			if(AccountSessionManager.getInstance().getLoggedInAccounts().isEmpty()){
-				showFragmentClearingBackStack(new CustomWelcomeFragment());
-			}else{
-				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){
-					String accountID=intent.getStringExtra("accountID");
-					try{
-						session=AccountSessionManager.getInstance().getAccount(accountID);
-						if(!hasNotification) args.putString("tab", "notifications");
-					}catch(IllegalStateException x){
-						session=AccountSessionManager.getInstance().getLastActiveAccount();
-					}
-				}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);
-				if(fromNotification && hasNotification){
-					Notification notification=Parcels.unwrap(intent.getParcelableExtra("notification"));
-					showFragmentForNotification(notification, session.getID());
-				} else if (intent.getBooleanExtra("compose", false)){
-					showCompose();
-				} else if (Intent.ACTION_VIEW.equals(intent.getAction())){
-					handleURL(intent.getData(), null);
-				} else {
-					showFragmentClearingBackStack(fragment);
-					maybeRequestNotificationsPermission();
-				}
+		Thread.UncaughtExceptionHandler defaultHandler=Thread.getDefaultUncaughtExceptionHandler();
+		Thread.setDefaultUncaughtExceptionHandler((t, e)->{
+			File file=new File(MastodonApp.context.getFilesDir(), "crash.log");
+			try(FileOutputStream out=new FileOutputStream(file)){
+				PrintWriter writer=new PrintWriter(out);
+				writer.println(BuildConfig.VERSION_NAME+" ("+BuildConfig.VERSION_CODE+")");
+				writer.println(Instant.now().toString());
+				writer.println();
+				e.printStackTrace(writer);
+				writer.flush();
+			}catch(IOException x){
+				Log.e(TAG, "Error writing crash.log", x);
+			}finally{
+				defaultHandler.uncaughtException(t, e);
 			}
+		});
+
+		if(savedInstanceState==null){
+			restartHomeFragment();
 		}
 
 		if(GithubSelfUpdater.needSelfUpdating()){
@@ -285,4 +269,81 @@ public class MainActivity extends FragmentStackActivity implements ProvidesAssis
 		Fragment fragment = getCurrentFragment();
 		if (fragment != null) callFragmentToProvideAssistContent(fragment, assistContent);
 	}
+
+	public AccountSession getCurrentSession(){
+		AccountSession session;
+		Bundle args=new Bundle();
+		Intent intent=getIntent();
+		if(intent.hasExtra("fromExternalShare")) {
+			return AccountSessionManager.getInstance()
+					.getAccount(intent.getStringExtra("account"));
+		}
+
+		boolean fromNotification = intent.getBooleanExtra("fromNotification", false);
+		boolean hasNotification = intent.hasExtra("notification");
+		if(fromNotification){
+			String accountID=intent.getStringExtra("accountID");
+			try{
+				session=AccountSessionManager.getInstance().getAccount(accountID);
+				if(!hasNotification) args.putString("tab", "notifications");
+			}catch(IllegalStateException x){
+				session=AccountSessionManager.getInstance().getLastActiveAccount();
+			}
+		}else{
+			session=AccountSessionManager.getInstance().getLastActiveAccount();
+		}
+		return session;
+	}
+
+	public void restartActivity(){
+		finish();
+		startActivity(new Intent(this, MainActivity.class));
+	}
+
+	public void restartHomeFragment(){
+		if(AccountSessionManager.getInstance().getLoggedInAccounts().isEmpty()){
+			showFragmentClearingBackStack(new CustomWelcomeFragment());
+		}else{
+			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){
+				String accountID=intent.getStringExtra("accountID");
+				try{
+					session=AccountSessionManager.getInstance().getAccount(accountID);
+					if(!hasNotification) args.putString("tab", "notifications");
+				}catch(IllegalStateException x){
+					session=AccountSessionManager.getInstance().getLastActiveAccount();
+				}
+			}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);
+			if(fromNotification && hasNotification){
+				Notification notification=Parcels.unwrap(intent.getParcelableExtra("notification"));
+				showFragmentForNotification(notification, session.getID());
+			} else if (intent.getBooleanExtra("compose", false)){
+				showCompose();
+			} else if (Intent.ACTION_VIEW.equals(intent.getAction())){
+				handleURL(intent.getData(), null);
+			} else {
+				showFragmentClearingBackStack(fragment);
+				maybeRequestNotificationsPermission();
+			}
+		}
+	}
 }

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

@@ -17,7 +17,6 @@ import android.graphics.drawable.Drawable;
 import android.opengl.Visibility;
 import android.os.Build;
 import android.os.Bundle;
-import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
 import android.util.Log;
 
@@ -38,7 +37,6 @@ import org.joinmastodon.android.model.PushNotification;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.model.StatusPrivacy;
 import org.joinmastodon.android.model.StatusPrivacy;
-import org.joinmastodon.android.ui.text.HtmlParser;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.parceler.Parcels;
 
@@ -218,7 +216,7 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 
 		if (!GlobalUserPreferences.uniformNotificationIcon) {
 			builder.setSmallIcon(switch (pn.notificationType) {
-				case FAVORITE -> R.drawable.ic_fluent_star_24_filled;
+				case FAVORITE -> GlobalUserPreferences.likeIcon ? R.drawable.ic_fluent_heart_24_filled : R.drawable.ic_fluent_star_24_filled;
 				case REBLOG -> R.drawable.ic_fluent_arrow_repeat_all_24_filled;
 				case FOLLOW -> R.drawable.ic_fluent_person_add_24_filled;
 				case MENTION -> R.drawable.ic_fluent_mention_24_filled;

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

@@ -26,6 +26,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.EnumSet;
 import java.util.List;
+import java.util.Objects;
 import java.util.function.Consumer;
 
 import me.grishka.appkit.api.Callback;
@@ -69,12 +70,11 @@ public class CacheController{
 								Status status=MastodonAPIController.gson.fromJson(cursor.getString(0), Status.class);
 								status.postprocess();
 								int flags=cursor.getInt(1);
-								status.hasGapAfter=((flags & POST_FLAG_GAP_AFTER)!=0);
+								status.hasGapAfter=((flags & POST_FLAG_GAP_AFTER)!=0) ? status.id : null;
 								newMaxID=status.id;
 								result.add(status);
 							}while(cursor.moveToNext());
 							String _newMaxID=newMaxID;
-							AccountSessionManager.get(accountID).filterStatuses(result, FilterContext.HOME);
 							uiHandler.post(()->callback.onSuccess(new CacheablePaginatedResponse<>(result, _newMaxID, true)));
 							return;
 						}
@@ -86,9 +86,7 @@ public class CacheController{
 						.setCallback(new Callback<>(){
 							@Override
 							public void onSuccess(List<Status> result){
-								ArrayList<Status> filtered=new ArrayList<>(result);
-								AccountSessionManager.get(accountID).filterStatuses(filtered, FilterContext.HOME);
-								callback.onSuccess(new CacheablePaginatedResponse<>(filtered, result.isEmpty() ? null : result.get(result.size()-1).id, false));
+								callback.onSuccess(new CacheablePaginatedResponse<>(result, result.isEmpty() ? null : result.get(result.size()-1).id, false));
 								putHomeTimeline(result, maxID==null);
 							}
 
@@ -116,12 +114,14 @@ public class CacheController{
 				values.put("id", s.id);
 				values.put("json", MastodonAPIController.gson.toJson(s));
 				int flags=0;
-				if(s.hasGapAfter)
+				if(Objects.equals(s.hasGapAfter, s.id))
 					flags|=POST_FLAG_GAP_AFTER;
 				values.put("flags", flags);
 				values.put("time", s.createdAt.getEpochSecond());
 				db.insertWithOnConflict("home_timeline", null, values, SQLiteDatabase.CONFLICT_REPLACE);
 			}
+			if(!clear)
+				db.delete("home_timeline", "`id` NOT IN (SELECT `id` FROM `home_timeline` ORDER BY `time` DESC LIMIT ?)", new String[]{"1000"});
 		});
 	}
 
@@ -273,6 +273,28 @@ public class CacheController{
 
 	public void deleteStatus(String id){
 		runOnDbThread((db)->{
+			String gapId=null;
+			int gapFlags=0;
+			// select to-be-removed and newer row
+			try(Cursor cursor=db.query("home_timeline", new String[]{"id", "flags"}, "`time`>=(SELECT `time` FROM `home_timeline` WHERE `id`=?)", new String[]{id}, null, null, "`time` ASC", "2")){
+				boolean hadGapAfter=false;
+				// always either one or two iterations (only one if there's no newer post)
+				while(cursor.moveToNext()){
+					String currentId=cursor.getString(0);
+					int currentFlags=cursor.getInt(1);
+					if(currentId.equals(id)){
+						hadGapAfter=((currentFlags & POST_FLAG_GAP_AFTER)!=0);
+					}else if(hadGapAfter){
+						gapFlags=currentFlags|POST_FLAG_GAP_AFTER;
+						gapId=currentId;
+					}
+				}
+			}
+			if(gapId!=null){
+				ContentValues values=new ContentValues();
+				values.put("flags", gapFlags);
+				db.update("home_timeline", values, "`id`=?", new String[]{gapId});
+			}
 			db.delete("home_timeline", "`id`=?", new String[]{id});
 		});
 	}

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

@@ -54,7 +54,7 @@ public class MastodonAPIController{
 			.create();
 	private static WorkerThread thread=new WorkerThread("MastodonAPIController");
 	private static OkHttpClient httpClient=new OkHttpClient.Builder()
-			.readTimeout(5, TimeUnit.MINUTES)
+			.readTimeout(30, TimeUnit.SECONDS)
 			.build();
 
 	private AccountSession session;
@@ -113,13 +113,13 @@ public class MastodonAPIController{
 				}
 
 				Request hreq=builder.build();
-				Call call=httpClient.newCall(hreq);
+				OkHttpClient client=req.timeout>0
+						? httpClient.newBuilder().readTimeout(req.timeout, TimeUnit.MILLISECONDS).build()
+						: httpClient;
+				Call call=client.newCall(hreq);
 				synchronized(req){
 					req.okhttpCall=call;
 				}
-				if(req.timeout>0){
-					call.timeout().timeout(req.timeout, TimeUnit.MILLISECONDS);
-				}
 
 				if(BuildConfig.DEBUG)
 					Log.d(TAG, "["+(session==null ? "no-auth" : session.getID())+"] Sending request: "+hreq);

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

@@ -153,8 +153,9 @@ public abstract class MastodonAPIRequest<T> extends APIRequest<T>{
 		headers.put(key, value);
 	}
 
-	protected void setTimeout(long timeout){
+	public MastodonAPIRequest<T> setTimeout(long timeout){
 		this.timeout=timeout;
+		return this;
 	}
 
 	protected String getPathPrefix(){

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

@@ -97,7 +97,7 @@ public class PushSubscriptionManager{
 		deviceToken=getPrefs().getString("deviceToken", null);
 		int tokenVersion=getPrefs().getInt("version", 0);
 		if(!TextUtils.isEmpty(deviceToken) && tokenVersion==BuildConfig.VERSION_CODE){
-			registerAllAccountsForPush(true); // TODO: revert this before release
+			registerAllAccountsForPush(false);
 			return;
 		}
 		Log.i(TAG, "tryRegisterFCM: no token found or app was updated. Trying to get push token...");

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

@@ -8,7 +8,10 @@ import org.joinmastodon.android.api.requests.statuses.SetStatusBookmarked;
 import org.joinmastodon.android.api.requests.statuses.SetStatusFavorited;
 import org.joinmastodon.android.api.requests.statuses.SetStatusMuted;
 import org.joinmastodon.android.api.requests.statuses.SetStatusReblogged;
+import org.joinmastodon.android.events.ReblogDeletedEvent;
 import org.joinmastodon.android.events.StatusCountersUpdatedEvent;
+import org.joinmastodon.android.events.StatusCreatedEvent;
+import org.joinmastodon.android.events.StatusDeletedEvent;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.model.StatusPrivacy;
 
@@ -50,7 +53,7 @@ public class StatusInteractionController{
 						runningFavoriteRequests.remove(status.id);
 						result.favouritesCount = Math.max(0, status.favouritesCount + (favorited ? 1 : -1));
 						cb.accept(result);
-						if (updateCounters) E.post(new StatusCountersUpdatedEvent(result));
+						if(updateCounters) E.post(new StatusCountersUpdatedEvent(result));
 					}
 
 					@Override
@@ -59,13 +62,13 @@ public class StatusInteractionController{
 						error.showToast(MastodonApp.context);
 						status.favourited=!favorited;
 						cb.accept(status);
-						if (updateCounters) E.post(new StatusCountersUpdatedEvent(status));
+						if(updateCounters) E.post(new StatusCountersUpdatedEvent(status));
 					}
 				})
 				.exec(accountID);
 		runningFavoriteRequests.put(status.id, req);
 		status.favourited=favorited;
-		if (updateCounters) E.post(new StatusCountersUpdatedEvent(status));
+		if(updateCounters) E.post(new StatusCountersUpdatedEvent(status));
 	}
 
 	public void setReblogged(Status status, boolean reblogged, StatusPrivacy visibility, Consumer<Status> cb){
@@ -80,11 +83,15 @@ public class StatusInteractionController{
 				.setCallback(new Callback<>(){
 					@Override
 					public void onSuccess(Status reblog){
-						Status result = reblog.getContentStatus();
+						Status result=reblog.getContentStatus();
 						runningReblogRequests.remove(status.id);
 						result.reblogsCount = Math.max(0, status.reblogsCount + (reblogged ? 1 : -1));
 						cb.accept(result);
-						if (updateCounters) E.post(new StatusCountersUpdatedEvent(result));
+						if(updateCounters){
+							E.post(new StatusCountersUpdatedEvent(result));
+							if(reblogged) E.post(new StatusCreatedEvent(reblog, accountID));
+							else E.post(new ReblogDeletedEvent(status.id, accountID));
+						}
 					}
 
 					@Override
@@ -93,13 +100,13 @@ public class StatusInteractionController{
 						error.showToast(MastodonApp.context);
 						status.reblogged=!reblogged;
 						cb.accept(status);
-						if (updateCounters) E.post(new StatusCountersUpdatedEvent(status));
+						if(updateCounters) E.post(new StatusCountersUpdatedEvent(status));
 					}
 				})
 				.exec(accountID);
 		runningReblogRequests.put(status.id, req);
 		status.reblogged=reblogged;
-		if (updateCounters) E.post(new StatusCountersUpdatedEvent(status));
+		if(updateCounters) E.post(new StatusCountersUpdatedEvent(status));
 	}
 
 	public void setBookmarked(Status status, boolean bookmarked){
@@ -120,7 +127,7 @@ public class StatusInteractionController{
 					public void onSuccess(Status result){
 						runningBookmarkRequests.remove(status.id);
 						cb.accept(result);
-						if (updateCounters) E.post(new StatusCountersUpdatedEvent(result));
+						if(updateCounters) E.post(new StatusCountersUpdatedEvent(result));
 					}
 
 					@Override
@@ -129,12 +136,12 @@ public class StatusInteractionController{
 						error.showToast(MastodonApp.context);
 						status.bookmarked=!bookmarked;
 						cb.accept(status);
-						if (updateCounters) E.post(new StatusCountersUpdatedEvent(status));
+						if(updateCounters) E.post(new StatusCountersUpdatedEvent(status));
 					}
 				})
 				.exec(accountID);
 		runningBookmarkRequests.put(status.id, req);
 		status.bookmarked=bookmarked;
-		if (updateCounters) E.post(new StatusCountersUpdatedEvent(status));
+		if(updateCounters) E.post(new StatusCountersUpdatedEvent(status));
 	}
 }

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

@@ -13,7 +13,7 @@ import okhttp3.MultipartBody;
 import okhttp3.RequestBody;
 
 public class PleromaMarkNotificationsRead extends MastodonAPIRequest<List<Notification>> {
-    private String maxID;
+    private final String maxID;
     public PleromaMarkNotificationsRead(String maxID) {
         super(HttpMethod.POST, "/pleroma/notifications/read", new TypeToken<>(){});
         this.maxID = maxID;

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

@@ -0,0 +1,11 @@
+package org.joinmastodon.android.api.requests.statuses;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.model.AkkomaTranslation;
+
+public class AkkomaTranslateStatus extends MastodonAPIRequest<AkkomaTranslation>{
+	public AkkomaTranslateStatus(String id, String lang){
+		super(HttpMethod.GET, "/statuses/"+id+"/translations/"+lang.toUpperCase(), AkkomaTranslation.class);
+	}
+}
+

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

@@ -48,6 +48,8 @@ public class CreateStatus extends MastodonAPIRequest<Status>{
 		public String quoteId;
 		public ContentType contentType;
 
+		public boolean preview;
+
 		public static class Poll{
 			public ArrayList<String> options=new ArrayList<>();
 			public int expiresIn;

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

@@ -26,6 +26,8 @@ public class GetStatusEditHistory extends MastodonAPIRequest<List<Status>>{
 			s.visibility=StatusPrivacy.PUBLIC;
 			s.mentions=Collections.emptyList();
 			s.tags=Collections.emptyList();
+			if (s.poll != null)
+				s.poll.id="fakeID"+i;
 			i++;
 		}
 		super.validateAndPostprocessResponse(respObj, httpResponse);

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

@@ -1,11 +1,13 @@
 package org.joinmastodon.android.api.requests.statuses;
 
 import org.joinmastodon.android.api.MastodonAPIRequest;
-import org.joinmastodon.android.model.TranslatedStatus;
+import org.joinmastodon.android.model.Translation;
 
-public class TranslateStatus extends MastodonAPIRequest<TranslatedStatus> {
-    public TranslateStatus(String id) {
-        super(HttpMethod.POST, "/statuses/"+id+"/translate", TranslatedStatus.class);
-        setRequestBody(new Object());
-    }
+import java.util.Map;
+
+public class TranslateStatus extends MastodonAPIRequest<Translation>{
+	public TranslateStatus(String id, String lang){
+		super(HttpMethod.POST, "/statuses/"+id+"/translate", Translation.class);
+		setRequestBody(Map.of("lang", lang));
+	}
 }

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

@@ -6,10 +6,16 @@ import static org.joinmastodon.android.api.MastodonAPIController.gson;
 
 import android.content.SharedPreferences;
 
+import androidx.annotation.StringRes;
+
 import com.google.gson.reflect.TypeToken;
 
+import org.joinmastodon.android.GlobalUserPreferences;
+import org.joinmastodon.android.R;
 import org.joinmastodon.android.model.ContentType;
 import org.joinmastodon.android.model.Emoji;
+import org.joinmastodon.android.model.Emoji;
+import org.joinmastodon.android.model.PushSubscription;
 import org.joinmastodon.android.model.TimelineDefinition;
 
 import java.lang.reflect.Type;
@@ -40,16 +46,20 @@ public class AccountLocalPreferences{
 	public String publishButtonText;
 	public String timelineReplyVisibility; // akkoma-only
 	public boolean keepOnlyLatestNotification;
-
 	public boolean emojiReactionsEnabled;
 	public ShowEmojiReactions showEmojiReactions;
+	public ColorPreference color;
+	public ArrayList<Emoji> recentCustomEmoji;
 
-	private final static Type recentLanguagesType = new TypeToken<ArrayList<String>>() {}.getType();
-	private final static Type timelinesType = new TypeToken<ArrayList<TimelineDefinition>>() {}.getType();
+	private final static Type recentLanguagesType=new TypeToken<ArrayList<String>>() {}.getType();
+	private final static Type timelinesType=new TypeToken<ArrayList<TimelineDefinition>>() {}.getType();
+	private final static Type recentCustomEmojiType=new TypeToken<ArrayList<Emoji>>() {}.getType();
 
 	// MOSHIDON
-	private final static Type recentEmojisType = new TypeToken<Map<String, Integer>>() {}.getType();
-	public Map<String, Integer> recentEmojis;
+//	private final static Type recentEmojisType = new TypeToken<Map<String, Integer>>() {}.getType();
+//	public Map<String, Integer> recentEmojis;
+	private final static Type notificationFiltersType = new TypeToken<PushSubscription.Alerts>() {}.getType();
+	public PushSubscription.Alerts notificationFilters;
 
 	public AccountLocalPreferences(SharedPreferences prefs, AccountSession session){
 		this.prefs=prefs;
@@ -74,9 +84,12 @@ public class AccountLocalPreferences{
 		keepOnlyLatestNotification=prefs.getBoolean("keepOnlyLatestNotification", false);
 		emojiReactionsEnabled=prefs.getBoolean("emojiReactionsEnabled", session.getInstance().isPresent() && session.getInstance().get().isAkkoma());
 		showEmojiReactions=ShowEmojiReactions.valueOf(prefs.getString("showEmojiReactions", ShowEmojiReactions.HIDE_EMPTY.name()));
+		color=prefs.contains("color") ? ColorPreference.valueOf(prefs.getString("color", null)) : null;
+		recentCustomEmoji=fromJson(prefs.getString("recentCustomEmoji", null), recentCustomEmojiType, new ArrayList<>());
 
 		// MOSHIDON
-		recentEmojis=fromJson(prefs.getString("recentEmojis", "{}"), recentEmojisType, new HashMap<>());
+//		recentEmojis=fromJson(prefs.getString("recentEmojis", "{}"), recentEmojisType, new HashMap<>());
+		notificationFilters=fromJson(prefs.getString("notificationFilters", gson.toJson(PushSubscription.Alerts.ofAll())), notificationFiltersType, PushSubscription.Alerts.ofAll());
 	}
 
 	public long getNotificationsPauseEndTime(){
@@ -87,6 +100,10 @@ public class AccountLocalPreferences{
 		prefs.edit().putLong("notificationsPauseTime", time).apply();
 	}
 
+	public ColorPreference getCurrentColor(){
+		return color!=null ? color : GlobalUserPreferences.color!=null ? GlobalUserPreferences.color : ColorPreference.MATERIAL3;
+	}
+
 	public void save(){
 		prefs.edit()
 				.putBoolean("interactionCounts", showInteractionCounts)
@@ -110,12 +127,43 @@ public class AccountLocalPreferences{
 				.putBoolean("keepOnlyLatestNotification", keepOnlyLatestNotification)
 				.putBoolean("emojiReactionsEnabled", emojiReactionsEnabled)
 				.putString("showEmojiReactions", showEmojiReactions.name())
+				.putString("color", color!=null ? color.name() : null)
+				.putString("recentCustomEmoji", gson.toJson(recentCustomEmoji))
 
 				// MOSHIDON
-				.putString("recentEmojis", gson.toJson(recentEmojis))
+//				.putString("recentEmojis", gson.toJson(recentEmojis))
+				.putString("notificationFilters", gson.toJson(notificationFilters))
 				.apply();
 	}
 
+	public enum ColorPreference{
+		MATERIAL3,
+		PURPLE,
+		PINK,
+		GREEN,
+		BLUE,
+		BROWN,
+		RED,
+		YELLOW,
+		NORD,
+		WHITE;
+
+		public @StringRes int getName() {
+			return switch(this){
+				case MATERIAL3 -> R.string.sk_color_palette_material3;
+				case PINK -> R.string.sk_color_palette_pink;
+				case PURPLE -> R.string.sk_color_palette_purple;
+				case GREEN -> R.string.sk_color_palette_green;
+				case BLUE -> R.string.sk_color_palette_blue;
+				case BROWN -> R.string.sk_color_palette_brown;
+				case RED -> R.string.sk_color_palette_red;
+				case YELLOW -> R.string.sk_color_palette_yellow;
+				case NORD -> R.string.mo_color_palette_nord;
+				case WHITE -> R.string.mo_color_palette_black_and_white;
+			};
+		}
+	}
+
 	public enum ShowEmojiReactions{
 		HIDE_EMPTY,
 		ONLY_OPENED,

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

@@ -40,7 +40,6 @@ import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Consumer;
 import java.util.function.Function;
-import java.util.function.Predicate;
 
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
@@ -219,7 +218,7 @@ public class AccountSession{
 
 	public void savePreferencesIfPending(){
 		if(preferencesNeedSaving){
-			new UpdateAccountCredentialsPreferences(preferences, null, self.discoverable, self.source.indexable)
+			new UpdateAccountCredentialsPreferences(preferences, self.locked, self.discoverable, self.source.indexable)
 					.setCallback(new Callback<>(){
 						@Override
 						public void onSuccess(Account result){
@@ -255,52 +254,77 @@ public class AccountSession{
 		filterStatusContainingObjects(objects, extractor, context, null);
 	}
 
-	public <T> void filterStatusContainingObjects(List<T> objects, Function<T, Status> extractor, FilterContext context, Account profile){
-		Predicate<Status> statusIsOnOwnProfile = (s) -> self != null && profile != null && s.account != null
+	private boolean statusIsOnOwnProfile(Status s, Account profile){
+		return self != null && profile != null && s.account != null
 				&& Objects.equals(self.id, profile.id) && Objects.equals(self.id, s.account.id);
+	}
 
-		if(getLocalPreferences().serverSideFiltersSupported){
-			// Even with server-side filters, clients are expected to remove statuses that match a filter that hides them
-			objects.removeIf(o->{
-				Status s=extractor.apply(o);
-				if(s==null)
-					return false;
-				if(s.filtered==null)
-					return false;
-				// don't hide own posts in own profile
-				if (statusIsOnOwnProfile.test(s))
-					return false;
-				for(FilterResult filter:s.filtered){
-					if(filter.filter.isActive() && filter.filter.filterAction==FilterAction.HIDE)
-						return true;
-				}
-				return false;
-			});
-			return;
-		}
-		if(wordFilters==null)
-			return;
-		for(T obj:objects){
+	private boolean isFilteredType(Status s){
+		AccountLocalPreferences localPreferences = getLocalPreferences();
+		return (!localPreferences.showReplies && s.inReplyToId != null)
+				|| (!localPreferences.showBoosts && s.reblog != null);
+	}
+
+	public <T> void filterStatusContainingObjects(List<T> objects, Function<T, Status> extractor, FilterContext context, Account profile){
+		AccountLocalPreferences localPreferences = getLocalPreferences();
+		if(!localPreferences.serverSideFiltersSupported) for(T obj:objects){
 			Status s=extractor.apply(obj);
 			if(s!=null && s.filtered!=null){
-				getLocalPreferences().serverSideFiltersSupported=true;
-				getLocalPreferences().save();
-				return;
+				localPreferences.serverSideFiltersSupported=true;
+				localPreferences.save();
+				break;
 			}
 		}
-		objects.removeIf(o->{
-			Status s=extractor.apply(o);
-			if(s==null)
-				return false;
-			// don't hide own posts in own profile
-			if (statusIsOnOwnProfile.test(s))
-				return false;
-			for(LegacyFilter filter:wordFilters){
+
+		List<T> removeUs=new ArrayList<>();
+		for(int i=0; i<objects.size(); i++){
+			T o=objects.get(i);
+			if(filterStatusContainingObject(o, extractor, context, profile)){
+				Status s=extractor.apply(o);
+				removeUs.add(o);
+				if(s!=null && s.hasGapAfter!=null && i>0){
+					// oops, we're about to remove an item that has a gap after...
+					// gotta find the previous status that's not also about to be removed
+					for(int j=i-1; j>=0; j--){
+						T p=objects.get(j);
+						Status prev=extractor.apply(objects.get(j));
+						if(prev!=null && !removeUs.contains(p)){
+							prev.hasGapAfter=s.hasGapAfter;
+							break;
+						}
+					}
+				}
+			}
+		}
+		objects.removeAll(removeUs);
+	}
+
+	public <T> boolean filterStatusContainingObject(T object, Function<T, Status> extractor, FilterContext context, Account profile){
+		Status s=extractor.apply(object);
+		if(s==null)
+			return false;
+		// don't hide own posts in own profile
+		if(statusIsOnOwnProfile(s, profile))
+			return false;
+		if(isFilteredType(s) && (context == FilterContext.HOME || context == FilterContext.PUBLIC))
+			return true;
+		// Even with server-side filters, clients are expected to remove statuses that match a filter that hides them
+		if(getLocalPreferences().serverSideFiltersSupported){
+			for(FilterResult filter : s.filtered){
+				if(filter.filter.isActive() && filter.filter.filterAction==FilterAction.HIDE)
+					return true;
+			}
+		}else if(wordFilters!=null){
+			for(LegacyFilter filter : wordFilters){
 				if(filter.context.contains(context) && filter.matches(s) && filter.isActive())
 					return true;
 			}
-			return false;
-		});
+		}
+		return false;
+	}
+
+	public void updateAccountInfo(){
+		AccountSessionManager.getInstance().updateSessionLocalInfo(this);
 	}
 
 	public Optional<Instance> getInstance() {
@@ -319,8 +343,4 @@ public class AccountSession{
 				.map(instance->"https://"+domain+(instance.isAkkoma() ? "/images/avi.png" : "/avatars/original/missing.png"))
 				.orElse("");
 	}
-
-	public void updateAccountInfo(){
-		AccountSessionManager.getInstance().updateSessionLocalInfo(this);
-	}
 }

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

@@ -1,5 +1,7 @@
 package org.joinmastodon.android.api.session;
 
+import static org.unifiedpush.android.connector.UnifiedPush.getDistributor;
+
 import android.app.Activity;
 import android.app.NotificationManager;
 import android.content.ComponentName;
@@ -34,6 +36,7 @@ import org.joinmastodon.android.model.EmojiCategory;
 import org.joinmastodon.android.model.LegacyFilter;
 import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.model.Token;
+import org.unifiedpush.android.connector.UnifiedPush;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -112,6 +115,7 @@ public class AccountSessionManager{
 	}
 
 	public void addAccount(Instance instance, Token token, Account self, Application app, AccountActivationInfo activationInfo){
+		Context context = MastodonApp.context;
 		instances.put(instance.uri, instance);
 		AccountSession session=new AccountSession(token, self, app, instance.uri, activationInfo==null, activationInfo);
 		sessions.put(session.getID(), session);
@@ -124,7 +128,14 @@ public class AccountSessionManager{
 		MastodonAPIController.runInBackground(()->writeInstanceInfoFile(wrapper, instance.uri));
 
 		updateMoreInstanceInfo(instance, instance.uri);
-		if(PushSubscriptionManager.arePushNotificationsAvailable()){
+		if (!UnifiedPush.getDistributor(context).isEmpty()) {
+			UnifiedPush.registerApp(
+					context,
+					session.getID(),
+					new ArrayList<>(),
+					context.getPackageName()
+			);
+		} else if(PushSubscriptionManager.arePushNotificationsAvailable()){
 			session.getPushSubscriptionManager().registerAccountForPush(null);
 		}
 		maybeUpdateShortcuts();
@@ -314,8 +325,7 @@ public class AccountSessionManager{
 		}
 	}
 
-
-	public void updateSessionLocalInfo(AccountSession session){
+	/*package*/ void updateSessionLocalInfo(AccountSession session){
 		new GetOwnAccount()
 				.setCallback(new Callback<>(){
 					@Override

mastodon/src/main/java/org/joinmastodon/android/events/ReblogDeletedEvent.java

@@ -0,0 +1,11 @@
+package org.joinmastodon.android.events;
+
+public class ReblogDeletedEvent{
+	public final String statusID;
+	public final String accountID;
+
+	public ReblogDeletedEvent(String statusID, String accountID){
+		this.statusID=statusID;
+		this.accountID=accountID;
+	}
+}

mastodon/src/main/java/org/joinmastodon/android/events/ScheduledStatusDeletedEvent.java

@@ -1,7 +1,5 @@
 package org.joinmastodon.android.events;
 
-import org.joinmastodon.android.model.ScheduledStatus;
-
 public class ScheduledStatusDeletedEvent{
 	public final String id;
 	public final String accountID;

mastodon/src/main/java/org/joinmastodon/android/events/StatusCreatedEvent.java

@@ -9,5 +9,6 @@ public class StatusCreatedEvent{
 	public StatusCreatedEvent(Status status, String accountID){
 		this.status=status;
 		this.accountID=accountID;
+		status.fromStatusCreated=true;
 	}
 }

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

@@ -9,19 +9,16 @@ import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.accounts.GetAccountStatuses;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.events.RemoveAccountPostsEvent;
-import org.joinmastodon.android.events.StatusCreatedEvent;
 import org.joinmastodon.android.events.StatusUnpinnedEvent;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.FilterContext;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.displayitems.HeaderStatusDisplayItem;
-import org.joinmastodon.android.utils.StatusFilterPredicate;
 import org.parceler.Parcels;
 
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
-import java.util.stream.Collectors;
 
 import me.grishka.appkit.api.SimpleCallback;
 
@@ -55,15 +52,14 @@ public class AccountTimelineFragment extends StatusListFragment{
 
 	@Override
 	protected void doLoadData(int offset, int count){
-		currentRequest=new GetAccountStatuses(user.id, offset>0 ? getMaxID() : null, null, count, filter)
+		currentRequest=new GetAccountStatuses(user.id, getMaxID(), null, count, filter)
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(List<Status> result){
 						if(getActivity()==null) return;
-						AccountSessionManager asm = AccountSessionManager.getInstance();
-						boolean empty=result.isEmpty();
+						boolean more=applyMaxID(result);
 						AccountSessionManager.get(accountID).filterStatuses(result, getFilterContext(), user);
-						onDataLoaded(result, !empty);
+						onDataLoaded(result, more);
 					}
 				})
 				.exec(accountID);

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

@@ -97,7 +97,7 @@ public class AnnouncementsFragment extends BaseStatusListFragment<Announcement>
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(List<Announcement> result){
-						if (getActivity() == null) return;
+						if(getActivity()==null) return;
 
 						// get unread items first
 						List<Announcement> data = result.stream().filter(a -> !a.read).collect(toList());

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

@@ -9,7 +9,6 @@ import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowInsets;
@@ -24,18 +23,24 @@ import androidx.recyclerview.widget.RecyclerView;
 import org.joinmastodon.android.E;
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.api.requests.accounts.GetAccountRelationships;
 import org.joinmastodon.android.api.requests.polls.SubmitPollVote;
+import org.joinmastodon.android.api.requests.statuses.AkkomaTranslateStatus;
+import org.joinmastodon.android.api.requests.statuses.TranslateStatus;
+import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.events.PollUpdatedEvent;
 import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.model.AkkomaTranslation;
 import org.joinmastodon.android.model.DisplayItemsParent;
 import org.joinmastodon.android.model.Poll;
 import org.joinmastodon.android.model.Relationship;
 import org.joinmastodon.android.model.Status;
+import org.joinmastodon.android.model.Translation;
 import org.joinmastodon.android.ui.BetterItemAnimator;
+import org.joinmastodon.android.ui.M3AlertDialogBuilder;
 import org.joinmastodon.android.ui.displayitems.AccountStatusDisplayItem;
-import org.joinmastodon.android.ui.displayitems.EmojiReactionsStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.ExtendedFooterStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.FooterStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.GapStatusDisplayItem;
@@ -51,6 +56,7 @@ import org.joinmastodon.android.ui.displayitems.TextStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.WarningFilteredStatusDisplayItem;
 import org.joinmastodon.android.ui.photoviewer.PhotoViewer;
 import org.joinmastodon.android.ui.photoviewer.PhotoViewerHost;
+import org.joinmastodon.android.ui.utils.InsetStatusItemDecoration;
 import org.joinmastodon.android.ui.utils.MediaAttachmentViewController;
 import org.joinmastodon.android.ui.utils.PreviewlessMediaAttachmentViewController;
 import org.joinmastodon.android.ui.utils.UiUtils;
@@ -61,8 +67,10 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Objects;
 import java.util.Set;
+import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
 import androidx.annotation.NonNull;
@@ -95,6 +103,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 	protected TypedObjectPool<MediaGridStatusDisplayItem.GridItemType, PreviewlessMediaAttachmentViewController> previewlessAttachmentViewsPool=new TypedObjectPool<>(this::makeNewPreviewlessMediaAttachmentView);
 
 	protected boolean currentlyScrolling;
+	protected String maxID;
 
 	public BaseStatusListFragment(){
 		super(20);
@@ -161,6 +170,8 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 	}
 
 	protected String getMaxID(){
+		if(refreshing) return null;
+		if(maxID!=null) return maxID;
 		if(!preloadedData.isEmpty())
 			return preloadedData.get(preloadedData.size()-1).getID();
 		else if(!data.isEmpty())
@@ -169,6 +180,12 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 			return null;
 	}
 
+	protected boolean applyMaxID(List<Status> result){
+		boolean empty=result.isEmpty();
+		if(!empty) maxID=result.get(result.size()-1).id;
+		return !empty;
+	}
+
 	protected abstract List<StatusDisplayItem> buildDisplayItems(T s);
 	protected abstract void addAccountToKnown(T s);
 
@@ -429,12 +446,14 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 			}
 		});
 		list.addItemDecoration(new StatusListItemDecoration());
+		list.addItemDecoration(new InsetStatusItemDecoration(this));
 		((UsableRecyclerView)list).setSelectorBoundsProvider(new UsableRecyclerView.SelectorBoundsProvider(){
 			private Rect tmpRect=new Rect();
 			@Override
 			public void getSelectorBounds(View view, Rect outRect){
-				boolean hasDescendant = false, hasAncestor = false, isWarning = false;
-				int lastIndex = -1, firstIndex = -1;
+				if(list!=view.getParent()) return;
+				boolean hasDescendant=false, hasAncestor=false, isWarning=false;
+				int lastIndex=-1, firstIndex=-1;
 				if(((UsableRecyclerView) list).isIncludeMarginsInItemHitbox()){
 					list.getDecoratedBoundsWithMargins(view, outRect);
 				}else{
@@ -539,10 +558,14 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 	protected void updatePoll(String itemID, Status status, Poll poll){
 		status.poll=poll;
 		int firstOptionIndex=-1, footerIndex=-1;
+		int spoilerFirstOptionIndex=-1, spoilerFooterIndex=-1;
+		SpoilerStatusDisplayItem spoilerItem=null;
 		int i=0;
 		for(StatusDisplayItem item:displayItems){
 			if(item.parentID.equals(itemID)){
-				if(item instanceof PollOptionStatusDisplayItem && firstOptionIndex==-1){
+				if(item instanceof SpoilerStatusDisplayItem){
+					spoilerItem=(SpoilerStatusDisplayItem) item;
+				}else if(item instanceof PollOptionStatusDisplayItem && firstOptionIndex==-1){
 					firstOptionIndex=i;
 				}else if(item instanceof PollFooterStatusDisplayItem){
 					footerIndex=i;
@@ -555,8 +578,16 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 			throw new IllegalStateException("Can't find all poll items in displayItems");
 		List<StatusDisplayItem> pollItems=displayItems.subList(firstOptionIndex, footerIndex+1);
 		int prevSize=pollItems.size();
+		if(spoilerItem!=null){
+			spoilerFirstOptionIndex=spoilerItem.contentItems.indexOf(pollItems.get(0));
+			spoilerFooterIndex=spoilerItem.contentItems.indexOf(pollItems.get(pollItems.size()-1));
+		}
 		pollItems.clear();
-		StatusDisplayItem.buildPollItems(itemID, this, poll, pollItems, status);
+		StatusDisplayItem.buildPollItems(itemID, this, poll, status, pollItems);
+		if(spoilerItem!=null){
+			spoilerItem.contentItems.subList(spoilerFirstOptionIndex, spoilerFooterIndex+1).clear();
+			spoilerItem.contentItems.addAll(spoilerFirstOptionIndex, pollItems);
+		}
 		if(prevSize!=pollItems.size()){
 			adapter.notifyItemRangeRemoved(firstOptionIndex, prevSize);
 			adapter.notifyItemRangeInserted(firstOptionIndex, pollItems.size());
@@ -568,7 +599,8 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 	public void onPollOptionClick(PollOptionStatusDisplayItem.Holder holder){
 		Poll poll=holder.getItem().poll;
 		Poll.Option option=holder.getItem().option;
-		if(poll.multiple || GlobalUserPreferences.voteButtonForSingleChoice){
+		// MEGALODON: always show vote button
+//		if(poll.multiple){
 			if(poll.selectedOptions==null)
 				poll.selectedOptions=new ArrayList<>();
 			boolean optionContained=poll.selectedOptions.contains(option);
@@ -583,7 +615,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 			for(int i=0;i<list.getChildCount();i++){
 				RecyclerView.ViewHolder vh=list.getChildViewHolder(list.getChildAt(i));
 				if(!poll.multiple && vh instanceof PollOptionStatusDisplayItem.Holder item){
-					if (item != holder) item.itemView.setSelected(false);
+					if(item!=holder) item.itemView.setSelected(false);
 				}
 				if(vh instanceof PollFooterStatusDisplayItem.Holder footer){
 					if(footer.getItemID().equals(holder.getItemID())){
@@ -592,9 +624,9 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 					}
 				}
 			}
-		}else{
-			submitPollVote(holder.getItemID(), poll.id, Collections.singletonList(poll.options.indexOf(option)));
-		}
+//		}else{
+//			submitPollVote(holder.getItemID(), poll.id, Collections.singletonList(poll.options.indexOf(option)));
+//		}
 	}
 
 	public void onPollVoteButtonClick(PollFooterStatusDisplayItem.Holder holder){
@@ -602,6 +634,14 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		submitPollVote(holder.getItemID(), poll.id, poll.selectedOptions.stream().map(opt->poll.options.indexOf(opt)).collect(Collectors.toList()));
 	}
 
+	public void onPollViewResultsButtonClick(PollFooterStatusDisplayItem.Holder holder, boolean shown){
+			for(int i=0;i<list.getChildCount();i++){
+				if(list.getChildViewHolder(list.getChildAt(i)) instanceof PollOptionStatusDisplayItem.Holder item && item.getItemID().equals(holder.getItemID())){
+					item.showResults(shown);
+				}
+			}
+	}
+
 	protected void submitPollVote(String parentID, String pollID, List<Integer> choices){
 		if(refreshing)
 			return;
@@ -623,37 +663,39 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 
 	public void onRevealSpoilerClick(SpoilerStatusDisplayItem.Holder holder){
 		Status status=holder.getItem().status;
-		toggleSpoiler(status, holder.getItemID());
+		boolean isForQuote=holder.getItem().isForQuote;
+		toggleSpoiler(status, isForQuote, holder.getItemID());
 	}
 
 	public void onVisibilityIconClick(HeaderStatusDisplayItem.Holder holder) {
 		Status status = holder.getItem().status;
-		MediaGridStatusDisplayItem.Holder mediaGrid = findHolderOfType(holder.getItemID(), MediaGridStatusDisplayItem.Holder.class);
-		if (mediaGrid != null) {
-			if (!status.sensitiveRevealed) mediaGrid.revealSensitive();
+		if(holder.getItem().hasVisibilityToggle) holder.animateVisibilityToggle(false);
+		MediaGridStatusDisplayItem.Holder mediaGrid=findHolderOfType(holder.getItemID(), MediaGridStatusDisplayItem.Holder.class);
+		if(mediaGrid!=null){
+			if(!status.sensitiveRevealed) mediaGrid.revealSensitive();
 			else mediaGrid.hideSensitive();
-		} else {
-			// media grid's methods normally change the status' state - we still want to be able
-			// to do this if the media grid is not bound, tho - so, doing it ourselves here
-			status.sensitiveRevealed = !status.sensitiveRevealed;
+		}else{
+			status.sensitiveRevealed=false;
+			notifyItemChangedAfter(holder.getItem(), MediaGridStatusDisplayItem.class);
 		}
-		holder.rebind();
 	}
 
 	public void onSensitiveRevealed(MediaGridStatusDisplayItem.Holder holder) {
-		HeaderStatusDisplayItem.Holder header = findHolderOfType(holder.getItemID(), HeaderStatusDisplayItem.Holder.class);
-		if(header != null) header.rebind();
+		HeaderStatusDisplayItem.Holder header=findHolderOfType(holder.getItemID(), HeaderStatusDisplayItem.Holder.class);
+		if(header!=null && header.getItem().hasVisibilityToggle) header.animateVisibilityToggle(true);
+		else notifyItemChangedBefore(holder.getItem(), HeaderStatusDisplayItem.class);
 	}
 
-	protected void toggleSpoiler(Status status, String itemID){
+	protected void toggleSpoiler(Status status, boolean isForQuote, String itemID){
 		status.spoilerRevealed=!status.spoilerRevealed;
 		if (!status.spoilerRevealed && !AccountSessionManager.get(accountID).getLocalPreferences().revealCWs)
 			status.sensitiveRevealed = false;
 
-		SpoilerStatusDisplayItem.Holder spoiler=findHolderOfType(itemID, SpoilerStatusDisplayItem.Holder.class);
-		if(spoiler!=null)
-			spoiler.rebind();
-		SpoilerStatusDisplayItem spoilerItem=Objects.requireNonNull(findItemOfType(itemID, SpoilerStatusDisplayItem.class));
+		List<SpoilerStatusDisplayItem.Holder> spoilers=findAllHoldersOfType(itemID, SpoilerStatusDisplayItem.Holder.class);
+		SpoilerStatusDisplayItem.Holder spoiler=spoilers.size() > 1 && isForQuote ? spoilers.get(1) : spoilers.get(0);
+		if(spoiler!=null) spoiler.rebind();
+		else notifyItemChanged(itemID, SpoilerStatusDisplayItem.class);
+		SpoilerStatusDisplayItem spoilerItem=Objects.requireNonNull(spoiler.getItem());
 
 		int index=displayItems.indexOf(spoilerItem);
 		if(status.spoilerRevealed){
@@ -664,39 +706,29 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 			adapter.notifyItemRangeRemoved(index+1, spoilerItem.contentItems.size());
 		}
 
-		TextStatusDisplayItem.Holder text=findHolderOfType(itemID, TextStatusDisplayItem.Holder.class);
-		if(text!=null)
-			adapter.notifyItemChanged(text.getAbsoluteAdapterPosition()-getMainAdapterOffset());
+		notifyItemChanged(itemID, TextStatusDisplayItem.class);
 		HeaderStatusDisplayItem.Holder header=findHolderOfType(itemID, HeaderStatusDisplayItem.Holder.class);
-		if(header!=null)
-			header.rebind();
+		if(header!=null) header.rebind();
+		else notifyItemChanged(itemID, HeaderStatusDisplayItem.class);
 
 		list.invalidateItemDecorations();
 	}
 
 	public void onEnableExpandable(TextStatusDisplayItem.Holder holder, boolean expandable) {
-		if (holder.getItem().status.textExpandable != expandable && list != null) {
-			holder.getItem().status.textExpandable = expandable;
-			HeaderStatusDisplayItem.Holder header = findHolderOfType(holder.getItemID(), HeaderStatusDisplayItem.Holder.class);
-			if (header != null) header.rebind();
+		Status s=holder.getItem().status;
+		if(s.textExpandable!=expandable && list!=null) {
+			s.textExpandable=expandable;
+			HeaderStatusDisplayItem.Holder header=findHolderOfType(holder.getItemID(), HeaderStatusDisplayItem.Holder.class);
+			if(header!=null) header.bindCollapseButton();
 		}
 	}
 
 	public void onToggleExpanded(Status status, String itemID) {
 		status.textExpanded = !status.textExpanded;
-		TextStatusDisplayItem.Holder text=findHolderOfType(itemID, TextStatusDisplayItem.Holder.class);
+		notifyItemChanged(itemID, TextStatusDisplayItem.class);
 		HeaderStatusDisplayItem.Holder header=findHolderOfType(itemID, HeaderStatusDisplayItem.Holder.class);
-		if (text != null) text.rebind();
-		if (header != null) header.rebind();
-	}
-
-	public void updateEmojiReactions(Status status, String itemID){
-		EmojiReactionsStatusDisplayItem.Holder reactions=findHolderOfType(itemID, EmojiReactionsStatusDisplayItem.Holder.class);
-		if(reactions != null){
-			reactions.getItem().status.reactions.clear();
-			reactions.getItem().status.reactions.addAll(status.reactions);
-			reactions.rebind();
-		}
+		if(header!=null) header.animateExpandToggle();
+		else notifyItemChanged(itemID, HeaderStatusDisplayItem.class);
 	}
 
 	public void onGapClick(GapStatusDisplayItem.Holder item, boolean downwards){}
@@ -755,9 +787,61 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		return null;
 	}
 
+	/**
+	 * Use this as a fallback if findHolderOfType fails to find the ViewHolder.
+	 * It might still be bound but off-screen and therefore not a child of the RecyclerView -
+	 * resulting in the ViewHolder displaying an outdated state once scrolled back into view.
+	 */
+	protected <I extends StatusDisplayItem> int notifyItemChanged(String id, Class<I> type){
+		boolean encounteredParent=false;
+		for(int i=0; i<displayItems.size(); i++){
+			StatusDisplayItem item=displayItems.get(i);
+			boolean idEquals=id.equals(item.parentID);
+			if(!encounteredParent && idEquals) encounteredParent=true; // reached top of the parent
+			else if(encounteredParent && !idEquals) break; // passed by bottom of the parent. man muss ja wissen wann schluss is
+			if(idEquals && type.isInstance(item)){
+				adapter.notifyItemChanged(i);
+				return i;
+			}
+		}
+		return -1;
+	}
+
+	protected <I extends StatusDisplayItem> int notifyItemChangedAfter(StatusDisplayItem afterThis, Class<I> type){
+		int startIndex=displayItems.indexOf(afterThis);
+		if(startIndex == -1) throw new IllegalStateException("notifyItemChangedAfter didn't find the passed StatusDisplayItem");
+		String parentID=afterThis.parentID;
+		for(int i=startIndex; i<displayItems.size(); i++){
+			StatusDisplayItem item=displayItems.get(i);
+			if(!parentID.equals(item.parentID)) break; // didn't find anything
+			if(type.isInstance(item)){
+				// found it
+				adapter.notifyItemChanged(i);
+				return i;
+			}
+		}
+		return -1;
+	}
+
+	protected <I extends StatusDisplayItem> int notifyItemChangedBefore(StatusDisplayItem beforeThis, Class<I> type){
+		int startIndex=displayItems.indexOf(beforeThis);
+		if(startIndex == -1) throw new IllegalStateException("notifyItemChangedBefore didn't find the passed StatusDisplayItem");
+		String parentID=beforeThis.parentID;
+		for(int i=startIndex; i>=0; i--){
+			StatusDisplayItem item=displayItems.get(i);
+			if(!parentID.equals(item.parentID)) break; // didn't find anything
+			if(type.isInstance(item)){
+				// found it
+				adapter.notifyItemChanged(i);
+				return i;
+			}
+		}
+		return -1;
+	}
+
 	@Nullable
 	protected <I extends StatusDisplayItem, H extends StatusDisplayItem.Holder<I>> H findHolderOfType(String id, Class<H> type){
-		for(int i=0;i<list.getChildCount();i++){
+		for(int i=0; i<list.getChildCount(); i++){
 			RecyclerView.ViewHolder holder=list.getChildViewHolder(list.getChildAt(i));
 			if(holder instanceof StatusDisplayItem.Holder<?> itemHolder && itemHolder.getItemID().equals(id) && type.isInstance(holder))
 				return type.cast(holder);
@@ -862,6 +946,99 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		assistContent.setWebUri(getWebUri(getSession().getInstanceUri().buildUpon()));
 	}
 
+	public void togglePostTranslation(Status status, String itemID){
+		switch(status.translationState){
+			case LOADING -> {
+				return;
+			}
+			case SHOWN -> {
+				status.translationState=Status.TranslationState.HIDDEN;
+			}
+			case HIDDEN -> {
+				if(status.translation!=null){
+					status.translationState=Status.TranslationState.SHOWN;
+				}else{
+					status.translationState=Status.TranslationState.LOADING;
+					Consumer<Translation> successCallback=(result)->{
+						status.translation=result;
+						status.translationState=Status.TranslationState.SHOWN;
+						updateTranslation(itemID);
+					};
+					MastodonAPIRequest<?> req=isInstanceAkkoma()
+							? new AkkomaTranslateStatus(status.getContentStatus().id, Locale.getDefault().getLanguage()).setCallback(new Callback<>(){
+								@Override
+								public void onSuccess(AkkomaTranslation result){
+									if(getActivity()!=null) successCallback.accept(result.toTranslation());
+								}
+								@Override
+								public void onError(ErrorResponse error){
+									if(getActivity()!=null) translationCallbackError(status, itemID);
+								}
+							})
+							: new TranslateStatus(status.getContentStatus().id, Locale.getDefault().getLanguage()).setCallback(new Callback<>(){
+								@Override
+								public void onSuccess(Translation result){
+									if(getActivity()!=null) successCallback.accept(result);
+								}
+
+								@Override
+								public void onError(ErrorResponse error){
+									if(getActivity()!=null) translationCallbackError(status, itemID);
+								}
+							});
+
+					// 1 minute
+					req.setTimeout(60000).exec(accountID);
+				}
+			}
+		}
+		updateTranslation(itemID);
+	}
+
+	private void translationCallbackError(Status status, String itemID) {
+		status.translationState=Status.TranslationState.HIDDEN;
+		updateTranslation(itemID);
+		new M3AlertDialogBuilder(getActivity())
+				.setTitle(R.string.error)
+				.setMessage(R.string.translation_failed)
+				.setPositiveButton(R.string.ok, null)
+				.show();
+	}
+
+	private void updateTranslation(String itemID) {
+		TextStatusDisplayItem.Holder text=findHolderOfType(itemID, TextStatusDisplayItem.Holder.class);
+		if(text!=null){
+			text.updateTranslation(true);
+			imgLoader.bindViewHolder((ImageLoaderRecyclerAdapter) list.getAdapter(), text, text.getAbsoluteAdapterPosition());
+		}else{
+			notifyItemChanged(itemID, TextStatusDisplayItem.class);
+		}
+
+		if(isInstanceAkkoma())
+			return;
+
+		SpoilerStatusDisplayItem.Holder spoiler=findHolderOfType(itemID, SpoilerStatusDisplayItem.Holder.class);
+		if(spoiler!=null){
+			spoiler.rebind();
+		}
+
+		MediaGridStatusDisplayItem.Holder media=findHolderOfType(itemID, MediaGridStatusDisplayItem.Holder.class);
+		if (media!=null) {
+			media.rebind();
+		}
+
+		PreviewlessMediaGridStatusDisplayItem.Holder previewLessMedia=findHolderOfType(itemID, PreviewlessMediaGridStatusDisplayItem.Holder.class);
+		if (previewLessMedia!=null) {
+			previewLessMedia.rebind();
+		}
+
+		for(int i=0;i<list.getChildCount();i++){
+			if(list.getChildViewHolder(list.getChildAt(i)) instanceof PollOptionStatusDisplayItem.Holder item){
+				item.rebind();
+			}
+		}
+	}
+
 	public void rebuildAllDisplayItems(){
 		displayItems.clear();
 		for(T item:data){
@@ -877,7 +1054,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		if(getContext()==null) return;
 		super.onDataLoaded(d, more);
 		// more available, but the page isn't even full yet? seems wrong, let's load some more
-		if(more && d.size() < itemsPerPage){
+		if(more && data.size() < itemsPerPage){
 			preloader.onScrolledToLastItem();
 		}
 	}

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

@@ -28,7 +28,7 @@ public class BookmarkedStatusListFragment extends StatusListFragment{
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(HeaderPaginationList<Status> result){
-						if (getActivity() == null) return;
+						if(getActivity()==null) return;
 						if(result.nextPageUri!=null)
 							nextMaxID=result.nextPageUri.getQueryParameter("max_id");
 						else

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

@@ -123,11 +123,11 @@ import java.time.format.DateTimeFormatter;
 import java.time.format.FormatStyle;
 import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
 import java.util.Objects;
 import java.util.UUID;
+import java.util.function.Consumer;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -165,7 +165,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 
 	public LinearLayout mainLayout;
 	private SizeListenerLinearLayout contentView;
-	private TextView selfName, selfUsername, selfExtraText, extraText, pronouns;
+	private TextView selfName, selfUsername, selfExtraText, extraText;
 	private ImageView selfAvatar;
 	private Account self;
 	private String instanceDomain;
@@ -176,7 +176,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 	private int charCount, charLimit, trimmedCharCount;
 
 	private Button publishButton, languageButton, scheduleTimeBtn;
-	private PopupMenu languagePopup, contentTypePopup, visibilityPopup, draftOptionsPopup;
+	private PopupMenu contentTypePopup, visibilityPopup, draftOptionsPopup;
 	private ImageButton publishButtonRelocated, mediaBtn, pollBtn, emojiBtn, spoilerBtn, draftsBtn, scheduleDraftDismiss, contentTypeBtn;
 	private View sensitiveBtn;
 	private TextView replyText;
@@ -215,7 +215,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 	public Instance instance;
 
 	public Status editingStatus;
-	private ScheduledStatus scheduledStatus;
+	public ScheduledStatus scheduledStatus;
 	private boolean redraftStatus;
 
 	private Uri photoUri;
@@ -312,7 +312,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 	@Override
 	public View onCreateContentView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState){
 		creatingView=true;
-		emojiKeyboard=new CustomEmojiPopupKeyboard(getActivity(), customEmojis, instanceDomain, getAccountID());
+		emojiKeyboard=new CustomEmojiPopupKeyboard(getActivity(), accountID, customEmojis, instanceDomain);
 		emojiKeyboard.setListener(new CustomEmojiPopupKeyboard.Listener(){
 			@Override
 			public void onEmojiSelected(Emoji emoji){
@@ -364,7 +364,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		selfUsername=view.findViewById(R.id.self_username);
 		selfAvatar=view.findViewById(R.id.self_avatar);
 		selfExtraText=view.findViewById(R.id.self_extra_text);
-		HtmlParser.setTextWithCustomEmoji(selfName, self.displayName, self.emojis);
+		HtmlParser.setTextWithCustomEmoji(selfName, self.getDisplayName(), self.emojis);
 		selfUsername.setText('@'+self.username+'@'+instanceDomain);
 		if(self.avatar!=null)
 			ViewImageLoader.load(selfAvatar, null, new UrlImageLoaderRequest(self.avatar));
@@ -685,7 +685,6 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			});
 			View originalPost=view.findViewById(R.id.original_post);
 			extraText=view.findViewById(R.id.extra_text);
-			pronouns=view.findViewById(R.id.pronouns);
 			originalPost.setVisibility(View.VISIBLE);
 			originalPost.setOnClickListener(v->{
 				Bundle args=new Bundle();
@@ -725,7 +724,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			moreBtn.setBackground(null);
 
 			TextView name = view.findViewById(R.id.name);
-			name.setText(HtmlParser.parseCustomEmoji(status.account.displayName, status.account.emojis));
+			name.setText(HtmlParser.parseCustomEmoji(status.account.getDisplayName(), status.account.emojis));
 			UiUtils.loadCustomEmojiInTextView(name);
 
 			String time = status==null || status.editedAt==null
@@ -759,7 +758,8 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 						.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, V.dp(16)));
 			}
 
-			replyText.setText(getString(quote!=null? R.string.sk_quoting_user : R.string.in_reply_to, status.account.displayName));
+			replyText.setText(HtmlParser.parseCustomEmoji(getString(quote!=null? R.string.sk_quoting_user : R.string.in_reply_to, status.account.getDisplayName()), status.account.emojis));
+			UiUtils.loadCustomEmojiInTextView(replyText);
 			int visibilityNameRes = switch (status.visibility) {
 				case PUBLIC -> R.string.visibility_public;
 				case UNLISTED -> R.string.sk_visibility_unlisted;
@@ -767,7 +767,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 				case DIRECT -> R.string.visibility_private;
 				case LOCAL -> R.string.sk_local_only;
 			};
-			replyText.setContentDescription(getString(R.string.in_reply_to, status.account.displayName) + ", " + getString(visibilityNameRes));
+			replyText.setContentDescription(getString(R.string.in_reply_to, status.account.getDisplayName()) + ", " + getString(visibilityNameRes));
 			replyText.setOnClickListener(v->{
 				scrollView.smoothScrollTo(0, 0);
 			});
@@ -801,7 +801,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 					String prefix = (GlobalUserPreferences.prefixReplies == ALWAYS
 							|| (GlobalUserPreferences.prefixReplies == TO_OTHERS && !ownID.equals(status.account.id)))
 							&& !status.spoilerText.startsWith("re: ") ? "re: " : "";
-					spoilerEdit.setText(prefix + replyTo.spoilerText);
+					spoilerEdit.setText(prefix + status.spoilerText);
 					spoilerBtn.setSelected(true);
 				}
 				if (status.language != null && !status.language.isEmpty()) setPostLanguage(status.language);
@@ -862,6 +862,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		}
 	}
 
+	@SuppressLint("ClickableViewAccessibility")
 	@Override
 	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater){
 		inflater.inflate(editingStatus==null ? R.menu.compose : R.menu.compose_edit, menu);
@@ -889,19 +890,22 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			charCounter.setText(String.valueOf(charLimit));
 		}
 
-//		draftsBtn = wrap.findViewById(R.id.drafts_btn);
-		draftOptionsPopup = new PopupMenu(getContext(), draftsBtn);
+//		draftsBtn=wrap.findViewById(R.id.drafts_btn);
+		draftOptionsPopup=new PopupMenu(getContext(), draftsBtn);
 		draftOptionsPopup.inflate(R.menu.compose_more);
-		draftMenuItem = draftOptionsPopup.getMenu().findItem(R.id.draft);
-		undraftMenuItem = draftOptionsPopup.getMenu().findItem(R.id.undraft);
-		scheduleMenuItem = draftOptionsPopup.getMenu().findItem(R.id.schedule);
-		unscheduleMenuItem = draftOptionsPopup.getMenu().findItem(R.id.unschedule);
+		Menu draftOptionsMenu=draftOptionsPopup.getMenu();
+		draftMenuItem=draftOptionsMenu.findItem(R.id.draft);
+		undraftMenuItem=draftOptionsMenu.findItem(R.id.undraft);
+		scheduleMenuItem=draftOptionsMenu.findItem(R.id.schedule);
+		unscheduleMenuItem=draftOptionsMenu.findItem(R.id.unschedule);
+		draftOptionsMenu.findItem(R.id.preview).setVisible(isInstanceAkkoma());
 		draftOptionsPopup.setOnMenuItemClickListener(i->{
-			int id = i.getItemId();
-			if (id == R.id.draft) updateScheduledAt(getDraftInstant());
-			else if (id == R.id.schedule) pickScheduledDateTime();
-			else if (id == R.id.unschedule || id == R.id.undraft) updateScheduledAt(null);
-			else navigateToUnsentPosts();
+			int id=i.getItemId();
+			if(id==R.id.draft) updateScheduledAt(getDraftInstant());
+			else if(id==R.id.schedule) pickScheduledDateTime();
+			else if(id==R.id.unschedule || id==R.id.undraft) updateScheduledAt(null);
+			else if(id==R.id.drafts) navigateToUnsentPosts();
+			else if(id==R.id.preview) publish(true);
 			return true;
 		});
 		UiUtils.enablePopupMenuIcons(getContext(), draftOptionsPopup);
@@ -909,23 +913,37 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 
 		languageButton = wrap.findViewById(R.id.language_btn);
 		languageButton.setOnClickListener(v->showLanguageAlert());
+		languageButton.setOnLongClickListener(v->{
+			if(!getLocalPrefs().bottomEncoding){
+				getLocalPrefs().bottomEncoding=true;
+				getLocalPrefs().save();
+			}
+			return false;
+		});
+		if (!GlobalUserPreferences.relocatePublishButton)
+			publishButton.post(()->publishButton.setMinimumWidth(publishButton.getWidth()));
 
-		if(GlobalUserPreferences.relocatePublishButton){
-			publishButtonRelocated.setOnClickListener(v -> {
-				if(GlobalUserPreferences.altTextReminders && editingStatus==null)
-					checkAltTextsAndPublish();
-				else
-					publish();
-			});
-		} else {
-			publishButton.setOnClickListener(v -> {
-				if(GlobalUserPreferences.altTextReminders && editingStatus==null)
-					checkAltTextsAndPublish();
-				else
-					publish();
-			});
-		}
+		(GlobalUserPreferences.relocatePublishButton ? publishButtonRelocated : publishButton).setOnClickListener(v->{
+			Consumer<Boolean> draftCheckComplete=(isDraft)->{
+				if(GlobalUserPreferences.altTextReminders && !isDraft) checkAltTextsAndPublish();
+				else publish();
+			};
 
+			boolean isAlreadyDraft=scheduledAt!=null && scheduledAt.isAfter(DRAFTS_AFTER_INSTANT);
+			if(editingStatus!=null && scheduledAt!=null && isAlreadyDraft) {
+				new M3AlertDialogBuilder(getActivity())
+						.setTitle(R.string.sk_save_draft)
+						.setMessage(R.string.sk_save_draft_message)
+						.setPositiveButton(R.string.save, (d, w)->draftCheckComplete.accept(isAlreadyDraft))
+						.setNegativeButton(R.string.publish, (d, w)->{
+							updateScheduledAt(null);
+							draftCheckComplete.accept(false);
+						})
+						.show();
+			}else{
+				draftCheckComplete.accept(isAlreadyDraft);
+			}
+		});
 		draftsBtn.setOnClickListener(v-> draftOptionsPopup.show());
 		draftsBtn.setOnTouchListener(draftOptionsPopup.getDragToOpenListener());
 		updateScheduledAt(scheduledAt != null ? scheduledAt : scheduledStatus != null ? scheduledStatus.scheduledAt : null);
@@ -936,8 +954,8 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 				? languageResolver.fromOrFallback(prefs.postingDefaultLanguage)
 				: languageResolver.getDefault());
 
-		if (isInstancePixelfed()) spoilerBtn.setVisibility(View.GONE);
-		if (isInstancePixelfed() || (editingStatus != null && scheduledStatus == null)) {
+		if(isInstancePixelfed()) spoilerBtn.setVisibility(View.GONE);
+		if(isInstancePixelfed() || (editingStatus!=null && !redraftStatus)) {
 			// editing an already published post
 			draftsBtn.setVisibility(View.GONE);
 		}
@@ -1068,7 +1086,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 
 	@Override
 	protected int getNavigationIconDrawableResource(){
-		return R.drawable.ic_baseline_close_24;
+		return R.drawable.ic_fluent_dismiss_24_regular;
 	}
 
 	@Override
@@ -1127,6 +1145,10 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 	}
 
 	private void publish(){
+		publish(false);
+	}
+
+	private void publish(boolean preview){
 		sendingOverlay=new View(getActivity());
 		WindowManager.LayoutParams overlayParams=new WindowManager.LayoutParams();
 		overlayParams.type=WindowManager.LayoutParams.TYPE_APPLICATION_PANEL;
@@ -1137,31 +1159,25 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		overlayParams.token=mainEditText.getWindowToken();
 		wm.addView(sendingOverlay, overlayParams);
 
-		if(GlobalUserPreferences.relocatePublishButton){
-			publishButtonRelocated.setEnabled(false);
-		} else {
-			publishButton.setEnabled(false);
-		}
-
+		(GlobalUserPreferences.relocatePublishButton ? publishButtonRelocated : publishButton).setEnabled(false);
 		V.setVisibilityAnimated(sendProgress, View.VISIBLE);
 
-		mediaViewController.saveAltTextsBeforePublishing(this::actuallyPublish, this::handlePublishError);
+		mediaViewController.saveAltTextsBeforePublishing(
+				()->actuallyPublish(preview),
+				this::handlePublishError);
 	}
 
-	private void actuallyPublish(){
-		actuallyPublish(false);
-	}
-	private void actuallyPublish(boolean force){
+	private void actuallyPublish(boolean preview){
 		String text=mainEditText.getText().toString();
 		CreateStatus.Request req=new CreateStatus.Request();
-		if ("bottom".equals(postLang.encoding)) {
-			text = new StatusTextEncoder(Bottom::encode).encode(text);
-			req.spoilerText = "bottom-encoded emoji spam";
+		if("bottom".equals(postLang.encoding)){
+			text=new StatusTextEncoder(Bottom::encode).encode(text);
+			req.spoilerText="bottom-encoded emoji spam";
 		}
-		if (localOnly &&
+		if(localOnly &&
 				AccountSessionManager.get(accountID).getLocalPreferences().glitchInstance &&
-				!GLITCH_LOCAL_ONLY_PATTERN.matcher(text).matches()) {
-			text += " " + GLITCH_LOCAL_ONLY_SUFFIX;
+				!GLITCH_LOCAL_ONLY_PATTERN.matcher(text).matches()){
+			text+=" "+GLITCH_LOCAL_ONLY_SUFFIX;
 		}
 		req.status=text;
 		req.localOnly=localOnly;
@@ -1169,25 +1185,13 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		req.sensitive=sensitive;
 		req.contentType=contentType==ContentType.UNSPECIFIED ? null : contentType;
 		req.scheduledAt=scheduledAt;
+		req.preview=preview;
 		if(!mediaViewController.isEmpty()){
 			req.mediaIds=mediaViewController.getAttachmentIDs();
 			if(editingStatus != null){
 				req.mediaAttributes=mediaViewController.getAttachmentAttributes();
 			}
 		}
-		// ask whether to publish now when editing an existing draft
-		if (!force && editingStatus != null && scheduledAt != null && scheduledAt.isAfter(DRAFTS_AFTER_INSTANT)) {
-			new M3AlertDialogBuilder(getActivity())
-					.setTitle(R.string.sk_save_draft)
-					.setMessage(R.string.sk_save_draft_message)
-					.setPositiveButton(R.string.save, (d, w) -> actuallyPublish(true))
-					.setNegativeButton(R.string.publish, (d, w) -> {
-						updateScheduledAt(null);
-						actuallyPublish();
-					})
-					.show();
-			return;
-		}
 		if(replyTo!=null || (editingStatus != null && editingStatus.inReplyToId!=null)){
 			req.inReplyToId=editingStatus!=null ? editingStatus.inReplyToId : replyTo.id;
 		}
@@ -1209,7 +1213,12 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		Callback<Status> resCallback=new Callback<>(){
 			@Override
 			public void onSuccess(Status result){
-				maybeDeleteScheduledPost(() -> {
+				if(preview){
+					openPreview(result);
+					return;
+				}
+
+				maybeDeleteScheduledPost(()->{
 					wm.removeView(sendingOverlay);
 					sendingOverlay=null;
 					if(editingStatus==null || redraftStatus){
@@ -1231,10 +1240,10 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 						}
 						E.post(new StatusUpdatedEvent(editedStatus));
 					}
-					if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O || !isStateSaved()) {
+					if(Build.VERSION.SDK_INT < Build.VERSION_CODES.O || !isStateSaved()){
 						Nav.finish(ComposeFragment.this);
 					}
-					if (getArguments().getBoolean("navigateToStatus", false)) {
+					if(getArguments().getBoolean("navigateToStatus", false)){
 						Bundle args=new Bundle();
 						args.putString("account", accountID);
 						args.putParcelable("status", Parcels.wrap(result));
@@ -1250,11 +1259,11 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			}
 		};
 
-		if(editingStatus!=null && !redraftStatus){
+		if(editingStatus!=null && !redraftStatus && !preview){
 			new EditStatus(req, editingStatus.id)
 					.setCallback(resCallback)
 					.exec(accountID);
-		}else if(req.scheduledAt == null){
+		}else if(req.scheduledAt == null || preview){
 			new CreateStatus(req, uuid)
 					.setCallback(resCallback)
 					.exec(accountID);
@@ -1294,13 +1303,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		wm.removeView(sendingOverlay);
 		sendingOverlay=null;
 		V.setVisibilityAnimated(sendProgress, View.GONE);
-
-		if(GlobalUserPreferences.relocatePublishButton) {
-			publishButtonRelocated.setEnabled(true);
-		} else {
-			publishButton.setEnabled(true);
-		}
-
+		(GlobalUserPreferences.relocatePublishButton ? publishButtonRelocated : publishButton).setEnabled(true);
 		if(error instanceof MastodonErrorResponse me){
 			new M3AlertDialogBuilder(getActivity())
 					.setTitle(R.string.post_failed)
@@ -1313,6 +1316,25 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		}
 	}
 
+	private void openPreview(Status result){
+		result.preview=true;
+		wm.removeView(sendingOverlay);
+		sendingOverlay=null;
+		publishButton.setEnabled(true);
+		V.setVisibilityAnimated(sendProgress, View.GONE);
+		InputMethodManager imm=getActivity().getSystemService(InputMethodManager.class);
+		imm.hideSoftInputFromWindow(contentView.getWindowToken(), 0);
+
+		Bundle args=new Bundle();
+		args.putString("account", accountID);
+		args.putParcelable("status", Parcels.wrap(result));
+		if(replyTo!=null){
+			args.putParcelable("inReplyTo", Parcels.wrap(replyTo));
+			args.putParcelable("inReplyToAccount", Parcels.wrap(replyTo.account));
+		}
+		Nav.go(getActivity(), ThreadFragment.class, args);
+	}
+
 	private void updateRecentLanguages() {
 		if (postLang == null || postLang.language == null) return;
 		String language = postLang.language.getLanguage();
@@ -1388,20 +1410,20 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 	}
 
 	private void confirmDiscardDraftAndFinish(){
-		boolean attachmentsPending = mediaViewController.areAnyAttachmentsNotDone();
-		if (attachmentsPending) new M3AlertDialogBuilder(getActivity())
+		boolean attachmentsPending=mediaViewController.areAnyAttachmentsNotDone();
+		if(attachmentsPending) new M3AlertDialogBuilder(getActivity())
 				.setTitle(R.string.sk_unfinished_attachments)
 				.setMessage(R.string.sk_unfinished_attachments_message)
-				.setPositiveButton(R.string.edit, (d, w) -> {})
-				.setNegativeButton(R.string.discard, (d, w) -> Nav.finish(this))
+				.setPositiveButton(R.string.ok, (d, w)->{})
+				.setNegativeButton(R.string.discard, (d, w)->Nav.finish(this))
 				.show();
 		else new M3AlertDialogBuilder(getActivity())
-				.setTitle(editingStatus != null ? R.string.sk_confirm_save_changes : R.string.sk_confirm_save_draft)
-				.setPositiveButton(R.string.save, (d, w) -> {
-					updateScheduledAt(scheduledAt == null ? getDraftInstant() : scheduledAt);
+				.setTitle(editingStatus!=null ? R.string.sk_confirm_save_changes : R.string.sk_confirm_save_draft)
+				.setPositiveButton(R.string.save, (d, w)->{
+					updateScheduledAt(scheduledAt==null ? getDraftInstant() : scheduledAt);
 					publish();
 				})
-				.setNegativeButton(R.string.discard, (d, w) -> Nav.finish(this))
+				.setNegativeButton(R.string.discard, (d, w)->Nav.finish(this))
 				.show();
 	}
 
@@ -1528,7 +1550,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 
 	public void updateSensitive() {
 		sensitiveBtn.setVisibility(View.GONE);
-		if (!mediaViewController.isEmpty() && !hasSpoiler) sensitiveBtn.setVisibility(View.VISIBLE);
+		if (!mediaViewController.isEmpty()) sensitiveBtn.setVisibility(View.VISIBLE);
 		if (mediaViewController.isEmpty()) sensitive = false;
 	}
 
@@ -1539,8 +1561,8 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 				.withMinute(0);
 		new DatePickerDialog(getActivity(), (datePicker, year, arrayMonth, dayOfMonth) -> {
 			new TimePickerDialog(getActivity(), (timePicker, hour, minute) -> {
-				updateScheduledAt(LocalDateTime.of(year, arrayMonth + 1, dayOfMonth, hour, minute)
-						.toInstant(OffsetDateTime.now().getOffset()));
+				LocalDateTime at=LocalDateTime.of(year, arrayMonth + 1, dayOfMonth, hour, minute);
+				updateScheduledAt(at.toInstant(ZoneId.systemDefault().getRules().getOffset(at)));
 			}, soon.getHour(), soon.getMinute(), DateFormat.is24HourFormat(getActivity())).show();
 		}, soon.getYear(), soon.getMonthValue() - 1, soon.getDayOfMonth()).show();
 	}
@@ -1606,8 +1628,8 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 	}
 
 	private void updateHeaders() {
-		UiUtils.setExtraTextInfo(getContext(), selfExtraText, null, false, false, localOnly || statusVisibility==StatusPrivacy.LOCAL, null);
-		if (replyTo != null) UiUtils.setExtraTextInfo(getContext(), extraText, pronouns, true, false, replyTo.localOnly || replyTo.visibility==StatusPrivacy.LOCAL, replyTo.account);
+		UiUtils.setExtraTextInfo(getContext(), selfExtraText, false, false, localOnly, null);
+		if (replyTo != null) UiUtils.setExtraTextInfo(getContext(), extraText, true, false, replyTo.localOnly || replyTo.visibility==StatusPrivacy.LOCAL, replyTo.account);
 	}
 
 	private void buildVisibilityPopup(View v){
@@ -1679,6 +1701,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		}
 
 		contentTypePopup.setOnMenuItemClickListener(i->{
+			uuid=null;
 			int index=i.getItemId();
 			contentType=ContentType.values()[index];
 			btn.setSelected(index!=ContentType.UNSPECIFIED.ordinal() && index!=ContentType.PLAIN.ordinal());

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

@@ -26,12 +26,12 @@ import android.widget.ImageView;
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.MastodonAPIController;
+import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.model.Attachment;
 import org.joinmastodon.android.ui.M3AlertDialogBuilder;
 import org.joinmastodon.android.ui.photoviewer.PhotoViewer;
 import org.joinmastodon.android.ui.utils.ColorPalette;
 import org.joinmastodon.android.ui.utils.UiUtils;
-import org.joinmastodon.android.ui.views.FixedAspectRatioImageView;
 
 import java.util.Collections;
 
@@ -54,16 +54,17 @@ public class ComposeImageDescriptionFragment extends MastodonToolbarFragment imp
 	@Override
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
-		accountID=getArguments().getString("account");
-		attachmentID=getArguments().getString("attachment");
 		setHasOptionsMenu(true);
 	}
 
 	@Override
 	public void onAttach(Activity activity){
 		super.onAttach(activity);
+		accountID=getArguments().getString("account");
+		attachmentID=getArguments().getString("attachment");
 		themeWrapper=new ContextThemeWrapper(activity, R.style.Theme_Mastodon_Dark);
-		ColorPalette.palettes.get(GlobalUserPreferences.color).apply(themeWrapper, GlobalUserPreferences.ThemePreference.DARK);
+		ColorPalette.palettes.get(AccountSessionManager.get(accountID).getLocalPreferences().getCurrentColor())
+				.apply(themeWrapper, GlobalUserPreferences.ThemePreference.DARK);
 		setTitle(R.string.add_alt_text);
 	}
 

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

@@ -67,86 +67,86 @@ import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.utils.V;
 import me.grishka.appkit.views.UsableRecyclerView;
 
-public class EditTimelinesFragment extends MastodonRecyclerFragment<TimelineDefinition> implements ScrollableToTop {
-    private String accountID;
-    private TimelinesAdapter adapter;
-    private final ItemTouchHelper itemTouchHelper;
-    private Menu optionsMenu;
-    private boolean updated;
-    private final Map<MenuItem, TimelineDefinition> timelineByMenuItem = new HashMap<>();
-    private final List<ListTimeline> listTimelines = new ArrayList<>();
-    private final List<Hashtag> hashtags = new ArrayList<>();
-    private MenuItem addHashtagItem;
+public class EditTimelinesFragment extends MastodonRecyclerFragment<TimelineDefinition> implements ScrollableToTop{
+	private String accountID;
+	private TimelinesAdapter adapter;
+	private final ItemTouchHelper itemTouchHelper;
+	private Menu optionsMenu;
+	private boolean updated;
+	private final Map<MenuItem, TimelineDefinition> timelineByMenuItem=new HashMap<>();
+	private final List<ListTimeline> listTimelines=new ArrayList<>();
+	private final List<Hashtag> hashtags=new ArrayList<>();
+	private MenuItem addHashtagItem;
     private final List<CustomLocalTimeline> localTimelines = new ArrayList<>();
 
-    public EditTimelinesFragment() {
-        super(10);
-        ItemTouchHelper.SimpleCallback itemTouchCallback = new ItemTouchHelperCallback() ;
-        itemTouchHelper = new ItemTouchHelper(itemTouchCallback);
-    }
+	public EditTimelinesFragment(){
+		super(10);
+		ItemTouchHelper.SimpleCallback itemTouchCallback=new ItemTouchHelperCallback();
+		itemTouchHelper=new ItemTouchHelper(itemTouchCallback);
+	}
 
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setHasOptionsMenu(true);
-        setTitle(R.string.sk_timelines);
-        accountID = getArguments().getString("account");
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		setHasOptionsMenu(true);
+		setTitle(R.string.sk_timelines);
+		accountID=getArguments().getString("account");
 
-        new GetLists().setCallback(new Callback<>() {
-            @Override
-            public void onSuccess(List<ListTimeline> result) {
-                listTimelines.addAll(result);
-                updateOptionsMenu();
-            }
+		new GetLists().setCallback(new Callback<>(){
+			@Override
+			public void onSuccess(List<ListTimeline> result){
+				listTimelines.addAll(result);
+				updateOptionsMenu();
+			}
 
-            @Override
-            public void onError(ErrorResponse error) {
-                error.showToast(getContext());
-            }
-        }).exec(accountID);
+			@Override
+			public void onError(ErrorResponse error){
+				error.showToast(getContext());
+			}
+		}).exec(accountID);
 
-        new GetFollowedHashtags().setCallback(new Callback<>() {
-            @Override
-            public void onSuccess(HeaderPaginationList<Hashtag> result) {
-                hashtags.addAll(result);
-                updateOptionsMenu();
-            }
+		new GetFollowedHashtags().setCallback(new Callback<>(){
+			@Override
+			public void onSuccess(HeaderPaginationList<Hashtag> result){
+				hashtags.addAll(result);
+				updateOptionsMenu();
+			}
 
-            @Override
-            public void onError(ErrorResponse error) {
-                error.showToast(getContext());
-            }
-        }).exec(accountID);
-    }
+			@Override
+			public void onError(ErrorResponse error){
+				error.showToast(getContext());
+			}
+		}).exec(accountID);
+	}
 
-    @Override
-    protected void onShown(){
-        super.onShown();
-        if(!getArguments().getBoolean("noAutoLoad") && !loaded && !dataLoading) loadData();
-    }
+	@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);
-        itemTouchHelper.attachToRecyclerView(list);
-        refreshLayout.setEnabled(false);
-        list.addItemDecoration(new DividerItemDecoration(getActivity(), R.attr.colorM3OutlineVariant, 0.5f, 56, 16));
-    }
+	@Override
+	public void onViewCreated(View view, Bundle savedInstanceState){
+		super.onViewCreated(view, savedInstanceState);
+		itemTouchHelper.attachToRecyclerView(list);
+		refreshLayout.setEnabled(false);
+		list.addItemDecoration(new DividerItemDecoration(getActivity(), R.attr.colorM3OutlineVariant, 0.5f, 56, 16));
+	}
 
-    @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        this.optionsMenu = menu;
-        updateOptionsMenu();
-    }
+	@Override
+	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater){
+		this.optionsMenu=menu;
+		updateOptionsMenu();
+	}
 
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == R.id.menu_back) {
-            updateOptionsMenu();
-            optionsMenu.performIdentifierAction(R.id.menu_add_timeline, 0);
-            return true;
-        }
-        if (item.getItemId() == R.id.menu_add_local_timelines) {
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item){
+		if(item.getItemId()==R.id.menu_back){
+			updateOptionsMenu();
+			optionsMenu.performIdentifierAction(R.id.menu_add_timeline, 0);
+			return true;
+		}
+		if (item.getItemId() == R.id.menu_add_local_timelines) {
             addNewLocalTimeline();
             return true;
         }
@@ -161,14 +161,14 @@ public class EditTimelinesFragment extends MastodonRecyclerFragment<TimelineDefi
         return true;
     }
 
-    private void addTimeline(TimelineDefinition tl) {
-        data.add(tl.copy());
-        adapter.notifyItemInserted(data.size());
-        saveTimelines();
-        updateOptionsMenu();
-    }
+	private void addTimeline(TimelineDefinition tl){
+		data.add(tl.copy());
+		adapter.notifyItemInserted(data.size());
+		saveTimelines();
+		updateOptionsMenu();
+	}
 
-    private void addNewLocalTimeline() {
+	private void addNewLocalTimeline() {
         FrameLayout inputWrap = new FrameLayout(getContext());
         EditText input = new EditText(getContext());
         input.setHint(R.string.sk_example_domain);
@@ -194,92 +194,92 @@ public class EditTimelinesFragment extends MastodonRecyclerFragment<TimelineDefi
         timelineByMenuItem.put(item, tl);
     }
 
-    private MenuItem addOptionsItem(Menu menu, String name, @DrawableRes int icon) {
-        MenuItem item = menu.add(0, View.generateViewId(), Menu.NONE, name);
-        item.setIcon(icon);
-        return item;
-    }
+	private MenuItem addOptionsItem(Menu menu, String name, @DrawableRes int icon){
+		MenuItem item=menu.add(0, View.generateViewId(), Menu.NONE, name);
+		item.setIcon(icon);
+		return item;
+	}
 
-    private void updateOptionsMenu() {
-        if (getActivity() == null) return;
-        optionsMenu.clear();
-        timelineByMenuItem.clear();
+	private void updateOptionsMenu(){
+		if(getActivity()==null) return;
+		optionsMenu.clear();
+		timelineByMenuItem.clear();
 
-        SubMenu menu = optionsMenu.addSubMenu(0, R.id.menu_add_timeline, NONE, R.string.sk_timelines_add);
-        menu.getItem().setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
-        menu.getItem().setIcon(R.drawable.ic_fluent_add_24_regular);
+		SubMenu menu=optionsMenu.addSubMenu(0, R.id.menu_add_timeline, NONE, R.string.sk_timelines_add);
+		menu.getItem().setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
+		menu.getItem().setIcon(R.drawable.ic_fluent_add_24_regular);
 
-        SubMenu timelinesMenu = menu.addSubMenu(R.string.sk_timeline);
-        timelinesMenu.getItem().setIcon(R.drawable.ic_fluent_timeline_24_regular);
-        SubMenu listsMenu = menu.addSubMenu(R.string.sk_list);
-        listsMenu.getItem().setIcon(R.drawable.ic_fluent_people_24_regular);
-        SubMenu hashtagsMenu = menu.addSubMenu(R.string.sk_hashtag);
-        hashtagsMenu.getItem().setIcon(R.drawable.ic_fluent_number_symbol_24_regular);
+		SubMenu timelinesMenu=menu.addSubMenu(R.string.sk_timeline);
+		timelinesMenu.getItem().setIcon(R.drawable.ic_fluent_timeline_24_regular);
+		SubMenu listsMenu=menu.addSubMenu(R.string.sk_list);
+		listsMenu.getItem().setIcon(R.drawable.ic_fluent_people_24_regular);
+		SubMenu hashtagsMenu=menu.addSubMenu(R.string.sk_hashtag);
+		hashtagsMenu.getItem().setIcon(R.drawable.ic_fluent_number_symbol_24_regular);
 
-        MenuItem addLocalTimelines = menu.add(0, R.id.menu_add_local_timelines, NONE, R.string.local_timeline);
+		MenuItem addLocalTimelines = menu.add(0, R.id.menu_add_local_timelines, NONE, R.string.local_timeline);
         addLocalTimelines.setIcon(R.drawable.ic_fluent_add_24_regular);
 
         makeBackItem(timelinesMenu);
         makeBackItem(listsMenu);
         makeBackItem(hashtagsMenu);
 
-        TimelineDefinition.getAllTimelines(accountID).stream().forEach(tl -> addTimelineToOptions(tl, timelinesMenu));
-        listTimelines.stream().map(TimelineDefinition::ofList).forEach(tl -> addTimelineToOptions(tl, listsMenu));
-        addHashtagItem = addOptionsItem(hashtagsMenu, getContext().getString(R.string.sk_timelines_add), R.drawable.ic_fluent_add_24_regular);
-        hashtags.stream().map(TimelineDefinition::ofHashtag).forEach(tl -> addTimelineToOptions(tl, hashtagsMenu));
+		TimelineDefinition.getAllTimelines(accountID).stream().forEach(tl->addTimelineToOptions(tl, timelinesMenu));
+		listTimelines.stream().map(TimelineDefinition::ofList).forEach(tl->addTimelineToOptions(tl, listsMenu));
+		addHashtagItem=addOptionsItem(hashtagsMenu, getContext().getString(R.string.sk_timelines_add), R.drawable.ic_fluent_add_24_regular);
+		hashtags.stream().map(TimelineDefinition::ofHashtag).forEach(tl->addTimelineToOptions(tl, hashtagsMenu));
 
-        timelinesMenu.getItem().setVisible(timelinesMenu.size() > 0);
-        listsMenu.getItem().setVisible(listsMenu.size() > 0);
-        hashtagsMenu.getItem().setVisible(hashtagsMenu.size() > 0);
+		timelinesMenu.getItem().setVisible(timelinesMenu.size()>0);
+		listsMenu.getItem().setVisible(listsMenu.size()>0);
+		hashtagsMenu.getItem().setVisible(hashtagsMenu.size()>0);
 
-        UiUtils.enableOptionsMenuIcons(getContext(), optionsMenu, R.id.menu_add_timeline);
-    }
+		UiUtils.enableOptionsMenuIcons(getContext(), optionsMenu, R.id.menu_add_timeline);
+	}
 
-    private void saveTimelines() {
-        updated=true;
+	private void saveTimelines(){
+		updated=true;
 		AccountLocalPreferences prefs=AccountSessionManager.get(accountID).getLocalPreferences();
 		if(data.isEmpty()) data.add(TimelineDefinition.HOME_TIMELINE);
 		prefs.timelines=data;
 		prefs.save();
 	}
 
-    private void removeTimeline(int position) {
-        data.remove(position);
-        adapter.notifyItemRemoved(position);
-        saveTimelines();
-        updateOptionsMenu();
-    }
+	private void removeTimeline(int position){
+		data.remove(position);
+		adapter.notifyItemRemoved(position);
+		saveTimelines();
+		updateOptionsMenu();
+	}
 
-    @Override
-    protected void doLoadData(int offset, int count){
-        onDataLoaded(AccountSessionManager.get(accountID).getLocalPreferences().timelines);
-        updateOptionsMenu();
-    }
+	@Override
+	protected void doLoadData(int offset, int count){
+		onDataLoaded(AccountSessionManager.get(accountID).getLocalPreferences().timelines);
+		updateOptionsMenu();
+	}
 
-    @Override
-    protected RecyclerView.Adapter<TimelineViewHolder> getAdapter() {
-        return adapter = new TimelinesAdapter();
-    }
+	@Override
+	protected RecyclerView.Adapter<TimelineViewHolder> getAdapter(){
+		return adapter=new TimelinesAdapter();
+	}
 
-    @Override
-    public void scrollToTop() {
-        smoothScrollRecyclerViewToTop(list);
-    }
+	@Override
+	public void scrollToTop(){
+		smoothScrollRecyclerViewToTop(list);
+	}
 
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        if (updated) UiUtils.restartApp();
-    }
+	@Override
+	public void onDestroy(){
+		super.onDestroy();
+		if(updated) UiUtils.restartApp();
+	}
 
-    private boolean setTagListContent(NachoTextView editText, @Nullable List<String> tags) {
-        if (tags == null || tags.isEmpty()) return false;
+	private boolean setTagListContent(NachoTextView editText, @Nullable List<String> tags){
+		if(tags==null || tags.isEmpty()) return false;
 		editText.setText(tags);
 		editText.chipifyAllUnterminatedTokens();
-        return true;
-    }
+		return true;
+	}
 
-    private NachoTextView prepareChipTextView(NachoTextView nacho) {
+	private NachoTextView prepareChipTextView(NachoTextView nacho){
 		//I’ll Be Back
 		nacho.setChipTerminators(
 				Map.of(
@@ -289,223 +289,228 @@ public class EditTimelinesFragment extends MastodonRecyclerFragment<TimelineDefi
 						';', BEHAVIOR_CHIPIFY_ALL
 				)
 		);
-        nacho.enableEditChipOnTouch(true, true);
-        nacho.setOnFocusChangeListener((v, hasFocus) -> nacho.chipifyAllUnterminatedTokens());
-        return nacho;
-    }
+		nacho.enableEditChipOnTouch(true, true);
+		nacho.setOnFocusChangeListener((v, hasFocus)->nacho.chipifyAllUnterminatedTokens());
+		return nacho;
+	}
 
-    @SuppressLint("ClickableViewAccessibility")
-    protected void makeTimelineEditor(@Nullable TimelineDefinition item, Consumer<TimelineDefinition> onSave, Runnable onRemove) {
-        Context ctx = getContext();
-        View view = getActivity().getLayoutInflater().inflate(R.layout.edit_timeline, list, false);
+	@SuppressLint("ClickableViewAccessibility")
+	protected void makeTimelineEditor(@Nullable TimelineDefinition item, Consumer<TimelineDefinition> onSave, Runnable onRemove){
+		Context ctx=getContext();
+		View view=getActivity().getLayoutInflater().inflate(R.layout.edit_timeline, list, false);
 
-		View divider = view.findViewById(R.id.divider);
-		Button advancedBtn = view.findViewById(R.id.advanced);
-        EditText editText = view.findViewById(R.id.input);
-        if (item != null) editText.setText(item.getCustomTitle());
-        editText.setHint(item != null ? item.getDefaultTitle(ctx) : ctx.getString(R.string.sk_hashtag));
+		View divider=view.findViewById(R.id.divider);
+		Button advancedBtn=view.findViewById(R.id.advanced);
+		EditText editText=view.findViewById(R.id.input);
+		if(item!=null) editText.setText(item.getCustomTitle());
+		editText.setHint(item!=null ? item.getDefaultTitle(ctx) : ctx.getString(R.string.sk_hashtag));
 
-        LinearLayout tagWrap = view.findViewById(R.id.tag_wrap);
-        boolean advancedOptionsAvailable = item == null || item.getType() == TimelineDefinition.TimelineType.HASHTAG;
-        advancedBtn.setVisibility(advancedOptionsAvailable ? View.VISIBLE : View.GONE);
-        advancedBtn.setOnClickListener(l -> {
-            advancedBtn.setSelected(!advancedBtn.isSelected());
+		LinearLayout tagWrap=view.findViewById(R.id.tag_wrap);
+		boolean hashtagOptionsAvailable=item==null || item.getType()==TimelineDefinition.TimelineType.HASHTAG;
+		advancedBtn.setVisibility(hashtagOptionsAvailable ? View.VISIBLE : View.GONE);
+		advancedBtn.setOnClickListener(l->{
+			advancedBtn.setSelected(!advancedBtn.isSelected());
 			advancedBtn.setText(advancedBtn.isSelected() ? R.string.sk_advanced_options_hide : R.string.sk_advanced_options_show);
 			divider.setVisibility(advancedBtn.isSelected() ? View.VISIBLE : View.GONE);
-            tagWrap.setVisibility(advancedBtn.isSelected() ? View.VISIBLE : View.GONE);
+			tagWrap.setVisibility(advancedBtn.isSelected() ? View.VISIBLE : View.GONE);
 			UiUtils.beginLayoutTransition((ViewGroup) view);
-        });
+		});
 
-        Switch localOnlySwitch = view.findViewById(R.id.local_only_switch);
-        view.findViewById(R.id.local_only)
-                .setOnClickListener(l -> localOnlySwitch.setChecked(!localOnlySwitch.isChecked()));
+		Switch localOnlySwitch=view.findViewById(R.id.local_only_switch);
+		view.findViewById(R.id.local_only).setOnClickListener(l->localOnlySwitch.setChecked(!localOnlySwitch.isChecked()));
 
-        EditText tagMain = view.findViewById(R.id.tag_main);
-        NachoTextView tagsAny = prepareChipTextView(view.findViewById(R.id.tags_any));
-        NachoTextView tagsAll = prepareChipTextView(view.findViewById(R.id.tags_all));
-        NachoTextView tagsNone = prepareChipTextView(view.findViewById(R.id.tags_none));
-        if (item != null) {
-            tagMain.setText(item.getHashtagName());
-			boolean hasAdvanced = !TextUtils.isEmpty(item.getCustomTitle()) && !Objects.equals(item.getHashtagName(), item.getCustomTitle());
-			hasAdvanced = setTagListContent(tagsAny, item.getHashtagAny()) || hasAdvanced;
-			hasAdvanced = setTagListContent(tagsAll, item.getHashtagAll()) || hasAdvanced;
-            hasAdvanced = setTagListContent(tagsNone, item.getHashtagNone()) || hasAdvanced;
-            if (item.isHashtagLocalOnly()) {
-                localOnlySwitch.setChecked(true);
-                hasAdvanced = true;
-            }
-            if (hasAdvanced) {
-                advancedBtn.setSelected(true);
-                advancedBtn.setText(R.string.sk_advanced_options_hide);
+		EditText tagMain=view.findViewById(R.id.tag_main);
+		NachoTextView tagsAny=prepareChipTextView(view.findViewById(R.id.tags_any));
+		NachoTextView tagsAll=prepareChipTextView(view.findViewById(R.id.tags_all));
+		NachoTextView tagsNone=prepareChipTextView(view.findViewById(R.id.tags_none));
+
+		if(item!=null && hashtagOptionsAvailable){
+			tagMain.setText(item.getHashtagName());
+			boolean hasAdvanced=!TextUtils.isEmpty(item.getCustomTitle()) && !Objects.equals(item.getHashtagName(), item.getCustomTitle());
+			hasAdvanced=setTagListContent(tagsAny, item.getHashtagAny()) || hasAdvanced;
+			hasAdvanced=setTagListContent(tagsAll, item.getHashtagAll()) || hasAdvanced;
+			hasAdvanced=setTagListContent(tagsNone, item.getHashtagNone()) || hasAdvanced;
+			if(item.isHashtagLocalOnly()){
+				localOnlySwitch.setChecked(true);
+				hasAdvanced=true;
+			}
+			if(hasAdvanced){
+				advancedBtn.setSelected(true);
+				advancedBtn.setText(R.string.sk_advanced_options_hide);
 				tagWrap.setVisibility(View.VISIBLE);
 				divider.setVisibility(View.VISIBLE);
-            }
-        }
+			}
+		}
 
-        ImageButton btn = view.findViewById(R.id.button);
-        PopupMenu popup = new PopupMenu(ctx, btn);
-        TimelineDefinition.Icon currentIcon = item != null ? item.getIcon() : TimelineDefinition.Icon.HASHTAG;
-        btn.setImageResource(currentIcon.iconRes);
-        btn.setTag(currentIcon.ordinal());
-        btn.setContentDescription(ctx.getString(currentIcon.nameRes));
-        btn.setOnTouchListener(popup.getDragToOpenListener());
-        btn.setOnClickListener(l -> popup.show());
+		ImageButton btn=view.findViewById(R.id.button);
+		PopupMenu popup=new PopupMenu(ctx, btn);
+		TimelineDefinition.Icon currentIcon=item!=null ? item.getIcon() : TimelineDefinition.Icon.HASHTAG;
+		btn.setImageResource(currentIcon.iconRes);
+		btn.setTag(currentIcon.ordinal());
+		btn.setContentDescription(ctx.getString(currentIcon.nameRes));
+		btn.setOnTouchListener(popup.getDragToOpenListener());
+		btn.setOnClickListener(l->popup.show());
 
-        Menu menu = popup.getMenu();
-        TimelineDefinition.Icon defaultIcon = item != null ? item.getDefaultIcon() : TimelineDefinition.Icon.HASHTAG;
-        menu.add(0, currentIcon.ordinal(), NONE, currentIcon.nameRes).setIcon(currentIcon.iconRes);
-        if (!currentIcon.equals(defaultIcon)) {
-            menu.add(0, defaultIcon.ordinal(), NONE, defaultIcon.nameRes).setIcon(defaultIcon.iconRes);
-        }
-        for (TimelineDefinition.Icon icon : TimelineDefinition.Icon.values()) {
-            if (icon.hidden || icon.ordinal() == (int) btn.getTag()) continue;
-            menu.add(0, icon.ordinal(), NONE, icon.nameRes).setIcon(icon.iconRes);
-        }
-        UiUtils.enablePopupMenuIcons(ctx, popup);
+		Menu menu=popup.getMenu();
+		TimelineDefinition.Icon defaultIcon=item!=null ? item.getDefaultIcon() : TimelineDefinition.Icon.HASHTAG;
+		menu.add(0, currentIcon.ordinal(), NONE, currentIcon.nameRes).setIcon(currentIcon.iconRes);
+		if(!currentIcon.equals(defaultIcon)){
+			menu.add(0, defaultIcon.ordinal(), NONE, defaultIcon.nameRes).setIcon(defaultIcon.iconRes);
+		}
+		for(TimelineDefinition.Icon icon : TimelineDefinition.Icon.values()){
+			if(icon.hidden || icon.ordinal()==(int) btn.getTag()) continue;
+			menu.add(0, icon.ordinal(), NONE, icon.nameRes).setIcon(icon.iconRes);
+		}
+		UiUtils.enablePopupMenuIcons(ctx, popup);
 
-        popup.setOnMenuItemClickListener(menuItem -> {
-            TimelineDefinition.Icon icon = TimelineDefinition.Icon.values()[menuItem.getItemId()];
-            btn.setImageResource(icon.iconRes);
-            btn.setTag(menuItem.getItemId());
-            btn.setContentDescription(ctx.getString(icon.nameRes));
-            return true;
-        });
+		popup.setOnMenuItemClickListener(menuItem->{
+			TimelineDefinition.Icon icon=TimelineDefinition.Icon.values()[menuItem.getItemId()];
+			btn.setImageResource(icon.iconRes);
+			btn.setTag(menuItem.getItemId());
+			btn.setContentDescription(ctx.getString(icon.nameRes));
+			return true;
+		});
 
-        AlertDialog.Builder builder = new M3AlertDialogBuilder(ctx)
-                .setTitle(item == null ? R.string.sk_add_timeline : R.string.sk_edit_timeline)
-                .setView(view)
-                .setPositiveButton(R.string.save, (d, which) -> {
-                    tagsAny.chipifyAllUnterminatedTokens();
-                    tagsAll.chipifyAllUnterminatedTokens();
-                    tagsNone.chipifyAllUnterminatedTokens();
-                    String name = editText.getText().toString().trim();
-                    String mainHashtag = tagMain.getText().toString().trim();
-                    if (TextUtils.isEmpty(mainHashtag)) {
-                        mainHashtag = name;
-                        name = null;
-                    }
-                    if (TextUtils.isEmpty(mainHashtag) && (item != null && item.getType() == TimelineDefinition.TimelineType.HASHTAG)) {
-                        Toast.makeText(ctx, R.string.sk_add_timeline_tag_error_empty, Toast.LENGTH_SHORT).show();
-                        onSave.accept(null);
-                        return;
-                    }
+		AlertDialog.Builder builder=new M3AlertDialogBuilder(ctx)
+				.setTitle(item==null ? R.string.sk_add_timeline : R.string.sk_edit_timeline)
+				.setView(view)
+				.setPositiveButton(R.string.save, (d, which)->{
+					String name=editText.getText().toString().trim();
 
-                    TimelineDefinition tl = item != null ? item : TimelineDefinition.ofHashtag(name);
-                    TimelineDefinition.Icon icon = TimelineDefinition.Icon.values()[(int) btn.getTag()];
-                    tl.setIcon(icon);
-                    tl.setTitle(name);
-                    tl.setTagOptions(
-                            mainHashtag,
-                            tagsAny.getChipValues(),
-                            tagsAll.getChipValues(),
-                            tagsNone.getChipValues(),
-                            localOnlySwitch.isChecked()
-                    );
-                    onSave.accept(tl);
-                })
-                .setNegativeButton(R.string.cancel, (d, which) -> {});
+					String mainHashtag=tagMain.getText().toString().trim();
+					if(item != null && item.getType()==TimelineDefinition.TimelineType.HASHTAG){
+						tagsAny.chipifyAllUnterminatedTokens();
+						tagsAll.chipifyAllUnterminatedTokens();
+						tagsNone.chipifyAllUnterminatedTokens();
+						if(TextUtils.isEmpty(mainHashtag)){
+							mainHashtag=name;
+							name=null;
+						}
+						if(TextUtils.isEmpty(mainHashtag) && (item!=null && item.getType()==TimelineDefinition.TimelineType.HASHTAG)){
+							Toast.makeText(ctx, R.string.sk_add_timeline_tag_error_empty, Toast.LENGTH_SHORT).show();
+							onSave.accept(null);
+							return;
+						}
+					}
 
-        if (onRemove != null) builder.setNeutralButton(R.string.sk_remove, (d, which) -> onRemove.run());
+					TimelineDefinition tl=item!=null ? item : TimelineDefinition.ofHashtag(name);
+					TimelineDefinition.Icon icon=TimelineDefinition.Icon.values()[(int) btn.getTag()];
+					tl.setIcon(icon);
+					tl.setTitle(name);
+					if(item == null || item.getType()==TimelineDefinition.TimelineType.HASHTAG){
+						tl.setTagOptions(
+								mainHashtag,
+								tagsAny.getChipValues(),
+								tagsAll.getChipValues(),
+								tagsNone.getChipValues(),
+								localOnlySwitch.isChecked()
+						);
+					}
+					onSave.accept(tl);
+				})
+				.setNegativeButton(R.string.cancel, (d, which)->{});
 
-        builder.show();
-        btn.requestFocus();
-    }
+		if(onRemove!=null) builder.setNeutralButton(R.string.sk_remove, (d, which)->onRemove.run());
 
-    private class TimelinesAdapter extends RecyclerView.Adapter<TimelineViewHolder>{
-        @NonNull
-        @Override
-        public TimelineViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType){
-            return new TimelineViewHolder();
-        }
+		builder.show();
+		btn.requestFocus();
+	}
 
-        @Override
-        public void onBindViewHolder(@NonNull TimelineViewHolder holder, int position) {
-            holder.bind(data.get(position));
-        }
+	private class TimelinesAdapter extends RecyclerView.Adapter<TimelineViewHolder>{
+		@NonNull
+		@Override
+		public TimelineViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType){
+			return new TimelineViewHolder();
+		}
 
-        @Override
-        public int getItemCount() {
-            return data.size();
-        }
-    }
+		@Override
+		public void onBindViewHolder(@NonNull TimelineViewHolder holder, int position){
+			holder.bind(data.get(position));
+		}
 
-    private class TimelineViewHolder extends BindableViewHolder<TimelineDefinition> implements UsableRecyclerView.Clickable{
-        private final TextView title;
-        private final ImageView dragger;
+		@Override
+		public int getItemCount(){
+			return data.size();
+		}
+	}
 
-        public TimelineViewHolder(){
-            super(getActivity(), R.layout.item_text, list);
-            title=findViewById(R.id.title);
-            dragger=findViewById(R.id.dragger_thingy);
-        }
+	private class TimelineViewHolder extends BindableViewHolder<TimelineDefinition> implements UsableRecyclerView.Clickable{
+		private final TextView title;
+		private final ImageView dragger;
 
-        @SuppressLint("ClickableViewAccessibility")
-        @Override
-        public void onBind(TimelineDefinition item) {
-            title.setText(item.getTitle(getContext()));
-            title.setCompoundDrawablesRelativeWithIntrinsicBounds(itemView.getContext().getDrawable(item.getIcon().iconRes), null, null, null);
-            dragger.setVisibility(View.VISIBLE);
-            dragger.setOnTouchListener((View v, MotionEvent event) -> {
-                if (event.getAction() == MotionEvent.ACTION_DOWN) {
-                    itemTouchHelper.startDrag(this);
-                    return true;
-                }
-                return false;
-            });
-        }
+		public TimelineViewHolder(){
+			super(getActivity(), R.layout.item_text, list);
+			title=findViewById(R.id.title);
+			dragger=findViewById(R.id.dragger_thingy);
+		}
 
-        private void onSave(TimelineDefinition tl) {
-            saveTimelines();
-            rebind();
-        }
+		@SuppressLint("ClickableViewAccessibility")
+		@Override
+		public void onBind(TimelineDefinition item){
+			title.setText(item.getTitle(getContext()));
+			title.setCompoundDrawablesRelativeWithIntrinsicBounds(itemView.getContext().getDrawable(item.getIcon().iconRes), null, null, null);
+			dragger.setVisibility(View.VISIBLE);
+			dragger.setOnTouchListener((View v, MotionEvent event)->{
+				if(event.getAction()==MotionEvent.ACTION_DOWN){
+					itemTouchHelper.startDrag(this);
+					return true;
+				}
+				return false;
+			});
+		}
 
-        private void onRemove() {
-            removeTimeline(getAbsoluteAdapterPosition());
-        }
+		private void onSave(TimelineDefinition tl){
+			saveTimelines();
+			rebind();
+		}
 
-        @SuppressLint("ClickableViewAccessibility")
-        @Override
-        public void onClick() {
-            makeTimelineEditor(item, this::onSave, this::onRemove);
-        }
-    }
+		private void onRemove(){
+			removeTimeline(getAbsoluteAdapterPosition());
+		}
 
-    private class ItemTouchHelperCallback extends ItemTouchHelper.SimpleCallback {
-        public ItemTouchHelperCallback() {
-            super(ItemTouchHelper.UP | ItemTouchHelper.DOWN, ItemTouchHelper.LEFT | ItemTouchHelper.RIGHT);
-        }
+		@SuppressLint("ClickableViewAccessibility")
+		@Override
+		public void onClick(){
+			makeTimelineEditor(item, this::onSave, this::onRemove);
+		}
+	}
 
-        @Override
-        public boolean onMove(@NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder viewHolder, @NonNull RecyclerView.ViewHolder target) {
-            int fromPosition = viewHolder.getAbsoluteAdapterPosition();
-            int toPosition = target.getAbsoluteAdapterPosition();
-            if (Math.max(fromPosition, toPosition) >= data.size() || Math.min(fromPosition, toPosition) < 0) {
-                return false;
-            } else {
-                Collections.swap(data, fromPosition, toPosition);
-                adapter.notifyItemMoved(fromPosition, toPosition);
-                saveTimelines();
-                return true;
-            }
-        }
+	private class ItemTouchHelperCallback extends ItemTouchHelper.SimpleCallback{
+		public ItemTouchHelperCallback(){
+			super(ItemTouchHelper.UP|ItemTouchHelper.DOWN, ItemTouchHelper.LEFT|ItemTouchHelper.RIGHT);
+		}
 
-        @Override
-        public void onSelectedChanged(@Nullable RecyclerView.ViewHolder viewHolder, int actionState) {
-            if (actionState == ItemTouchHelper.ACTION_STATE_DRAG && viewHolder != null) {
-                viewHolder.itemView.animate().alpha(0.65f);
-            }
-        }
+		@Override
+		public boolean onMove(@NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder viewHolder, @NonNull RecyclerView.ViewHolder target){
+			int fromPosition=viewHolder.getAbsoluteAdapterPosition();
+			int toPosition=target.getAbsoluteAdapterPosition();
+			if(Math.max(fromPosition, toPosition)>=data.size() || Math.min(fromPosition, toPosition)<0){
+				return false;
+			}else{
+				Collections.swap(data, fromPosition, toPosition);
+				adapter.notifyItemMoved(fromPosition, toPosition);
+				saveTimelines();
+				return true;
+			}
+		}
 
-        @Override
-        public void clearView(@NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder viewHolder) {
-            super.clearView(recyclerView, viewHolder);
-            viewHolder.itemView.animate().alpha(1f);
-        }
+		@Override
+		public void onSelectedChanged(@Nullable RecyclerView.ViewHolder viewHolder, int actionState){
+			if(actionState==ItemTouchHelper.ACTION_STATE_DRAG && viewHolder!=null){
+				viewHolder.itemView.animate().alpha(0.65f);
+			}
+		}
 
-        @Override
-        public void onSwiped(@NonNull RecyclerView.ViewHolder viewHolder, int direction) {
-            int position = viewHolder.getAbsoluteAdapterPosition();
-            removeTimeline(position);
-        }
-    }
+		@Override
+		public void clearView(@NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder viewHolder){
+			super.clearView(recyclerView, viewHolder);
+			viewHolder.itemView.animate().alpha(1f);
+		}
+
+		@Override
+		public void onSwiped(@NonNull RecyclerView.ViewHolder viewHolder, int direction){
+			int position=viewHolder.getAbsoluteAdapterPosition();
+			removeTimeline(position);
+		}
+	}
 }

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

@@ -27,7 +27,7 @@ public class FavoritedStatusListFragment extends StatusListFragment{
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(HeaderPaginationList<Status> result){
-						if (getActivity() == null) return;
+						if(getActivity()==null) return;
 						if(result.nextPageUri!=null)
 							nextMaxID=result.nextPageUri.getQueryParameter("max_id");
 						else

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

@@ -45,8 +45,8 @@ public class FeaturedHashtagsListFragment extends BaseStatusListFragment<Hashtag
 	}
 
 	@Override
-	public void onItemClick(String hashtag){
-		UiUtils.openHashtagTimeline(getActivity(), accountID, hashtag, data.stream().filter(h -> Objects.equals(h.name, hashtag)).findAny().map(h -> h.following).orElse(null));
+	public void onItemClick(String id){
+		UiUtils.openHashtagTimeline(getActivity(), accountID, Objects.requireNonNull(findItemOfType(id, HashtagStatusDisplayItem.class)).tag);
 	}
 
 	@Override

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

@@ -20,7 +20,6 @@ import org.joinmastodon.android.api.requests.accounts.GetFollowRequests;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.HeaderPaginationList;
-import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.model.Relationship;
 import org.joinmastodon.android.ui.OutlineProviders;
 import org.joinmastodon.android.ui.text.HtmlParser;
@@ -83,7 +82,7 @@ public class FollowRequestsListFragment extends MastodonRecyclerFragment<FollowR
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(HeaderPaginationList<Account> result){
-						if (getActivity() == null) return;
+						if(getActivity()==null) return;
 						if(result.nextPageUri!=null)
 							nextMaxID=result.nextPageUri.getQueryParameter("max_id");
 						else
@@ -271,7 +270,7 @@ public class FollowRequestsListFragment extends MastodonRecyclerFragment<FollowR
 			followingCount.setVisibility(item.account.followingCount < 0 ? View.GONE : View.VISIBLE);
 			followingLabel.setVisibility(item.account.followingCount < 0 ? View.GONE : View.VISIBLE);
 			relationship=relationships.get(item.account.id);
-			UiUtils.setExtraTextInfo(getContext(), null, findViewById(R.id.pronouns), true, false, false, item.account);
+			UiUtils.setExtraTextInfo(getContext(), null, true, false, false, item.account);
 
 			if(relationship==null || !relationship.followedBy){
 				actionWrap.setVisibility(View.GONE);
@@ -366,9 +365,9 @@ public class FollowRequestsListFragment extends MastodonRecyclerFragment<FollowR
 				coverRequest=new UrlImageLoaderRequest(account.header, 1000, 1000);
 			parsedBio=HtmlParser.parse(account.note, account.emojis, Collections.emptyList(), Collections.emptyList(), accountID);
 			if(account.emojis.isEmpty()){
-				parsedName=account.displayName;
+				parsedName= account.getDisplayName();
 			}else{
-				parsedName=HtmlParser.parseCustomEmoji(account.displayName, account.emojis);
+				parsedName=HtmlParser.parseCustomEmoji(account.getDisplayName(), account.emojis);
 				emojiHelper.setText(new SpannableStringBuilder(parsedName).append(parsedBio));
 			}
 		}

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

@@ -56,7 +56,7 @@ public class FollowedHashtagsFragment extends MastodonRecyclerFragment<Hashtag>
                 .setCallback(new SimpleCallback<>(this){
                     @Override
                     public void onSuccess(HeaderPaginationList<Hashtag> result){
-                        if (getActivity() == null) return;
+                        if(getActivity()==null) return;
                         if(result.nextPageUri!=null)
                             nextMaxID=result.nextPageUri.getQueryParameter("max_id");
                         else
@@ -122,7 +122,7 @@ public class FollowedHashtagsFragment extends MastodonRecyclerFragment<Hashtag>
 
         @Override
         public void onClick() {
-            UiUtils.openHashtagTimeline(getActivity(), accountID, item.name, item.following);
+            UiUtils.openHashtagTimeline(getActivity(), accountID, item.name);
         }
     }
 }

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

@@ -1,35 +1,43 @@
 package org.joinmastodon.android.fragments;
 
 import android.app.Activity;
+import android.content.res.TypedArray;
 import android.net.Uri;
 import android.os.Bundle;
+import android.text.SpannableStringBuilder;
 import android.view.HapticFeedbackConstants;
 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 android.widget.ProgressBar;
+import android.widget.TextView;
 import android.widget.Toast;
 
-import org.joinmastodon.android.E;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
 import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.MastodonErrorResponse;
 import org.joinmastodon.android.api.requests.filters.CreateFilter;
 import org.joinmastodon.android.api.requests.filters.DeleteFilter;
 import org.joinmastodon.android.api.requests.filters.GetFilters;
-import org.joinmastodon.android.api.requests.tags.GetHashtag;
-import org.joinmastodon.android.api.requests.tags.SetHashtagFollowed;
+import org.joinmastodon.android.api.requests.tags.GetTag;
+import org.joinmastodon.android.api.requests.tags.SetTagFollowed;
 import org.joinmastodon.android.api.requests.timelines.GetHashtagTimeline;
-import org.joinmastodon.android.events.HashtagUpdatedEvent;
-import org.joinmastodon.android.fragments.settings.EditFilterFragment;
 import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.FilterAction;
+import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.model.FilterContext;
 import org.joinmastodon.android.model.FilterKeyword;
 import org.joinmastodon.android.model.Hashtag;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.model.TimelineDefinition;
+import org.joinmastodon.android.ui.text.SpacerSpan;
 import org.joinmastodon.android.ui.utils.UiUtils;
-import org.joinmastodon.android.utils.StatusFilterPredicate;
+import org.joinmastodon.android.ui.views.ProgressBarButton;
 import org.parceler.Parcels;
 
 import java.util.ArrayList;
@@ -42,17 +50,28 @@ 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.MergeRecyclerAdapter;
+import me.grishka.appkit.utils.SingleViewRecyclerAdapter;
 import me.grishka.appkit.utils.V;
 
-public class HashtagTimelineFragment extends PinnableStatusListFragment {
-	private String hashtag;
+public class HashtagTimelineFragment extends PinnableStatusListFragment{
+	private Hashtag hashtag;
+	private String hashtagName;
+	private TextView headerTitle, headerSubtitle;
+	private ProgressBarButton followButton;
+	private ProgressBar followProgress;
+	private MenuItem followMenuItem, pinMenuItem, muteMenuItem;
+	private boolean followRequestRunning;
+	private boolean toolbarContentVisible;
+
 	private List<String> any;
 	private List<String> all;
 	private List<String> none;
 	private boolean following;
 	private boolean localOnly;
-	private MenuItem followButton;
-	private MenuItem muteButton;
+	private Menu optionsMenu;
+	private MenuInflater optionsMenuInflater;
+
 	private Optional<Filter> filter = Optional.empty();
 
 	@Override
@@ -60,100 +79,27 @@ public class HashtagTimelineFragment extends PinnableStatusListFragment {
 		return true;
 	}
 
-
 	@Override
 	public void onAttach(Activity activity){
 		super.onAttach(activity);
-		updateTitle(getArguments().getString("hashtag"));
 		following=getArguments().getBoolean("following", false);
 		localOnly=getArguments().getBoolean("localOnly", false);
 		any=getArguments().getStringArrayList("any");
 		all=getArguments().getStringArrayList("all");
 		none=getArguments().getStringArrayList("none");
+		if(getArguments().containsKey("hashtag")){
+			hashtag=Parcels.unwrap(getArguments().getParcelable("hashtag"));
+			hashtagName=hashtag.name;
+		}else{
+			hashtagName=getArguments().getString("hashtagName");
+		}
+		setTitle('#'+hashtagName);
 		setHasOptionsMenu(true);
 	}
 
-	private void updateTitle(String hashtagName) {
-		hashtag = hashtagName;
-		setTitle('#'+hashtag);
-	}
-
-	private void updateFollowingState(boolean newFollowing) {
-		this.following = newFollowing;
-		followButton.setTitle(getString(newFollowing ? R.string.unfollow_user : R.string.follow_user, "#" + hashtag));
-		followButton.setIcon(newFollowing ? R.drawable.ic_fluent_person_delete_24_filled : R.drawable.ic_fluent_person_add_24_regular);
-		E.post(new HashtagUpdatedEvent(hashtag, following));
-	}
-
 	private void updateMuteState(boolean newMute) {
-		muteButton.setTitle(getString(newMute ? R.string.unmute_user : R.string.mute_user, "#" + hashtag));
-		muteButton.setIcon(newMute ? R.drawable.ic_fluent_speaker_2_24_regular : R.drawable.ic_fluent_speaker_off_24_regular);
-	}
-
-	@Override
-	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-		inflater.inflate(R.menu.hashtag_timeline, menu);
-		super.onCreateOptionsMenu(menu, inflater);
-		followButton = menu.findItem(R.id.follow_hashtag);
-		updateFollowingState(following);
-		muteButton = menu.findItem(R.id.mute_hashtag);
-		updateMuteState(filter.isPresent());
-		new GetHashtag(hashtag).setCallback(new Callback<>() {
-			@Override
-			public void onSuccess(Hashtag hashtag) {
-				if (getActivity() == null) return;
-				updateTitle(hashtag.name);
-				updateFollowingState(hashtag.following);
-			}
-
-			@Override
-			public void onError(ErrorResponse error) {
-				error.showToast(getActivity());
-			}
-		}).exec(accountID);
-
-		new GetFilters().setCallback(new Callback<>() {
-			@Override
-			public void onSuccess(List<Filter> filters) {
-				if (getActivity() == null) return;
-				filter=filters.stream().filter(filter->filter.title.equals("#"+hashtag)).findAny();
-				updateMuteState(filter.isPresent());
-			}
-
-			@Override
-			public void onError(ErrorResponse error) {
-				error.showToast(getActivity());
-			}
-		}).exec(accountID);
-	}
-
-
-	@Override
-	public boolean onOptionsItemSelected(MenuItem item) {
-		if (super.onOptionsItemSelected(item)) return true;
-		if (item.getItemId() == R.id.follow_hashtag) {
-			updateFollowingState(!following);
-			getToolbar().performHapticFeedback(HapticFeedbackConstants.CONTEXT_CLICK);
-			new SetHashtagFollowed(hashtag, following).setCallback(new Callback<>() {
-				@Override
-				public void onSuccess(Hashtag i) {
-					if (getActivity() == null) return;
-					if (i.following == following) Toast.makeText(getActivity(), getString(i.following ? R.string.followed_user : R.string.unfollowed_user, "#" + i.name), Toast.LENGTH_SHORT).show();
-					updateFollowingState(i.following);
-				}
-
-				@Override
-				public void onError(ErrorResponse error) {
-					error.showToast(getActivity());
-					updateFollowingState(!following);
-				}
-			}).exec(accountID);
-			return true;
-		} else if (item.getItemId() == R.id.mute_hashtag) {
-			showMuteDialog(filter.isPresent());
-			return true;
-		}
-		return false;
+		muteMenuItem.setTitle(getString(newMute ? R.string.unmute_user : R.string.mute_user, "#" + hashtag));
+		muteMenuItem.setIcon(newMute ? R.drawable.ic_fluent_speaker_2_24_regular : R.drawable.ic_fluent_speaker_off_24_regular);
 	}
 
 	private void showMuteDialog(boolean mute) {
@@ -184,8 +130,8 @@ public class HashtagTimelineFragment extends PinnableStatusListFragment {
 	private void muteHashtag() {
 		FilterKeyword hashtagFilter=new FilterKeyword();
 		hashtagFilter.wholeWord=true;
-		hashtagFilter.keyword="#"+hashtag;
-		new CreateFilter("#"+hashtag, EnumSet.of(FilterContext.HOME), FilterAction.HIDE, 0 , List.of(hashtagFilter)).setCallback(new Callback<>(){
+		hashtagFilter.keyword="#"+hashtagName;
+		new CreateFilter("#"+hashtagName, EnumSet.of(FilterContext.HOME), FilterAction.HIDE, 0 , List.of(hashtagFilter)).setCallback(new Callback<>(){
 			@Override
 			public void onSuccess(Filter result){
 				filter=Optional.of(result);
@@ -203,18 +149,19 @@ public class HashtagTimelineFragment extends PinnableStatusListFragment {
 
 	@Override
 	protected TimelineDefinition makeTimelineDefinition() {
-		return TimelineDefinition.ofHashtag(hashtag);
+		return TimelineDefinition.ofHashtag(hashtagName);
 	}
 
 	@Override
 	protected void doLoadData(int offset, int count){
-		currentRequest=new GetHashtagTimeline(hashtag, offset==0 ? null : getMaxID(), null, count, any, all, none, localOnly, getLocalPrefs().timelineReplyVisibility)
+		currentRequest=new GetHashtagTimeline(hashtagName, getMaxID(), null, count, any, all, none, localOnly, getLocalPrefs().timelineReplyVisibility)
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(List<Status> result){
-						if (getActivity() == null) return;
-						result=result.stream().filter(new StatusFilterPredicate(accountID, getFilterContext())).collect(Collectors.toList());
-						onDataLoaded(result, !result.isEmpty());
+						if(getActivity()==null) return;
+						boolean more=applyMaxID(result);
+						AccountSessionManager.get(accountID).filterStatuses(result, getFilterContext());
+						onDataLoaded(result, more);
 					}
 				})
 				.exec(accountID);
@@ -227,16 +174,46 @@ public class HashtagTimelineFragment extends PinnableStatusListFragment {
 			loadData();
 	}
 
+	@Override
+	public void loadData(){
+		reloadTag();
+		super.loadData();
+	}
+
+	@Override
+	public void onViewCreated(View view, Bundle savedInstanceState){
+		super.onViewCreated(view, savedInstanceState);
+		fab=view.findViewById(R.id.fab);
+		fab.setOnClickListener(this::onFabClick);
+
+		if(getParentFragment() instanceof HomeTabFragment) return;
+
+		list.addOnScrollListener(new RecyclerView.OnScrollListener(){
+			@Override
+			public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy){
+				View topChild=recyclerView.getChildAt(0);
+				int firstChildPos=recyclerView.getChildAdapterPosition(topChild);
+				float newAlpha=firstChildPos>0 ? 1f : Math.min(1f, -topChild.getTop()/(float)headerTitle.getHeight());
+				toolbarTitleView.setAlpha(newAlpha);
+				boolean newToolbarVisibility=newAlpha>0.5f;
+				if(newToolbarVisibility!=toolbarContentVisible){
+					toolbarContentVisible=newToolbarVisibility;
+					createOptionsMenu();
+				}
+			}
+		});
+	}
+
 	@Override
 	public boolean onFabLongClick(View v) {
-		return UiUtils.pickAccountForCompose(getActivity(), accountID, '#'+hashtag+' ');
+		return UiUtils.pickAccountForCompose(getActivity(), accountID, '#'+hashtagName+' ');
 	}
 
 	@Override
 	public void onFabClick(View v){
 		Bundle args=new Bundle();
 		args.putString("account", accountID);
-		args.putString("prefilledText", '#'+hashtag+' ');
+		args.putString("prefilledText", '#'+hashtagName+' ');
 		Nav.go(getActivity(), ComposeFragment.class, args);
 	}
 
@@ -252,6 +229,219 @@ public class HashtagTimelineFragment extends PinnableStatusListFragment {
 
 	@Override
 	public Uri getWebUri(Uri.Builder base) {
-		return base.path((isInstanceAkkoma() ? "/tag/" : "/tags") + hashtag).build();
+		return base.path((isInstanceAkkoma() ? "/tag/" : "/tags/") + hashtag).build();
+	}
+
+	@Override
+	protected RecyclerView.Adapter getAdapter(){
+		View header=getActivity().getLayoutInflater().inflate(R.layout.header_hashtag_timeline, list, false);
+		headerTitle=header.findViewById(R.id.title);
+		headerSubtitle=header.findViewById(R.id.subtitle);
+		followButton=header.findViewById(R.id.profile_action_btn);
+		followProgress=header.findViewById(R.id.action_progress);
+
+		headerTitle.setText("#"+hashtagName);
+		followButton.setVisibility(View.GONE);
+		followButton.setOnClickListener(v->{
+			if(hashtag==null)
+				return;
+			setFollowed(!hashtag.following);
+		});
+		followButton.setOnLongClickListener(v->{
+			if(hashtag==null) return false;
+			UiUtils.pickAccount(getActivity(), accountID, R.string.sk_follow_as, R.drawable.ic_fluent_person_add_28_regular, session -> {
+				new SetTagFollowed(hashtagName, true).setCallback(new Callback<>(){
+					@Override
+					public void onSuccess(Hashtag hashtag) {
+						Toast.makeText(
+								getActivity(),
+								getString(R.string.sk_followed_as, session.self.getShortUsername()),
+								Toast.LENGTH_SHORT
+						).show();
+					}
+
+					@Override
+					public void onError(ErrorResponse error) {
+						error.showToast(getActivity());
+					}
+				}).exec(session.getID());
+			}, null);
+			return true;
+		});
+		updateHeader();
+
+		MergeRecyclerAdapter mergeAdapter=new MergeRecyclerAdapter();
+		if(!(getParentFragment() instanceof HomeTabFragment)){
+			mergeAdapter.addAdapter(new SingleViewRecyclerAdapter(header));
+		}
+		mergeAdapter.addAdapter(super.getAdapter());
+		return mergeAdapter;
+	}
+
+	@Override
+	protected int getMainAdapterOffset(){
+		return 1;
+	}
+
+	private void createOptionsMenu(){
+		optionsMenu.clear();
+		optionsMenuInflater.inflate(R.menu.hashtag_timeline, optionsMenu);
+		followMenuItem=optionsMenu.findItem(R.id.follow_hashtag);
+		pinMenuItem=optionsMenu.findItem(R.id.pin);
+		followMenuItem.setVisible(toolbarContentVisible);
+//		pinMenuItem.setShowAsAction(toolbarContentVisible ? MenuItem.SHOW_AS_ACTION_NEVER : MenuItem.SHOW_AS_ACTION_ALWAYS);
+		super.updatePinButton(pinMenuItem);
+
+		muteMenuItem = optionsMenu.findItem(R.id.mute_hashtag);
+		updateMuteState(filter.isPresent());
+		new GetFilters().setCallback(new Callback<>() {
+			@Override
+			public void onSuccess(List<Filter> filters) {
+				if (getActivity() == null) return;
+				filter=filters.stream().filter(filter->filter.title.equals("#"+hashtagName)).findAny();
+				updateMuteState(filter.isPresent());
+			}
+
+			@Override
+			public void onError(ErrorResponse error) {
+				error.showToast(getActivity());
+			}
+		}).exec(accountID);
+	}
+
+	@Override
+	public void updatePinButton(MenuItem pin){
+		super.updatePinButton(pin);
+		if(toolbarContentVisible) UiUtils.insetPopupMenuIcon(getContext(), pin);
+	}
+
+	@Override
+	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater){
+		inflater.inflate(R.menu.hashtag_timeline, menu);
+		super.onCreateOptionsMenu(menu, inflater);
+		optionsMenu=menu;
+		optionsMenuInflater=inflater;
+		createOptionsMenu();
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item){
+		if (super.onOptionsItemSelected(item)) return true;
+		if (item.getItemId() == R.id.follow_hashtag && hashtag!=null) {
+			setFollowed(!hashtag.following);
+		} else if (item.getItemId() == R.id.mute_hashtag) {
+			showMuteDialog(filter.isPresent());
+			return true;
+		}
+		return true;
+	}
+
+	@Override
+	protected void onUpdateToolbar(){
+		super.onUpdateToolbar();
+		toolbarTitleView.setAlpha(toolbarContentVisible ? 1f : 0f);
+		createOptionsMenu();
+	}
+
+	private void updateHeader(){
+		if(hashtag==null || getActivity()==null)
+			return;
+
+		if(hashtag.history!=null && !hashtag.history.isEmpty()){
+			int weekPosts=hashtag.history.stream().mapToInt(h->h.uses).sum();
+			int todayPosts=hashtag.history.get(0).uses;
+			int numAccounts=hashtag.history.stream().mapToInt(h->h.accounts).sum();
+			int hSpace=V.dp(8);
+			SpannableStringBuilder ssb=new SpannableStringBuilder();
+			ssb.append(getResources().getQuantityString(R.plurals.x_posts, weekPosts, weekPosts));
+			ssb.append(" ", new SpacerSpan(hSpace, 0), 0);
+			ssb.append('·');
+			ssb.append(" ", new SpacerSpan(hSpace, 0), 0);
+			ssb.append(getResources().getQuantityString(R.plurals.x_participants, numAccounts, numAccounts));
+			ssb.append(" ", new SpacerSpan(hSpace, 0), 0);
+			ssb.append('·');
+			ssb.append(" ", new SpacerSpan(hSpace, 0), 0);
+			ssb.append(getResources().getQuantityString(R.plurals.x_posts_today, todayPosts, todayPosts));
+			headerSubtitle.setText(ssb);
+		}
+
+		int styleRes;
+		followButton.setVisibility(View.VISIBLE);
+		if(hashtag.following){
+			followButton.setText(R.string.button_following);
+			styleRes=R.style.Widget_Mastodon_M3_Button_Tonal;
+		}else{
+			followButton.setText(R.string.button_follow);
+			styleRes=R.style.Widget_Mastodon_M3_Button_Filled;
+		}
+		TypedArray ta=followButton.getContext().obtainStyledAttributes(styleRes, new int[]{android.R.attr.background});
+		followButton.setBackground(ta.getDrawable(0));
+		ta.recycle();
+		ta=followButton.getContext().obtainStyledAttributes(styleRes, new int[]{android.R.attr.textColor});
+		followButton.setTextColor(ta.getColorStateList(0));
+		followProgress.setIndeterminateTintList(ta.getColorStateList(0));
+		ta.recycle();
+
+		followButton.setTextVisible(true);
+		followProgress.setVisibility(View.GONE);
+		if(followMenuItem!=null){
+			followMenuItem.setTitle(getString(hashtag.following ? R.string.unfollow_user : R.string.follow_user, "#"+hashtagName));
+			followMenuItem.setIcon(hashtag.following ? R.drawable.ic_fluent_person_delete_24_filled : R.drawable.ic_fluent_person_add_24_regular);
+		}
+		if(muteMenuItem!=null){
+			muteMenuItem.setTitle(getString(filter.isPresent() ? R.string.unmute_user : R.string.mute_user, "#" + hashtag));
+			muteMenuItem.setIcon(filter.isPresent() ? R.drawable.ic_fluent_speaker_2_24_regular : R.drawable.ic_fluent_speaker_off_24_regular);
+		}
+	}
+
+	private void reloadTag(){
+		new GetTag(hashtagName)
+				.setCallback(new Callback<>(){
+					@Override
+					public void onSuccess(Hashtag result){
+						hashtag=result;
+						updateHeader();
+					}
+
+					@Override
+					public void onError(ErrorResponse error){
+
+					}
+				})
+				.exec(accountID);
+	}
+
+	private void setFollowed(boolean followed){
+		if(followRequestRunning)
+			return;
+		getToolbar().performHapticFeedback(HapticFeedbackConstants.CONTEXT_CLICK);
+		followButton.setTextVisible(false);
+		followProgress.setVisibility(View.VISIBLE);
+		followRequestRunning=true;
+		new SetTagFollowed(hashtagName, followed)
+				.setCallback(new Callback<>(){
+					@Override
+					public void onSuccess(Hashtag result){
+						if(getActivity()==null)
+							return;
+						hashtag=result;
+						updateHeader();
+						followRequestRunning=false;
+					}
+
+					@Override
+					public void onError(ErrorResponse error){
+						if(getActivity()==null)
+							return;
+						if(error instanceof MastodonErrorResponse er && "Duplicate record".equals(er.error)){
+							hashtag.following=true;
+						}else{
+							error.showToast(getActivity());
+						}
+						updateHeader();
+						followRequestRunning=false;
+					}
+				})
+				.exec(accountID);
 	}
 }

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

@@ -35,7 +35,6 @@ import org.joinmastodon.android.events.StatusDisplaySettingsChangedEvent;
 import org.joinmastodon.android.fragments.discover.DiscoverFragment;
 import org.joinmastodon.android.fragments.onboarding.OnboardingFollowSuggestionsFragment;
 import org.joinmastodon.android.model.Account;
-import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.model.Notification;
 import org.joinmastodon.android.model.PaginatedResponse;
 import org.joinmastodon.android.ui.AccountSwitcherSheet;
@@ -75,7 +74,6 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 	private TextView notificationsBadge;
 
 	private String accountID;
-	private boolean isAkkoma;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState){
@@ -83,8 +81,6 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 		accountID=getArguments().getString("account");
 		setTitle(R.string.mo_app_name);
 
-		isAkkoma = getInstance().map(Instance::isAkkoma).orElse(false);
-
 		if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.N)
 			setRetainInstance(true);
 
@@ -94,7 +90,6 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 			homeTabFragment=new HomeTabFragment();
 			homeTabFragment.setArguments(args);
 			args=new Bundle(args);
-			args.putBoolean("disableDiscover", isAkkoma);
 			args.putBoolean("noAutoLoad", true);
 			discoverFragment=new DiscoverFragment();
 			discoverFragment.setArguments(args);
@@ -304,7 +299,7 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 		if(tab==R.id.tab_profile){
 			ArrayList<String> options=new ArrayList<>();
 			for(AccountSession session:AccountSessionManager.getInstance().getLoggedInAccounts()){
-				options.add(session.self.displayName+"\n("+session.self.username+"@"+session.domain+")");
+				options.add(session.self.getDisplayName()+"\n("+session.self.username+"@"+session.domain+")");
 			}
 			new AccountSwitcherSheet(getActivity(), this).show();
 			return true;

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

@@ -237,21 +237,25 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab
 
 		ViewTreeObserver vto = getToolbar().getViewTreeObserver();
 		if (vto.isAlive()) {
-			vto.addOnGlobalLayoutListener(() -> {
-				Toolbar t = getToolbar();
-				if (t == null) return;
-				int toolbarWidth = t.getWidth();
-				if (toolbarWidth == 0) return;
+			vto.addOnGlobalLayoutListener(()->{
+				Toolbar t=getToolbar();
+				if(t==null) return;
+				int toolbarWidth=t.getWidth();
+				if(toolbarWidth==0) return;
 
-				int toolbarFrameWidth = toolbarFrame.getWidth();
-				int padding = toolbarWidth - toolbarFrameWidth;
-				FrameLayout parent = ((FrameLayout) toolbarShowNewPostsBtn.getParent());
-				if (padding == parent.getPaddingStart()) return;
+				int toolbarFrameWidth=toolbarFrame.getWidth();
+				int actionsWidth=toolbarWidth-toolbarFrameWidth;
+				// margin (4) + padding (12) + icon (24) + margin (8) + chevron (16) + padding (12)
+				int switcherWidth=V.dp(76);
+				FrameLayout parent=((FrameLayout) toolbarShowNewPostsBtn.getParent());
+				if(actionsWidth==parent.getPaddingStart()) return;
+				int paddingMax=Math.max(actionsWidth, switcherWidth);
+				int paddingEnd=(Math.max(0, switcherWidth-actionsWidth));
 
 				// toolbar frame goes from screen edge to beginning of right-aligned option buttons.
 				// centering button by applying the same space on the left
-				parent.setPaddingRelative(padding, 0, 0, 0);
-				toolbarShowNewPostsBtn.setMaxWidth(toolbarWidth - padding * 2);
+				parent.setPaddingRelative(paddingMax, 0, paddingEnd, 0);
+				toolbarShowNewPostsBtn.setMaxWidth(toolbarWidth-paddingMax*2);
 
 				switcher.setPivotX(V.dp(28)); // padding + half of icon
 				switcher.setPivotY(switcher.getHeight() / 2f);
@@ -291,7 +295,7 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab
 		new GetAnnouncements(false).setCallback(new Callback<>() {
 			@Override
 			public void onSuccess(List<Announcement> result) {
-				if (getActivity() == null) return;
+				if(getActivity()==null) return;
 				if (result.stream().anyMatch(a -> !a.read)) {
 					announcementsBadged = true;
 					announcements.setVisible(false);
@@ -385,7 +389,7 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab
 	}
 
 	private void updateOverflowMenu() {
-		if (getActivity() == null) return;
+		if(getActivity()==null) return;
 		Menu m = overflowPopup.getMenu();
 		m.clear();
 		overflowPopup.inflate(R.menu.home_overflow);
@@ -404,9 +408,8 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab
 		addListsToOverflowMenu();
 		addHashtagsToOverflowMenu();
 
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && !UiUtils.isEMUI()) {
+		if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.P && !UiUtils.isEMUI())
 			m.setGroupDividerEnabled(true);
-		}
 	}
 
 	@Override
@@ -528,9 +531,7 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab
 			if (list.repliesPolicy != null) args.putInt("repliesPolicy", list.repliesPolicy.ordinal());
 			Nav.go(getActivity(), ListTimelineFragment.class, args);
 		} else if ((hashtag = hashtagsItems.get(id)) != null) {
-			args.putString("hashtag", hashtag.name);
-			args.putBoolean("following", hashtag.following);
-			Nav.go(getActivity(), HashtagTimelineFragment.class, args);
+			UiUtils.openHashtagTimeline(getContext(), accountID, hashtag);
 		}
 		return true;
 	}

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

@@ -11,7 +11,6 @@ import androidx.recyclerview.widget.RecyclerView;
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.api.requests.markers.SaveMarkers;
 import org.joinmastodon.android.api.requests.timelines.GetHomeTimeline;
-import org.joinmastodon.android.api.session.AccountLocalPreferences;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.model.CacheablePaginatedResponse;
 import org.joinmastodon.android.model.FilterContext;
@@ -20,6 +19,7 @@ import org.joinmastodon.android.model.TimelineMarkers;
 import org.joinmastodon.android.ui.displayitems.GapStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
@@ -49,16 +49,6 @@ public class HomeTimelineFragment extends StatusListFragment {
 		loadData();
 	}
 
-	private boolean typeFilterPredicate(Status s) {
-		AccountLocalPreferences lp=getLocalPrefs();
-		return (lp.showReplies || s.inReplyToId == null) &&
-				(lp.showBoosts || s.reblog == null);
-	}
-
-	private List<Status> filterPosts(List<Status> items) {
-		return items.stream().filter(this::typeFilterPredicate).collect(Collectors.toList());
-	}
-
 	@Override
 	protected void doLoadData(int offset, int count){
 		AccountSessionManager.getInstance()
@@ -66,11 +56,12 @@ public class HomeTimelineFragment extends StatusListFragment {
 				.getHomeTimeline(offset>0 ? maxID : null, count, refreshing, new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(CacheablePaginatedResponse<List<Status>> result){
-						if (getActivity() == null) return;
-						List<Status> filteredItems = filterPosts(result.items);
+						if(getActivity()==null) return;
+						boolean empty=result.items.isEmpty();
 						maxID=result.maxID;
-						onDataLoaded(filteredItems, !result.items.isEmpty());
-						if(result.isFromCache())
+						AccountSessionManager.get(accountID).filterStatuses(result.items, getFilterContext());
+						onDataLoaded(result.items, !empty);
+						if(result.isFromCache() && GlobalUserPreferences.loadNewPosts)
 							loadNewPosts();
 					}
 				});
@@ -83,7 +74,7 @@ public class HomeTimelineFragment extends StatusListFragment {
 		list.addOnScrollListener(new RecyclerView.OnScrollListener(){
 			@Override
 			public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy){
-				if(parent != null && parent.isNewPostsBtnShown() && list.getChildAdapterPosition(list.getChildAt(0))<=getMainAdapterOffset()){
+				if(parent!=null && parent.isNewPostsBtnShown() && list.getChildAdapterPosition(list.getChildAt(0))<=getMainAdapterOffset()){
 					parent.hideNewPostsButton();
 				}
 			}
@@ -96,7 +87,7 @@ public class HomeTimelineFragment extends StatusListFragment {
 		if(!getArguments().getBoolean("noAutoLoad")){
 			if(!loaded && !dataLoading){
 				loadData();
-			}else if(!dataLoading){
+			}else if(!dataLoading && GlobalUserPreferences.loadNewPosts){
 				loadNewPosts();
 			}
 		}
@@ -126,38 +117,46 @@ public class HomeTimelineFragment extends StatusListFragment {
 	}
 
 	public void onStatusCreated(Status status){
+		if(status.reblog!=null) return;
 		prependItems(Collections.singletonList(status), true);
 	}
 
 	private void loadNewPosts(){
-		if (!GlobalUserPreferences.loadNewPosts) return;
 		dataLoading=true;
+		// we only care about the data that was actually retrieved from the timeline api since
+		// user-created statuses are probably in the wrong position
+		List<Status> dataFromTimeline=data.stream().filter(s->!s.fromStatusCreated).collect(Collectors.toList());
 		// The idea here is that we request the timeline such that if there are fewer than `limit` posts,
 		// we'll get the currently topmost post as last in the response. This way we know there's no gap
 		// between the existing and newly loaded parts of the timeline.
-		String sinceID=data.size()>1 ? data.get(1).id : "1";
+		String sinceID=dataFromTimeline.size()>1 ? dataFromTimeline.get(1).id : "1";
 		currentRequest=new GetHomeTimeline(null, null, 20, sinceID, getLocalPrefs().timelineReplyVisibility)
 				.setCallback(new Callback<>(){
 					@Override
 					public void onSuccess(List<Status> result){
 						currentRequest=null;
 						dataLoading=false;
-						result = filterPosts(result);
+						refreshDone();
 						if(result.isEmpty() || getActivity()==null)
 							return;
 						Status last=result.get(result.size()-1);
 						List<Status> toAdd;
-						if(!data.isEmpty() && last.id.equals(data.get(0).id)){ // This part intersects with the existing one
-							toAdd=result.subList(0, result.size()-1); // Remove the already known last post
+						if(!dataFromTimeline.isEmpty() && last.id.equals(dataFromTimeline.get(0).id)){ // This part intersects with the existing one
+							toAdd=new ArrayList<>(result.subList(0, result.size()-1)); // Remove the already known last post
 						}else{
-							result.get(result.size()-1).hasGapAfter=true;
+							last.hasGapAfter=last.id;
 							toAdd=result;
 						}
+						if(!toAdd.isEmpty())
+							AccountSessionManager.getInstance().getAccount(accountID).getCacheController().putHomeTimeline(new ArrayList<>(toAdd), false);
+						// removing statuses that come up as duplicates (hopefully only posts and boosts that were locally created
+						// and thus were already prepended to the timeline earlier)
+						List<String> existingIds=data.stream().map(Status::getID).collect(Collectors.toList());
+						toAdd.removeIf(s->existingIds.contains(s.getID()));
 						AccountSessionManager.get(accountID).filterStatuses(toAdd, getFilterContext());
 						if(!toAdd.isEmpty()){
 							prependItems(toAdd, true);
-							if (parent != null && GlobalUserPreferences.showNewPostsButton) parent.showNewPostsButton();
-							AccountSessionManager.getInstance().getAccount(accountID).getCacheController().putHomeTimeline(toAdd, false);
+							if(parent != null && GlobalUserPreferences.showNewPostsButton) parent.showNewPostsButton();
 						}
 					}
 
@@ -165,6 +164,7 @@ public class HomeTimelineFragment extends StatusListFragment {
 					public void onError(ErrorResponse error){
 						currentRequest=null;
 						dataLoading=false;
+						refreshDone();
 					}
 				})
 				.exec(accountID);
@@ -182,10 +182,10 @@ public class HomeTimelineFragment extends StatusListFragment {
 		gap.loading=true;
 		dataLoading=true;
 
-		String maxID = null;
-		String minID = null;
+		String maxID=null;
+		String minID=null;
 		if (downwards) {
-			maxID = item.getItemID();
+			maxID=item.getItem().getMaxID();
 		} else {
 			int gapPos=displayItems.indexOf(gap);
 			StatusDisplayItem nextItem=displayItems.get(gapPos + 1);
@@ -202,15 +202,17 @@ public class HomeTimelineFragment extends StatusListFragment {
 						int gapPos=displayItems.indexOf(gap);
 						if(gapPos==-1)
 							return;
+						AccountSessionManager.get(accountID).filterStatuses(result, getFilterContext());
 						if(result.isEmpty()){
 							displayItems.remove(gapPos);
 							adapter.notifyItemRemoved(getMainAdapterOffset()+gapPos);
 							Status gapStatus=getStatusByID(gap.parentID);
 							if(gapStatus!=null){
-								gapStatus.hasGapAfter=false;
+								gapStatus.hasGapAfter=null;
 								AccountSessionManager.getInstance().getAccount(accountID).getCacheController().putHomeTimeline(Collections.singletonList(gapStatus), false);
 							}
 						}else{
+							// TODO: refactor this code. it's too long. incomprehensible, even
 							if(downwards) {
 								Set<String> idsBelowGap=new HashSet<>();
 								boolean belowGap=false;
@@ -220,7 +222,7 @@ public class HomeTimelineFragment extends StatusListFragment {
 										idsBelowGap.add(s.id);
 									}else if(s.id.equals(gap.parentID)){
 										belowGap=true;
-										s.hasGapAfter=false;
+										s.hasGapAfter=null;
 										AccountSessionManager.getInstance().getAccount(accountID).getCacheController().putHomeTimeline(Collections.singletonList(s), false);
 									}else{
 										gapPostIndex++;
@@ -233,7 +235,8 @@ public class HomeTimelineFragment extends StatusListFragment {
 										break;
 								}
 								if(endIndex==result.size()){
-									result.get(result.size()-1).hasGapAfter=true;
+									Status last=result.get(result.size()-1);
+									last.hasGapAfter=last.id;
 								}else{
 									result=result.subList(0, endIndex);
 								}
@@ -278,7 +281,7 @@ public class HomeTimelineFragment extends StatusListFragment {
 											.filter(s->Objects.equals(s.id, gap.parentID))
 											.findFirst();
 									if (gapStatus.isPresent()) {
-										gapStatus.get().hasGapAfter=false;
+										gapStatus.get().hasGapAfter=null;
 										AccountSessionManager.getInstance().getAccount(accountID).getCacheController().putHomeTimeline(Collections.singletonList(gapStatus.get()), false);
 									}
 									targetList.clear();
@@ -329,7 +332,7 @@ public class HomeTimelineFragment extends StatusListFragment {
 			currentRequest=null;
 			dataLoading=false;
 		}
-		if (parent != null) parent.hideNewPostsButton();
+		if(parent!=null) parent.hideNewPostsButton();
 		super.onRefresh();
 	}
 

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

@@ -16,6 +16,7 @@ import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.lists.GetList;
 import org.joinmastodon.android.api.requests.lists.UpdateList;
 import org.joinmastodon.android.api.requests.timelines.GetListTimeline;
+import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.events.ListDeletedEvent;
 import org.joinmastodon.android.events.ListUpdatedCreatedEvent;
 import org.joinmastodon.android.model.FilterContext;
@@ -25,10 +26,8 @@ import org.joinmastodon.android.model.TimelineDefinition;
 import org.joinmastodon.android.ui.M3AlertDialogBuilder;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.ui.views.ListEditor;
-import org.joinmastodon.android.utils.StatusFilterPredicate;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.Callback;
@@ -63,7 +62,7 @@ public class ListTimelineFragment extends PinnableStatusListFragment {
         new GetList(listID).setCallback(new Callback<>() {
             @Override
             public void onSuccess(ListTimeline listTimeline) {
-                if (getActivity() == null) return;
+                if(getActivity()==null) return;
                 // TODO: save updated info
                 if (!listTimeline.title.equals(listTitle)) setTitle(listTimeline.title);
                 if (listTimeline.repliesPolicy != null && !listTimeline.repliesPolicy.equals(repliesPolicy)) {
@@ -101,7 +100,7 @@ public class ListTimelineFragment extends PinnableStatusListFragment {
                         new UpdateList(listID, newTitle, editor.isExclusive(), editor.getRepliesPolicy()).setCallback(new Callback<>() {
                             @Override
                             public void onSuccess(ListTimeline list) {
-                                if (getActivity() == null) return;
+                                if(getActivity()==null) return;
                                 setTitle(list.title);
                                 listTitle = list.title;
                                 repliesPolicy = list.repliesPolicy;
@@ -134,13 +133,14 @@ public class ListTimelineFragment extends PinnableStatusListFragment {
 
     @Override
     protected void doLoadData(int offset, int count) {
-        currentRequest=new GetListTimeline(listID, offset==0 ? null : getMaxID(), null, count, null, getLocalPrefs().timelineReplyVisibility)
+        currentRequest=new GetListTimeline(listID, getMaxID(), null, count, null, getLocalPrefs().timelineReplyVisibility)
                 .setCallback(new SimpleCallback<>(this) {
                     @Override
                     public void onSuccess(List<Status> result) {
-                        if (getActivity() == null) return;
-                        result=result.stream().filter(new StatusFilterPredicate(accountID, getFilterContext())).collect(Collectors.toList());
-                        onDataLoaded(result, !result.isEmpty());
+						if(getActivity()==null) return;
+						boolean more=applyMaxID(result);
+						AccountSessionManager.get(accountID).filterStatuses(result, getFilterContext());
+						onDataLoaded(result, more);
                     }
                 })
                .exec(accountID);

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

@@ -140,7 +140,7 @@ public class ListsFragment extends MastodonRecyclerFragment<ListTimeline> implem
 				.setCallback(new SimpleCallback<>(this) {
 					@Override
 					public void onSuccess(List<ListTimeline> lists) {
-						if (getActivity() == null) return;
+						if(getActivity()==null) return;
 						for (ListTimeline l : lists) userInListBefore.put(l.id, true);
 						userInList.putAll(userInListBefore);
 						if (profileAccountId == null || !lists.isEmpty()) onDataLoaded(lists, false);
@@ -149,7 +149,7 @@ public class ListsFragment extends MastodonRecyclerFragment<ListTimeline> implem
 						currentRequest=new GetLists().setCallback(new SimpleCallback<>(ListsFragment.this) {
 							@Override
 							public void onSuccess(List<ListTimeline> allLists) {
-								if (getActivity() == null) return;
+								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);

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

@@ -40,11 +40,13 @@ public abstract class MastodonRecyclerFragment<T> extends BaseRecyclerFragment<T
 	@CallSuper
 	public void onViewCreated(View view, Bundle savedInstanceState){
 		super.onViewCreated(view, savedInstanceState);
-		if(wantsElevationOnScrollEffect())
+		if (getParentFragment() instanceof HasElevationOnScrollListener elevator)
+			list.addOnScrollListener(elevator.getElevationOnScrollListener());
+		else if(wantsElevationOnScrollEffect())
 			list.addOnScrollListener(elevationOnScrollListener=new ElevationOnScrollListener((FragmentRootLinearLayout) view, getViewsForElevationEffect()));
-		if(refreshLayout!=null){
+		if(refreshLayout!=null)
 			setRefreshLayoutColors(refreshLayout);
-		}
+
 	}
 
 	@Override

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

@@ -3,6 +3,7 @@ package org.joinmastodon.android.fragments;
 import android.app.Activity;
 import android.app.Fragment;
 import android.app.assist.AssistContent;
+import android.content.Context;
 import android.content.res.Configuration;
 import android.os.Build;
 import android.os.Bundle;
@@ -15,10 +16,6 @@ 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;
@@ -31,6 +28,8 @@ import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.events.FollowRequestHandledEvent;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.HeaderPaginationList;
+import org.joinmastodon.android.model.PushSubscription;
+import org.joinmastodon.android.ui.M3AlertDialogBuilder;
 import org.joinmastodon.android.ui.SimpleViewHolder;
 import org.joinmastodon.android.ui.tabs.TabLayout;
 import org.joinmastodon.android.ui.tabs.TabLayoutMediator;
@@ -39,6 +38,11 @@ import org.joinmastodon.android.utils.ElevationOnScrollListener;
 import org.joinmastodon.android.utils.ObjectIdComparator;
 import org.joinmastodon.android.utils.ProvidesAssistContent;
 
+import java.util.Arrays;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.viewpager2.widget.ViewPager2;
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
@@ -46,7 +50,7 @@ import me.grishka.appkit.fragments.BaseRecyclerFragment;
 import me.grishka.appkit.utils.V;
 import me.grishka.appkit.views.FragmentRootLinearLayout;
 
-public class NotificationsFragment extends MastodonToolbarFragment implements ScrollableToTop, ProvidesAssistContent, HasElevationOnScrollListener {
+public class NotificationsFragment extends MastodonToolbarFragment implements ScrollableToTop, ProvidesAssistContent, HasElevationOnScrollListener, HasAccountID {
 
 	TabLayout tabLayout;
 	private ViewPager2 pager;
@@ -54,7 +58,7 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
 	private View tabsDivider;
 	private TabLayoutMediator tabLayoutMediator;
 	String unreadMarker, realUnreadMarker;
-	private MenuItem markAllReadItem;
+	private MenuItem markAllReadItem, filterItem;
 	private NotificationsListFragment allNotificationsFragment, mentionsFragment;
 	private ElevationOnScrollListener elevationOnScrollListener;
 
@@ -92,9 +96,10 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
 	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater){
 		inflater.inflate(R.menu.notifications, menu);
 		menu.findItem(R.id.clear_notifications).setVisible(GlobalUserPreferences.enableDeleteNotifications);
+		filterItem=menu.findItem(R.id.filter_notifications).setVisible(true);
 		markAllReadItem=menu.findItem(R.id.mark_all_read);
 		updateMarkAllReadButton();
-		UiUtils.enableOptionsMenuIcons(getActivity(), menu, R.id.follow_requests, R.id.mark_all_read);
+		UiUtils.enableOptionsMenuIcons(getActivity(), menu, R.id.follow_requests, R.id.mark_all_read, R.id.filter_notifications);
 	}
 
 	@Override
@@ -116,11 +121,61 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
 			if (getCurrentFragment() instanceof NotificationsListFragment nlf) {
 				nlf.resetUnreadBackground();
 			}
+			return true;
+		} else if (item.getItemId() == R.id.filter_notifications) {
+			Context ctx = getToolbarContext();
+			String[] listItems = {
+					ctx.getString(R.string.notification_type_mentions_and_replies),
+					ctx.getString(R.string.notification_type_reblog),
+					ctx.getString(R.string.notification_type_favorite),
+					ctx.getString(R.string.notification_type_follow),
+					ctx.getString(R.string.notification_type_poll),
+					ctx.getString(R.string.sk_notification_type_update),
+					ctx.getString(R.string.sk_notification_type_posts)
+			};
+
+			boolean[] checkedItems = {
+					getLocalPrefs().notificationFilters.mention,
+					getLocalPrefs().notificationFilters.reblog,
+					getLocalPrefs().notificationFilters.favourite,
+					getLocalPrefs().notificationFilters.follow,
+					getLocalPrefs().notificationFilters.poll,
+					getLocalPrefs().notificationFilters.update,
+					getLocalPrefs().notificationFilters.status,
+			};
+
+			M3AlertDialogBuilder dialogBuilder = new M3AlertDialogBuilder(ctx);
+			dialogBuilder.setTitle(R.string.sk_settings_filters);
+			dialogBuilder.setMultiChoiceItems(listItems, checkedItems, (dialog, which, isChecked) ->checkedItems[which] = isChecked);
+
+			dialogBuilder.setPositiveButton(R.string.save, (d, which) -> {
+				saveFilters(checkedItems);
+				this.allNotificationsFragment.reload();
+			}).setNeutralButton(R.string.mo_notification_filter_reset, (d, which) -> {
+				Arrays.fill(checkedItems, true);
+				saveFilters(checkedItems);
+				this.allNotificationsFragment.reload();
+			}).setNegativeButton(R.string.cancel, (d, which) -> {});
+
+			dialogBuilder.create().show();
+
 			return true;
 		}
 		return false;
 	}
 
+	private void saveFilters(boolean[] checkedItems) {
+		PushSubscription.Alerts filter = getLocalPrefs().notificationFilters;
+		filter.mention = checkedItems[0];
+		filter.reblog = checkedItems[1];
+		filter.favourite = checkedItems[2];
+		filter.follow = checkedItems[3];
+		filter.poll = checkedItems[4];
+		filter.update = checkedItems[5];
+		filter.status = checkedItems[6];
+		getLocalPrefs().save();
+	}
+
 	void markAsRead(){
 		if(allNotificationsFragment.getData().isEmpty()) return;
 		String id=allNotificationsFragment.getData().get(0).id;
@@ -184,6 +239,7 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
 			public void onPageSelected(int position){
 				if (elevationOnScrollListener != null && getCurrentFragment() instanceof IsOnTop f)
 					elevationOnScrollListener.handleScroll(getContext(), f.isOnTop());
+				filterItem.setVisible(position==0);
 				if(position==0)
 					return;
 				Fragment _page=getFragmentForPage(position);
@@ -254,7 +310,7 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
 		new GetFollowRequests(null, 1).setCallback(new Callback<>() {
 			@Override
 			public void onSuccess(HeaderPaginationList<Account> accounts) {
-				if (getActivity() == null) return;
+				if(getActivity()==null) return;
 				getToolbar().getMenu().findItem(R.id.follow_requests).setVisible(!accounts.isEmpty());
 			}
 
@@ -309,6 +365,11 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
 		callFragmentToProvideAssistContent(getFragmentForPage(pager.getCurrentItem()), assistContent);
 	}
 
+	@Override
+	public String getAccountID(){
+		return accountID;
+	}
+
 	private class DiscoverPagerAdapter extends RecyclerView.Adapter<SimpleViewHolder>{
 		@NonNull
 		@Override

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

@@ -88,6 +88,40 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 
 	@Override
 	protected List<StatusDisplayItem> buildDisplayItems(Notification n){
+		if(!onlyMentions && !onlyPosts){
+			switch(n.type){
+				case MENTION -> {
+					if(!getLocalPrefs().notificationFilters.mention)
+						return new ArrayList<>();
+				}
+				case REBLOG -> {
+					if(!getLocalPrefs().notificationFilters.reblog)
+						return new ArrayList<>();
+				}
+				case FAVORITE, REACTION -> {
+					if(!getLocalPrefs().notificationFilters.favourite)
+						return new ArrayList<>();
+				}
+				case FOLLOW, FOLLOW_REQUEST -> {
+					if(!getLocalPrefs().notificationFilters.follow)
+						return new ArrayList<>();
+				}
+				case POLL -> {
+					if(!getLocalPrefs().notificationFilters.poll)
+						return new ArrayList<>();
+				}
+				case UPDATE -> {
+					if(!getLocalPrefs().notificationFilters.update)
+						return new ArrayList<>();
+				}
+				case STATUS -> {
+					if(!getLocalPrefs().notificationFilters.status)
+						return new ArrayList<>();
+				}
+				default -> {}
+			}
+		}
+
 		NotificationHeaderStatusDisplayItem titleItem;
 		if(n.type==Notification.Type.MENTION || n.type==Notification.Type.STATUS){
 			titleItem=null;
@@ -144,6 +178,7 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 
 						maxID=result.maxID;
 						onDataLoaded(result.items.stream().filter(n->n.type!=null).collect(Collectors.toList()), !result.items.isEmpty());
+						if(bannerHelper!=null) bannerHelper.onBannerBecameVisible();
 						reloadingFromCache=false;
 						if (getParentFragment() instanceof NotificationsFragment nf) {
 							nf.updateMarkAllReadButton();
@@ -194,7 +229,6 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 	@Override
 	public void onViewCreated(View view, Bundle savedInstanceState){
 		super.onViewCreated(view, savedInstanceState);
-		list.addItemDecoration(new InsetStatusItemDecoration(this));
 		list.addItemDecoration(new RecyclerView.ItemDecoration(){
 			private Paint paint=new Paint();
 			private Rect tmpRect=new Rect();
@@ -258,7 +292,7 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 				continue;
 			Status contentStatus=ntf.status.getContentStatus();
 			if(contentStatus.poll!=null && contentStatus.poll.id.equals(ev.poll.id)){
-				updatePoll(ntf.id, ntf.status, ev.poll);
+				updatePoll(ntf.id, contentStatus, ev.poll);
 			}
 		}
 	}

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

@@ -5,6 +5,7 @@ import android.os.Bundle;
 
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.accounts.GetAccountStatuses;
+import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.FilterContext;
 import org.joinmastodon.android.model.Status;
@@ -35,6 +36,8 @@ public class PinnedPostsListFragment extends StatusListFragment{
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(List<Status> result){
+						if(getActivity()==null) return;
+						AccountSessionManager.get(accountID).filterStatuses(result, getFilterContext());
 						onDataLoaded(result, false);
 					}
 				}).exec(accountID);

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

@@ -21,9 +21,12 @@ import android.graphics.drawable.LayerDrawable;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
+import android.text.Editable;
+import android.text.InputType;
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
 import android.text.style.ImageSpan;
+import android.text.TextWatcher;
 import android.transition.ChangeBounds;
 import android.transition.Fade;
 import android.transition.TransitionManager;
@@ -68,9 +71,11 @@ import org.joinmastodon.android.api.requests.accounts.SetPrivateNote;
 import org.joinmastodon.android.api.requests.accounts.UpdateAccountCredentials;
 import org.joinmastodon.android.api.requests.instance.GetInstance;
 import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.fragments.account_list.BlockedAccountsListFragment;
 import org.joinmastodon.android.fragments.account_list.BlocksListFragment;
 import org.joinmastodon.android.fragments.account_list.FollowerListFragment;
 import org.joinmastodon.android.fragments.account_list.FollowingListFragment;
+import org.joinmastodon.android.fragments.account_list.MutedAccountsListFragment;
 import org.joinmastodon.android.fragments.account_list.MutesListFragment;
 import org.joinmastodon.android.fragments.report.ReportReasonChoiceFragment;
 import org.joinmastodon.android.fragments.settings.SettingsServerFragment;
@@ -149,7 +154,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 	private SwipeRefreshLayout refreshLayout;
 	private View followersBtn, followingBtn;
 	private EditText nameEdit, bioEdit;
-	private ProgressBar actionProgress, notifyProgress;
+	private ProgressBar actionProgress, notifyProgress, noteSaveProgress;
 	private FrameLayout[] tabViews;
 	private TabLayoutMediator tabLayoutMediator;
 	private TextView followsYouView;
@@ -160,9 +165,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 	private View actionButtonWrap;
 	private CustomDrawingOrderLinearLayout scrollableContent;
 
-	public FrameLayout noteWrap;
-	public EditText noteEdit;
-	private String note;
 	private Account account, remoteAccount;
 	private String accountID;
 	private String domain;
@@ -193,6 +195,11 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 	private ItemTouchHelper dragHelper=new ItemTouchHelper(new ReorderCallback());
 	private ListImageLoaderWrapper imgLoader;
 
+	// profile note
+	private FrameLayout noteWrap;
+	private ImageButton noteSaveBtn;
+	private EditText noteEdit;
+
 	@Override
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
@@ -241,6 +248,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		cover=content.findViewById(R.id.cover);
 		avatarBorder=content.findViewById(R.id.avatar_border);
 		name=content.findViewById(R.id.name);
+		usernameWrap=content.findViewById(R.id.username_wrap);
 		username=content.findViewById(R.id.username);
 		lockIcon=content.findViewById(R.id.lock_icon);
 		botIcon=content.findViewById(R.id.bot_icon);
@@ -261,9 +269,9 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		bioEdit=content.findViewById(R.id.bio_edit);
 		nameEditWrap=content.findViewById(R.id.name_edit_wrap);
 		bioEditWrap=content.findViewById(R.id.bio_edit_wrap);
-		usernameWrap=content.findViewById(R.id.username_wrap);
 		actionProgress=content.findViewById(R.id.action_progress);
 		notifyProgress=content.findViewById(R.id.notify_progress);
+		noteSaveProgress=content.findViewById(R.id.note_save_progress);
 		fab=content.findViewById(R.id.fab);
 		followsYouView=content.findViewById(R.id.follows_you);
 		countersLayout=content.findViewById(R.id.profile_counters);
@@ -278,60 +286,50 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		avatar.setOutlineProvider(OutlineProviders.roundedRect(24));
 		avatar.setClipToOutline(true);
 
-		noteEdit = content.findViewById(R.id.note_edit);
-		noteWrap = content.findViewById(R.id.note_edit_wrap);
-		ImageButton noteEditConfirm = content.findViewById(R.id.note_edit_confirm);
+		noteEdit=content.findViewById(R.id.note_edit);
+		noteWrap=content.findViewById(R.id.note_edit_wrap);
+		noteSaveBtn=content.findViewById(R.id.note_save_btn);
 
-		noteEditConfirm.setOnClickListener((v -> {
-			if (!noteEdit.getText().toString().trim().equals(note)) {
-				savePrivateNote();
-			}
-			InputMethodManager imm = (InputMethodManager) getContext().getSystemService(Activity.INPUT_METHOD_SERVICE);
+		noteSaveBtn.setOnClickListener((v->{
+			savePrivateNote(noteEdit.getText().toString());
+			InputMethodManager imm=(InputMethodManager) getContext().getSystemService(Activity.INPUT_METHOD_SERVICE);
 			imm.hideSoftInputFromWindow(this.getView().getRootView().getWindowToken(), 0);
 			noteEdit.clearFocus();
+			noteSaveBtn.clearFocus();
 		}));
 
 
-		noteEdit.setOnFocusChangeListener((v, hasFocus) -> {
-			if (hasFocus) {
-				fab.setVisibility(View.INVISIBLE);
-				TranslateAnimation animate = new TranslateAnimation(
-						0,
-						0,
-						0,
-						fab.getHeight() * 2);
-				animate.setDuration(300);
-				fab.startAnimation(animate);
-
-				noteEditConfirm.setVisibility(View.VISIBLE);
-				noteEditConfirm.animate()
-						.alpha(1.0f)
-						.setDuration(700);
-			} else {
-				fab.setVisibility(View.VISIBLE);
-				TranslateAnimation animate = new TranslateAnimation(
-						0,
-						0,
-						fab.getHeight() * 2,
-						0);
-				animate.setDuration(300);
-				fab.startAnimation(animate);
-
-				noteEditConfirm.animate()
-						.alpha(0.0f)
-						.setDuration(700);
-				noteEditConfirm.setVisibility(View.INVISIBLE);
+		noteEdit.setOnFocusChangeListener((v, hasFocus)->{
+			if(hasFocus){
+				hideFab();
+				V.setVisibilityAnimated(noteSaveBtn, View.VISIBLE);
+				noteEdit.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_MULTI_LINE | InputType.TYPE_TEXT_FLAG_CAP_SENTENCES);
+			}else if(!noteSaveBtn.hasFocus()){
+				showFab();
+				hideNoteSaveBtnIfNotDirty();
 			}
 		});
 
-		noteEditConfirm.setOnClickListener((v -> {
-			if (!noteEdit.getText().toString().trim().equals(note)) {
-				savePrivateNote();
+		noteEdit.addTextChangedListener(new TextWatcher(){
+			@Override
+			public void beforeTextChanged(CharSequence s, int start, int count, int after){}
+
+			@Override
+			public void onTextChanged(CharSequence s, int start, int before, int count){
+				if(relationship!=null && noteSaveBtn.getVisibility()!=View.VISIBLE && !s.toString().equals(relationship.note))
+					V.setVisibilityAnimated(noteSaveBtn, View.VISIBLE);
 			}
-			InputMethodManager imm = (InputMethodManager) getContext().getSystemService(Activity.INPUT_METHOD_SERVICE);
-			imm.hideSoftInputFromWindow(this.getView().getRootView().getWindowToken(), 0);
-			noteEdit.clearFocus();
-		}));
+
+			@Override
+			public void afterTextChanged(Editable s){}
+		});
+
+		noteSaveBtn.setOnFocusChangeListener((v, hasFocus)->{
+			if(!hasFocus && !noteEdit.hasFocus()){
+				showFab();
+				hideNoteSaveBtnIfNotDirty();
+			}
+		});
 
 		FrameLayout sizeWrapper=new FrameLayout(getActivity()){
 			@Override
@@ -369,6 +367,12 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 
 		tabbar.setTabTextColors(UiUtils.getThemeColor(getActivity(), R.attr.colorM3OnSurfaceVariant), UiUtils.getThemeColor(getActivity(), R.attr.colorM3Primary));
 		tabbar.setTabTextSize(V.dp(14));
+		tabLayoutMediator=new TabLayoutMediator(tabbar, pager, (tab, position)->tab.setText(switch(position){
+			case 0 -> R.string.profile_featured;
+			case 1 -> R.string.profile_timeline;
+			case 2 -> R.string.profile_about;
+			default -> throw new IllegalStateException();
+		}));
 		tabLayoutMediator=new TabLayoutMediator(tabbar, pager, new TabLayoutMediator.TabConfigurationStrategy(){
 			@Override
 			public void onConfigureTab(@NonNull TabLayout.Tab tab, int position){
@@ -491,6 +495,46 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		return sizeWrapper;
 	}
 
+	private void hideNoteSaveBtnIfNotDirty(){
+		if(noteEdit.getText().toString().equals(relationship.note)){
+			V.setVisibilityAnimated(noteSaveBtn, View.INVISIBLE);
+		}
+	}
+
+	private void showPrivateNote(){
+		noteWrap.setVisibility(View.VISIBLE);
+		noteEdit.setText(relationship.note);
+	}
+
+	private void hidePrivateNote(){
+		noteWrap.setVisibility(View.GONE);
+		noteEdit.setText(null);
+	}
+
+	private void savePrivateNote(String note){
+		if(note!=null && note.equals(relationship.note)){
+			updateRelationship();
+			invalidateOptionsMenu();
+			return;
+		}
+		V.setVisibilityAnimated(noteSaveProgress, View.VISIBLE);
+		V.setVisibilityAnimated(noteSaveBtn, View.INVISIBLE);
+		new SetPrivateNote(profileAccountID, note).setCallback(new Callback<>() {
+			@Override
+			public void onSuccess(Relationship result) {
+				updateRelationship(result);
+				invalidateOptionsMenu();
+			}
+
+			@Override
+			public void onError(ErrorResponse error) {
+				error.showToast(getContext());
+				V.setVisibilityAnimated(noteSaveProgress, View.GONE);
+				V.setVisibilityAnimated(noteSaveBtn, View.VISIBLE);
+			}
+		}).exec(accountID);
+	}
+
 	private void onAccountLoaded(Account result) {
 		account=result;
 		isOwnProfile=AccountSessionManager.getInstance().isSelf(accountID, account);
@@ -517,25 +561,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		V.setVisibilityAnimated(fab, View.VISIBLE);
 	}
 
-	public void setNote(String note){
-		this.note=note;
-		noteWrap.setVisibility(View.VISIBLE);
-		noteEdit.setVisibility(View.VISIBLE);
-		noteEdit.setText(note);
-	}
-
-	private void savePrivateNote(){
-		new SetPrivateNote(profileAccountID, noteEdit.getText().toString()).setCallback(new Callback<>() {
-			@Override
-			public void onSuccess(Relationship result) {}
-
-			@Override
-			public void onError(ErrorResponse error) {
-				error.showToast(getActivity());
-			}
-		}).exec(accountID);
-	}
-
 	@Override
 	protected void doLoadData(){
 		if (remoteAccount != null) {
@@ -557,7 +582,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(Account result){
-						if (getActivity() == null) return;
+						if(getActivity()==null) return;
 						onAccountLoaded(result);
 					}
 				})
@@ -701,14 +726,14 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 
 	@SuppressLint("SetTextI18n")
 	private void bindHeaderView(){
-		setTitle(account.displayName);
+		setTitle(account.getDisplayName());
 		setSubtitle(getResources().getQuantityString(R.plurals.x_posts, (int)(account.statusesCount%1000), account.statusesCount));
 		ViewImageLoader.load(avatar, null, new UrlImageLoaderRequest(
 				TextUtils.isEmpty(account.avatar) ? getSession().getDefaultAvatarUrl() :
 						GlobalUserPreferences.playGifs ? account.avatar : account.avatarStatic,
 				V.dp(100), V.dp(100)));
 		ViewImageLoader.load(cover, null, new UrlImageLoaderRequest(GlobalUserPreferences.playGifs ? account.header : account.headerStatic, 1000, 1000));
-		SpannableStringBuilder ssb=new SpannableStringBuilder(account.displayName);
+		SpannableStringBuilder ssb=new SpannableStringBuilder(account.getDisplayName());
 		if(AccountSessionManager.get(accountID).getLocalPreferences().customEmojiInNames)
 			HtmlParser.parseCustomEmoji(ssb, account.emojis);
 		name.setText(ssb);
@@ -755,7 +780,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		followingCount.setText(UiUtils.abbreviateNumber(account.followingCount));
 		followersLabel.setText(getResources().getQuantityString(R.plurals.followers, (int)Math.min(999, account.followersCount)));
 		followingLabel.setText(getResources().getQuantityString(R.plurals.following, (int)Math.min(999, account.followingCount)));
-
+		
 		if (account.followersCount < 0) followersBtn.setVisibility(View.GONE);
 		if (account.followingCount < 0) followingBtn.setVisibility(View.GONE);
 		if (account.followersCount < 0 || account.followingCount < 0)
@@ -839,20 +864,21 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		boolean hasMultipleAccounts = AccountSessionManager.getInstance().getLoggedInAccounts().size() > 1;
 		MenuItem openWithAccounts = menu.findItem(R.id.open_with_account);
 		openWithAccounts.setVisible(hasMultipleAccounts);
-		SubMenu accountsMenu = openWithAccounts.getSubMenu();
-		if (hasMultipleAccounts) {
+		SubMenu accountsMenu=openWithAccounts.getSubMenu();
+		if(hasMultipleAccounts){
 			accountsMenu.clear();
 			UiUtils.populateAccountsMenu(accountID, accountsMenu, s-> UiUtils.openURL(
 					getActivity(), s.getID(), account.url, false
 			));
 		}
-		menu.findItem(R.id.share).setTitle(R.string.share_user);
+
 		if(isOwnProfile) {
 			if (isInstancePixelfed()) menu.findItem(R.id.scheduled).setVisible(false);
 			return;
 		}
 
-		MenuItem mute = menu.findItem(R.id.mute);
+		menu.findItem(R.id.manage_user_lists).setTitle(getString(R.string.sk_lists_with_user, account.getShortUsername()));
+		MenuItem mute=menu.findItem(R.id.mute);
 		mute.setTitle(getString(relationship.muting ? R.string.unmute_user : R.string.mute_user, account.getShortUsername()));
 		mute.setIcon(relationship.muting ? R.drawable.ic_fluent_speaker_2_24_regular : R.drawable.ic_fluent_speaker_off_24_regular);
 		UiUtils.insetPopupMenuIcon(getContext(), mute);
@@ -860,19 +886,24 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		menu.findItem(R.id.report).setTitle(getString(R.string.report_user, account.getShortUsername()));
 		menu.findItem(R.id.manage_user_lists).setVisible(relationship.following);
 		menu.findItem(R.id.soft_block).setVisible(relationship.followedBy && !relationship.following);
+		MenuItem hideBoosts=menu.findItem(R.id.hide_boosts);
 		if (relationship.following) {
-			MenuItem hideBoosts = menu.findItem(R.id.hide_boosts);
 			hideBoosts.setTitle(getString(relationship.showingReblogs ? R.string.hide_boosts_from_user : R.string.show_boosts_from_user, account.getShortUsername()));
 			hideBoosts.setIcon(relationship.showingReblogs ? R.drawable.ic_fluent_arrow_repeat_all_off_24_regular : R.drawable.ic_fluent_arrow_repeat_all_24_regular);
 			UiUtils.insetPopupMenuIcon(getContext(), hideBoosts);
-			menu.findItem(R.id.manage_user_lists).setTitle(getString(R.string.sk_lists_with_user, account.getShortUsername()));
+			hideBoosts.setVisible(true);
 		} else {
-			menu.findItem(R.id.hide_boosts).setVisible(false);
+			hideBoosts.setVisible(false);
 		}
-		if(!account.isLocal())
-			menu.findItem(R.id.block_domain).setTitle(getString(relationship.domainBlocking ? R.string.unblock_domain : R.string.block_domain, account.getDomain()));
-		else
-			menu.findItem(R.id.block_domain).setVisible(false);
+		MenuItem blockDomain=menu.findItem(R.id.block_domain);
+		if(!account.isLocal()){
+			blockDomain.setTitle(getString(relationship.domainBlocking ? R.string.unblock_domain : R.string.block_domain, account.getDomain()));
+			blockDomain.setVisible(true);
+		}else{
+			blockDomain.setVisible(false);
+		}
+		menu.findItem(R.id.edit_note).setTitle(noteWrap.getVisibility()==View.GONE && (relationship.note==null || relationship.note.isEmpty())
+				? R.string.sk_add_note : R.string.sk_delete_note);
 	}
 
 	@Override
@@ -884,11 +915,11 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			intent.putExtra(Intent.EXTRA_TEXT, account.url);
 			startActivity(Intent.createChooser(intent, item.getTitle()));
 		}else if(id==R.id.mute){
-			confirmToggleMuted();
+			UiUtils.confirmToggleMuteUser(getActivity(), accountID, account, relationship.muting, this::updateRelationship);
 		}else if(id==R.id.block){
-			confirmToggleBlocked();
+			UiUtils.confirmToggleBlockUser(getActivity(), accountID, account, relationship.blocking, this::updateRelationship);
 		}else if(id==R.id.soft_block){
-			confirmSoftBlockUser();
+			UiUtils.confirmSoftBlockUser(getActivity(), accountID, account, this::updateRelationship);
 		}else if(id==R.id.report){
 			Bundle args=new Bundle();
 			args.putString("account", accountID);
@@ -933,16 +964,16 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 				args.putString("profileDisplayUsername", account.getDisplayUsername());
 			}
 			Nav.go(getActivity(), ListsFragment.class, args);
-		}else if(id==R.id.mutes){
+		}else if(id==R.id.muted_accounts){
 			final Bundle args=new Bundle();
 			args.putString("account", accountID);
 			args.putParcelable("targetAccount", Parcels.wrap(account));
-			Nav.go(getActivity(), MutesListFragment.class, args);
-		}else if(id==R.id.blocks){
+			Nav.go(getActivity(), MutedAccountsListFragment.class, args);
+		}else if(id==R.id.blocked_accounts){
 			final Bundle args=new Bundle();
 			args.putString("account", accountID);
 			args.putParcelable("targetAccount", Parcels.wrap(account));
-			Nav.go(getActivity(), BlocksListFragment.class, args);
+			Nav.go(getActivity(), BlockedAccountsListFragment.class, args);
 		}else if(id==R.id.followed_hashtags){
 			Bundle args=new Bundle();
 			args.putString("account", accountID);
@@ -954,6 +985,26 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		}else if(id==R.id.save){
 			if(isInEditMode)
 				saveAndExitEditMode();
+		}else if(id==R.id.edit_note){
+			if(noteWrap.getVisibility()==View.GONE){
+				showPrivateNote();
+				UiUtils.beginLayoutTransition(scrollableContent);
+				noteEdit.requestFocus();
+				noteEdit.postDelayed(()->{
+					InputMethodManager imm=getActivity().getSystemService(InputMethodManager.class);
+					imm.showSoftInput(noteEdit, 0);
+				}, 100);
+			}else if(relationship.note.isEmpty()){
+				hidePrivateNote();
+				UiUtils.beginLayoutTransition(scrollableContent);
+			}else{
+				new M3AlertDialogBuilder(getActivity())
+						.setMessage(getContext().getString(R.string.sk_private_note_confirm_delete, account.getDisplayUsername()))
+						.setPositiveButton(R.string.delete, (dlg, btn)->savePrivateNote(null))
+						.setNegativeButton(R.string.cancel, null)
+						.show();
+			}
+			invalidateOptionsMenu();
 		}
 		return true;
 	}
@@ -978,21 +1029,23 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 	}
 
 	private void updateRelationship(){
-		if (getActivity() == null) return;
+		if(getActivity()==null) return;
+		if(relationship.note!=null && !relationship.note.isEmpty()) showPrivateNote();
+		else hidePrivateNote();
 		invalidateOptionsMenu();
 		actionButton.setVisibility(View.VISIBLE);
 		notifyButton.setVisibility(relationship.following ? View.VISIBLE : View.GONE);
 		UiUtils.setRelationshipToActionButtonM3(relationship, actionButton);
 		actionProgress.setIndeterminateTintList(actionButton.getTextColors());
 		notifyProgress.setIndeterminateTintList(notifyButton.getTextColors());
+		noteSaveProgress.setIndeterminateTintList(noteEdit.getTextColors());
 		followsYouView.setVisibility(relationship.followedBy ? View.VISIBLE : View.GONE);
 		notifyButton.setSelected(relationship.notifying);
 		notifyButton.setContentDescription(getString(relationship.notifying ? R.string.sk_user_post_notifications_on : R.string.sk_user_post_notifications_off, '@'+account.username));
-
-		if (!isOwnProfile) {
-			setNote(relationship.note);
-//			aboutFragment.setNote(relationship.note, accountID, profileAccountID);
-		}
+		noteEdit.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_MULTI_LINE | InputType.TYPE_TEXT_FLAG_CAP_SENTENCES | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
+		V.setVisibilityAnimated(noteSaveProgress, View.GONE);
+		V.setVisibilityAnimated(noteSaveBtn, View.INVISIBLE);
+		UiUtils.beginLayoutTransition(scrollableContent);
 	}
 
 	public ImageButton getFab() {
@@ -1190,7 +1243,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		updateMetadataHeight();
 
 		Toolbar toolbar=getToolbar();
-		Drawable close=getToolbarContext().getDrawable(R.drawable.ic_baseline_close_24).mutate();
+		Drawable close=getToolbarContext().getDrawable(R.drawable.ic_fluent_dismiss_24_regular).mutate();
 		close.setTint(UiUtils.getThemeColor(getToolbarContext(), R.attr.colorM3OnSurfaceVariant));
 		toolbar.setNavigationIcon(close);
 		toolbar.setNavigationContentDescription(R.string.discard);
@@ -1266,6 +1319,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		imm.hideSoftInputFromWindow(content.getWindowToken(), 0);
 		V.setVisibilityAnimated(fab, View.VISIBLE);
 		bindHeaderView();
+		V.setVisibilityAnimated(fab, View.VISIBLE);
 	}
 
 	private void saveAndExitEditMode(){
@@ -1280,7 +1334,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 						savingEdits=false;
 						account=result;
 						AccountSessionManager.getInstance().updateAccountInfo(accountID, account);
-						if (getActivity() == null) return;
+						if(getActivity()==null) return;
 						exitEditMode();
 						setActionProgressVisible(false);
 					}
@@ -1295,18 +1349,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 				.exec(accountID);
 	}
 
-	private void confirmToggleMuted(){
-		UiUtils.confirmToggleMuteUser(getActivity(), accountID, account, relationship.muting, this::updateRelationship);
-	}
-
-	private void confirmToggleBlocked(){
-		UiUtils.confirmToggleBlockUser(getActivity(), accountID, account, relationship.blocking, this::updateRelationship);
-	}
-
-	private void confirmSoftBlockUser(){
-		UiUtils.confirmSoftBlockUser(getActivity(), accountID, account, this::updateRelationship);
-	}
-
 	private void updateRelationship(Relationship r){
 		relationship=r;
 		updateRelationship();
@@ -1315,7 +1357,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 	@Override
 	public boolean onBackPressed(){
 		if(noteEdit.hasFocus()) {
-			savePrivateNote();
+			savePrivateNote(noteEdit.getText().toString());
 		}
 		if(isInEditMode){
 			if(savingEdits)
@@ -1576,7 +1618,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			title.setText(item.parsedName);
 			value.setText(item.parsedValue);
 			if(item.verifiedAt!=null){
-				int textColor=UiUtils.isDarkTheme() ? 0xFF89bb9c : 0xFF5b8e63;
+				int textColor=UiUtils.getThemeColor(getContext(), R.attr.colorM3Success);
 				value.setTextColor(textColor);
 				value.setLinkTextColor(textColor);
 				Drawable check=getResources().getDrawable(R.drawable.ic_fluent_checkmark_starburst_20_regular, getActivity().getTheme()).mutate();

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

@@ -120,6 +120,15 @@ public class ScheduledStatusListFragment extends BaseStatusListFragment<Schedule
 		}
 	}
 
+	@Override
+	protected void onShown(){
+		super.onShown();
+		// because, for some reason, when navigating back from compose fragment,
+		// match_parent would otherwise be incorrect (leaving a gap for the keyboard
+		// where there is none)
+		list.post(list::requestLayout);
+	}
+
 	@Override
 	protected void doLoadData(int offset, int count){
 		currentRequest=new GetScheduledStatuses(offset==0 ? null : nextMaxID, count)
@@ -130,7 +139,7 @@ public class ScheduledStatusListFragment extends BaseStatusListFragment<Schedule
 							nextMaxID=result.nextPageUri.getQueryParameter("max_id");
 						else
 							nextMaxID=null;
-						if (getActivity() == null) return;
+						if(getActivity()==null) return;
 						onDataLoaded(result, nextMaxID!=null);
 					}
 				})

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

@@ -47,13 +47,12 @@ public class SplashFragment extends AppKitFragment{
 	private ProgressBarButton defaultServerButton;
 	private ProgressBar defaultServerProgress;
 	private String chosenDefaultServer=DEFAULT_SERVER;
-	private boolean loadingDefaultServer;
+	private boolean loadingDefaultServer, loadedDefaultServer;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
 		motionEffect=new InterpolatingMotionEffect(MastodonApp.context);
-		loadAndChooseDefaultServer();
 	}
 
 	@Nullable
@@ -101,6 +100,8 @@ public class SplashFragment extends AppKitFragment{
 				});
 			}
 		});
+		if(!loadedDefaultServer && !loadingDefaultServer)
+			loadAndChooseDefaultServer();
 
 		return contentView;
 	}
@@ -239,6 +240,7 @@ public class SplashFragment extends AppKitFragment{
 	private void setChosenDefaultServer(String domain){
 		chosenDefaultServer=domain;
 		loadingDefaultServer=false;
+		loadedDefaultServer=true;
 		if(defaultServerButton!=null && getActivity()!=null){
 			defaultServerButton.setTextVisible(true);
 			defaultServerProgress.setVisibility(View.GONE);

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

@@ -12,18 +12,22 @@ import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.displayitems.DummyStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.ReblogOrReplyLineStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
+import org.joinmastodon.android.ui.text.HtmlParser;
 import org.joinmastodon.android.ui.utils.InsetStatusItemDecoration;
 import org.joinmastodon.android.ui.utils.UiUtils;
 
 import java.time.ZoneId;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.EnumSet;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
 import me.grishka.appkit.api.SimpleCallback;
+import name.fraser.neil.plaintext.diff_match_patch;
 
 public class StatusEditHistoryFragment extends StatusListFragment{
 	private String id, url;
@@ -48,8 +52,8 @@ public class StatusEditHistoryFragment extends StatusListFragment{
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(List<Status> result){
+						if(getActivity()==null) return;
 						Collections.sort(result, Comparator.comparing((Status s)->s.createdAt).reversed());
-						if (getActivity() == null) return;
 						onDataLoaded(result, false);
 					}
 				})
@@ -58,7 +62,7 @@ public class StatusEditHistoryFragment extends StatusListFragment{
 
 	@Override
 	protected List<StatusDisplayItem> buildDisplayItems(Status s){
-		List<StatusDisplayItem> items=StatusDisplayItem.buildItems(this, s, accountID, s, knownAccounts, null, StatusDisplayItem.FLAG_NO_FOOTER | StatusDisplayItem.FLAG_INSET | StatusDisplayItem.FLAG_NO_EMOJI_REACTIONS);
+		List<StatusDisplayItem> items=new ArrayList<>();
 		int idx=data.indexOf(s);
 		if(idx>=0){
 			String date=UiUtils.DATE_TIME_FORMATTER.format(s.createdAt.atZone(ZoneId.systemDefault()));
@@ -83,8 +87,11 @@ public class StatusEditHistoryFragment extends StatusListFragment{
 				EnumSet<StatusEditChangeType> changes=EnumSet.noneOf(StatusEditChangeType.class);
 				Status prev=data.get(idx+1);
 
-				if(!Objects.equals(s.content, prev.content)){
+				// if only formatting was changed, don't even try to create a diff text
+				if(!Objects.equals(HtmlParser.text(s.content), HtmlParser.text(prev.content))){
 					changes.add(StatusEditChangeType.TEXT_CHANGED);
+					//update status content to display a diffs
+					s.content=createDiffText(prev.content, s.content);
 				}
 				if(!Objects.equals(s.spoilerText, prev.spoilerText)){
 					if(s.spoilerText==null){
@@ -147,15 +154,10 @@ public class StatusEditHistoryFragment extends StatusListFragment{
 			items.add(0, new ReblogOrReplyLineStatusDisplayItem(s.id, this, action+" "+sep+" "+date, Collections.emptyList(), 0, null, null, s));
 			items.add(1, new DummyStatusDisplayItem(s.id, this));
 		}
+		items.addAll(StatusDisplayItem.buildItems(this, s, accountID, s, knownAccounts, null, StatusDisplayItem.FLAG_NO_FOOTER|StatusDisplayItem.FLAG_INSET|StatusDisplayItem.FLAG_NO_EMOJI_REACTIONS));
 		return items;
 	}
 
-	@Override
-	public void onViewCreated(View view, Bundle savedInstanceState){
-		super.onViewCreated(view, savedInstanceState);
-		list.addItemDecoration(new InsetStatusItemDecoration(this));
-	}
-
 	@Override
 	public boolean isItemEnabled(String id){
 		return false;
@@ -170,4 +172,28 @@ public class StatusEditHistoryFragment extends StatusListFragment{
 	public Uri getWebUri(Uri.Builder base) {
 		return Uri.parse(url);
 	}
+
+	private String createDiffText(String original, String modified) {
+		diff_match_patch dmp=new diff_match_patch();
+		LinkedList<diff_match_patch.Diff> diffs=dmp.diff_main(original, modified);
+		dmp.diff_cleanupSemantic(diffs);
+
+		StringBuilder stringBuilder=new StringBuilder();
+		for(diff_match_patch.Diff diff : diffs){
+			switch(diff.operation){
+				case DELETE->{
+					stringBuilder.append("<edit-diff-delete>");
+					stringBuilder.append(diff.text);
+					stringBuilder.append("</edit-diff-delete>");
+				}
+				case INSERT->{
+					stringBuilder.append("<edit-diff-insert>");
+					stringBuilder.append(diff.text);
+					stringBuilder.append("</edit-diff-insert>");
+				}
+				default->stringBuilder.append(diff.text);
+			}
+		}
+		return stringBuilder.toString();
+	}
 }

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

@@ -9,11 +9,13 @@ import com.squareup.otto.Subscribe;
 
 import org.joinmastodon.android.E;
 import org.joinmastodon.android.GlobalUserPreferences;
+import org.joinmastodon.android.api.CacheController;
 import org.joinmastodon.android.api.session.AccountLocalPreferences;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.events.StatusMuteChangedEvent;
 import org.joinmastodon.android.events.EmojiReactionsUpdatedEvent;
 import org.joinmastodon.android.events.PollUpdatedEvent;
+import org.joinmastodon.android.events.ReblogDeletedEvent;
 import org.joinmastodon.android.events.RemoveAccountPostsEvent;
 import org.joinmastodon.android.events.StatusCountersUpdatedEvent;
 import org.joinmastodon.android.events.StatusCreatedEvent;
@@ -25,13 +27,19 @@ import org.joinmastodon.android.ui.displayitems.EmojiReactionsStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.ExtendedFooterStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.FooterStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.HeaderStatusDisplayItem;
+import org.joinmastodon.android.ui.displayitems.GapStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.TextStatusDisplayItem;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.parceler.Parcels;
 
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
+import java.util.function.BiPredicate;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -45,10 +53,12 @@ public abstract class StatusListFragment extends BaseStatusListFragment<Status>
 		boolean isMainThreadStatus = this instanceof ThreadFragment t && s.id.equals(t.mainStatus.id);
 		int flags = 0;
 		AccountLocalPreferences lp=getLocalPrefs();
-		if (GlobalUserPreferences.spectatorMode)
+		if(GlobalUserPreferences.spectatorMode)
 			flags |= StatusDisplayItem.FLAG_NO_FOOTER;
-		if (!lp.emojiReactionsEnabled || lp.showEmojiReactions==ONLY_OPENED)
+		if(!lp.emojiReactionsEnabled || lp.showEmojiReactions==ONLY_OPENED)
 			flags |= StatusDisplayItem.FLAG_NO_EMOJI_REACTIONS;
+		if(GlobalUserPreferences.translateButtonOpenedOnly)
+			flags |= StatusDisplayItem.FLAG_NO_TRANSLATE;
 		if(!GlobalUserPreferences.showMediaPreview)
 			flags |= StatusDisplayItem.FLAG_NO_MEDIA_PREVIEW;
 		return StatusDisplayItem.buildItems(this, s, accountID, s, knownAccounts, getFilterContext(), isMainThreadStatus ? 0 : flags);
@@ -79,8 +89,7 @@ public abstract class StatusListFragment extends BaseStatusListFragment<Status>
 	@Override
 	public void onItemClick(String id){
 		Status status=getContentStatusByID(id);
-		if(status==null)
-			return;
+		if(status==null || status.preview) return;
 		if(status.isRemote){
 			UiUtils.lookupStatus(getContext(), status, accountID, null, status1 -> {
 				status1.filterRevealed = true;
@@ -157,12 +166,12 @@ public abstract class StatusListFragment extends BaseStatusListFragment<Status>
 		}
 	}
 
-	protected Status getContentStatusByID(String id){
+	public Status getContentStatusByID(String id){
 		Status s=getStatusByID(id);
 		return s==null ? null : s.getContentStatus();
 	}
 
-	protected Status getStatusByID(String id){
+	public Status getStatusByID(String id){
 		for(Status s:data){
 			if(s.id.equals(id)){
 				return s;
@@ -189,41 +198,73 @@ public abstract class StatusListFragment extends BaseStatusListFragment<Status>
 		}
 	}
 
-	protected void removeStatus(Status status){
-		data.remove(status);
-		preloadedData.remove(status);
-		int index=-1, ancestorFirstIndex = -1, ancestorLastIndex = -1;
-		for(int i=0;i<displayItems.size();i++){
-			StatusDisplayItem item = displayItems.get(i);
-			if(status.id.equals(item.parentID)){
-				index=i;
-				break;
-			}
-			if (item.parentID.equals(status.inReplyToId)) {
-				if (ancestorFirstIndex == -1) ancestorFirstIndex = i;
-				ancestorLastIndex = i;
-			}
-		}
-
+	private boolean removeStatusDisplayItems(String parentID, int firstIndex, int ancestorFirstIndex, int ancestorLastIndex){
 		// did we find an ancestor that is also the status' neighbor?
-		if (ancestorFirstIndex >= 0 && ancestorLastIndex == index - 1) {
-			for (int i = ancestorFirstIndex; i <= ancestorLastIndex; i++) {
-				StatusDisplayItem item = displayItems.get(i);
-				// update ancestor to have no descendant anymore
-				if (item.parentID.equals(status.inReplyToId)) item.hasDescendantNeighbor = false;
-			}
-			adapter.notifyItemRangeChanged(ancestorFirstIndex, ancestorLastIndex - ancestorFirstIndex + 1);
+		if(ancestorFirstIndex>=0 && ancestorLastIndex==firstIndex-1){
+			// update ancestor to have no descendant anymore
+			displayItems.subList(ancestorFirstIndex, ancestorLastIndex+1).forEach(i->i.hasDescendantNeighbor=false);
+			adapter.notifyItemRangeChanged(ancestorFirstIndex, ancestorLastIndex-ancestorFirstIndex+1);
 		}
 
-		if(index==-1)
-			return;
-		int lastIndex;
-		for(lastIndex=index;lastIndex<displayItems.size();lastIndex++){
-			if(!displayItems.get(lastIndex).parentID.equals(status.id))
-				break;
+		if(firstIndex==-1) return false;
+		int lastIndex=firstIndex;
+		while(lastIndex<displayItems.size()){
+			StatusDisplayItem item=displayItems.get(lastIndex);
+			if(!item.parentID.equals(parentID) || item instanceof GapStatusDisplayItem) break;
+			lastIndex++;
 		}
-		displayItems.subList(index, lastIndex).clear();
-		adapter.notifyItemRangeRemoved(index, lastIndex-index);
+		int count=lastIndex-firstIndex;
+		if(count<1) return false;
+		displayItems.subList(firstIndex, lastIndex).clear();
+		adapter.notifyItemRangeRemoved(firstIndex, count);
+		return true;
+	}
+
+	protected void removeStatus(Status status){
+		final AccountSessionManager asm=AccountSessionManager.getInstance();
+		final CacheController cache=AccountSessionManager.get(accountID).getCacheController();
+		final boolean unReblogging=status.reblog!=null && asm.isSelf(accountID, status.account);
+		final Predicate<Status> isToBeRemovedReblog=item->item!=null && item.reblog!=null
+				&& item.reblog.id.equals(status.reblog.id)
+				&& asm.isSelf(accountID, item.account);
+		final BiPredicate<String, Supplier<String>> isToBeRemovedContent=(parentId, contentIdSupplier)->
+				parentId.equals(status.id) || contentIdSupplier.get().equals(status.id);
+
+		int ancestorFirstIndex=-1, ancestorLastIndex=-1;
+		for(int i=0;i<displayItems.size();i++){
+			StatusDisplayItem item=displayItems.get(i);
+			// we found a status that the to-be-removed status replies to!
+			// storing indices to maybe update its display items
+			if(item.parentID.equals(status.inReplyToId)){
+				if(ancestorFirstIndex==-1) ancestorFirstIndex=i;
+				ancestorLastIndex=i;
+			}
+			// if we're un-reblogging, we compare the reblogged status's id with the current status's
+			if(unReblogging
+					? isToBeRemovedReblog.test(getStatusByID(item.parentID))
+					: isToBeRemovedContent.test(item.parentID, item::getContentStatusID)){
+				// if statuses are removed from index i, the next iteration should be on the same index again
+				if(removeStatusDisplayItems(item.parentID, i, ancestorFirstIndex, ancestorLastIndex)) i--;
+				// resetting in case we find another occurrence of the same status that also has ancestors
+				// (we won't - unless the timeline is being especially weird)
+				ancestorFirstIndex=-1; ancestorLastIndex=-1;
+			}
+		}
+
+		Consumer<List<Status>> removeStatusFromData=(list)->{
+			Iterator<Status> it=list.iterator();
+			while(it.hasNext()){
+				Status s=it.next();
+				if(unReblogging
+						? isToBeRemovedReblog.test(s)
+						: isToBeRemovedContent.test(s.id, s::getContentStatusID)){
+					it.remove();
+					cache.deleteStatus(s.id);
+				}
+			}
+		};
+		removeStatusFromData.accept(data);
+		removeStatusFromData.accept(preloadedData);
 	}
 
 	@Override
@@ -314,6 +355,22 @@ public abstract class StatusListFragment extends BaseStatusListFragment<Status>
 			removeStatus(status);
 		}
 
+		@Subscribe
+		public void onReblogDeleted(ReblogDeletedEvent ev){
+			AccountSessionManager asm=AccountSessionManager.getInstance();
+			if(!ev.accountID.equals(accountID))
+				return;
+			for(Status item : data){
+				boolean itemIsOwnReblog=item.reblog!=null
+						&& item.getContentStatusID().equals(ev.statusID)
+						&& asm.isSelf(accountID, item.account);
+				if(itemIsOwnReblog){
+					removeStatus(item);
+					break;
+				}
+			}
+		}
+
 		@Subscribe
 		public void onStatusCreated(StatusCreatedEvent ev){
 			if(!ev.accountID.equals(accountID))
@@ -334,6 +391,7 @@ public abstract class StatusListFragment extends BaseStatusListFragment<Status>
 				Status contentStatus=status.getContentStatus();
 				if(contentStatus.poll!=null && contentStatus.poll.id.equals(ev.poll.id)){
 					updatePoll(status.id, contentStatus, ev.poll);
+					AccountSessionManager.get(accountID).getCacheController().updateStatus(contentStatus);
 				}
 			}
 		}

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

@@ -28,13 +28,13 @@ import org.joinmastodon.android.ui.displayitems.ExtendedFooterStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.FooterStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.HeaderStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.ReblogOrReplyLineStatusDisplayItem;
+import org.joinmastodon.android.ui.displayitems.SpoilerStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.TextStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.WarningFilteredStatusDisplayItem;
 import org.joinmastodon.android.ui.text.HtmlParser;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.utils.ProvidesAssistContent;
-import org.joinmastodon.android.utils.StatusFilterPredicate;
 import org.parceler.Parcels;
 
 import java.util.ArrayDeque;
@@ -54,21 +54,25 @@ import me.grishka.appkit.api.SimpleCallback;
 import me.grishka.appkit.utils.V;
 
 public class ThreadFragment extends StatusListFragment implements ProvidesAssistContent {
-	protected Status mainStatus, updatedStatus;
+	protected Status mainStatus, updatedStatus, replyTo;
 	private final HashMap<String, NeighborAncestryInfo> ancestryMap = new HashMap<>();
 	private StatusContext result;
-	protected boolean contextInitiallyRendered, transitionFinished;
+	protected boolean contextInitiallyRendered, transitionFinished, preview;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
 		mainStatus=Parcels.unwrap(getArguments().getParcelable("status"));
+		replyTo=Parcels.unwrap(getArguments().getParcelable("inReplyTo"));
 		Account inReplyToAccount=Parcels.unwrap(getArguments().getParcelable("inReplyToAccount"));
+		refreshing=contextInitiallyRendered=getArguments().getBoolean("refresh", false);
 		if(inReplyToAccount!=null)
 			knownAccounts.put(inReplyToAccount.id, inReplyToAccount);
 		data.add(mainStatus);
 		onAppendItems(Collections.singletonList(mainStatus));
-		setTitle(HtmlParser.parseCustomEmoji(getString(R.string.post_from_user, mainStatus.account.displayName), mainStatus.account.emojis));
+		preview=mainStatus.preview;
+		if(preview) setRefreshEnabled(false);
+		setTitle(preview ? getString(R.string.sk_post_preview) : HtmlParser.parseCustomEmoji(getString(R.string.post_from_user, mainStatus.account.getDisplayName()), mainStatus.account.emojis));
 		transitionFinished = getArguments().getBoolean("noTransition", false);
 
 		E.register(this);
@@ -81,7 +85,7 @@ public class ThreadFragment extends StatusListFragment implements ProvidesAssist
 	}
 
 	@Subscribe
-	public void onStatusMuteChaged(StatusMuteChangedEvent ev){
+	public void onStatusMuteChanged(StatusMuteChangedEvent ev){
 		for(Status s:data){
 			s.getContentStatus().update(ev);
 			AccountSessionManager.get(accountID).getCacheController().updateStatus(s);
@@ -131,6 +135,12 @@ public class ThreadFragment extends StatusListFragment implements ProvidesAssist
 					text.textSelectable=true;
 				else if(item instanceof FooterStatusDisplayItem footer)
 					footer.hideCounts=true;
+				else if(item instanceof SpoilerStatusDisplayItem spoiler){
+					for(StatusDisplayItem subItem:spoiler.contentItems){
+						if(subItem instanceof TextStatusDisplayItem text)
+							text.textSelectable=true;
+					}
+				}
 			}
 		}
     
@@ -149,11 +159,21 @@ public class ThreadFragment extends StatusListFragment implements ProvidesAssist
 
 	@Override
 	protected void doLoadData(int offset, int count){
-		if (refreshing) loadMainStatus();
-		currentRequest=new GetStatusContext(mainStatus.id)
+		if(preview && replyTo==null){
+			result=new StatusContext();
+			result.descendants=Collections.emptyList();
+			result.ancestors=Collections.emptyList();
+			return;
+		}
+		if(refreshing && !preview) loadMainStatus();
+		currentRequest=new GetStatusContext(preview ? replyTo.id : mainStatus.id)
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(StatusContext result){
+						if(preview){
+							result.descendants=Collections.emptyList();
+							result.ancestors.add(replyTo);
+						}
 						ThreadFragment.this.result = result;
 						maybeApplyContext();
 					}
@@ -214,8 +234,8 @@ public class ThreadFragment extends StatusListFragment implements ProvidesAssist
 		// TODO: figure out how this code works
 		if (isInstanceAkkoma()) sortStatusContext(mainStatus, result);
 
-		result.descendants=filterStatuses(result.descendants);
-		result.ancestors=filterStatuses(result.ancestors);
+		filterStatuses(result.descendants);
+		filterStatuses(result.ancestors);
 		restoreStatusStates(result.descendants, oldData);
 		restoreStatusStates(result.ancestors, oldData);
 
@@ -295,12 +315,12 @@ public class ThreadFragment extends StatusListFragment implements ProvidesAssist
 					// descendant neighbor
 					Optional
 							.ofNullable(count > index + 1 ? statuses.get(index + 1) : null)
-							.filter(s -> s.inReplyToId.equals(current.id))
+							.filter(s -> current.id.equals(s.inReplyToId))
 							.orElse(null),
 					// ancestoring neighbor
 					Optional.ofNullable(index > 0 ? ancestry.get(index - 1) : null)
 							.filter(ancestor -> Optional.ofNullable(ancestor.descendantNeighbor)
-									.map(ancestorsDescendant -> ancestorsDescendant.id.equals(current.id))
+									.map(ancestorsDescendant -> current.id.equals(ancestorsDescendant.id))
 									.orElse(false))
 							.map(a -> a.status)
 							.orElse(null)
@@ -351,11 +371,8 @@ public class ThreadFragment extends StatusListFragment implements ProvidesAssist
 				.collect(Collectors.toList());
 	}
 
-	private List<Status> filterStatuses(List<Status> statuses){
-		StatusFilterPredicate statusFilterPredicate=new StatusFilterPredicate(accountID,getFilterContext());
-		return statuses.stream()
-				.filter(statusFilterPredicate)
-				.collect(Collectors.toList());
+	private void filterStatuses(List<Status> statuses){
+		AccountSessionManager.get(accountID).filterStatuses(statuses, getFilterContext());
 	}
 
 	@Override

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

@@ -83,7 +83,7 @@ public abstract class BaseAccountListFragment extends MastodonRecyclerFragment<A
 						for(Relationship rel:result){
 							relationships.put(rel.id, rel);
 						}
-						if (getActivity() == null) return;
+						if(getActivity()==null) return;
 						if(list==null)
 							return;
 						for(int i=0;i<list.getChildCount();i++){

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

@@ -0,0 +1,36 @@
+package org.joinmastodon.android.fragments.account_list;
+
+import android.net.Uri;
+import android.os.Bundle;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.HeaderPaginationRequest;
+import org.joinmastodon.android.api.requests.accounts.GetAccountBlocks;
+import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.ui.viewholders.AccountViewHolder;
+
+public class BlockedAccountsListFragment extends AccountRelatedAccountListFragment{
+
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		setTitle(R.string.sk_blocked_accounts);
+	}
+
+	@Override
+	public HeaderPaginationRequest<Account> onCreateRequest(String maxID, int count){
+		return new GetAccountBlocks(maxID, count);
+	}
+
+	@Override
+	protected void onConfigureViewHolder(AccountViewHolder holder){
+		super.onConfigureViewHolder(holder);
+		holder.setStyle(AccountViewHolder.AccessoryType.NONE, false);
+	}
+
+	@Override
+	public Uri getWebUri(Uri.Builder base) {
+		return super.getWebUri(base).buildUpon()
+				.appendPath("/blocks").build();
+	}
+}

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

@@ -0,0 +1,36 @@
+package org.joinmastodon.android.fragments.account_list;
+
+import android.net.Uri;
+import android.os.Bundle;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.HeaderPaginationRequest;
+import org.joinmastodon.android.api.requests.accounts.GetAccountMutes;
+import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.ui.viewholders.AccountViewHolder;
+
+public class MutedAccountsListFragment extends AccountRelatedAccountListFragment{
+
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		setTitle(R.string.sk_muted_accounts);
+	}
+
+	@Override
+	public HeaderPaginationRequest<Account> onCreateRequest(String maxID, int count){
+		return new GetAccountMutes(maxID, count);
+	}
+
+	@Override
+	protected void onConfigureViewHolder(AccountViewHolder holder){
+		super.onConfigureViewHolder(holder);
+		holder.setStyle(AccountViewHolder.AccessoryType.NONE, false);
+	}
+
+	@Override
+	public Uri getWebUri(Uri.Builder base) {
+		return super.getWebUri(base).buildUpon()
+				.appendPath("/mutes").build();
+	}
+}

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

@@ -133,7 +133,7 @@ public abstract class PaginatedAccountListFragment<T> extends BaseAccountListFra
 							nextMaxID=result.nextPageUri.getQueryParameter("max_id");
 						else
 							nextMaxID=null;
-						if (getActivity() == null) return;
+						if(getActivity()==null) return;
 						List<AccountViewModel> items = result.stream()
 								.filter(a -> d.size() > 1000 || d.stream()
 										.noneMatch(i -> i.account.url.equals(a.url)))

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

@@ -6,21 +6,19 @@ import android.os.Bundle;
 import androidx.recyclerview.widget.RecyclerView;
 
 import org.joinmastodon.android.api.requests.timelines.GetBubbleTimeline;
+import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.StatusListFragment;
 import org.joinmastodon.android.model.FilterContext;
 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;
 import me.grishka.appkit.utils.MergeRecyclerAdapter;
 
 public class BubbleTimelineFragment extends StatusListFragment {
     private DiscoverInfoBannerHelper bannerHelper;
-    private String maxID;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState){
@@ -36,15 +34,15 @@ public class BubbleTimelineFragment extends StatusListFragment {
 
 	@Override
     protected void doLoadData(int offset, int count){
-        currentRequest=new GetBubbleTimeline(refreshing ? null : maxID, count, getLocalPrefs().timelineReplyVisibility)
+        currentRequest=new GetBubbleTimeline(getMaxID(), count, getLocalPrefs().timelineReplyVisibility)
                 .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());
+						if(getActivity()==null) return;
+						boolean more=applyMaxID(result);
+						AccountSessionManager.get(accountID).filterStatuses(result, getFilterContext());
+						onDataLoaded(result, more);
+						bannerHelper.onBannerBecameVisible();
                     }
                 })
                 .exec(accountID);

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

@@ -4,6 +4,7 @@ import android.graphics.Rect;
 import android.graphics.drawable.Animatable;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
@@ -65,6 +66,8 @@ public class DiscoverAccountsFragment extends MastodonRecyclerFragment<DiscoverA
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
 		accountID=getArguments().getString("account");
+		if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.N)
+			setRetainInstance(true);
 	}
 
 	@Override
@@ -77,7 +80,7 @@ public class DiscoverAccountsFragment extends MastodonRecyclerFragment<DiscoverA
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(List<FollowSuggestion> result){
-						if (getActivity() == null) return;
+						if(getActivity()==null) return;
 						onDataLoaded(result.stream().map(fs->new AccountWrapper(fs.account)).collect(Collectors.toList()), false);
 						loadRelationships();
 					}
@@ -112,7 +115,7 @@ public class DiscoverAccountsFragment extends MastodonRecyclerFragment<DiscoverA
 			public void onSuccess(List<Relationship> result){
 				relationshipsRequest=null;
 				relationships=result.stream().collect(Collectors.toMap(rel->rel.id, Function.identity()));
-				if (getActivity() == null) return;
+				if(getActivity()==null) return;
 				if(list==null)
 					return;
 				for(int i=0;i<list.getChildCount();i++){
@@ -258,7 +261,7 @@ public class DiscoverAccountsFragment extends MastodonRecyclerFragment<DiscoverA
 			followingCount.setVisibility(item.account.followingCount < 0 ? View.GONE : View.VISIBLE);
 			followingLabel.setVisibility(item.account.followingCount < 0 ? View.GONE : View.VISIBLE);
 			relationship=relationships.get(item.account.id);
-			UiUtils.setExtraTextInfo(getContext(), null, findViewById(R.id.pronouns), true, false, false, item.account);
+			UiUtils.setExtraTextInfo(getContext(), null, true, false, false, item.account);
 
 			if(relationship==null){
 				actionWrap.setVisibility(View.GONE);
@@ -308,6 +311,8 @@ public class DiscoverAccountsFragment extends MastodonRecyclerFragment<DiscoverA
 		private void setActionProgressVisible(boolean visible){
 			actionButton.setTextVisible(!visible);
 			actionProgress.setVisibility(visible ? View.VISIBLE : View.GONE);
+			if(visible)
+				actionProgress.setIndeterminateTintList(actionButton.getTextColors());
 			actionButton.setClickable(!visible);
 		}
 	}
@@ -327,9 +332,9 @@ public class DiscoverAccountsFragment extends MastodonRecyclerFragment<DiscoverA
 				coverRequest=new UrlImageLoaderRequest(account.header, 1000, 1000);
 			parsedBio=HtmlParser.parse(account.note, account.emojis, Collections.emptyList(), Collections.emptyList(), accountID);
 			if(account.emojis.isEmpty()){
-				parsedName=account.displayName;
+				parsedName= account.getDisplayName();
 			}else{
-				parsedName=HtmlParser.parseCustomEmoji(account.displayName, account.emojis);
+				parsedName=HtmlParser.parseCustomEmoji(account.getDisplayName(), account.emojis);
 				emojiHelper.setText(new SpannableStringBuilder(parsedName).append(parsedBio));
 			}
 		}

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

@@ -14,8 +14,10 @@ import android.widget.TextView;
 
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.IsOnTop;
 import org.joinmastodon.android.fragments.ScrollableToTop;
+import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.model.SearchResult;
 import org.joinmastodon.android.ui.OutlineProviders;
 import org.joinmastodon.android.ui.SimpleViewHolder;
@@ -97,8 +99,6 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 		pager.registerOnPageChangeCallback(new ViewPager2.OnPageChangeCallback(){
 			@Override
 			public void onPageSelected(int position){
-				if(position==0)
-					return;
 				Fragment _page=getFragmentForPage(position);
 				if(_page instanceof BaseRecyclerFragment<?> page){
 					if(!page.loaded && !page.isDataLoading())
@@ -158,7 +158,7 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 			}
 		});
 
-		disableDiscover=getArguments().getBoolean("disableDiscover");
+		disableDiscover=AccountSessionManager.get(accountID).getInstance().map(Instance::isAkkoma).orElse(false);
 		searchView=view.findViewById(R.id.search_fragment);
 		if(searchFragment==null){
 			searchFragment=new SearchFragment();

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

@@ -2,8 +2,8 @@ package org.joinmastodon.android.fragments.discover;
 
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
+import android.os.Build;
 import android.os.Bundle;
-import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
@@ -15,14 +15,12 @@ import org.joinmastodon.android.fragments.IsOnTop;
 import org.joinmastodon.android.fragments.ScrollableToTop;
 import org.joinmastodon.android.model.Card;
 import org.joinmastodon.android.model.viewmodel.CardViewModel;
-import org.joinmastodon.android.ui.DividerItemDecoration;
 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 java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -33,11 +31,9 @@ import me.grishka.appkit.api.SimpleCallback;
 import me.grishka.appkit.fragments.BaseRecyclerFragment;
 import me.grishka.appkit.imageloader.ImageLoaderRecyclerAdapter;
 import me.grishka.appkit.imageloader.ImageLoaderViewHolder;
-import me.grishka.appkit.imageloader.ListImageLoaderAdapter;
 import me.grishka.appkit.imageloader.ListImageLoaderWrapper;
 import me.grishka.appkit.imageloader.RecyclerViewDelegate;
 import me.grishka.appkit.imageloader.requests.ImageLoaderRequest;
-import me.grishka.appkit.imageloader.requests.UrlImageLoaderRequest;
 import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.utils.MergeRecyclerAdapter;
 import me.grishka.appkit.utils.SingleViewRecyclerAdapter;
@@ -61,6 +57,8 @@ public class DiscoverNewsFragment extends BaseRecyclerFragment<CardViewModel> im
 		super.onCreate(savedInstanceState);
 		accountID=getArguments().getString("account");
 		bannerHelper=new DiscoverInfoBannerHelper(DiscoverInfoBannerHelper.BannerType.TRENDING_LINKS, accountID);
+		if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.N)
+			setRetainInstance(true);
 	}
 
 	@Override

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

@@ -4,6 +4,7 @@ import android.net.Uri;
 import android.os.Bundle;
 
 import org.joinmastodon.android.api.requests.trends.GetTrendingStatuses;
+import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.StatusListFragment;
 import org.joinmastodon.android.model.FilterContext;
 import org.joinmastodon.android.model.Status;
@@ -17,6 +18,7 @@ import me.grishka.appkit.utils.MergeRecyclerAdapter;
 
 public class DiscoverPostsFragment extends StatusListFragment{
 	private DiscoverInfoBannerHelper bannerHelper;
+	private int offset;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState){
@@ -26,12 +28,17 @@ public class DiscoverPostsFragment extends StatusListFragment{
 
 
 	@Override
-	protected void doLoadData(int offset, int count){
+	protected void doLoadData(int o, int count){
+		if(refreshing) offset=0;
 		currentRequest=new GetTrendingStatuses(offset, count)
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(List<Status> result){
-						onDataLoaded(result, !result.isEmpty());
+						if(getActivity()==null) return;
+						boolean empty=result.isEmpty();
+						offset+=result.size();
+						AccountSessionManager.get(accountID).filterStatuses(result, getFilterContext());
+						onDataLoaded(result, !empty);
 						bannerHelper.onBannerBecameVisible();
 					}
 				}).exec(accountID);

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

@@ -29,15 +29,14 @@ public class FederatedTimelineFragment extends StatusListFragment{
 
 	@Override
 	protected void doLoadData(int offset, int count){
-		currentRequest=new GetPublicTimeline(false, false, refreshing ? null : maxID, count, getLocalPrefs().timelineReplyVisibility)
+		currentRequest=new GetPublicTimeline(false, false, getMaxID(), count, getLocalPrefs().timelineReplyVisibility)
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(List<Status> result){
-						if(!result.isEmpty())
-							maxID=result.get(result.size()-1).id;
-						boolean empty=result.isEmpty();
-						AccountSessionManager.get(accountID).filterStatuses(result, FilterContext.PUBLIC);
-						onDataLoaded(result, !empty);
+						if(getActivity()==null) return;
+						boolean more=applyMaxID(result);
+						AccountSessionManager.get(accountID).filterStatuses(result, getFilterContext());
+						onDataLoaded(result, more);
 						bannerHelper.onBannerBecameVisible();
 					}
 				})

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

@@ -2,7 +2,6 @@ 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;
@@ -30,15 +29,14 @@ public class LocalTimelineFragment extends StatusListFragment{
 
 	@Override
 	protected void doLoadData(int offset, int count){
-		currentRequest=new GetPublicTimeline(true, false, refreshing ? null : maxID, count, getLocalPrefs().timelineReplyVisibility)
+		currentRequest=new GetPublicTimeline(true, false, getMaxID(), count, getLocalPrefs().timelineReplyVisibility)
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(List<Status> result){
-						if(!result.isEmpty())
-							maxID=result.get(result.size()-1).id;
-						boolean empty=result.isEmpty();
-						AccountSessionManager.get(accountID).filterStatuses(result, FilterContext.PUBLIC);
-						onDataLoaded(result, !empty);
+						if(getActivity()==null) return;
+						boolean more=applyMaxID(result);
+						AccountSessionManager.get(accountID).filterStatuses(result, getFilterContext());
+						onDataLoaded(result, more);
 						bannerHelper.onBannerBecameVisible();
 					}
 				})

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

@@ -36,6 +36,7 @@ import java.util.stream.Collectors;
 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.V;
 
 public class SearchFragment extends BaseStatusListFragment<SearchResult>{
@@ -96,7 +97,7 @@ public class SearchFragment extends BaseStatusListFragment<SearchResult>{
 				args.putParcelable("profileAccount", Parcels.wrap(res.account));
 				Nav.go(getActivity(), ProfileFragment.class, args);
 			}
-			case HASHTAG -> UiUtils.openHashtagTimeline(getActivity(), accountID, res.hashtag.name, res.hashtag.following);
+			case HASHTAG -> UiUtils.openHashtagTimeline(getActivity(), accountID, res.hashtag);
 			case STATUS -> {
 				Status status=res.status.getContentStatus();
 				Bundle args=new Bundle();
@@ -142,7 +143,7 @@ public class SearchFragment extends BaseStatusListFragment<SearchResult>{
 		}*/
 		int offset=_offset;
 		currentRequest=new GetSearchResults(currentQuery, type, type==null, maxID, offset, type==null ? 0 : count)
-				.setCallback(new Callback<>(){
+				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(SearchResults result){
 						ArrayList<SearchResult> results=new ArrayList<>();
@@ -165,16 +166,8 @@ public class SearchFragment extends BaseStatusListFragment<SearchResult>{
 						unfilteredResults=results;
 						onDataLoaded(filterSearchResults(results), type!=null && !results.isEmpty());
 					}
-
-					@Override
-					public void onError(ErrorResponse error){
-						currentRequest=null;
-						Activity a=getActivity();
-						if(a==null)
-							return;
-						error.showToast(a);
-					}
 				})
+				.setTimeout(180000) // 3 minutes (searches can take a long time)
 				.exec(accountID);
 	}
 

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

@@ -115,7 +115,7 @@ public class SearchQueryFragment extends MastodonRecyclerFragment<SearchResultVi
 				onDataLoaded(results.stream().map(sr->{
 					SearchResultViewModel vm=new SearchResultViewModel(sr, accountID, true);
 					if(sr.type==SearchResult.Type.HASHTAG){
-						vm.hashtagItem.onClick=()->openHashtag(sr);
+						vm.hashtagItem.setOnClick(i->openHashtag(sr));
 					}
 					return vm;
 				}).collect(Collectors.toList()), false);
@@ -127,12 +127,16 @@ public class SearchQueryFragment extends MastodonRecyclerFragment<SearchResultVi
 					.setCallback(new SimpleCallback<>(this){
 						@Override
 						public void onSuccess(SearchResults result){
-							onDataLoaded(Stream.of(result.hashtags.stream().map(SearchResult::new), result.accounts.stream().map(SearchResult::new))
+							onDataLoaded(Stream
+									.of(
+											result.hashtags.stream().filter(hashtag -> !hashtag.name.isEmpty()).map(SearchResult::new),
+											result.accounts.stream().map(SearchResult::new)
+									)
 									.flatMap(Function.identity())
 									.map(sr->{
 										SearchResultViewModel vm=new SearchResultViewModel(sr, accountID, false);
 										if(sr.type==SearchResult.Type.HASHTAG){
-											vm.hashtagItem.onClick=()->openHashtag(sr);
+											vm.hashtagItem.setOnClick(i->openHashtag(sr));
 										}
 										return vm;
 									})
@@ -378,7 +382,7 @@ public class SearchQueryFragment extends MastodonRecyclerFragment<SearchResultVi
 
 	private void openHashtag(SearchResult res){
 		wrapSuicideDialog(()->{
-			UiUtils.openHashtagTimeline(getActivity(), accountID, res.hashtag.name, res.hashtag.following);
+			UiUtils.openHashtagTimeline(getActivity(), accountID, res.hashtag);
 			AccountSessionManager.getInstance().getAccount(accountID).getCacheController().putRecentSearch(res);
 		});
 	}
@@ -429,20 +433,20 @@ public class SearchQueryFragment extends MastodonRecyclerFragment<SearchResultVi
 		wrapSuicideDialog(()->deliverResult(currentQuery, null));
 	}
 
-	private void onOpenURLClick(){
+	private void onOpenURLClick(ListItem<?> item_){
 		UiUtils.openURL(getContext(), accountID, searchViewHelper.getQuery(), false);
 	}
 
-	private void onGoToHashtagClick(){
+	private void onGoToHashtagClick(ListItem<?> item_){
 		wrapSuicideDialog(()->{
 			String q=searchViewHelper.getQuery();
 			if(q.startsWith("#"))
 				q=q.substring(1);
-			UiUtils.openHashtagTimeline(getActivity(), accountID, q, null);
+			UiUtils.openHashtagTimeline(getActivity(), accountID, q);
 		});
 	}
 
-	private void onGoToAccountClick(){
+	private void onGoToAccountClick(ListItem<?> item_){
 		String q=searchViewHelper.getQuery();
 		if(!q.startsWith("@")){
 			q="@"+q;
@@ -459,11 +463,11 @@ public class SearchQueryFragment extends MastodonRecyclerFragment<SearchResultVi
 		}).ifPresent(progress -> progress.wrapProgress((Activity) getContext(), R.string.loading, true));
 	}
 
-	private void onGoToStatusSearchClick(){
+	private void onGoToStatusSearchClick(ListItem<?> item_){
 		wrapSuicideDialog(()->deliverResult(searchViewHelper.getQuery(), SearchResult.Type.STATUS));
 	}
 
-	private void onGoToAccountSearchClick(){
+	private void onGoToAccountSearchClick(ListItem<?> item_){
 		wrapSuicideDialog(()->deliverResult(searchViewHelper.getQuery(), SearchResult.Type.ACCOUNT));
 	}
 

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

@@ -1,5 +1,6 @@
 package org.joinmastodon.android.fragments.discover;
 
+import android.os.Build;
 import android.os.Bundle;
 import android.view.View;
 import android.view.ViewGroup;
@@ -10,8 +11,6 @@ import org.joinmastodon.android.api.requests.trends.GetTrendingHashtags;
 import org.joinmastodon.android.fragments.IsOnTop;
 import org.joinmastodon.android.fragments.ScrollableToTop;
 import org.joinmastodon.android.model.Hashtag;
-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;
 
@@ -35,6 +34,8 @@ public class TrendingHashtagsFragment extends BaseRecyclerFragment<Hashtag> impl
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
 		accountID=getArguments().getString("account");
+		if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.N)
+			setRetainInstance(true);
 	}
 
 	@Override
@@ -111,7 +112,7 @@ public class TrendingHashtagsFragment extends BaseRecyclerFragment<Hashtag> impl
 
 		@Override
 		public void onClick(){
-			UiUtils.openHashtagTimeline(getActivity(), accountID, item.name, item.following);
+			UiUtils.openHashtagTimeline(getActivity(), accountID, item);
 		}
 	}
 }

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

@@ -165,9 +165,7 @@ public class AccountActivationFragment extends ToolbarFragment{
 	private void tryGetAccount(){
 		if(AccountSessionManager.getInstance().tryGetAccount(accountID)==null){
 			uiHandler.removeCallbacks(pollRunnable);
-			getActivity().finish();
-			Intent intent=new Intent(getActivity(), MainActivity.class);
-			startActivity(intent);
+			((MainActivity)getActivity()).restartHomeFragment();
 			return;
 		}
 		currentRequest=new GetOwnAccount()

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

@@ -83,9 +83,10 @@ public class CustomWelcomeFragment extends InstanceCatalogFragment {
 
 	@Override
 	protected void updateFilteredList(){
-		boolean addFakeInstance = currentSearchQuery.length()>0 && currentSearchQuery.matches("^\\S+\\.[^\\.]+$");
+		String query=getCurrentSearchQuery();
+		boolean addFakeInstance=query.length()>0 && query.matches("^\\S+\\.[^\\.]+$");
 		if(addFakeInstance){
-			fakeInstance.domain=fakeInstance.normalizedDomain=currentSearchQuery;
+			fakeInstance.domain=fakeInstance.normalizedDomain=query;
 			fakeInstance.description=getString(R.string.loading_instance);
 			if(filteredData.size()>0 && filteredData.get(0)==fakeInstance){
 				if(list.findViewHolderForAdapterPosition(1) instanceof InstanceViewHolder ivh){
@@ -99,12 +100,12 @@ public class CustomWelcomeFragment extends InstanceCatalogFragment {
 		}
 		ArrayList<CatalogInstance> prevData=new ArrayList<>(filteredData);
 		filteredData.clear();
-		if(currentSearchQuery.length()>0){
+		if(query.length()>0){
 			boolean foundExactMatch=false;
 			for(CatalogInstance inst:data){
-				if(inst.normalizedDomain.contains(currentSearchQuery)){
+				if(inst.normalizedDomain.contains(query)){
 					filteredData.add(inst);
-					if(inst.normalizedDomain.equals(currentSearchQuery))
+					if(inst.normalizedDomain.equals(query))
 						foundExactMatch=true;
 				}
 			}

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

@@ -93,10 +93,10 @@ abstract class InstanceCatalogFragment extends MastodonRecyclerFragment<CatalogI
 		currentSearchQuery=searchEdit.getText().toString().toLowerCase().trim();
 		updateFilteredList();
 		searchEdit.removeCallbacks(searchDebouncer);
-		Instance instance=instancesCache.get(normalizeInstanceDomain(currentSearchQuery));
+		Instance instance=instancesCache.get(normalizeInstanceDomain(getCurrentSearchQuery()));
 		if(instance==null){
 			showProgressDialog();
-			loadInstanceInfo(currentSearchQuery, false);
+			loadInstanceInfo(getCurrentSearchQuery(), false);
 		}else{
 			proceedWithAuthOrSignup(instance);
 		}
@@ -106,7 +106,7 @@ abstract class InstanceCatalogFragment extends MastodonRecyclerFragment<CatalogI
 	protected void onSearchChangedDebounced(){
 		currentSearchQuery=searchEdit.getText().toString().toLowerCase().trim();
 		updateFilteredList();
-		loadInstanceInfo(currentSearchQuery, false);
+		loadInstanceInfo(getCurrentSearchQuery(), false);
 	}
 
 	protected List<CatalogInstance> sortInstances(List<CatalogInstance> result){
@@ -126,9 +126,16 @@ abstract class InstanceCatalogFragment extends MastodonRecyclerFragment<CatalogI
 		instanceProgressDialog.show();
 	}
 
+	protected String getCurrentSearchQuery(){
+		String[] parts=currentSearchQuery.split("@");
+		return parts.length>0 ? parts[parts.length-1] : "";
+	}
+
 	protected String normalizeInstanceDomain(String _domain){
 		if(TextUtils.isEmpty(_domain))
 			return null;
+		String[] parts=_domain.split("@");
+		_domain=parts[parts.length - 1];
 		if(_domain.contains(":")){
 			try{
 				_domain=Uri.parse(_domain).getAuthority();
@@ -198,7 +205,7 @@ abstract class InstanceCatalogFragment extends MastodonRecyclerFragment<CatalogI
 					instanceProgressDialog=null;
 					proceedWithAuthOrSignup(result);
 				}
-				if(Objects.equals(domain, currentSearchQuery) || Objects.equals(currentSearchQuery, redirects.get(domain)) || Objects.equals(currentSearchQuery, redirectsInverse.get(domain))){
+				if(Objects.equals(domain, getCurrentSearchQuery()) || Objects.equals(getCurrentSearchQuery(), redirects.get(domain)) || Objects.equals(getCurrentSearchQuery(), redirectsInverse.get(domain))){
 					boolean found=false;
 					for(CatalogInstance ci:filteredData){
 						if(ci.domain.equals(domain) && ci!=fakeInstance){

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

@@ -3,7 +3,6 @@ package org.joinmastodon.android.fragments.onboarding;
 import android.app.Activity;
 import android.content.Intent;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;

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

@@ -271,7 +271,7 @@ public class SignupFragment extends ToolbarFragment{
 						@Override
 						public void tail(Node node, int depth){
 							if(node instanceof Element){
-								ssb.setSpan(new LinkSpan("", SignupFragment.this::onGoBackLinkClick, LinkSpan.Type.CUSTOM, null, null), spanStart, ssb.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+								ssb.setSpan(new LinkSpan("", SignupFragment.this::onGoBackLinkClick, LinkSpan.Type.CUSTOM, null, null, null), spanStart, ssb.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
 								ssb.setSpan(new TypefaceSpan("sans-serif-medium"), spanStart, ssb.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
 							}
 						}

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

@@ -1,8 +1,6 @@
 package org.joinmastodon.android.fragments.report;
 
 import android.app.Activity;
-import android.graphics.Canvas;
-import android.graphics.Paint;
 import android.graphics.Rect;
 import android.net.Uri;
 import android.os.Bundle;
@@ -25,6 +23,7 @@ import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.OutlineProviders;
 import org.joinmastodon.android.ui.displayitems.AudioStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.CheckableHeaderStatusDisplayItem;
+import org.joinmastodon.android.ui.displayitems.DummyStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.LinkCardStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.MediaGridStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
@@ -83,10 +82,11 @@ public class ReportAddPostsChoiceFragment extends StatusListFragment{
 
 	@Override
 	protected void doLoadData(int offset, int count){
-		currentRequest=new GetAccountStatuses(reportAccount.id, offset>0 ? getMaxID() : null, null, count, GetAccountStatuses.Filter.OWN_POSTS_AND_REPLIES)
+		currentRequest=new GetAccountStatuses(reportAccount.id, getMaxID(), null, count, GetAccountStatuses.Filter.OWN_POSTS_AND_REPLIES)
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(List<Status> result){
+						if(getActivity()==null) return;
 						for(Status s:result){
 							s.sensitive=true;
 						}
@@ -96,15 +96,14 @@ public class ReportAddPostsChoiceFragment extends StatusListFragment{
 				.exec(accountID);
 	}
 
-	@Override
-	public void onItemClick(String id){
+	public void onToggleItem(String id){
 		if(selectedIDs.contains(id))
 			selectedIDs.remove(id);
 		else
 			selectedIDs.add(id);
 		CheckableHeaderStatusDisplayItem.Holder holder=findHolderOfType(id, CheckableHeaderStatusDisplayItem.Holder.class);
-		if(holder!=null)
-			holder.rebind();
+		if(holder!=null) holder.rebind();
+		else notifyItemChanged(id, CheckableHeaderStatusDisplayItem.class);
 	}
 
 	@Override
@@ -120,13 +119,20 @@ public class ReportAddPostsChoiceFragment extends StatusListFragment{
 				RecyclerView.ViewHolder holder=parent.getChildViewHolder(view);
 				if(holder.getAbsoluteAdapterPosition()==0 || holder instanceof CheckableHeaderStatusDisplayItem.Holder)
 					return;
-				outRect.left=V.dp(40);
+				boolean isRTL=parent.getLayoutDirection()==View.LAYOUT_DIRECTION_RTL;
+				if(isRTL) outRect.right=V.dp(40);
+				else outRect.left=V.dp(40);
 				if(holder instanceof AudioStatusDisplayItem.Holder){
 					outRect.bottom=V.dp(16);
 				}else if(holder instanceof LinkCardStatusDisplayItem.Holder || holder instanceof MediaGridStatusDisplayItem.Holder){
-					outRect.bottom=V.dp(16);
-					outRect.left+=V.dp(16);
-					outRect.right=V.dp(16);
+					outRect.bottom=V.dp(8);
+					if(isRTL){
+						outRect.right+=V.dp(16);
+						outRect.left=V.dp(16);
+					}else{
+						outRect.left+=V.dp(16);
+						outRect.right=V.dp(16);
+					}
 				}
 			}
 		});
@@ -154,9 +160,6 @@ public class ReportAddPostsChoiceFragment extends StatusListFragment{
 		return adapter;
 	}
 
-	protected void drawDivider(View child, View bottomSibling, RecyclerView.ViewHolder holder, RecyclerView.ViewHolder siblingHolder, RecyclerView parent, Canvas c, Paint paint){
-	}
-
 	private void onButtonClick(View v){
 		Bundle args=new Bundle();
 		args.putString("account", accountID);
@@ -200,7 +203,9 @@ public class ReportAddPostsChoiceFragment extends StatusListFragment{
 
 	@Override
 	protected List<StatusDisplayItem> buildDisplayItems(Status s){
-		return StatusDisplayItem.buildItems(this, s, accountID, s, knownAccounts, getFilterContext(), StatusDisplayItem.FLAG_INSET | StatusDisplayItem.FLAG_NO_FOOTER | StatusDisplayItem.FLAG_CHECKABLE | StatusDisplayItem.FLAG_MEDIA_FORCE_HIDDEN);
+		List<StatusDisplayItem> items=StatusDisplayItem.buildItems(this, s, accountID, s, knownAccounts, getFilterContext(), StatusDisplayItem.FLAG_NO_FOOTER | StatusDisplayItem.FLAG_CHECKABLE | StatusDisplayItem.FLAG_MEDIA_FORCE_HIDDEN);
+		items.add(new DummyStatusDisplayItem(s.getID(), this));
+		return items;
 	}
 
 	@Override

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

@@ -34,7 +34,6 @@ import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.imageloader.ViewImageLoader;
 import me.grishka.appkit.imageloader.requests.UrlImageLoaderRequest;
-import me.grishka.appkit.utils.CubicBezierInterpolator;
 import me.grishka.appkit.utils.V;
 
 public class ReportDoneFragment extends MastodonToolbarFragment{
@@ -227,7 +226,7 @@ public class ReportDoneFragment extends MastodonToolbarFragment{
 
 	@Override
 	protected int getNavigationIconDrawableResource(){
-		return R.drawable.ic_baseline_close_24;
+		return R.drawable.ic_fluent_dismiss_24_regular;
 	}
 
 	@Override

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

@@ -204,14 +204,6 @@ public class ReportReasonChoiceFragment extends StatusListFragment{
 					float off=paint.getStrokeWidth()/2f;
 					c.drawRoundRect(V.dp(16)-off, top-off, parent.getWidth()-V.dp(16)+off, bottom+off, V.dp(12), V.dp(12), paint);
 				}
-
-				@Override
-				public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state){
-					RecyclerView.ViewHolder holder=parent.getChildViewHolder(view);
-					if(holder instanceof StatusDisplayItem.Holder<?>){
-						outRect.left=outRect.right=V.dp(16);
-					}
-				}
 			});
 		}
 	}

mastodon/src/main/java/org/joinmastodon/android/fragments/settings/EditFilterFragment.java

@@ -77,7 +77,7 @@ public class EditFilterFragment extends BaseSettingsFragment<Void> implements On
 				durationItem=new ListItem<>(R.string.settings_filter_duration, 0, this::onDurationClick),
 				wordsItem=new ListItem<>(R.string.settings_filter_muted_words, 0, this::onWordsClick),
 				contextItem=new ListItem<>(R.string.settings_filter_context, 0, this::onContextClick),
-				cwItem=new CheckableListItem<>(R.string.settings_filter_show_cw, R.string.settings_filter_show_cw_explanation, CheckableListItem.Style.SWITCH, filter==null || filter.filterAction==FilterAction.WARN, ()->toggleCheckableItem(cwItem))
+				cwItem=new CheckableListItem<>(R.string.settings_filter_show_cw, R.string.settings_filter_show_cw_explanation, CheckableListItem.Style.SWITCH, filter==null || filter.filterAction==FilterAction.WARN, this::toggleCheckableItem)
 		));
 
 		if(filter!=null){
@@ -117,7 +117,7 @@ public class EditFilterFragment extends BaseSettingsFragment<Void> implements On
 		return 1;
 	}
 
-	private void onDurationClick(){
+	private void onDurationClick(ListItem<Void> item_){
 		int[] durationOptions={
 				1800,
 				3600,
@@ -186,21 +186,21 @@ public class EditFilterFragment extends BaseSettingsFragment<Void> implements On
 		alert.setOnDismissListener(dialog->callback.accept(null));
 	}
 
-	private void onWordsClick(){
+	private void onWordsClick(ListItem<Void> item){
 		Bundle args=new Bundle();
 		args.putString("account", accountID);
 		args.putParcelableArrayList("words", (ArrayList<? extends Parcelable>) keywords.stream().map(Parcels::wrap).collect(Collectors.toCollection(ArrayList::new)));
 		Nav.goForResult(getActivity(), FilterWordsFragment.class, args, WORDS_RESULT, this);
 	}
 
-	private void onContextClick(){
+	private void onContextClick(ListItem<Void> item){
 		Bundle args=new Bundle();
 		args.putString("account", accountID);
 		args.putSerializable("context", context);
 		Nav.goForResult(getActivity(), FilterContextFragment.class, args, CONTEXT_RESULT, this);
 	}
 
-	private void onDeleteClick(){
+	private void onDeleteClick(ListItem<Void> item_){
 		AlertDialog alert=new M3AlertDialogBuilder(getActivity())
 				.setTitle(getString(R.string.settings_delete_filter_title, filter.title))
 				.setMessage(R.string.settings_delete_filter_confirmation)

mastodon/src/main/java/org/joinmastodon/android/fragments/settings/FilterContextFragment.java

@@ -22,10 +22,9 @@ public class FilterContextFragment extends BaseSettingsFragment<FilterContext> i
 		setTitle(R.string.settings_filter_context);
 		context=(EnumSet<FilterContext>) getArguments().getSerializable("context");
 		onDataLoaded(Arrays.stream(FilterContext.values()).map(c->{
-			CheckableListItem<FilterContext> item=new CheckableListItem<>(c.getDisplayNameRes(), 0, CheckableListItem.Style.CHECKBOX, context.contains(c), null);
+			CheckableListItem<FilterContext> item=new CheckableListItem<>(c.getDisplayNameRes(), 0, CheckableListItem.Style.CHECKBOX, context.contains(c), this::toggleCheckableItem);
 			item.parentObject=c;
 			item.isEnabled=true;
-			item.onClick=()->toggleCheckableItem(item);
 			return item;
 		}).collect(Collectors.toList()));
 	}

mastodon/src/main/java/org/joinmastodon/android/fragments/settings/FilterWordsFragment.java

@@ -1,11 +1,6 @@
 package org.joinmastodon.android.fragments.settings;
 
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
-import android.animation.IntEvaluator;
-import android.animation.ObjectAnimator;
 import android.app.AlertDialog;
-import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Parcelable;
@@ -27,6 +22,7 @@ import org.joinmastodon.android.model.FilterKeyword;
 import org.joinmastodon.android.model.viewmodel.CheckableListItem;
 import org.joinmastodon.android.model.viewmodel.ListItem;
 import org.joinmastodon.android.ui.M3AlertDialogBuilder;
+import org.joinmastodon.android.ui.utils.ActionModeHelper;
 import org.joinmastodon.android.ui.utils.SimpleTextWatcher;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.ui.views.FloatingHintEditTextLayout;
@@ -37,7 +33,6 @@ import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import me.grishka.appkit.FragmentStackActivity;
 import me.grishka.appkit.fragments.OnBackPressedListener;
 import me.grishka.appkit.utils.V;
 
@@ -60,7 +55,7 @@ public class FilterWordsFragment extends BaseSettingsFragment<FilterKeyword> imp
 			FilterKeyword word=Parcels.unwrap(p);
 			ListItem<FilterKeyword> item=new ListItem<>(word.keyword, null, null, word);
 			item.isEnabled=true;
-			item.onClick=()->onWordClick(item);
+			item.setOnClick(this::onWordClick);
 			return item;
 		}).collect(Collectors.toList()));
 		setHasOptionsMenu(true);
@@ -97,7 +92,7 @@ public class FilterWordsFragment extends BaseSettingsFragment<FilterKeyword> imp
 	public void onViewCreated(View view, Bundle savedInstanceState){
 		super.onViewCreated(view, savedInstanceState);
 		fab=view.findViewById(R.id.fab);
-		fab.setImageResource(R.drawable.ic_add_24px);
+		fab.setImageResource(R.drawable.ic_fluent_add_24_regular);
 		fab.setContentDescription(getString(R.string.add_muted_word));
 		fab.setOnClickListener(v->onFabClick());
 	}
@@ -114,7 +109,7 @@ public class FilterWordsFragment extends BaseSettingsFragment<FilterKeyword> imp
 
 	@Override
 	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater){
-		inflater.inflate(R.menu.settings_filter_words, menu);
+		inflater.inflate(R.menu.selectable_list, menu);
 	}
 
 	@Override
@@ -174,7 +169,7 @@ public class FilterWordsFragment extends BaseSettingsFragment<FilterKeyword> imp
 				w.keyword=input;
 				ListItem<FilterKeyword> item=new ListItem<>(w.keyword, null, null, w);
 				item.isEnabled=true;
-				item.onClick=()->onWordClick(item);
+				item.setOnClick(this::onWordClick);
 				data.add(item);
 				itemsAdapter.notifyItemInserted(data.size()-1);
 			}else{
@@ -228,29 +223,15 @@ public class FilterWordsFragment extends BaseSettingsFragment<FilterKeyword> imp
 			return;
 		V.setVisibilityAnimated(fab, View.GONE);
 
-		actionMode=getActivity().startActionMode(new ActionMode.Callback(){
+		actionMode=ActionModeHelper.startActionMode(this, ()->elevationOnScrollListener.getCurrentStatusBarColor(), new ActionMode.Callback(){
 			@Override
 			public boolean onCreateActionMode(ActionMode mode, Menu menu){
-				ObjectAnimator anim=ObjectAnimator.ofInt(getActivity().getWindow(), "statusBarColor", elevationOnScrollListener.getCurrentStatusBarColor(), UiUtils.getThemeColor(getActivity(), R.attr.colorM3Primary));
-				anim.setEvaluator(new IntEvaluator(){
-					@Override
-					public Integer evaluate(float fraction, Integer startValue, Integer endValue){
-						return UiUtils.alphaBlendColors(startValue, endValue, fraction);
-					}
-				});
-				anim.start();
-				((FragmentStackActivity) getActivity()).invalidateSystemBarColors(FilterWordsFragment.this);
 				return true;
 			}
 
 			@Override
 			public boolean onPrepareActionMode(ActionMode mode, Menu menu){
 				mode.getMenuInflater().inflate(R.menu.settings_filter_words_action_mode, menu);
-				for(int i=0;i<menu.size();i++){
-					Drawable icon=menu.getItem(i).getIcon().mutate();
-					icon.setTint(UiUtils.getThemeColor(getActivity(), R.attr.colorM3OnPrimary));
-					menu.getItem(i).setIcon(icon);
-				}
 				deleteItem=menu.findItem(R.id.delete);
 				return true;
 			}
@@ -266,21 +247,6 @@ public class FilterWordsFragment extends BaseSettingsFragment<FilterKeyword> imp
 			@Override
 			public void onDestroyActionMode(ActionMode mode){
 				leaveSelectionMode(true);
-				ObjectAnimator anim=ObjectAnimator.ofInt(getActivity().getWindow(), "statusBarColor", UiUtils.getThemeColor(getActivity(), R.attr.colorM3Primary), elevationOnScrollListener.getCurrentStatusBarColor());
-				anim.setEvaluator(new IntEvaluator(){
-					@Override
-					public Integer evaluate(float fraction, Integer startValue, Integer endValue){
-						return UiUtils.alphaBlendColors(startValue, endValue, fraction);
-					}
-				});
-				anim.addListener(new AnimatorListenerAdapter(){
-					@Override
-					public void onAnimationEnd(Animator animation){
-						getActivity().getWindow().setStatusBarColor(0);
-					}
-				});
-				anim.start();
-				((FragmentStackActivity) getActivity()).invalidateSystemBarColors(FilterWordsFragment.this);
 			}
 		});
 
@@ -289,7 +255,7 @@ public class FilterWordsFragment extends BaseSettingsFragment<FilterKeyword> imp
 			ListItem<FilterKeyword> item=data.get(i);
 			CheckableListItem<FilterKeyword> newItem=new CheckableListItem<>(item.title, null, CheckableListItem.Style.CHECKBOX, selectAll, null);
 			newItem.isEnabled=true;
-			newItem.onClick=()->onSelectionModeWordClick(newItem);
+			newItem.setOnClick(this::onSelectionModeWordClick);
 			newItem.parentObject=item.parentObject;
 			if(selectAll)
 				selectedItems.add(newItem);
@@ -313,7 +279,7 @@ public class FilterWordsFragment extends BaseSettingsFragment<FilterKeyword> imp
 			ListItem<FilterKeyword> item=data.get(i);
 			ListItem<FilterKeyword> newItem=new ListItem<>(item.title, null, null);
 			newItem.isEnabled=true;
-			newItem.onClick=()->onWordClick(newItem);
+			newItem.setOnClick(this::onWordClick);
 			newItem.parentObject=item.parentObject;
 			data.set(i, newItem);
 		}

mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsAboutAppFragment.java

@@ -2,23 +2,42 @@ package org.joinmastodon.android.fragments.settings;
 
 import android.app.Activity;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.Gravity;
 import android.view.ViewGroup;
 import android.widget.TextView;
 import android.widget.Toast;
 
 import org.joinmastodon.android.BuildConfig;
+import org.joinmastodon.android.GlobalUserPreferences;
+import org.joinmastodon.android.MastodonApp;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.MastodonAPIController;
 import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.HasAccountID;
+import org.joinmastodon.android.model.viewmodel.CheckableListItem;
 import org.joinmastodon.android.model.viewmodel.ListItem;
 import org.joinmastodon.android.ui.utils.UiUtils;
+import org.joinmastodon.android.updater.GithubSelfUpdater;
 
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.StringReader;
+import java.nio.charset.Charset;
+import java.nio.file.Files;
+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.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Objects;
 
 import androidx.recyclerview.widget.RecyclerView;
 import me.grishka.appkit.imageloader.ImageCache;
@@ -27,7 +46,12 @@ import me.grishka.appkit.utils.SingleViewRecyclerAdapter;
 import me.grishka.appkit.utils.V;
 
 public class SettingsAboutAppFragment extends BaseSettingsFragment<Void> implements HasAccountID{
-	private ListItem<Void> mediaCacheItem;
+	private static final String TAG="SettingsAboutAppFragment";
+	private ListItem<Void> mediaCacheItem, copyCrashLogItem;
+	private CheckableListItem<Void> enablePreReleasesItem;
+	private AccountSession session;
+	private boolean timelineCacheCleared=false;
+	private File crashLogFile=new File(MastodonApp.context.getFilesDir(), "crash.log");
 
 	// MOSHIDON
 	private ListItem<Void> clearRecentEmojisItem;
@@ -35,19 +59,39 @@ public class SettingsAboutAppFragment extends BaseSettingsFragment<Void> impleme
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
 		setTitle(getString(R.string.about_app, getString(R.string.mo_app_name)));
-		AccountSession s=AccountSessionManager.get(accountID);
-		onDataLoaded(List.of(
-				new ListItem<>(R.string.sk_settings_donate, 0, R.drawable.ic_fluent_heart_24_regular, ()->UiUtils.launchWebBrowser(getActivity(), getString(R.string.mo_donate_url))),
-				new ListItem<>(R.string.mo_settings_contribute, 0, R.drawable.ic_fluent_open_24_regular, ()->UiUtils.launchWebBrowser(getActivity(), getString(R.string.mo_repo_url))),
-				new ListItem<>(R.string.settings_tos, 0, R.drawable.ic_fluent_open_24_regular, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+s.domain+"/terms")),
-				new ListItem<>(R.string.settings_privacy_policy, 0, R.drawable.ic_fluent_open_24_regular, ()->UiUtils.launchWebBrowser(getActivity(), getString(R.string.privacy_policy_url)), 0, true),
+		session=AccountSessionManager.get(accountID);
+
+		String lastModified=crashLogFile.exists()
+				? DateTimeFormatter.ofLocalizedDateTime(FormatStyle.LONG, FormatStyle.SHORT).withZone(ZoneId.systemDefault()).format(Instant.ofEpochMilli(crashLogFile.lastModified()))
+				: getString(R.string.sk_settings_crash_log_unavailable);
+		List<ListItem<Void>> items=new ArrayList<>(List.of(
+				new ListItem<>(R.string.sk_settings_donate, 0, R.drawable.ic_fluent_heart_24_regular, i->UiUtils.launchWebBrowser(getActivity(), getString(R.string.mo_donate_url))),
+				new ListItem<>(R.string.mo_settings_contribute, 0, R.drawable.ic_fluent_open_24_regular, i->UiUtils.launchWebBrowser(getActivity(), getString(R.string.mo_repo_url))),
+				new ListItem<>(R.string.settings_tos, 0, R.drawable.ic_fluent_open_24_regular, i->UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/terms")),
+				new ListItem<>(R.string.settings_privacy_policy, 0, R.drawable.ic_fluent_open_24_regular, i->UiUtils.launchWebBrowser(getActivity(), getString(R.string.privacy_policy_url)), 0, true),
 				clearRecentEmojisItem=new ListItem<>(R.string.mo_clear_recent_emoji, 0, this::onClearRecentEmojisClick),
-				mediaCacheItem=new ListItem<>(R.string.settings_clear_cache, 0, this::onClearMediaCacheClick)
+				mediaCacheItem=new ListItem<>(R.string.settings_clear_cache, 0, this::onClearMediaCacheClick),
+				new ListItem<>(getString(R.string.sk_settings_clear_timeline_cache), session.domain, this::onClearTimelineCacheClick),
+				copyCrashLogItem=new ListItem<>(getString(R.string.sk_settings_copy_crash_log), lastModified, 0, this::onCopyCrashLog)
 		));
 
+		if(GithubSelfUpdater.needSelfUpdating()){
+			items.add(enablePreReleasesItem=new CheckableListItem<>(R.string.sk_updater_enable_pre_releases, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.enablePreReleases, i->toggleCheckableItem(enablePreReleasesItem)));
+		}
+
+		copyCrashLogItem.isEnabled=crashLogFile.exists();
+		onDataLoaded(items);
 		updateMediaCacheItem();
 	}
 
+	@Override
+	protected void onHidden(){
+		super.onHidden();
+		GlobalUserPreferences.enablePreReleases=enablePreReleasesItem!=null && enablePreReleasesItem.checked;
+		GlobalUserPreferences.save();
+		if(timelineCacheCleared) getActivity().recreate();
+	}
+
 	@Override
 	protected void doLoadData(int offset, int count){}
 
@@ -67,7 +111,7 @@ public class SettingsAboutAppFragment extends BaseSettingsFragment<Void> impleme
 		return adapter;
 	}
 
-	private void onClearMediaCacheClick(){
+	private void onClearMediaCacheClick(ListItem<?> item){
 		MastodonAPIController.runInBackground(()->{
 			Activity activity=getActivity();
 			ImageCache.getInstance(getActivity()).clear();
@@ -78,8 +122,14 @@ public class SettingsAboutAppFragment extends BaseSettingsFragment<Void> impleme
 		});
 	}
 
-	private void onClearRecentEmojisClick(){
-		getLocalPrefs().recentEmojis=new HashMap<>();
+	private void onClearTimelineCacheClick(ListItem<?> item){
+		session.getCacheController().putHomeTimeline(List.of(), true);
+		Toast.makeText(getContext(), R.string.sk_timeline_cache_cleared, Toast.LENGTH_SHORT).show();
+		timelineCacheCleared=true;
+	}
+
+	private void onClearRecentEmojisClick(ListItem<?> item){
+		getLocalPrefs().recentCustomEmoji=new ArrayList<>();
 		getLocalPrefs().save();
 		Toast.makeText(getContext(), R.string.mo_recent_emoji_cleared, Toast.LENGTH_SHORT).show();
 	}
@@ -95,4 +145,17 @@ public class SettingsAboutAppFragment extends BaseSettingsFragment<Void> impleme
 	public String getAccountID(){
 		return accountID;
 	}
+
+	private void onCopyCrashLog(ListItem<?> item){
+		if(!crashLogFile.exists()) return;
+		try(InputStream is=new FileInputStream(crashLogFile)){
+			BufferedReader reader=new BufferedReader(new InputStreamReader(is));
+			StringBuilder sb=new StringBuilder();
+			String line;
+			while ((line=reader.readLine())!=null) sb.append(line).append("\n");
+			UiUtils.copyText(list, sb.toString());
+		} catch(IOException e){
+			Log.e(TAG, "Error reading crash log", e);
+		}
+	}
 }

mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBehaviorFragment.java

@@ -34,7 +34,7 @@ public class SettingsBehaviorFragment extends BaseSettingsFragment<Void> impleme
 	private CheckableListItem<Void> forwardReportsItem, remoteLoadingItem, showBoostsItem, showRepliesItem, loadNewPostsItem, seeNewPostsBtnItem, overlayMediaItem;
 
 	// MOSHIDON
-    private CheckableListItem<Void> mentionRebloggerAutomaticallyItem, hapticFeedbackItem, unlistedRepliesItem, showPostsWithoutAltItem;
+    private CheckableListItem<Void> mentionRebloggerAutomaticallyItem, hapticFeedbackItem, showPostsWithoutAltItem;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState){
@@ -49,24 +49,23 @@ public class SettingsBehaviorFragment extends BaseSettingsFragment<Void> impleme
 
 		List<ListItem<Void>> items = new ArrayList<>(List.of(
 				languageItem=new ListItem<>(getString(R.string.default_post_language), postLanguage!=null ? postLanguage.getDisplayName(getContext()) : null, R.drawable.ic_fluent_local_language_24_regular, this::onDefaultLanguageClick),
-				altTextItem=new CheckableListItem<>(R.string.settings_alt_text_reminders, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.altTextReminders, R.drawable.ic_fluent_image_alt_text_24_regular, ()->toggleCheckableItem(altTextItem)),
-				showPostsWithoutAltItem=new CheckableListItem<>(R.string.mo_settings_show_posts_without_alt, R.string.mo_settings_show_posts_without_alt_summary, CheckableListItem.Style.SWITCH, GlobalUserPreferences.showPostsWithoutAlt, R.drawable.ic_fluent_eye_tracking_on_24_regular, ()->toggleCheckableItem(showPostsWithoutAltItem)),
-				playGifsItem=new CheckableListItem<>(R.string.settings_gif, R.string.mo_setting_play_gif_summary, CheckableListItem.Style.SWITCH, GlobalUserPreferences.playGifs, R.drawable.ic_fluent_gif_24_regular, ()->toggleCheckableItem(playGifsItem)),
-				unlistedRepliesItem=new CheckableListItem<>(R.string.mo_change_default_reply_visibility_to_unlisted, R.string.mo_setting_default_reply_privacy_summary, CheckableListItem.Style.SWITCH, GlobalUserPreferences.defaultToUnlistedReplies, R.drawable.ic_fluent_lock_open_24_regular, ()->toggleCheckableItem(unlistedRepliesItem)),
-				overlayMediaItem=new CheckableListItem<>(R.string.sk_settings_continues_playback, R.string.sk_settings_continues_playback_summary, CheckableListItem.Style.SWITCH, GlobalUserPreferences.overlayMedia, R.drawable.ic_fluent_play_circle_hint_24_regular, ()->toggleCheckableItem(overlayMediaItem)),
-				customTabsItem=new CheckableListItem<>(R.string.settings_custom_tabs, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.useCustomTabs, R.drawable.ic_fluent_link_24_regular, ()->toggleCheckableItem(customTabsItem)),
-				confirmUnfollowItem=new CheckableListItem<>(R.string.settings_confirm_unfollow, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.confirmUnfollow, R.drawable.ic_fluent_person_delete_24_regular, ()->toggleCheckableItem(confirmUnfollowItem)),
-				confirmBoostItem=new CheckableListItem<>(R.string.settings_confirm_boost, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.confirmBoost, R.drawable.ic_fluent_arrow_repeat_all_24_regular, ()->toggleCheckableItem(confirmBoostItem)),
-				confirmDeleteItem=new CheckableListItem<>(R.string.settings_confirm_delete_post, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.confirmDeletePost, R.drawable.ic_fluent_delete_24_regular, ()->toggleCheckableItem(confirmDeleteItem)),
+				altTextItem=new CheckableListItem<>(R.string.settings_alt_text_reminders, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.altTextReminders, R.drawable.ic_fluent_image_alt_text_24_regular, i->toggleCheckableItem(altTextItem)),
+				showPostsWithoutAltItem=new CheckableListItem<>(R.string.mo_settings_show_posts_without_alt, R.string.mo_settings_show_posts_without_alt_summary, CheckableListItem.Style.SWITCH, GlobalUserPreferences.showPostsWithoutAlt, R.drawable.ic_fluent_eye_tracking_on_24_regular, i->toggleCheckableItem(showPostsWithoutAltItem)),
+				playGifsItem=new CheckableListItem<>(R.string.settings_gif, R.string.mo_setting_play_gif_summary, CheckableListItem.Style.SWITCH, GlobalUserPreferences.playGifs, R.drawable.ic_fluent_gif_24_regular, i->toggleCheckableItem(playGifsItem)),
+				overlayMediaItem=new CheckableListItem<>(R.string.sk_settings_continues_playback, R.string.sk_settings_continues_playback_summary, CheckableListItem.Style.SWITCH, GlobalUserPreferences.overlayMedia, R.drawable.ic_fluent_play_circle_hint_24_regular, i->toggleCheckableItem(overlayMediaItem)),
+				customTabsItem=new CheckableListItem<>(R.string.settings_custom_tabs, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.useCustomTabs, R.drawable.ic_fluent_link_24_regular, i->toggleCheckableItem(customTabsItem)),
+				confirmUnfollowItem=new CheckableListItem<>(R.string.settings_confirm_unfollow, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.confirmUnfollow, R.drawable.ic_fluent_person_delete_24_regular, i->toggleCheckableItem(confirmUnfollowItem)),
+				confirmBoostItem=new CheckableListItem<>(R.string.settings_confirm_boost, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.confirmBoost, R.drawable.ic_fluent_arrow_repeat_all_24_regular, i->toggleCheckableItem(confirmBoostItem)),
+				confirmDeleteItem=new CheckableListItem<>(R.string.settings_confirm_delete_post, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.confirmDeletePost, R.drawable.ic_fluent_delete_24_regular, i->toggleCheckableItem(confirmDeleteItem)),
 				prefixRepliesItem=new ListItem<>(R.string.sk_settings_prefix_reply_cw_with_re, getPrefixWithRepliesString(), R.drawable.ic_fluent_arrow_reply_24_regular, this::onPrefixRepliesClick),
-				forwardReportsItem=new CheckableListItem<>(R.string.sk_settings_forward_report_default, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.forwardReportDefault, R.drawable.ic_fluent_arrow_forward_24_regular, ()->toggleCheckableItem(forwardReportsItem)),
-				loadNewPostsItem=new CheckableListItem<>(R.string.sk_settings_load_new_posts, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.loadNewPosts, R.drawable.ic_fluent_arrow_sync_24_regular, this::onLoadNewPostsClick),
-				seeNewPostsBtnItem=new CheckableListItem<>(R.string.sk_settings_see_new_posts_button, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.showNewPostsButton, R.drawable.ic_fluent_arrow_up_24_regular, ()->toggleCheckableItem(seeNewPostsBtnItem)),
-				remoteLoadingItem=new CheckableListItem<>(R.string.sk_settings_allow_remote_loading, R.string.sk_settings_allow_remote_loading_explanation, CheckableListItem.Style.SWITCH, GlobalUserPreferences.allowRemoteLoading, R.drawable.ic_fluent_communication_24_regular, ()->toggleCheckableItem(remoteLoadingItem)),
-				mentionRebloggerAutomaticallyItem=new CheckableListItem<>(R.string.mo_mention_reblogger_automatically, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.mentionRebloggerAutomatically, R.drawable.ic_fluent_comment_mention_24_regular, ()->toggleCheckableItem(mentionRebloggerAutomaticallyItem)),
-				hapticFeedbackItem=new CheckableListItem<>(R.string.mo_haptic_feedback, R.string.mo_setting_haptic_feedback_summary, CheckableListItem.Style.SWITCH, GlobalUserPreferences.hapticFeedback, R.drawable.ic_fluent_phone_vibrate_24_regular,()->toggleCheckableItem(hapticFeedbackItem), true),
-				showBoostsItem=new CheckableListItem<>(R.string.sk_settings_show_boosts, 0, CheckableListItem.Style.SWITCH, lp.showBoosts, R.drawable.ic_fluent_arrow_repeat_all_24_regular, ()->toggleCheckableItem(showBoostsItem)),
-				showRepliesItem=new CheckableListItem<>(R.string.sk_settings_show_replies, 0, CheckableListItem.Style.SWITCH, lp.showReplies, R.drawable.ic_fluent_arrow_reply_24_regular, ()->toggleCheckableItem(showRepliesItem))
+				forwardReportsItem=new CheckableListItem<>(R.string.sk_settings_forward_report_default, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.forwardReportDefault, R.drawable.ic_fluent_arrow_forward_24_regular, i->toggleCheckableItem(forwardReportsItem)),
+				loadNewPostsItem=new CheckableListItem<>(R.string.sk_settings_load_new_posts, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.loadNewPosts, R.drawable.ic_fluent_arrow_sync_24_regular, i->onLoadNewPostsClick()),
+				seeNewPostsBtnItem=new CheckableListItem<>(R.string.sk_settings_see_new_posts_button, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.showNewPostsButton, R.drawable.ic_fluent_arrow_up_24_regular, i->toggleCheckableItem(seeNewPostsBtnItem)),
+				remoteLoadingItem=new CheckableListItem<>(R.string.sk_settings_allow_remote_loading, R.string.sk_settings_allow_remote_loading_explanation, CheckableListItem.Style.SWITCH, GlobalUserPreferences.allowRemoteLoading, R.drawable.ic_fluent_communication_24_regular, i->toggleCheckableItem(remoteLoadingItem)),
+				mentionRebloggerAutomaticallyItem=new CheckableListItem<>(R.string.mo_mention_reblogger_automatically, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.mentionRebloggerAutomatically, R.drawable.ic_fluent_comment_mention_24_regular, i->toggleCheckableItem(mentionRebloggerAutomaticallyItem)),
+				hapticFeedbackItem=new CheckableListItem<>(R.string.mo_haptic_feedback, R.string.mo_setting_haptic_feedback_summary, CheckableListItem.Style.SWITCH, GlobalUserPreferences.hapticFeedback, R.drawable.ic_fluent_phone_vibrate_24_regular, i->toggleCheckableItem(hapticFeedbackItem), true),
+				showBoostsItem=new CheckableListItem<>(R.string.sk_settings_show_boosts, 0, CheckableListItem.Style.SWITCH, lp.showBoosts, R.drawable.ic_fluent_arrow_repeat_all_24_regular, i->toggleCheckableItem(showBoostsItem)),
+				showRepliesItem=new CheckableListItem<>(R.string.sk_settings_show_replies, 0, CheckableListItem.Style.SWITCH, lp.showReplies, R.drawable.ic_fluent_arrow_reply_24_regular, i->toggleCheckableItem(showRepliesItem))
 		));
 
 		if(isInstanceAkkoma()) items.add(
@@ -100,7 +99,7 @@ public class SettingsBehaviorFragment extends BaseSettingsFragment<Void> impleme
 	@Override
 	protected void doLoadData(int offset, int count){}
 
-	private void onDefaultLanguageClick(){
+	private void onDefaultLanguageClick(ListItem<?> item){
 		if (languageResolver == null) return;
 		ComposeLanguageAlertViewController vc=new ComposeLanguageAlertViewController(getActivity(), null, new ComposeLanguageAlertViewController.SelectedOption(postLanguage), null, languageResolver);
 		new M3AlertDialogBuilder(getActivity())
@@ -119,14 +118,14 @@ public class SettingsBehaviorFragment extends BaseSettingsFragment<Void> impleme
 				.show();
 	}
 
-	private void onPrefixRepliesClick(){
+	private void onPrefixRepliesClick(ListItem<?> item){
 		int selected=GlobalUserPreferences.prefixReplies.ordinal();
 		int[] newSelected={selected};
 		new M3AlertDialogBuilder(getActivity())
 				.setTitle(R.string.sk_settings_prefix_reply_cw_with_re)
 				.setSingleChoiceItems((String[]) IntStream.of(R.string.sk_settings_prefix_replies_never, R.string.sk_settings_prefix_replies_always, R.string.sk_settings_prefix_replies_to_others).mapToObj(this::getString).toArray(String[]::new),
-						selected, (dlg, item)->newSelected[0]=item)
-				.setPositiveButton(R.string.ok, (dlg, item)->{
+						selected, (dlg, which)->newSelected[0]=which)
+				.setPositiveButton(R.string.ok, (dlg, which)->{
 					GlobalUserPreferences.prefixReplies=GlobalUserPreferences.PrefixRepliesMode.values()[newSelected[0]];
 					prefixRepliesItem.subtitleRes=getPrefixWithRepliesString();
 					rebindItem(prefixRepliesItem);
@@ -135,7 +134,7 @@ public class SettingsBehaviorFragment extends BaseSettingsFragment<Void> impleme
 				.show();
 	}
 
-	private void onReplyVisibilityClick(){
+	private void onReplyVisibilityClick(ListItem<?> item){
 		AccountLocalPreferences lp=getLocalPrefs();
 		int selected=lp.timelineReplyVisibility==null ? 2 : switch(lp.timelineReplyVisibility){
 			case "following" -> 0;
@@ -146,8 +145,8 @@ public class SettingsBehaviorFragment extends BaseSettingsFragment<Void> impleme
 		new M3AlertDialogBuilder(getActivity())
 				.setTitle(R.string.sk_settings_prefix_reply_cw_with_re)
 				.setSingleChoiceItems((String[]) IntStream.of(R.string.sk_settings_reply_visibility_following, R.string.sk_settings_reply_visibility_self, R.string.sk_settings_reply_visibility_all).mapToObj(this::getString).toArray(String[]::new),
-						selected, (dlg, item)->newSelected[0]=item)
-				.setPositiveButton(R.string.ok, (dlg, item)->{
+						selected, (dlg, which)->newSelected[0]=which)
+				.setPositiveButton(R.string.ok, (dlg, which)->{
 					lp.timelineReplyVisibility=switch(newSelected[0]){
 						case 0 -> "following";
 						case 1 -> "self";
@@ -183,10 +182,11 @@ public class SettingsBehaviorFragment extends BaseSettingsFragment<Void> impleme
 		GlobalUserPreferences.allowRemoteLoading=remoteLoadingItem.checked;
 		GlobalUserPreferences.mentionRebloggerAutomatically=mentionRebloggerAutomaticallyItem.checked;
 		GlobalUserPreferences.hapticFeedback=hapticFeedbackItem.checked;
-		GlobalUserPreferences.defaultToUnlistedReplies=unlistedRepliesItem.checked;
 		GlobalUserPreferences.showPostsWithoutAlt=showPostsWithoutAltItem.checked;
 		GlobalUserPreferences.save();
 		AccountLocalPreferences lp=getLocalPrefs();
+		boolean restartPlease=lp.showBoosts!=showBoostsItem.checked
+				|| lp.showReplies!=showRepliesItem.checked;
 		lp.showBoosts=showBoostsItem.checked;
 		lp.showReplies=showRepliesItem.checked;
 		lp.save();
@@ -197,6 +197,7 @@ public class SettingsBehaviorFragment extends BaseSettingsFragment<Void> impleme
 			s.preferences.postingDefaultLanguage=newPostLanguage.language.getLanguage();
 			s.savePreferencesLater();
 		}
+		if(restartPlease) getActivity().recreate();
 	}
 
 	@Override

mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsDebugFragment.java

@@ -39,7 +39,7 @@ public class SettingsDebugFragment extends BaseSettingsFragment<Void>{
 	@Override
 	protected void doLoadData(int offset, int count){}
 
-	private void onTestEmailConfirmClick(){
+	private void onTestEmailConfirmClick(ListItem<?> item){
 		AccountSession sess=AccountSessionManager.getInstance().getAccount(accountID);
 		sess.activated=false;
 		sess.activationInfo=new AccountActivationInfo("test@email", System.currentTimeMillis());
@@ -49,18 +49,18 @@ public class SettingsDebugFragment extends BaseSettingsFragment<Void>{
 		Nav.goClearingStack(getActivity(), AccountActivationFragment.class, args);
 	}
 
-	private void onForceSelfUpdateClick(){
+	private void onForceSelfUpdateClick(ListItem<?> item){
 		GithubSelfUpdater.forceUpdate=true;
 		GithubSelfUpdater.getInstance().maybeCheckForUpdates();
 		restartUI();
 	}
 
-	private void onResetUpdaterClick(){
+	private void onResetUpdaterClick(ListItem<?> item){
 		GithubSelfUpdater.getInstance().reset();
 		restartUI();
 	}
 
-	private void onResetDiscoverBannersClick(){
+	private void onResetDiscoverBannersClick(ListItem<?> item){
 		DiscoverInfoBannerHelper.reset();
 		restartUI();
 	}

mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsDisplayFragment.java

@@ -1,6 +1,7 @@
 package org.joinmastodon.android.fragments.settings;
 
 import android.app.Activity;
+import android.app.AlertDialog;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.os.Build;
@@ -18,6 +19,7 @@ import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.MastodonApp;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.session.AccountLocalPreferences;
+import org.joinmastodon.android.api.session.AccountLocalPreferences.ColorPreference;
 import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.events.StatusDisplaySettingsChangedEvent;
@@ -28,6 +30,8 @@ import org.joinmastodon.android.ui.views.TextInputFrameLayout;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
 import me.grishka.appkit.FragmentStackActivity;
@@ -38,7 +42,7 @@ public class SettingsDisplayFragment extends BaseSettingsFragment<Void>{
 	private CheckableListItem<Void> revealCWsItem, hideSensitiveMediaItem, interactionCountsItem, emojiInNamesItem;
 
 	// MEGALODON
-	private CheckableListItem<Void> trueBlackModeItem, marqueeItem, disableSwipeItem, reduceMotionItem, altIndicatorItem, noAltIndicatorItem, collapsePostsItem, spectatorModeItem, hideFabItem, translateOpenedItem, disablePillItem, showNavigationLabelsItem;
+	private CheckableListItem<Void> trueBlackModeItem, marqueeItem, disableSwipeItem, reduceMotionItem, altIndicatorItem, noAltIndicatorItem, collapsePostsItem, spectatorModeItem, hideFabItem, translateOpenedItem, disablePillItem, showNavigationLabelsItem, likeIconItem, underlinedLinksItem;
 	private ListItem<Void> colorItem, publishTextItem, autoRevealCWsItem;
 	private CheckableListItem<Void> pronounsInUserListingsItem, pronounsInTimelinesItem, pronounsInThreadsItem;
 
@@ -55,33 +59,35 @@ public class SettingsDisplayFragment extends BaseSettingsFragment<Void>{
 		lp=s.getLocalPreferences();
 		onDataLoaded(List.of(
 				themeItem=new ListItem<>(R.string.settings_theme, getAppearanceValue(), R.drawable.ic_fluent_weather_moon_24_regular, this::onAppearanceClick),
-				colorItem=new ListItem<>(R.string.sk_settings_color_palette, getColorPaletteValue(), R.drawable.ic_fluent_color_24_regular, this::onColorClick),
-				trueBlackModeItem=new CheckableListItem<>(R.string.sk_settings_true_black, R.string.mo_setting_true_black_summary, CheckableListItem.Style.SWITCH, GlobalUserPreferences.trueBlackTheme, R.drawable.ic_fluent_dark_theme_24_regular, this::onTrueBlackModeClick, true),
+				colorItem=new ListItem<>(getString(R.string.sk_settings_color_palette), getColorPaletteValue(), R.drawable.ic_fluent_color_24_regular, this::onColorClick),
+				trueBlackModeItem=new CheckableListItem<>(R.string.sk_settings_true_black, R.string.mo_setting_true_black_summary, CheckableListItem.Style.SWITCH, GlobalUserPreferences.trueBlackTheme, R.drawable.ic_fluent_dark_theme_24_regular, i->onTrueBlackModeClick(), true),
 				publishTextItem=new ListItem<>(getString(R.string.sk_settings_publish_button_text), getPublishButtonText(), R.drawable.ic_fluent_send_24_regular, this::onPublishTextClick),
 				autoRevealCWsItem=new ListItem<>(R.string.sk_settings_auto_reveal_equal_spoilers, getAutoRevealSpoilersText(), R.drawable.ic_fluent_eye_24_regular, this::onAutoRevealSpoilersClick),
-				relocatePublishButtonItem=new CheckableListItem<>(R.string.mo_relocate_publish_button, R.string.mo_setting_relocate_publish_summary, CheckableListItem.Style.SWITCH, GlobalUserPreferences.relocatePublishButton, R.drawable.ic_fluent_arrow_autofit_down_24_regular, ()->toggleCheckableItem(relocatePublishButtonItem)),
-				revealCWsItem=new CheckableListItem<>(R.string.sk_settings_always_reveal_content_warnings, 0, CheckableListItem.Style.SWITCH, lp.revealCWs, R.drawable.ic_fluent_chat_warning_24_regular, ()->toggleCheckableItem(revealCWsItem)),
-				hideSensitiveMediaItem=new CheckableListItem<>(R.string.settings_hide_sensitive_media, 0, CheckableListItem.Style.SWITCH, lp.hideSensitiveMedia, R.drawable.ic_fluent_flag_24_regular, ()->toggleCheckableItem(hideSensitiveMediaItem)),
-				showMediaPreviewItem=new CheckableListItem<>(R.string.mo_show_media_preview, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.showMediaPreview, R.drawable.ic_fluent_image_24_regular, ()->toggleCheckableItem(showMediaPreviewItem)),
-				interactionCountsItem=new CheckableListItem<>(R.string.settings_show_interaction_counts, R.string.mo_setting_interaction_count_summary, CheckableListItem.Style.SWITCH, lp.showInteractionCounts, R.drawable.ic_fluent_number_row_24_regular, ()->toggleCheckableItem(interactionCountsItem)),
-				emojiInNamesItem=new CheckableListItem<>(R.string.settings_show_emoji_in_names, 0, CheckableListItem.Style.SWITCH, lp.customEmojiInNames, R.drawable.ic_fluent_emoji_24_regular, ()->toggleCheckableItem(emojiInNamesItem)),
-				marqueeItem=new CheckableListItem<>(R.string.sk_settings_enable_marquee, R.string.mo_setting_marquee_summary, CheckableListItem.Style.SWITCH, GlobalUserPreferences.toolbarMarquee, R.drawable.ic_fluent_text_more_24_regular, ()->toggleCheckableItem(marqueeItem)),
-				reduceMotionItem=new CheckableListItem<>(R.string.sk_settings_reduce_motion, R.string.mo_setting_reduced_motion_summary, CheckableListItem.Style.SWITCH, GlobalUserPreferences.reduceMotion, R.drawable.ic_fluent_star_emphasis_24_regular, ()->toggleCheckableItem(reduceMotionItem)),
-				enableDoubleTapToSearchItem=new CheckableListItem<>(R.string.mo_double_tap_to_search, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.doubleTapToSearch, R.drawable.ic_fluent_search_24_regular, ()->toggleCheckableItem(enableDoubleTapToSearchItem)),
-				disableSwipeItem=new CheckableListItem<>(R.string.sk_settings_tabs_disable_swipe, R.string.mo_setting_disable_swipe_summary, CheckableListItem.Style.SWITCH, GlobalUserPreferences.disableSwipe, R.drawable.ic_fluent_swipe_right_24_regular, ()->toggleCheckableItem(disableSwipeItem)),
-				enableDoubleTapToSwipeItem=new CheckableListItem<>(R.string.mo_double_tap_to_swipe_between_tabs, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.doubleTapToSwipe, R.drawable.ic_fluent_double_tap_swipe_right_24_regular, ()->toggleCheckableItem(enableDoubleTapToSwipeItem)),
-				altIndicatorItem=new CheckableListItem<>(R.string.sk_settings_show_alt_indicator, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.showAltIndicator, R.drawable.ic_fluent_scan_text_24_regular, ()->toggleCheckableItem(altIndicatorItem)),
-				noAltIndicatorItem=new CheckableListItem<>(R.string.sk_settings_show_no_alt_indicator, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.showNoAltIndicator, R.drawable.ic_fluent_important_24_regular, ()->toggleCheckableItem(noAltIndicatorItem)),
-				collapsePostsItem=new CheckableListItem<>(R.string.sk_settings_collapse_long_posts, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.collapseLongPosts, R.drawable.ic_fluent_chevron_down_24_regular, ()->toggleCheckableItem(collapsePostsItem)),
-				spectatorModeItem=new CheckableListItem<>(R.string.sk_settings_hide_interaction, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.spectatorMode, R.drawable.ic_fluent_star_off_24_regular, ()->toggleCheckableItem(spectatorModeItem)),
-				hideFabItem=new CheckableListItem<>(R.string.sk_settings_hide_fab, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.autoHideFab, R.drawable.ic_fluent_edit_24_regular, ()->toggleCheckableItem(hideFabItem)),
-				translateOpenedItem=new CheckableListItem<>(R.string.sk_settings_translate_only_opened, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.translateButtonOpenedOnly, R.drawable.ic_fluent_translate_24_regular, ()->toggleCheckableItem(translateOpenedItem)),
-				showPostDividersItem=new CheckableListItem<>(R.string.mo_enable_dividers, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.showDividers, R.drawable.ic_fluent_timeline_24_regular, ()->toggleCheckableItem(showPostDividersItem)),
-				disablePillItem=new CheckableListItem<>(R.string.sk_disable_pill_shaped_active_indicator, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.disableM3PillActiveIndicator, R.drawable.ic_fluent_pill_24_regular, ()->toggleCheckableItem(disablePillItem)),
-				showNavigationLabelsItem=new CheckableListItem<>(R.string.sk_settings_show_labels_in_navigation_bar, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.showNavigationLabels, R.drawable.ic_fluent_tag_24_regular, ()->toggleCheckableItem(showNavigationLabelsItem), true),
-				pronounsInTimelinesItem=new CheckableListItem<>(R.string.sk_settings_display_pronouns_in_timelines, 0, CheckableListItem.Style.CHECKBOX, GlobalUserPreferences.displayPronounsInTimelines, 0, ()->toggleCheckableItem(pronounsInTimelinesItem)),
-				pronounsInThreadsItem=new CheckableListItem<>(R.string.sk_settings_display_pronouns_in_threads, 0, CheckableListItem.Style.CHECKBOX, GlobalUserPreferences.displayPronounsInThreads, 0, ()->toggleCheckableItem(pronounsInThreadsItem)),
-				pronounsInUserListingsItem=new CheckableListItem<>(R.string.sk_settings_display_pronouns_in_user_listings, 0, CheckableListItem.Style.CHECKBOX, GlobalUserPreferences.displayPronounsInUserListings, 0, ()->toggleCheckableItem(pronounsInUserListingsItem))
+				relocatePublishButtonItem=new CheckableListItem<>(R.string.mo_relocate_publish_button, R.string.mo_setting_relocate_publish_summary, CheckableListItem.Style.SWITCH, GlobalUserPreferences.relocatePublishButton, R.drawable.ic_fluent_arrow_autofit_down_24_regular, i->toggleCheckableItem(relocatePublishButtonItem)),
+				revealCWsItem=new CheckableListItem<>(R.string.sk_settings_always_reveal_content_warnings, 0, CheckableListItem.Style.SWITCH, lp.revealCWs, R.drawable.ic_fluent_chat_warning_24_regular, i->toggleCheckableItem(revealCWsItem)),
+				hideSensitiveMediaItem=new CheckableListItem<>(R.string.settings_hide_sensitive_media, 0, CheckableListItem.Style.SWITCH, lp.hideSensitiveMedia, R.drawable.ic_fluent_flag_24_regular, i->toggleCheckableItem(hideSensitiveMediaItem)),
+				showMediaPreviewItem=new CheckableListItem<>(R.string.mo_show_media_preview, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.showMediaPreview, R.drawable.ic_fluent_image_24_regular, i->toggleCheckableItem(showMediaPreviewItem)),
+				interactionCountsItem=new CheckableListItem<>(R.string.settings_show_interaction_counts, R.string.mo_setting_interaction_count_summary, CheckableListItem.Style.SWITCH, lp.showInteractionCounts, R.drawable.ic_fluent_number_row_24_regular, i->toggleCheckableItem(interactionCountsItem)),
+				emojiInNamesItem=new CheckableListItem<>(R.string.settings_show_emoji_in_names, 0, CheckableListItem.Style.SWITCH, lp.customEmojiInNames, R.drawable.ic_fluent_emoji_24_regular, i->toggleCheckableItem(emojiInNamesItem)),
+				marqueeItem=new CheckableListItem<>(R.string.sk_settings_enable_marquee, R.string.mo_setting_marquee_summary, CheckableListItem.Style.SWITCH, GlobalUserPreferences.toolbarMarquee, R.drawable.ic_fluent_text_more_24_regular, i->toggleCheckableItem(marqueeItem)),
+				reduceMotionItem=new CheckableListItem<>(R.string.sk_settings_reduce_motion, R.string.mo_setting_reduced_motion_summary, CheckableListItem.Style.SWITCH, GlobalUserPreferences.reduceMotion, R.drawable.ic_fluent_star_emphasis_24_regular, i->toggleCheckableItem(reduceMotionItem)),
+				enableDoubleTapToSearchItem=new CheckableListItem<>(R.string.mo_double_tap_to_search, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.doubleTapToSearch, R.drawable.ic_fluent_search_24_regular, i->toggleCheckableItem(enableDoubleTapToSearchItem)),
+				disableSwipeItem=new CheckableListItem<>(R.string.sk_settings_tabs_disable_swipe, R.string.mo_setting_disable_swipe_summary, CheckableListItem.Style.SWITCH, GlobalUserPreferences.disableSwipe, R.drawable.ic_fluent_swipe_right_24_regular, i->toggleCheckableItem(disableSwipeItem)),
+				enableDoubleTapToSwipeItem=new CheckableListItem<>(R.string.mo_double_tap_to_swipe_between_tabs, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.doubleTapToSwipe, R.drawable.ic_fluent_double_tap_swipe_right_24_regular, i->toggleCheckableItem(enableDoubleTapToSwipeItem)),
+				altIndicatorItem=new CheckableListItem<>(R.string.sk_settings_show_alt_indicator, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.showAltIndicator, R.drawable.ic_fluent_scan_text_24_regular, i->toggleCheckableItem(altIndicatorItem)),
+				noAltIndicatorItem=new CheckableListItem<>(R.string.sk_settings_show_no_alt_indicator, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.showNoAltIndicator, R.drawable.ic_fluent_important_24_regular, i->toggleCheckableItem(noAltIndicatorItem)),
+				collapsePostsItem=new CheckableListItem<>(R.string.sk_settings_collapse_long_posts, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.collapseLongPosts, R.drawable.ic_fluent_chevron_down_24_regular, i->toggleCheckableItem(collapsePostsItem)),
+				spectatorModeItem=new CheckableListItem<>(R.string.sk_settings_hide_interaction, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.spectatorMode, R.drawable.ic_fluent_star_off_24_regular, i->toggleCheckableItem(spectatorModeItem)),
+				hideFabItem=new CheckableListItem<>(R.string.sk_settings_hide_fab, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.autoHideFab, R.drawable.ic_fluent_edit_24_regular, i->toggleCheckableItem(hideFabItem)),
+				translateOpenedItem=new CheckableListItem<>(R.string.sk_settings_translate_only_opened, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.translateButtonOpenedOnly, R.drawable.ic_fluent_translate_24_regular, i->toggleCheckableItem(translateOpenedItem)),
+				likeIconItem=new CheckableListItem<>(R.string.sk_settings_like_icon, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.likeIcon, R.drawable.ic_fluent_heart_24_regular, i->toggleCheckableItem(likeIconItem)),
+				underlinedLinksItem=new CheckableListItem<>(R.string.sk_settings_underlined_links, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.underlinedLinks, R.drawable.ic_fluent_text_underline_24_regular, i->toggleCheckableItem(underlinedLinksItem)),
+				showPostDividersItem=new CheckableListItem<>(R.string.mo_enable_dividers, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.showDividers, R.drawable.ic_fluent_timeline_24_regular, i->toggleCheckableItem(showPostDividersItem)),
+				disablePillItem=new CheckableListItem<>(R.string.sk_disable_pill_shaped_active_indicator, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.disableM3PillActiveIndicator, R.drawable.ic_fluent_pill_24_regular, i->toggleCheckableItem(disablePillItem)),
+				showNavigationLabelsItem=new CheckableListItem<>(R.string.sk_settings_show_labels_in_navigation_bar, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.showNavigationLabels, R.drawable.ic_fluent_tag_24_regular, i->toggleCheckableItem(showNavigationLabelsItem), true),
+				pronounsInTimelinesItem=new CheckableListItem<>(R.string.sk_settings_display_pronouns_in_timelines, 0, CheckableListItem.Style.CHECKBOX, GlobalUserPreferences.displayPronounsInTimelines, 0, i->toggleCheckableItem(pronounsInTimelinesItem)),
+				pronounsInThreadsItem=new CheckableListItem<>(R.string.sk_settings_display_pronouns_in_threads, 0, CheckableListItem.Style.CHECKBOX, GlobalUserPreferences.displayPronounsInThreads, 0, i->toggleCheckableItem(pronounsInThreadsItem)),
+				pronounsInUserListingsItem=new CheckableListItem<>(R.string.sk_settings_display_pronouns_in_user_listings, 0, CheckableListItem.Style.CHECKBOX, GlobalUserPreferences.displayPronounsInUserListings, 0, i->toggleCheckableItem(pronounsInUserListingsItem))
 		));
 		trueBlackModeItem.checkedChangeListener=checked->onTrueBlackModeClick();
 	}
@@ -103,11 +109,11 @@ public class SettingsDisplayFragment extends BaseSettingsFragment<Void>{
 	protected void onHidden(){
 		super.onHidden();
 
-		boolean restartPlease=
-				GlobalUserPreferences.disableM3PillActiveIndicator!=disablePillItem.checked ||
-				GlobalUserPreferences.showNavigationLabels!=showNavigationLabelsItem.checked ||
-				GlobalUserPreferences.showMediaPreview !=showMediaPreviewItem.checked ||
-				GlobalUserPreferences.showDividers!=showPostDividersItem.checked;
+		boolean restartPlease=GlobalUserPreferences.disableM3PillActiveIndicator!=disablePillItem.checked
+				|| GlobalUserPreferences.showNavigationLabels!=showNavigationLabelsItem.checked
+				|| GlobalUserPreferences.showMediaPreview!=showMediaPreviewItem.checked
+				|| GlobalUserPreferences.showDividers!=showPostDividersItem.checked
+				|| GlobalUserPreferences.likeIcon!=likeIconItem.checked;
 
 		lp.revealCWs=revealCWsItem.checked;
 		lp.hideSensitiveMedia=hideSensitiveMediaItem.checked;
@@ -126,6 +132,8 @@ public class SettingsDisplayFragment extends BaseSettingsFragment<Void>{
 		GlobalUserPreferences.spectatorMode=spectatorModeItem.checked;
 		GlobalUserPreferences.autoHideFab=hideFabItem.checked;
 		GlobalUserPreferences.translateButtonOpenedOnly=translateOpenedItem.checked;
+		GlobalUserPreferences.likeIcon=likeIconItem.checked;
+		GlobalUserPreferences.underlinedLinks=underlinedLinksItem.checked;
 		GlobalUserPreferences.showDividers=showPostDividersItem.checked;
 		GlobalUserPreferences.disableM3PillActiveIndicator=disablePillItem.checked;
 		GlobalUserPreferences.showNavigationLabels=showNavigationLabelsItem.checked;
@@ -146,19 +154,11 @@ public class SettingsDisplayFragment extends BaseSettingsFragment<Void>{
 		};
 	}
 
-	private @StringRes int getColorPaletteValue(){
-		return switch(GlobalUserPreferences.color){
-			case MATERIAL3 -> R.string.sk_color_palette_material3;
-			case PINK -> R.string.sk_color_palette_pink;
-			case PURPLE -> R.string.sk_color_palette_purple;
-			case GREEN -> R.string.sk_color_palette_green;
-			case BLUE -> R.string.sk_color_palette_blue;
-			case BROWN -> R.string.sk_color_palette_brown;
-			case RED -> R.string.sk_color_palette_red;
-			case YELLOW -> R.string.sk_color_palette_yellow;
-			case NORD -> R.string.mo_color_palette_nord;
-			case WHITE -> R.string.mo_color_palette_black_and_white;
-		};
+	private String getColorPaletteValue(){
+		ColorPreference color=AccountSessionManager.get(accountID).getLocalPreferences().color;
+		return color==null
+				? getString(R.string.sk_settings_color_palette_default, getString(GlobalUserPreferences.color.getName()))
+				: getString(color.getName());
 	}
 
 	private String getPublishButtonText() {
@@ -182,7 +182,7 @@ public class SettingsDisplayFragment extends BaseSettingsFragment<Void>{
 		maybeApplyNewThemeRightNow(null, null, prev);
 	}
 
-	private void onAppearanceClick(){
+	private void onAppearanceClick(ListItem<?> item_){
 		int selected=switch(GlobalUserPreferences.theme){
 			case LIGHT -> 0;
 			case DARK -> 1;
@@ -213,30 +213,44 @@ public class SettingsDisplayFragment extends BaseSettingsFragment<Void>{
 				.show();
 	}
 
-	private void onColorClick(){
-		int selected=GlobalUserPreferences.color.ordinal();
+	private void onColorClick(ListItem<?> item_){
+		boolean multiple=AccountSessionManager.getInstance().getLoggedInAccounts().size() > 1;
+		int indexOffset=multiple ? 1 : 0;
+		int selected=lp.color==null ? 0 : lp.color.ordinal() + indexOffset;
 		int[] newSelected={selected};
-		String[] names=Arrays.stream(GlobalUserPreferences.ColorPreference.values()).map(GlobalUserPreferences.ColorPreference::getName).map(this::getString).toArray(String[]::new);
-		new M3AlertDialogBuilder(getActivity())
-				.setTitle(R.string.settings_theme)
-				.setSingleChoiceItems(names,
+		List<String> items=Arrays.stream(ColorPreference.values()).map(ColorPreference::getName).map(this::getString).collect(Collectors.toList());
+		if(multiple)
+			items.add(0, getString(R.string.sk_settings_color_palette_default, items.get(GlobalUserPreferences.color.ordinal())));
+
+		Consumer<Boolean> save=(asDefault)->{
+			boolean defaultSelected=multiple && newSelected[0]==0;
+			ColorPreference pref=defaultSelected ? null : ColorPreference.values()[newSelected[0]-indexOffset];
+			if(pref!=lp.color){
+				ColorPreference prev=lp.color;
+				lp.color=asDefault ? null : pref;
+				lp.save();
+				if((asDefault || !multiple) && pref!=null){
+					GlobalUserPreferences.color=pref;
+					GlobalUserPreferences.save();
+				}
+				colorItem.subtitle=getColorPaletteValue();
+				rebindItem(colorItem);
+				if(prev==null && pref!=null) restartActivityToApplyNewTheme();
+				else maybeApplyNewThemeRightNow(null, prev, null);
+			}
+		};
+
+		AlertDialog.Builder alert=new M3AlertDialogBuilder(getActivity())
+				.setTitle(R.string.sk_settings_color_palette)
+				.setSingleChoiceItems(items.stream().toArray(String[]::new),
 						selected, (dlg, item)->newSelected[0]=item)
-				.setPositiveButton(R.string.ok, (dlg, item)->{
-					GlobalUserPreferences.ColorPreference pref=GlobalUserPreferences.ColorPreference.values()[newSelected[0]];
-					if(pref!=GlobalUserPreferences.color){
-						GlobalUserPreferences.ColorPreference prev=GlobalUserPreferences.color;
-						GlobalUserPreferences.color=pref;
-						GlobalUserPreferences.save();
-						colorItem.subtitleRes=getColorPaletteValue();
-						rebindItem(colorItem);
-						maybeApplyNewThemeRightNow(null, prev, null);
-					}
-				})
-				.setNegativeButton(R.string.cancel, null)
-				.show();
+				.setPositiveButton(R.string.ok, (dlg, item)->save.accept(false))
+				.setNegativeButton(R.string.cancel, null);
+		if(multiple) alert.setNeutralButton(R.string.sk_set_as_default, (dlg, item)->save.accept(true));
+		alert.show();
 	}
 
-	private void onPublishTextClick(){
+	private void onPublishTextClick(ListItem<?> item_){
 		TextInputFrameLayout input = new TextInputFrameLayout(
 				getContext(),
 				getString(R.string.publish),
@@ -259,7 +273,7 @@ public class SettingsDisplayFragment extends BaseSettingsFragment<Void>{
 				.show();
 	}
 
-	private void onAutoRevealSpoilersClick(){
+	private void onAutoRevealSpoilersClick(ListItem<?> item_){
 		int selected=GlobalUserPreferences.autoRevealEqualSpoilers.ordinal();
 		int[] newSelected={selected};
 		new M3AlertDialogBuilder(getActivity())
@@ -275,17 +289,17 @@ public class SettingsDisplayFragment extends BaseSettingsFragment<Void>{
 				.show();
 	}
 
-	private void maybeApplyNewThemeRightNow(GlobalUserPreferences.ThemePreference prevTheme, GlobalUserPreferences.ColorPreference prevColor, Boolean prevTrueBlack){
+	private void maybeApplyNewThemeRightNow(GlobalUserPreferences.ThemePreference prevTheme, ColorPreference prevColor, Boolean prevTrueBlack){
 		if(prevTheme==null) prevTheme=GlobalUserPreferences.theme;
 		if(prevTrueBlack==null) prevTrueBlack=GlobalUserPreferences.trueBlackTheme;
-		if(prevColor==null) prevColor=GlobalUserPreferences.color;
+		if(prevColor==null) prevColor=lp.getCurrentColor();
 
 		boolean isCurrentDark=prevTheme==GlobalUserPreferences.ThemePreference.DARK ||
 				(prevTheme==GlobalUserPreferences.ThemePreference.AUTO && Build.VERSION.SDK_INT>=30 && getResources().getConfiguration().isNightModeActive());
 		boolean isNewDark=GlobalUserPreferences.theme==GlobalUserPreferences.ThemePreference.DARK ||
 				(GlobalUserPreferences.theme==GlobalUserPreferences.ThemePreference.AUTO && Build.VERSION.SDK_INT>=30 && getResources().getConfiguration().isNightModeActive());
 		boolean isNewBlack=GlobalUserPreferences.trueBlackTheme;
-		if(isCurrentDark!=isNewDark || prevColor!=GlobalUserPreferences.color || (isNewDark && prevTrueBlack!=isNewBlack)){
+		if(isCurrentDark!=isNewDark || prevColor!=lp.getCurrentColor() || (isNewDark && prevTrueBlack!=isNewBlack)){
 			restartActivityToApplyNewTheme();
 		}
 	}

mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsFiltersFragment.java

@@ -55,7 +55,7 @@ public class SettingsFiltersFragment extends BaseSettingsFragment<Filter>{
 		MergeRecyclerAdapter adapter=new MergeRecyclerAdapter();
 		adapter.addAdapter(super.getAdapter());
 		adapter.addAdapter(new GenericListItemsAdapter<>(Collections.singletonList(
-				new ListItem<Void>(R.string.settings_add_filter, 0, R.drawable.ic_add_24px, this::onAddFilterClick)
+				new ListItem<Void>(R.string.settings_add_filter, 0, R.drawable.ic_fluent_add_24_regular, this::onAddFilterClick)
 		)));
 		return adapter;
 	}
@@ -67,16 +67,14 @@ public class SettingsFiltersFragment extends BaseSettingsFragment<Filter>{
 		Nav.go(getActivity(), EditFilterFragment.class, args);
 	}
 
-	private void onAddFilterClick(){
+	private void onAddFilterClick(ListItem<?> item){
 		Bundle args=new Bundle();
 		args.putString("account", accountID);
 		Nav.go(getActivity(), EditFilterFragment.class, args);
 	}
 
 	private ListItem<Filter> makeListItem(Filter f){
-		ListItem<Filter> item=new ListItem<>(f.title, getString(f.isActive() ? R.string.filter_active : R.string.filter_inactive), null, f);
-		item.onClick=()->onFilterClick(item);
-		item.isEnabled=true;
+		ListItem<Filter> item=new ListItem<>(f.title, getString(f.isActive() ? R.string.filter_active : R.string.filter_inactive), this::onFilterClick, f);
 		return item;
 	}
 

mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsInstanceFragment.java

@@ -19,6 +19,7 @@ import org.joinmastodon.android.ui.utils.UiUtils;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
 import me.grishka.appkit.Nav;
@@ -36,15 +37,15 @@ public class SettingsInstanceFragment extends BaseSettingsFragment<Void> impleme
 		lp=s.getLocalPreferences();
 		onDataLoaded(List.of(
 				new ListItem<>(AccountSessionManager.get(accountID).domain, getString(R.string.settings_server_explanation), R.drawable.ic_fluent_server_24_regular, this::onServerClick),
-				new ListItem<>(R.string.sk_settings_profile, 0, R.drawable.ic_fluent_open_24_regular, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+s.domain+"/settings/profile")),
-				new ListItem<>(R.string.sk_settings_posting, 0, R.drawable.ic_fluent_open_24_regular, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+s.domain+"/settings/preferences/other")),
-				new ListItem<>(R.string.sk_settings_auth, 0, R.drawable.ic_fluent_open_24_regular, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+s.domain+"/auth/edit"), 0, true),
-				contentTypesItem=new CheckableListItem<>(R.string.sk_settings_content_types, R.string.sk_settings_content_types_explanation, CheckableListItem.Style.SWITCH, lp.contentTypesEnabled, R.drawable.ic_fluent_text_edit_style_24_regular, this::onContentTypeClick),
+				new ListItem<>(R.string.sk_settings_profile, 0, R.drawable.ic_fluent_open_24_regular, i->UiUtils.launchWebBrowser(getActivity(), "https://"+s.domain+"/settings/profile")),
+				new ListItem<>(R.string.sk_settings_posting, 0, R.drawable.ic_fluent_open_24_regular, i->UiUtils.launchWebBrowser(getActivity(), "https://"+s.domain+"/settings/preferences/other")),
+				new ListItem<>(R.string.sk_settings_auth, 0, R.drawable.ic_fluent_open_24_regular, i->UiUtils.launchWebBrowser(getActivity(), "https://"+s.domain+"/auth/edit"), 0, true),
+				contentTypesItem=new CheckableListItem<>(R.string.sk_settings_content_types, R.string.sk_settings_content_types_explanation, CheckableListItem.Style.SWITCH, lp.contentTypesEnabled, R.drawable.ic_fluent_text_edit_style_24_regular, i->onContentTypeClick()),
 				defaultContentTypeItem=new ListItem<>(R.string.sk_settings_default_content_type, lp.defaultContentType.getName(), R.drawable.ic_fluent_text_bold_24_regular, this::onDefaultContentTypeClick, 0, true),
-				emojiReactionsItem=new CheckableListItem<>(R.string.sk_settings_emoji_reactions, R.string.sk_settings_emoji_reactions_explanation, CheckableListItem.Style.SWITCH, lp.emojiReactionsEnabled, R.drawable.ic_fluent_emoji_laugh_24_regular, this::onEmojiReactionsClick),
+				emojiReactionsItem=new CheckableListItem<>(R.string.sk_settings_emoji_reactions, R.string.sk_settings_emoji_reactions_explanation, CheckableListItem.Style.SWITCH, lp.emojiReactionsEnabled, R.drawable.ic_fluent_emoji_laugh_24_regular, i->onEmojiReactionsClick()),
 				showEmojiReactionsItem=new ListItem<>(R.string.sk_settings_show_emoji_reactions, getShowEmojiReactionsString(), R.drawable.ic_fluent_emoji_24_regular, this::onShowEmojiReactionsClick, 0, true),
-				localOnlyItem=new CheckableListItem<>(R.string.sk_settings_support_local_only, R.string.sk_settings_local_only_explanation, CheckableListItem.Style.SWITCH, lp.localOnlySupported, R.drawable.ic_fluent_eye_24_regular, this::onLocalOnlyClick),
-				glitchModeItem=new CheckableListItem<>(R.string.sk_settings_glitch_instance, R.string.sk_settings_glitch_mode_explanation, CheckableListItem.Style.SWITCH, lp.glitchInstance, R.drawable.ic_fluent_eye_24_filled, ()->toggleCheckableItem(glitchModeItem))
+				localOnlyItem=new CheckableListItem<>(R.string.sk_settings_support_local_only, R.string.sk_settings_local_only_explanation, CheckableListItem.Style.SWITCH, lp.localOnlySupported, R.drawable.ic_fluent_eye_24_regular, i->onLocalOnlyClick()),
+				glitchModeItem=new CheckableListItem<>(R.string.sk_settings_glitch_instance, R.string.sk_settings_glitch_mode_explanation, CheckableListItem.Style.SWITCH, lp.glitchInstance, R.drawable.ic_fluent_eye_24_filled, i->toggleCheckableItem(glitchModeItem))
 		));
 		contentTypesItem.checkedChangeListener=checked->onContentTypeClick();
 		defaultContentTypeItem.isEnabled=contentTypesItem.checked;
@@ -68,7 +69,7 @@ public class SettingsInstanceFragment extends BaseSettingsFragment<Void> impleme
 		E.post(new StatusDisplaySettingsChangedEvent(accountID));
 	}
 
-	private void onServerClick(){
+	private void onServerClick(ListItem<?> item){
 		Bundle args=new Bundle();
 		args.putString("account", accountID);
 		Nav.go(getActivity(), SettingsServerFragment.class, args);
@@ -87,23 +88,23 @@ public class SettingsInstanceFragment extends BaseSettingsFragment<Void> impleme
 		defaultContentTypeItem.subtitleRes=lp.defaultContentType.getName();
 	}
 
-	private void onDefaultContentTypeClick(){
-		int selected=lp.defaultContentType.ordinal();
-		int[] newSelected={selected};
-		ContentType[] supportedContentTypes=Arrays.stream(ContentType.values())
+	private void onDefaultContentTypeClick(ListItem<?> item_){
+		List<ContentType> supportedContentTypes=Arrays.stream(ContentType.values())
 				.filter(t->t.supportedByInstance(getInstance().orElse(null)))
-				.toArray(ContentType[]::new);
-		String[] names=Arrays.stream(supportedContentTypes)
+				.collect(Collectors.toList());
+		int selected=supportedContentTypes.indexOf(lp.defaultContentType);
+		int[] newSelected={selected};
+		String[] names=supportedContentTypes.stream()
 				.map(ContentType::getName)
 				.map(this::getString)
 				.toArray(String[]::new);
 
 		new M3AlertDialogBuilder(getActivity())
-				.setTitle(R.string.settings_theme)
+				.setTitle(R.string.sk_settings_default_content_type)
 				.setSingleChoiceItems(names,
 						selected, (dlg, item)->newSelected[0]=item)
 				.setPositiveButton(R.string.ok, (dlg, item)->{
-					ContentType type=supportedContentTypes[newSelected[0]];
+					ContentType type=supportedContentTypes.get(newSelected[0]);
 					lp.defaultContentType=type;
 					defaultContentTypeItem.subtitleRes=type.getName();
 					rebindItem(defaultContentTypeItem);
@@ -112,7 +113,7 @@ public class SettingsInstanceFragment extends BaseSettingsFragment<Void> impleme
 				.show();
 	}
 
-	private void onShowEmojiReactionsClick(){
+	private void onShowEmojiReactionsClick(ListItem<?> item_){
 		int selected=lp.showEmojiReactions.ordinal();
 		int[] newSelected={selected};
 		new M3AlertDialogBuilder(getActivity())

mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsMainFragment.java

@@ -18,6 +18,7 @@ import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.events.SelfUpdateStateChangedEvent;
 import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.model.viewmodel.ListItem;
+import org.joinmastodon.android.ui.AccountSwitcherSheet;
 import org.joinmastodon.android.ui.M3AlertDialogBuilder;
 import org.joinmastodon.android.ui.utils.HideableSingleViewRecyclerAdapter;
 import org.joinmastodon.android.ui.utils.UiUtils;
@@ -49,28 +50,32 @@ public class SettingsMainFragment extends BaseSettingsFragment<Void>{
 	@Override
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
-		account = AccountSessionManager.get(accountID);
+		account=AccountSessionManager.get(accountID);
 		setTitle(R.string.settings);
 		setSubtitle(account.getFullUsername());
 		onDataLoaded(List.of(
 				new ListItem<>(R.string.settings_behavior, 0, R.drawable.ic_fluent_settings_24_regular, this::onBehaviorClick),
 				new ListItem<>(R.string.settings_display, 0, R.drawable.ic_fluent_color_24_regular, this::onDisplayClick),
-//				new ListItem<>(R.string.settings_privacy, 0, R.drawable.ic_privacy_tip_24px, this::onPrivacyClick),
+				new ListItem<>(R.string.settings_privacy, 0, R.drawable.ic_fluent_shield_24_regular, this::onPrivacyClick),
 				new ListItem<>(R.string.settings_notifications, 0, R.drawable.ic_fluent_alert_24_regular, this::onNotificationsClick),
 				new ListItem<>(R.string.sk_settings_instance, 0, R.drawable.ic_fluent_server_24_regular, this::onInstanceClick),
 				new ListItem<>(getString(R.string.about_app, getString(R.string.mo_app_name)), null, R.drawable.ic_fluent_info_24_regular, this::onAboutClick, null, 0, true),
+				new ListItem<>(R.string.manage_accounts, 0, R.drawable.ic_fluent_person_swap_24_regular, this::onManageAccountsClick),
 				new ListItem<>(R.string.log_out, 0, R.drawable.ic_fluent_sign_out_24_regular, this::onLogOutClick, R.attr.colorM3Error, false)
 		));
 
-		Instance instance = AccountSessionManager.getInstance().getInstanceInfo(account.domain);
-		if (!instance.isAkkoma())
-			data.add(2, new ListItem<>(R.string.settings_filters, 0, R.drawable.ic_fluent_filter_24_regular, this::onFiltersClick));
-
-		if(BuildConfig.DEBUG || BuildConfig.BUILD_TYPE.equals("appcenterPrivateBeta")){
-			data.add(0, new ListItem<>("Debug settings", null, R.drawable.ic_fluent_wrench_screwdriver_24_regular, ()->Nav.go(getActivity(), SettingsDebugFragment.class, makeFragmentArgs()), null, 0, true));
+		Instance instance=AccountSessionManager.getInstance().getInstanceInfo(account.domain);
+		if(!instance.isAkkoma()){
+			data.add(3, new ListItem<>(R.string.settings_filters, 0, R.drawable.ic_fluent_filter_24_regular, this::onFiltersClick));
 		}
 
-		account.reloadPreferences(null);
+		if(BuildConfig.DEBUG || BuildConfig.BUILD_TYPE.equals("appcenterPrivateBeta")){
+			data.add(0, new ListItem<>("Debug settings", null, R.drawable.ic_fluent_wrench_screwdriver_24_regular, i->Nav.go(getActivity(), SettingsDebugFragment.class, makeFragmentArgs()), null, 0, true));
+		}
+
+		AccountSession session=AccountSessionManager.get(accountID);
+		session.reloadPreferences(null);
+		session.updateAccountInfo();
 		E.register(this);
 	}
 
@@ -126,44 +131,46 @@ public class SettingsMainFragment extends BaseSettingsFragment<Void>{
 		return args;
 	}
 
-	private void onBehaviorClick(){
+	private void onBehaviorClick(ListItem<?> item_){
 		Nav.go(getActivity(), SettingsBehaviorFragment.class, makeFragmentArgs());
 	}
 
-	private void onDisplayClick(){
+	private void onDisplayClick(ListItem<?> item_){
 		Nav.go(getActivity(), SettingsDisplayFragment.class, makeFragmentArgs());
 	}
 
-//	private void onPrivacyClick(){
-//		Nav.go(getActivity(), SettingsPrivacyFragment.class, makeFragmentArgs());
-//	}
+	private void onPrivacyClick(ListItem<?> item_){
+		Nav.go(getActivity(), SettingsPrivacyFragment.class, makeFragmentArgs());
+	}
 
-	private void onFiltersClick(){
+	private void onFiltersClick(ListItem<?> item_){
 		Nav.go(getActivity(), SettingsFiltersFragment.class, makeFragmentArgs());
 	}
 
-	private void onNotificationsClick(){
+	private void onNotificationsClick(ListItem<?> item_){
 		Nav.go(getActivity(), SettingsNotificationsFragment.class, makeFragmentArgs());
 	}
 
-	private void onInstanceClick(){
+	private void onInstanceClick(ListItem<?> item_){
 		Nav.go(getActivity(), SettingsInstanceFragment.class, makeFragmentArgs());
 	}
 
-	private void onAboutClick(){
+	private void onAboutClick(ListItem<?> item_){
 		Nav.go(getActivity(), SettingsAboutAppFragment.class, makeFragmentArgs());
 	}
 
-	private void onLogOutClick(){
+	private void onManageAccountsClick(ListItem<?> item){
+		new AccountSwitcherSheet(getActivity(), null).show();
+	}
+
+	private void onLogOutClick(ListItem<?> item_){
 		AccountSession session=AccountSessionManager.getInstance().getAccount(accountID);
 		new M3AlertDialogBuilder(getActivity())
 				.setTitle(R.string.log_out)
 				.setMessage(getString(R.string.confirm_log_out, session.getFullUsername()))
 				.setPositiveButton(R.string.log_out, (dialog, which)->account.logOut(getActivity(), ()->{
 					loggedOut=true;
-					getActivity().finish();
-					Intent intent=new Intent(getActivity(), MainActivity.class);
-					startActivity(intent);
+					((MainActivity)getActivity()).restartActivity();
 				}))
 				.setNegativeButton(R.string.cancel, null)
 				.show();

mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsNotificationsFragment.java

@@ -27,7 +27,6 @@ import org.joinmastodon.android.model.viewmodel.ListItem;
 import org.joinmastodon.android.ui.M3AlertDialogBuilder;
 import org.joinmastodon.android.ui.utils.HideableSingleViewRecyclerAdapter;
 import org.joinmastodon.android.ui.utils.UiUtils;
-import org.unifiedpush.android.connector.RegistrationDialogContent;
 import org.unifiedpush.android.connector.UnifiedPush;
 
 import java.time.Instant;
@@ -76,22 +75,22 @@ public class SettingsNotificationsFragment extends BaseSettingsFragment<Void>{
 		useUnifiedPush=!getDistributor(getContext()).isEmpty();
 
 		onDataLoaded(List.of(
-				pauseItem=new CheckableListItem<>(getString(R.string.pause_all_notifications), getPauseItemSubtitle(), CheckableListItem.Style.SWITCH, false, R.drawable.ic_fluent_alert_snooze_24_regular, ()->onPauseNotificationsClick(false)),
+				pauseItem=new CheckableListItem<>(getString(R.string.pause_all_notifications), getPauseItemSubtitle(), CheckableListItem.Style.SWITCH, false, R.drawable.ic_fluent_alert_snooze_24_regular, i->onPauseNotificationsClick(false)),
 				policyItem=new ListItem<>(R.string.settings_notifications_policy, 0, R.drawable.ic_fluent_people_24_regular, this::onNotificationsPolicyClick, 0, true),
 
-				mentionsItem=new CheckableListItem<>(R.string.notification_type_mentions_and_replies, 0, CheckableListItem.Style.CHECKBOX, pushSubscription.alerts.mention, R.drawable.ic_fluent_mention_24_regular, ()->toggleCheckableItem(mentionsItem)),
-				boostsItem=new CheckableListItem<>(R.string.notification_type_reblog, 0, CheckableListItem.Style.CHECKBOX, pushSubscription.alerts.reblog, R.drawable.ic_fluent_arrow_repeat_all_24_regular, ()->toggleCheckableItem(boostsItem)),
-				favoritesItem=new CheckableListItem<>(R.string.notification_type_favorite, 0, CheckableListItem.Style.CHECKBOX, pushSubscription.alerts.favourite, R.drawable.ic_fluent_star_24_regular, ()->toggleCheckableItem(favoritesItem)),
-				followersItem=new CheckableListItem<>(R.string.notification_type_follow, 0, CheckableListItem.Style.CHECKBOX, pushSubscription.alerts.follow, R.drawable.ic_fluent_person_add_24_regular, ()->toggleCheckableItem(followersItem)),
-				pollsItem=new CheckableListItem<>(R.string.notification_type_poll, 0, CheckableListItem.Style.CHECKBOX, pushSubscription.alerts.poll, R.drawable.ic_fluent_poll_24_regular, ()->toggleCheckableItem(pollsItem)),
-				updateItem=new CheckableListItem<>(R.string.sk_notification_type_update, 0, CheckableListItem.Style.CHECKBOX, pushSubscription.alerts.update, R.drawable.ic_fluent_history_24_regular, ()->toggleCheckableItem(updateItem)),
-				postsItem=new CheckableListItem<>(R.string.sk_notification_type_posts, 0, CheckableListItem.Style.CHECKBOX, pushSubscription.alerts.status, R.drawable.ic_fluent_chat_24_regular, ()->toggleCheckableItem(postsItem), true),
+				mentionsItem=new CheckableListItem<>(R.string.notification_type_mentions_and_replies, 0, CheckableListItem.Style.CHECKBOX, pushSubscription.alerts.mention, R.drawable.ic_fluent_mention_24_regular, i->toggleCheckableItem(mentionsItem)),
+				boostsItem=new CheckableListItem<>(R.string.notification_type_reblog, 0, CheckableListItem.Style.CHECKBOX, pushSubscription.alerts.reblog, R.drawable.ic_fluent_arrow_repeat_all_24_regular, i->toggleCheckableItem(boostsItem)),
+				favoritesItem=new CheckableListItem<>(R.string.notification_type_favorite, 0, CheckableListItem.Style.CHECKBOX, pushSubscription.alerts.favourite, R.drawable.ic_fluent_star_24_regular, i->toggleCheckableItem(favoritesItem)),
+				followersItem=new CheckableListItem<>(R.string.notification_type_follow, 0, CheckableListItem.Style.CHECKBOX, pushSubscription.alerts.follow, R.drawable.ic_fluent_person_add_24_regular, i->toggleCheckableItem(followersItem)),
+				pollsItem=new CheckableListItem<>(R.string.notification_type_poll, 0, CheckableListItem.Style.CHECKBOX, pushSubscription.alerts.poll, R.drawable.ic_fluent_poll_24_regular, i->toggleCheckableItem(pollsItem)),
+				updateItem=new CheckableListItem<>(R.string.sk_notification_type_update, 0, CheckableListItem.Style.CHECKBOX, pushSubscription.alerts.update, R.drawable.ic_fluent_history_24_regular, i->toggleCheckableItem(updateItem)),
+				postsItem=new CheckableListItem<>(R.string.sk_notification_type_posts, 0, CheckableListItem.Style.CHECKBOX, pushSubscription.alerts.status, R.drawable.ic_fluent_chat_24_regular, i->toggleCheckableItem(postsItem), true),
 
-				uniformIconItem=new CheckableListItem<>(R.string.sk_settings_uniform_icon_for_notifications, R.string.mo_setting_uniform_summary, CheckableListItem.Style.SWITCH, GlobalUserPreferences.uniformNotificationIcon, R.drawable.ic_ntf_logo, ()->toggleCheckableItem(uniformIconItem)),
-				swapBookmarkWithReblogItem=new CheckableListItem<>(R.string.mo_swap_bookmark_with_reblog, R.string.mo_swap_bookmark_with_reblog_summary, CheckableListItem.Style.SWITCH, GlobalUserPreferences.swapBookmarkWithBoostAction, R.drawable.ic_boost, ()->toggleCheckableItem(swapBookmarkWithReblogItem)),
-				deleteItem=new CheckableListItem<>(R.string.sk_settings_enable_delete_notifications, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.enableDeleteNotifications, R.drawable.ic_fluent_mail_inbox_dismiss_24_regular, ()->toggleCheckableItem(deleteItem)),
-				onlyLatestItem=new CheckableListItem<>(R.string.sk_settings_single_notification, 0, CheckableListItem.Style.SWITCH, lp.keepOnlyLatestNotification, R.drawable.ic_fluent_convert_range_24_regular, ()->toggleCheckableItem(onlyLatestItem), true),
-				unifiedPushItem=new CheckableListItem<>(R.string.sk_settings_unifiedpush, 0, CheckableListItem.Style.SWITCH, useUnifiedPush, R.drawable.ic_fluent_alert_arrow_up_24_regular, this::onUnifiedPush, true)
+				uniformIconItem=new CheckableListItem<>(R.string.sk_settings_uniform_icon_for_notifications, R.string.mo_setting_uniform_summary, CheckableListItem.Style.SWITCH, GlobalUserPreferences.uniformNotificationIcon, R.drawable.ic_ntf_logo, i->toggleCheckableItem(uniformIconItem)),
+				swapBookmarkWithReblogItem=new CheckableListItem<>(R.string.mo_swap_bookmark_with_reblog, R.string.mo_swap_bookmark_with_reblog_summary, CheckableListItem.Style.SWITCH, GlobalUserPreferences.swapBookmarkWithBoostAction, R.drawable.ic_boost, i->toggleCheckableItem(swapBookmarkWithReblogItem)),
+				deleteItem=new CheckableListItem<>(R.string.sk_settings_enable_delete_notifications, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.enableDeleteNotifications, R.drawable.ic_fluent_mail_inbox_dismiss_24_regular, i->toggleCheckableItem(deleteItem)),
+				onlyLatestItem=new CheckableListItem<>(R.string.sk_settings_single_notification, 0, CheckableListItem.Style.SWITCH, lp.keepOnlyLatestNotification, R.drawable.ic_fluent_convert_range_24_regular, i->toggleCheckableItem(onlyLatestItem), true),
+				unifiedPushItem=new CheckableListItem<>(R.string.sk_settings_unifiedpush, 0, CheckableListItem.Style.SWITCH, useUnifiedPush, R.drawable.ic_fluent_alert_arrow_up_24_regular, i->onUnifiedPushClick(), true)
 		));
 
 		//only enable when distributors, who can receive notifications, are available
@@ -102,7 +101,7 @@ public class SettingsNotificationsFragment extends BaseSettingsFragment<Void>{
 
 		typeItems=List.of(mentionsItem, boostsItem, favoritesItem, followersItem, pollsItem, updateItem, postsItem);
 		pauseItem.checkedChangeListener=checked->onPauseNotificationsClick(true);
-		unifiedPushItem.checkedChangeListener=checked->onUnifiedPush();
+		unifiedPushItem.checkedChangeListener=checked->onUnifiedPushClick();
 		updatePolicyItem(null);
 		updatePauseItem();
 	}
@@ -166,12 +165,6 @@ public class SettingsNotificationsFragment extends BaseSettingsFragment<Void>{
 		bannerAdapter.setVisible(false);
 		banner.findViewById(R.id.button2).setVisibility(View.GONE);
 		banner.findViewById(R.id.title).setVisibility(View.GONE);
-		((RelativeLayout.LayoutParams) bannerText.getLayoutParams())
-				.setMargins(0, V.dp(4), 0, 0);
-		((RelativeLayout.LayoutParams) bannerIcon.getLayoutParams())
-				.addRule(RelativeLayout.CENTER_VERTICAL);
-		RelativeLayout.LayoutParams buttonParams = (RelativeLayout.LayoutParams) bannerButton.getLayoutParams();
-		buttonParams.setMargins(buttonParams.leftMargin, V.dp(-8), buttonParams.rightMargin, V.dp(-12));
 
 		mergeAdapter=new MergeRecyclerAdapter();
 		mergeAdapter.addAdapter(bannerAdapter);
@@ -259,7 +252,7 @@ public class SettingsNotificationsFragment extends BaseSettingsFragment<Void>{
 		alert.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
 	}
 
-	private void onNotificationsPolicyClick(){
+	private void onNotificationsPolicyClick(ListItem<?> item_){
 		String[] items=Stream.of(
 				R.string.notifications_policy_anyone,
 				R.string.notifications_policy_followed,
@@ -333,20 +326,22 @@ public class SettingsNotificationsFragment extends BaseSettingsFragment<Void>{
 		}
 	}
 
-	private void onUnifiedPush(){
+	private void onUnifiedPushClick(){
 		if(getDistributor(getContext()).isEmpty()){
 			List<String> distributors = UnifiedPush.getDistributors(getContext(), new ArrayList<>());
 			showUnifiedPushRegisterDialog(distributors);
 			return;
 		}
 
-		UnifiedPush.unregisterApp(
-				getContext(),
-				accountID
-		);
+		for (AccountSession accountSession : AccountSessionManager.getInstance().getLoggedInAccounts()) {
+			UnifiedPush.unregisterApp(
+					getContext(),
+					accountSession.getID()
+			);
 
-		//re-register to fcm
-		AccountSessionManager.getInstance().getAccount(accountID).getPushSubscriptionManager().registerAccountForPush(getPushSubscription());
+			//re-register to fcm
+			accountSession.getPushSubscriptionManager().registerAccountForPush(getPushSubscription());
+		}
 		unifiedPushItem.toggle();
 		rebindItem(unifiedPushItem);
 	}
@@ -356,12 +351,14 @@ public class SettingsNotificationsFragment extends BaseSettingsFragment<Void>{
 				(dialog, which)->{
 					String userDistrib = distributors.get(which);
 					UnifiedPush.saveDistributor(getContext(), userDistrib);
-					UnifiedPush.registerApp(
-							getContext(),
-							accountID,
-							new ArrayList<>(),
-							getContext().getPackageName()
-					);
+					for (AccountSession accountSession : AccountSessionManager.getInstance().getLoggedInAccounts()){
+						UnifiedPush.registerApp(
+								getContext(),
+								accountSession.getID(),
+								new ArrayList<>(),
+								getContext().getPackageName()
+						);
+					}
 					unifiedPushItem.toggle();
 					rebindItem(unifiedPushItem);
 				}).setOnCancelListener(d->rebindItem(unifiedPushItem)).show();

mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsPrivacyFragment.java

@@ -2,40 +2,106 @@ package org.joinmastodon.android.fragments.settings;
 
 import android.os.Bundle;
 
+import androidx.annotation.StringRes;
+
+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.model.Account;
+import org.joinmastodon.android.model.Instance;
+import org.joinmastodon.android.model.StatusPrivacy;
 import org.joinmastodon.android.model.viewmodel.CheckableListItem;
+import org.joinmastodon.android.model.viewmodel.ListItem;
+import org.joinmastodon.android.ui.M3AlertDialogBuilder;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public class SettingsPrivacyFragment extends BaseSettingsFragment<Void>{
-	private CheckableListItem<Void> discoverableItem, indexableItem;
+	private CheckableListItem<Void> discoverableItem, indexableItem, lockedItem;
+	private ListItem<Void> privacyItem;
+	private StatusPrivacy privacy=null;
+	private Instance instance;
+
+	//MOSHIDON
+	private CheckableListItem<Void> unlistedRepliesItem;
+
 
 	@Override
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
 		setTitle(R.string.settings_privacy);
-		Account self=AccountSessionManager.get(accountID).self;
+		AccountSession session=AccountSessionManager.get(accountID);
+		Account self=session.self;
+		instance=AccountSessionManager.getInstance().getInstanceInfo(session.domain);
+		privacy=self.source.privacy;
 		onDataLoaded(List.of(
-			discoverableItem=new CheckableListItem<>(R.string.settings_discoverable, 0, CheckableListItem.Style.SWITCH, self.discoverable, R.drawable.ic_thumbs_up_down_24px, ()->toggleCheckableItem(discoverableItem)),
-			indexableItem=new CheckableListItem<>(R.string.settings_indexable, 0, CheckableListItem.Style.SWITCH, self.source.indexable!=null ? self.source.indexable : true, R.drawable.ic_search_24px, ()->toggleCheckableItem(indexableItem))
+				privacyItem=new ListItem<>(R.string.sk_settings_default_visibility, getPrivacyString(privacy), R.drawable.ic_fluent_eye_24_regular, this::onPrivacyClick, 0, false),
+				unlistedRepliesItem=new CheckableListItem<>(R.string.mo_change_default_reply_visibility_to_unlisted, R.string.mo_setting_default_reply_privacy_summary, CheckableListItem.Style.SWITCH, GlobalUserPreferences.defaultToUnlistedReplies, R.drawable.ic_fluent_lock_open_24_regular, i->toggleCheckableItem(unlistedRepliesItem), true),
+				lockedItem=new CheckableListItem<>(R.string.sk_settings_lock_account, 0, CheckableListItem.Style.SWITCH, self.locked, R.drawable.ic_fluent_person_available_24_regular, i->toggleCheckableItem(lockedItem))
 		));
-		if(self.source.indexable==null)
-			indexableItem.isEnabled=false;
+
+		if(!instance.isAkkoma()){
+			data.addAll(List.of(
+					discoverableItem=new CheckableListItem<>(R.string.settings_discoverable, 0, CheckableListItem.Style.SWITCH, self.discoverable, R.drawable.ic_fluent_thumb_like_dislike_24_regular, i->toggleCheckableItem(discoverableItem)),
+					indexableItem=new CheckableListItem<>(R.string.settings_indexable, 0, CheckableListItem.Style.SWITCH, self.source.indexable!=null ? self.source.indexable : true, R.drawable.ic_fluent_search_24_regular, i->toggleCheckableItem(indexableItem))
+			));
+			if(self.source.indexable==null)
+				indexableItem.isEnabled=false;
+		}
 	}
 
 	@Override
 	protected void doLoadData(int offset, int count){}
 
+	private @StringRes int getPrivacyString(StatusPrivacy p){
+		if(p==null) return R.string.visibility_public;
+		return switch(p){
+			case PUBLIC -> R.string.visibility_public;
+			case UNLISTED -> R.string.sk_visibility_unlisted;
+			case PRIVATE -> R.string.visibility_followers_only;
+			case DIRECT -> R.string.visibility_private;
+			case LOCAL -> R.string.sk_local_only;
+		};
+	}
+
+	private void onPrivacyClick(ListItem<?> item_){
+		Account self=AccountSessionManager.get(accountID).self;
+		List<StatusPrivacy> options=new ArrayList<>(List.of(StatusPrivacy.PUBLIC, StatusPrivacy.UNLISTED, StatusPrivacy.PRIVATE, StatusPrivacy.DIRECT));
+		if(instance.isAkkoma()) options.add(StatusPrivacy.LOCAL);
+		int selected=options.indexOf(self.source.privacy);
+		int[] newSelected={selected};
+		new M3AlertDialogBuilder(getActivity())
+				.setTitle(R.string.sk_settings_default_visibility)
+				.setSingleChoiceItems(options.stream().map(this::getPrivacyString).map(this::getString).toArray(String[]::new),
+						selected, (dlg, item)->newSelected[0]=item)
+				.setPositiveButton(R.string.ok, (dlg, item)->{
+					privacy=options.get(newSelected[0]);
+					privacyItem.subtitleRes=getPrivacyString(privacy);
+					rebindItem(privacyItem);
+				})
+				.setNegativeButton(R.string.cancel, null)
+				.show();
+	}
+
 	@Override
 	public void onPause(){
 		super.onPause();
-		Account self=AccountSessionManager.get(accountID).self;
-		if(self.discoverable!=discoverableItem.checked || (self.source.indexable!=null && self.source.indexable!=indexableItem.checked)){
-			self.discoverable=discoverableItem.checked;
-			self.source.indexable=indexableItem.checked;
-			AccountSessionManager.get(accountID).savePreferencesLater();
+		GlobalUserPreferences.defaultToUnlistedReplies=unlistedRepliesItem.checked;
+		GlobalUserPreferences.save();
+		AccountSession s=AccountSessionManager.get(accountID);
+		Account self=s.self;
+		boolean savePlease=self.locked!=lockedItem.checked
+				|| self.source.privacy!=privacy
+				|| (discoverableItem!=null && self.discoverable!=discoverableItem.checked)
+				|| (indexableItem!=null && self.source.indexable!=null && self.source.indexable!=indexableItem.checked);
+		if(savePlease){
+			if(discoverableItem!=null) self.discoverable=discoverableItem.checked;
+			if(indexableItem!=null) self.source.indexable=indexableItem.checked;
+			self.locked=lockedItem.checked;
+			s.preferences.postingDefaultVisibility=privacy;
+			s.savePreferencesLater();
 		}
 	}
 }

mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsServerAboutFragment.java

@@ -145,7 +145,7 @@ public class SettingsServerAboutFragment extends LoaderFragment{
 		if(!TextUtils.isEmpty(instance.email)){
 			needDivider=true;
 			SimpleListItemViewHolder holder=new SimpleListItemViewHolder(getActivity(), scrollingLayout);
-			ListItem<Void> item=new ListItem<>(R.string.send_email_to_server_admin, 0, R.drawable.ic_fluent_mail_24_regular, ()->{});
+			ListItem<Void> item=new ListItem<>(R.string.send_email_to_server_admin, 0, R.drawable.ic_fluent_mail_24_regular, i->{});
 			holder.bind(item);
 			holder.itemView.setBackground(UiUtils.getThemeDrawable(getActivity(), android.R.attr.selectableItemBackground));
 			holder.itemView.setOnClickListener(v->openAdminEmail());

mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsServerFragment.java

@@ -1,18 +1,25 @@
 package org.joinmastodon.android.fragments.settings;
 
+import android.app.Activity;
 import android.app.Fragment;
+import android.content.Intent;
+import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.view.LayoutInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
 import android.view.WindowInsets;
 import android.widget.FrameLayout;
 import android.widget.TextView;
+import android.view.Menu;
+import android.view.MenuInflater;
 
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.fragments.CustomLocalTimelineFragment;
 import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.ui.SimpleViewHolder;
 import org.joinmastodon.android.ui.tabs.TabLayout;
@@ -25,6 +32,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.viewpager2.widget.ViewPager2;
+import me.grishka.appkit.Nav;
 import me.grishka.appkit.fragments.AppKitFragment;
 import me.grishka.appkit.utils.V;
 
@@ -129,6 +137,39 @@ public class SettingsServerFragment extends AppKitFragment{
 		};
 	}
 
+	@Override
+	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater){
+		if (instance != null) {
+			inflater.inflate(R.menu.instance_info, menu);
+			UiUtils.enableOptionsMenuIcons(getActivity(), menu);
+			menu.findItem(R.id.share).setTitle(R.string.button_share);
+
+		}
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item){
+		int id=item.getItemId();
+		if(id==R.id.share){
+			Intent intent = new Intent(Intent.ACTION_SEND);
+			intent.setType("text/plain");
+			intent.putExtra(Intent.EXTRA_TEXT, instance.normalizedUri);
+			startActivity(Intent.createChooser(intent, item.getTitle()));
+		} else if (id==R.id.open_timeline) {
+			Bundle args=new Bundle();
+			args.putString("account", accountID);
+			args.putString("domain", instance.normalizedUri);
+			Nav.go(getActivity(), CustomLocalTimelineFragment.class, args);
+		}
+		return true;
+	}
+
+	@Override
+	public void onAttach(Activity activity){
+		super.onAttach(activity);
+		setHasOptionsMenu(true);
+	}
+
 	@Override
 	public void onApplyWindowInsets(WindowInsets insets){
 		if(contentView!=null){

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

@@ -6,8 +6,6 @@ import android.text.TextUtils;
 import androidx.annotation.Nullable;
 
 import org.joinmastodon.android.api.ObjectValidationException;
-import org.joinmastodon.android.api.RequiredField;
-import org.joinmastodon.android.api.requests.instance.GetInstance;
 import org.parceler.Parcel;
 
 import java.time.Instant;
@@ -15,9 +13,6 @@ import java.time.LocalDate;
 import java.util.Collections;
 import java.util.List;
 
-import me.grishka.appkit.api.Callback;
-import me.grishka.appkit.api.ErrorResponse;
-
 /**
  * Represents a user of Mastodon and their associated profile.
  */
@@ -163,26 +158,26 @@ public class Account extends BaseModel implements Searchable{
 		if(fields!=null){
 			for(AccountField f:fields)
 				f.postprocess();
-		} else {
-			fields = Collections.emptyList();
+		}else{
+			fields=Collections.emptyList();
 		}
 		if(emojis!=null){
 			for(Emoji e:emojis)
 				e.postprocess();
-		} else {
-			emojis = Collections.emptyList();
+		}else{
+			emojis=Collections.emptyList();
 		}
 		if(moved!=null)
 			moved.postprocess();
-		if(fqn == null) fqn = getFullyQualifiedName();
-		if(id == null) id = "";
-		if(username == null) username = "";
+		if(fqn==null) fqn=getFullyQualifiedName();
+		if(id==null) id="";
+		if(username==null) username="";
 		if(TextUtils.isEmpty(displayName))
-			displayName = !TextUtils.isEmpty(username) ? username : "";
-		if(acct == null) acct = "";
-		if(url == null) url = "";
-		if(note == null) note = "";
-		if(avatar == null) avatar = "";
+			displayName=!TextUtils.isEmpty(username) ? username : "";
+		if(acct==null) acct="";
+		if(url==null) url="";
+		if(note==null) note="";
+		if(avatar==null) avatar="";
 	}
 
 	public boolean isLocal(){
@@ -212,6 +207,10 @@ public class Account extends BaseModel implements Searchable{
 		return fqn != null ? fqn : acct.split("@")[0] + "@" + getDomainFromURL();
 	}
 
+	public String getDisplayName(){
+		return '\u2068'+displayName+'\u2069';
+	}
+
 	@Override
 	public String toString(){
 		return "Account{"+

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

@@ -0,0 +1,14 @@
+package org.joinmastodon.android.model;
+
+public class AkkomaTranslation extends BaseModel{
+	public String text;
+	public String detectedLanguage;
+
+	public Translation toTranslation() {
+		Translation translation=new Translation();
+		translation.content=text;
+		translation.detectedSourceLanguage=detectedLanguage;
+		translation.provider="Akkoma";
+		return translation;
+	}
+}

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

@@ -52,7 +52,7 @@ public class Announcement extends BaseModel implements DisplayItemsParent {
 
 	public Status toStatus() {
         Status s=Status.ofFake(id, content, publishedAt);
-        s.createdAt=startsAt != null ? startsAt : publishedAt;
+		s.createdAt=startsAt != null ? startsAt : publishedAt;
 		s.reactions=reactions;
         if(updatedAt != null) s.editedAt=updatedAt;
         return s;

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

@@ -68,6 +68,14 @@ public class Attachment extends BaseModel{
 		return 1080;
 	}
 
+	public boolean hasKnownDimensions(){
+		return meta!=null && (
+				(meta.height>0 && meta.width>0)
+				|| (meta.original!=null && meta.original.height>0 && meta.original.width>0)
+				|| (meta.small!=null && meta.small.height>0 && meta.small.width>0)
+				);
+	}
+
 	public double getDuration(){
 		if(meta==null)
 			return 0;

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

@@ -2,6 +2,7 @@ package org.joinmastodon.android.model;
 
 import android.graphics.Bitmap;
 import android.graphics.drawable.Drawable;
+import android.net.Uri;
 
 import com.google.gson.annotations.SerializedName;
 
@@ -47,6 +48,13 @@ public class Card extends BaseModel{
 		}
 	}
 
+	public boolean isHashtagUrl(String statusUrl){
+		Uri parsedUrl=Uri.parse(url);
+		Uri parsedStatusUrl=Uri.parse(statusUrl);
+		if(parsedUrl.getHost()==null || parsedUrl.getPath()==null || parsedStatusUrl.getHost()==null) return false;
+		return title.equals("Akkoma") && parsedUrl.getHost().equals(parsedStatusUrl.getHost()) && parsedUrl.getPath().startsWith("/tag/");
+	}
+
 	@Override
 	public String toString(){
 		return "Card{"+

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

@@ -1,5 +1,6 @@
 package org.joinmastodon.android.model;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public class EmojiCategory{
@@ -10,4 +11,8 @@ public class EmojiCategory{
 		this.title=title;
 		this.emojis=emojis;
 	}
+	public EmojiCategory(EmojiCategory category){
+		this.title = category.title;
+		this.emojis = new ArrayList<>(category.emojis);
+	}
 }