Still set desired height

feat(Timeline/TrendingLinks): display URL, update icon

.github/FUNDING.yml

@@ -1,12 +1,11 @@
 # These are supported funding model platforms
 
 github: LucasGGamerM
-custom: ["https://liberapay.com/LucasGGamerM/donate", liberapay.com]
 patreon: # mastodon
 open_collective: # Replace with a single Open Collective username e.g., user1
 tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
 community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
-liberapay: # Replace with a single Liberapay username e.g., user1
+liberapay: LucasGGamerM # Replace with a single Liberapay username e.g., user1
 issuehunt: # Replace with a single IssueHunt username e.g., user1
 otechie: # Replace with a single Otechie username e.g., user1
 custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/ISSUE_TEMPLATE/bug_report.md

@@ -25,7 +25,7 @@ Does this issue also occur with the respective upstream release?
 > No / Yes
 
 > In case it does, please consider filing an [upstream bug report](https://github.com/mastodon/mastodon-android/issues) instead.
-> If this bug is seriously impacting your usage or you think I might want to try to fix it for Megalodon, feel free to still create this issue!
+> If this bug is seriously impacting your usage or you think I might want to try to fix it for Moshidon, feel free to still create this issue!
 
 **Screenshots and screen recordings**
 

.github/workflows/nightly-builds.yml

@@ -11,27 +11,27 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - name: Checkout Appkit Repo
-      uses: actions/checkout@v3
-      with:
-        repository: grishka/appkit
-        
-    - name: set up JDK 17
-      uses: actions/setup-java@v3
-      with:
-        java-version: '17'
-        distribution: 'corretto'
-        cache: gradle
-        
-    - name: Comment out signing config in appkits gradle file
-      run: |
-        sed -i 's/sign publishing\.publications\.release/\/\/ sign publishing.publications.release/' appkit/maven-push.gradle
-
-    - name: Grant execute permission for gradlew for Appkit
-      run: chmod +x gradlew
-    
-    - name: Compile appkit
-      run: ./gradlew publishToMavenLocal
+#    - name: Checkout Appkit Repo
+#      uses: actions/checkout@v3
+#      with:
+#        repository: grishka/appkit
+#
+#    - name: set up JDK 17
+#      uses: actions/setup-java@v3
+#      with:
+#        java-version: '17'
+#        distribution: 'corretto'
+#        cache: gradle
+#
+#    - name: Comment out signing config in appkits gradle file
+#      run: |
+#        sed -i 's/sign publishing\.publications\.release/\/\/ sign publishing.publications.release/' appkit/maven-push.gradle
+#
+#    - name: Grant execute permission for gradlew for Appkit
+#      run: chmod +x gradlew
+#
+#    - name: Compile appkit
+#      run: ./gradlew publishToMavenLocal
       
     - uses: actions/checkout@v3
     - name: set up JDK 17

README.md

@@ -21,7 +21,7 @@
 <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!
-### We also support LiberaPay at: https://liberapay.com/LucasGGamerM/donate (Currently broken)
+### We also support LiberaPay at: https://liberapay.com/LucasGGamerM/donate
 
 ### You can also donate some Monero through this wallet address as well:
 4886mdarcyB6Yf8Qc6vDJBK1fz6ibHFLZUmHb4GZZz9yLGNhcG3XC64e5UZ8dVQYTLZb82W6P9WhteowW4STJEec97Gf22j

mastodon/build.gradle

@@ -15,9 +15,9 @@ android {
 		archivesBaseName = "moshidon"
 		applicationId "org.joinmastodon.android.moshinda"
 		minSdk 23
-		targetSdk 33
-		versionCode 103
-		versionName "2.1.4+fork.103.moshinda"
+		targetSdk 34
+		versionCode 107
+		versionName "2.3.0+fork.107.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']
     }
@@ -44,6 +44,28 @@ android {
 				keyPassword = properties.getProperty('SIGNING_KEY_PASSWORD')
 			}
 		}
+
+//		release{
+//			storeFile = file("keystore/release_keystore.jks")
+//			storePassword System.getenv("RELEASE_SIGNING_STORE_PASSWORD")
+//			if (storePassword == null) {
+//				Properties properties = new Properties()
+//				properties.load(project.rootProject.file('local.properties').newDataInputStream())
+//				storePassword = properties.getProperty('RELEASE_SIGNING_STORE_PASSWORD')
+//			}
+//			keyAlias System.getenv("RELEASE_SIGNING_KEY_ALIAS")
+//			if (keyAlias == null) {
+//				Properties properties = new Properties()
+//				properties.load(project.rootProject.file('local.properties').newDataInputStream())
+//				keyAlias = properties.getProperty('RELEASE_SIGNING_KEY_ALIAS')
+//			}
+//			keyPassword System.getenv("RELEASE_SIGNING_KEY_PASSWORD")
+//			if (keyPassword == null) {
+//				Properties properties = new Properties()
+//				properties.load(project.rootProject.file('local.properties').newDataInputStream())
+//				keyPassword = properties.getProperty('RELEASE_SIGNING_KEY_PASSWORD')
+//			}
+//		}
 	}
 
 	buildTypes {
@@ -80,8 +102,16 @@ android {
 			shrinkResources true
 			versionNameSuffix '-play'
 		}
-		githubRelease { initWith release }
-		fdroidRelease { initWith release }
+		githubRelease {
+			initWith release
+			versionNameSuffix '-github'
+		}
+		fdroidRelease {
+			initWith release
+			// The F-droid build system doesn't like this at all for some reason.
+//			versionNameSuffix '-fdroid'
+//			signingConfig signingConfigs.release
+		}
 	}
 	compileOptions {
 		sourceCompatibility JavaVersion.VERSION_17
@@ -117,7 +147,7 @@ dependencies {
 	implementation 'me.grishka.litex:viewpager:1.0.0'
 	implementation 'me.grishka.litex:viewpager2:1.0.0'
 	implementation 'me.grishka.litex:palette:1.0.0'
-	implementation 'me.grishka.appkit:appkit:1.2.14'
+	implementation 'me.grishka.appkit:appkit:1.2.16'
 	implementation 'com.google.code.gson:gson:2.9.0'
 	implementation 'org.jsoup:jsoup:1.14.3'
 	implementation 'com.squareup:otto:1.3.8'

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

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

mastodon/src/github/java/org/joinmastodon/android/updater/GithubSelfUpdaterImpl.java

@@ -211,7 +211,13 @@ public class GithubSelfUpdaterImpl extends GithubSelfUpdater{
 		if(state==UpdateState.DOWNLOADING)
 			throw new IllegalStateException();
 		DownloadManager dm=MastodonApp.context.getSystemService(DownloadManager.class);
-		MastodonApp.context.registerReceiver(downloadCompletionReceiver, new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE));
+
+		if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.TIRAMISU){
+			MastodonApp.context.registerReceiver(downloadCompletionReceiver, new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE), Context.RECEIVER_EXPORTED);
+		}else{
+			MastodonApp.context.registerReceiver(downloadCompletionReceiver, new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE));
+		}
+
 		downloadID=dm.enqueue(
 				new DownloadManager.Request(Uri.parse(getPrefs().getString("apkURL", null)))
 						.setDestinationUri(Uri.fromFile(getUpdateApkFile()))

mastodon/src/main/AndroidManifest.xml

@@ -5,7 +5,8 @@
 
 	<uses-permission android:name="android.permission.INTERNET"/>
 	<uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
-    <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK"/>
+	<uses-permission android:name="android.permission.VIBRATE" />
 	<uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="28"/>
 	<uses-permission android:name="${applicationId}.permission.C2D_MESSAGE"/>
@@ -31,6 +32,7 @@
 		android:name=".MastodonApp"
 		android:allowBackup="true"
 		android:label="@string/mo_app_name"
+		android:dataExtractionRules="@xml/backup_rules"
 		android:supportsRtl="true"
 		android:localeConfig="@xml/locales_config"
 		android:icon="@mipmap/ic_launcher"
@@ -80,6 +82,15 @@
 				<data android:mimeType="*/*"/>
 			</intent-filter>
 		</activity>
+		<activity android:name=".ChooseAccountForComposeActivity" android:exported="true" android:configChanges="orientation|screenSize" android:windowSoftInputMode="adjustResize"
+			android:theme="@style/TransparentDialog">
+			<intent-filter>
+				<action android:name="android.intent.action.CHOOSER"/>
+				<category android:name="android.intent.category.LAUNCHER"/>
+				<data android:mimeType="*/*"/>
+			</intent-filter>
+		</activity>
+
 
 		<service android:name=".AudioPlayerService" android:foregroundServiceType="mediaPlayback"/>
 
@@ -105,13 +116,11 @@
 		</receiver>
 
 		<provider
-			android:name="org.joinmastodon.android.utils.FileProvider"
 			android:authorities="${applicationId}.fileprovider"
-			android:exported="false"
-			android:grantUriPermissions="true">
-			<meta-data
-				android:name="android.support.FILE_PROVIDER_PATHS"
-				android:resource="@xml/file_paths" />
+			android:name=".TweakedFileProvider"
+			android:grantUriPermissions="true"
+			android:exported="false">
+			<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/fileprovider_paths"/>
 		</provider>
 
 	</application>

mastodon/src/main/assets/blocks.txt

@@ -20,13 +20,16 @@ cachapa.xyz
 canary.fedinuke.example.com
 catgirl.life
 cawfee.club
-childlove.space
+childlove.su
 clew.lol
 clubcyberia.co
 contrapointsfan.club
+cottoncandy.cafe
+crlf.ninja
 crucible.world
 cum.camp
 cum.salon
+cunnyborea.space
 decayable.ink
 dembased.xyz
 detroitriotcity.com
@@ -34,10 +37,12 @@ djsumdog.com
 eientei.org
 eveningzoo.club
 fluf.club
+foxgirl.lol
 freak.university
 freeatlantis.com
 freespeechextremist.com
 froth.zone
+fsebugoutzone.org
 gameliberty.club
 gearlandia.haus
 genderheretics.xyz
@@ -49,6 +54,7 @@ goyim.app
 h5q.net
 haeder.net
 handholding.io
+harpy.faith
 hitchhiker.social
 iddqd.social
 kitsunemimi.club
@@ -56,15 +62,14 @@ kiwifarms.cc
 kurosawa.moe
 kyaruc.moe
 leafposter.club
-lewdieheaven.com
 liberdon.com
 ligma.pro
+loli.church
 lolicon.rocks
 lolison.network
 lolison.top
 lovingexpressions.net
 makemysarcophagus.com
-marsey.moe
 mastinator.com
 merovingian.club
 midwaytrades.com
@@ -74,17 +79,21 @@ mouse.services
 mugicha.club
 narrativerry.xyz
 natehiggers.online
+nationalist.social
 needs.vodka
 neenster.org
 nicecrew.digital
+nightshift.social
 nnia.space
 noagendasocial.com
 noagendasocial.nl
 noagendatube.com
+noauthority.social
 nobodyhasthe.biz
 norwoodzero.net
 nyanide.com
 onionfarms.org
+parcero.bond
 pawlicker.com
 pawoo.net
 pedo.school
@@ -129,9 +138,11 @@ sonichu.com
 spinster.xyz
 springbo.cc
 strelizia.net
+taihou.website
 tastingtraffic.net
 teci.world
 theapex.social
+theblab.org
 thechimp.zone
 thenobody.club
 thepostearthdestination.com
@@ -139,9 +150,11 @@ tkammer.de
 trumpislovetrumpis.life
 truthsocial.co.in
 usualsuspects.lol
+vampiremaid.cafe
 varishangout.net
 vtuberfan.social
 wolfgirl.bar
 xn--p1abe3d.xn--80asehdb
 yggdrasil.social
 youjo.love
+zhub.link

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

@@ -88,8 +88,13 @@ public class AudioPlayerService extends Service{
 		nm=getSystemService(NotificationManager.class);
 //		registerReceiver(receiver, new IntentFilter(Intent.ACTION_MEDIA_BUTTON));
 		registerReceiver(receiver, new IntentFilter(AudioManager.ACTION_AUDIO_BECOMING_NOISY));
-		registerReceiver(receiver, new IntentFilter(ACTION_PLAY_PAUSE));
-		registerReceiver(receiver, new IntentFilter(ACTION_STOP));
+		if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.TIRAMISU){
+			registerReceiver(receiver, new IntentFilter(ACTION_PLAY_PAUSE), RECEIVER_EXPORTED);
+			registerReceiver(receiver, new IntentFilter(ACTION_STOP), RECEIVER_EXPORTED);
+		}else{
+			registerReceiver(receiver, new IntentFilter(ACTION_PLAY_PAUSE));
+			registerReceiver(receiver, new IntentFilter(ACTION_STOP));
+		}
 		instance=this;
 	}
 

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

@@ -0,0 +1,52 @@
+package org.joinmastodon.android;
+
+import android.app.Fragment;
+import android.content.Intent;
+import android.os.Bundle;
+import android.widget.Toast;
+
+import org.joinmastodon.android.api.session.AccountSession;
+import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.fragments.ComposeFragment;
+import org.joinmastodon.android.ui.sheets.AccountSwitcherSheet;
+import org.joinmastodon.android.ui.utils.UiUtils;
+
+import java.util.List;
+import java.util.Objects;
+
+import androidx.annotation.Nullable;
+import me.grishka.appkit.FragmentStackActivity;
+
+public class ChooseAccountForComposeActivity extends FragmentStackActivity{
+	@Override
+	protected void onCreate(@Nullable Bundle savedInstanceState){
+		UiUtils.setUserPreferredTheme(this);
+		super.onCreate(savedInstanceState);
+		if (savedInstanceState == null && Objects.equals(getIntent().getAction(), Intent.ACTION_CHOOSER)) {
+			AccountSessionManager.getInstance().maybeUpdateLocalInfo();
+			List<AccountSession> sessions=AccountSessionManager.getInstance().getLoggedInAccounts();
+			if (sessions.isEmpty()){
+				Toast.makeText(this, R.string.err_not_logged_in, Toast.LENGTH_SHORT).show();
+				finish();
+			} else if (sessions.size() > 1) {
+				AccountSwitcherSheet sheet = new AccountSwitcherSheet(this, null, R.drawable.ic_fluent_compose_28_regular,
+						R.string.choose_account, null, false);
+				sheet.setOnClick((accountId, open) -> {
+					openComposeFragment(accountId);
+				});
+				sheet.show();
+			} else if (sessions.size() == 1) {
+				openComposeFragment(sessions.get(0).getID());
+			}
+		}
+	}
+
+	private void openComposeFragment(String accountID){
+		getWindow().setBackgroundDrawable(null);
+		Bundle args=new Bundle();
+		args.putString("account", accountID);
+		Fragment fragment=new ComposeFragment();
+		fragment.setArguments(args);
+		showFragmentClearingBackStack(fragment);
+	}
+}

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

@@ -13,7 +13,7 @@ import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.ComposeFragment;
-import org.joinmastodon.android.ui.AccountSwitcherSheet;
+import org.joinmastodon.android.ui.sheets.AccountSwitcherSheet;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.jsoup.internal.StringUtil;
 
@@ -42,7 +42,11 @@ public class ExternalShareActivity extends FragmentStackActivity{
 				Toast.makeText(this, R.string.err_not_logged_in, Toast.LENGTH_SHORT).show();
 				finish();
 			} else if (isOpenable || sessions.size() > 1) {
-				AccountSwitcherSheet sheet = new AccountSwitcherSheet(this, null, true, isOpenable);
+				AccountSwitcherSheet sheet = new AccountSwitcherSheet(this, null, R.drawable.ic_fluent_share_28_regular,
+						isOpenable
+								? R.string.sk_external_share_or_open_title
+								: R.string.sk_external_share_title,
+						null, isOpenable);
 				sheet.setOnClick((accountId, open) -> {
 					if (open && text.isPresent()) {
 						BiConsumer<Class<? extends Fragment>, Bundle> callback = (clazz, args) -> {

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

@@ -0,0 +1,841 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * 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.
+ */
+
+package org.joinmastodon.android;
+
+import static org.xmlpull.v1.XmlPullParser.END_DOCUMENT;
+import static org.xmlpull.v1.XmlPullParser.START_TAG;
+
+import android.content.ClipData;
+import android.content.ContentProvider;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ProviderInfo;
+import android.content.res.XmlResourceParser;
+import android.database.Cursor;
+import android.database.MatrixCursor;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Environment;
+import android.os.ParcelFileDescriptor;
+import android.provider.OpenableColumns;
+import android.text.TextUtils;
+import android.webkit.MimeTypeMap;
+
+import androidx.annotation.GuardedBy;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import org.xmlpull.v1.XmlPullParserException;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * FileProvider is a special subclass of {@link ContentProvider} that facilitates secure sharing
+ * of files associated with an app by creating a <code>content://</code> {@link Uri} for a file
+ * instead of a <code>file:///</code> {@link Uri}.
+ * <p>
+ * A content URI allows you to grant read and write access using
+ * temporary access permissions. When you create an {@link Intent} containing
+ * a content URI, in order to send the content URI
+ * to a client app, you can also call {@link Intent#setFlags(int) Intent.setFlags()} to add
+ * permissions. These permissions are available to the client app for as long as the stack for
+ * a receiving {@link android.app.Activity} is active. For an {@link Intent} going to a
+ * {@link android.app.Service}, the permissions are available as long as the
+ * {@link android.app.Service} is running.
+ * <p>
+ * In comparison, to control access to a <code>file:///</code> {@link Uri} you have to modify the
+ * file system permissions of the underlying file. The permissions you provide become available to
+ * <em>any</em> app, and remain in effect until you change them. This level of access is
+ * fundamentally insecure.
+ * <p>
+ * The increased level of file access security offered by a content URI
+ * makes FileProvider a key part of Android's security infrastructure.
+ * <p>
+ * This overview of FileProvider includes the following topics:
+ * </p>
+ * <ol>
+ *     <li><a href="#ProviderDefinition">Defining a FileProvider</a></li>
+ *     <li><a href="#SpecifyFiles">Specifying Available Files</a></li>
+ *     <li><a href="#GetUri">Retrieving the Content URI for a File</li>
+ *     <li><a href="#Permissions">Granting Temporary Permissions to a URI</a></li>
+ *     <li><a href="#ServeUri">Serving a Content URI to Another App</a></li>
+ * </ol>
+ * <h3 id="ProviderDefinition">Defining a FileProvider</h3>
+ * <p>
+ * Since the default functionality of FileProvider includes content URI generation for files, you
+ * don't need to define a subclass in code. Instead, you can include a FileProvider in your app
+ * by specifying it entirely in XML. To specify the FileProvider component itself, add a
+ * <code><a href="{@docRoot}guide/topics/manifest/provider-element.html">&lt;provider&gt;</a></code>
+ * element to your app manifest. Set the <code>android:name</code> attribute to
+ * <code>androidx.core.content.FileProvider</code>. Set the <code>android:authorities</code>
+ * attribute to a URI authority based on a domain you control; for example, if you control the
+ * domain <code>mydomain.com</code> you should use the authority
+ * <code>com.mydomain.fileprovider</code>. Set the <code>android:exported</code> attribute to
+ * <code>false</code>; the FileProvider does not need to be public. Set the
+ * <a href="{@docRoot}guide/topics/manifest/provider-element.html#gprmsn"
+ * >android:grantUriPermissions</a> attribute to <code>true</code>, to allow you
+ * to grant temporary access to files. For example:
+ * <pre class="prettyprint">
+ *&lt;manifest&gt;
+ *    ...
+ *    &lt;application&gt;
+ *        ...
+ *        &lt;provider
+ *            android:name="androidx.core.content.FileProvider"
+ *            android:authorities="com.mydomain.fileprovider"
+ *            android:exported="false"
+ *            android:grantUriPermissions="true"&gt;
+ *            ...
+ *        &lt;/provider&gt;
+ *        ...
+ *    &lt;/application&gt;
+ *&lt;/manifest&gt;</pre>
+ * <p>
+ * If you want to override any of the default behavior of FileProvider methods, extend
+ * the FileProvider class and use the fully-qualified class name in the <code>android:name</code>
+ * attribute of the <code>&lt;provider&gt;</code> element.
+ * <h3 id="SpecifyFiles">Specifying Available Files</h3>
+ * A FileProvider can only generate a content URI for files in directories that you specify
+ * beforehand. To specify a directory, specify the its storage area and path in XML, using child
+ * elements of the <code>&lt;paths&gt;</code> element.
+ * For example, the following <code>paths</code> element tells FileProvider that you intend to
+ * request content URIs for the <code>images/</code> subdirectory of your private file area.
+ * <pre class="prettyprint">
+ *&lt;paths xmlns:android="http://schemas.android.com/apk/res/android"&gt;
+ *    &lt;files-path name="my_images" path="images/"/&gt;
+ *    ...
+ *&lt;/paths&gt;
+ *</pre>
+ * <p>
+ * The <code>&lt;paths&gt;</code> element must contain one or more of the following child elements:
+ * </p>
+ * <dl>
+ *     <dt>
+ * <pre class="prettyprint">
+ *&lt;files-path name="<i>name</i>" path="<i>path</i>" /&gt;
+ *</pre>
+ *     </dt>
+ *     <dd>
+ *     Represents files in the <code>files/</code> subdirectory of your app's internal storage
+ *     area. This subdirectory is the same as the value returned by {@link Context#getFilesDir()
+ *     Context.getFilesDir()}.
+ *     </dd>
+ *     <dt>
+ * <pre>
+ *&lt;cache-path name="<i>name</i>" path="<i>path</i>" /&gt;
+ *</pre>
+ *     <dt>
+ *     <dd>
+ *     Represents files in the cache subdirectory of your app's internal storage area. The root path
+ *     of this subdirectory is the same as the value returned by {@link Context#getCacheDir()
+ *     getCacheDir()}.
+ *     </dd>
+ *     <dt>
+ * <pre class="prettyprint">
+ *&lt;external-path name="<i>name</i>" path="<i>path</i>" /&gt;
+ *</pre>
+ *     </dt>
+ *     <dd>
+ *     Represents files in the root of the external storage area. The root path of this subdirectory
+ *     is the same as the value returned by
+ *     {@link Environment#getExternalStorageDirectory() Environment.getExternalStorageDirectory()}.
+ *     </dd>
+ *     <dt>
+ * <pre class="prettyprint">
+ *&lt;external-files-path name="<i>name</i>" path="<i>path</i>" /&gt;
+ *</pre>
+ *     </dt>
+ *     <dd>
+ *     Represents files in the root of your app's external storage area. The root path of this
+ *     subdirectory is the same as the value returned by
+ *     {@code Context#getExternalFilesDir(String) Context.getExternalFilesDir(null)}.
+ *     </dd>
+ *     <dt>
+ * <pre class="prettyprint">
+ *&lt;external-cache-path name="<i>name</i>" path="<i>path</i>" /&gt;
+ *</pre>
+ *     </dt>
+ *     <dd>
+ *     Represents files in the root of your app's external cache area. The root path of this
+ *     subdirectory is the same as the value returned by
+ *     {@link Context#getExternalCacheDir() Context.getExternalCacheDir()}.
+ *     </dd>
+ *     <dt>
+ * <pre class="prettyprint">
+ *&lt;external-media-path name="<i>name</i>" path="<i>path</i>" /&gt;
+ *</pre>
+ *     </dt>
+ *     <dd>
+ *     Represents files in the root of your app's external media area. The root path of this
+ *     subdirectory is the same as the value returned by the first result of
+ *     {@link Context#getExternalMediaDirs() Context.getExternalMediaDirs()}.
+ *     <p><strong>Note:</strong> this directory is only available on API 21+ devices.</p>
+ *     </dd>
+ * </dl>
+ * <p>
+ *     These child elements all use the same attributes:
+ * </p>
+ * <dl>
+ *     <dt>
+ *         <code>name="<i>name</i>"</code>
+ *     </dt>
+ *     <dd>
+ *         A URI path segment. To enforce security, this value hides the name of the subdirectory
+ *         you're sharing. The subdirectory name for this value is contained in the
+ *         <code>path</code> attribute.
+ *     </dd>
+ *     <dt>
+ *         <code>path="<i>path</i>"</code>
+ *     </dt>
+ *     <dd>
+ *         The subdirectory you're sharing. While the <code>name</code> attribute is a URI path
+ *         segment, the <code>path</code> value is an actual subdirectory name. Notice that the
+ *         value refers to a <b>subdirectory</b>, not an individual file or files. You can't
+ *         share a single file by its file name, nor can you specify a subset of files using
+ *         wildcards.
+ *     </dd>
+ * </dl>
+ * <p>
+ * You must specify a child element of <code>&lt;paths&gt;</code> for each directory that contains
+ * files for which you want content URIs. For example, these XML elements specify two directories:
+ * <pre class="prettyprint">
+ *&lt;paths xmlns:android="http://schemas.android.com/apk/res/android"&gt;
+ *    &lt;files-path name="my_images" path="images/"/&gt;
+ *    &lt;files-path name="my_docs" path="docs/"/&gt;
+ *&lt;/paths&gt;
+ *</pre>
+ * <p>
+ * Put the <code>&lt;paths&gt;</code> element and its children in an XML file in your project.
+ * For example, you can add them to a new file called <code>res/xml/file_paths.xml</code>.
+ * To link this file to the FileProvider, add a
+ * <a href="{@docRoot}guide/topics/manifest/meta-data-element.html">&lt;meta-data&gt;</a> element
+ * as a child of the <code>&lt;provider&gt;</code> element that defines the FileProvider. Set the
+ * <code>&lt;meta-data&gt;</code> element's "android:name" attribute to
+ * <code>android.support.FILE_PROVIDER_PATHS</code>. Set the element's "android:resource" attribute
+ * to <code>&#64;xml/file_paths</code> (notice that you don't specify the <code>.xml</code>
+ * extension). For example:
+ * <pre class="prettyprint">
+ *&lt;provider
+ *    android:name="androidx.core.content.FileProvider"
+ *    android:authorities="com.mydomain.fileprovider"
+ *    android:exported="false"
+ *    android:grantUriPermissions="true"&gt;
+ *    &lt;meta-data
+ *        android:name="android.support.FILE_PROVIDER_PATHS"
+ *        android:resource="&#64;xml/file_paths" /&gt;
+ *&lt;/provider&gt;
+ *</pre>
+ * <h3 id="GetUri">Generating the Content URI for a File</h3>
+ * <p>
+ * To share a file with another app using a content URI, your app has to generate the content URI.
+ * To generate the content URI, create a new {@link File} for the file, then pass the {@link File}
+ * to {@link #getUriForFile(Context, String, File) getUriForFile()}. You can send the content URI
+ * returned by {@link #getUriForFile(Context, String, File) getUriForFile()} to another app in an
+ * {@link Intent}. The client app that receives the content URI can open the file
+ * and access its contents by calling
+ * {@link android.content.ContentResolver#openFileDescriptor(Uri, String)
+ * ContentResolver.openFileDescriptor} to get a {@link ParcelFileDescriptor}.
+ * <p>
+ * For example, suppose your app is offering files to other apps with a FileProvider that has the
+ * authority <code>com.mydomain.fileprovider</code>. To get a content URI for the file
+ * <code>default_image.jpg</code> in the <code>images/</code> subdirectory of your internal storage
+ * add the following code:
+ * <pre class="prettyprint">
+ *File imagePath = new File(Context.getFilesDir(), "images");
+ *File newFile = new File(imagePath, "default_image.jpg");
+ *Uri contentUri = getUriForFile(getContext(), "com.mydomain.fileprovider", newFile);
+ *</pre>
+ * As a result of the previous snippet,
+ * {@link #getUriForFile(Context, String, File) getUriForFile()} returns the content URI
+ * <code>content://com.mydomain.fileprovider/my_images/default_image.jpg</code>.
+ * <h3 id="Permissions">Granting Temporary Permissions to a URI</h3>
+ * To grant an access permission to a content URI returned from
+ * {@link #getUriForFile(Context, String, File) getUriForFile()}, do one of the following:
+ * <ul>
+ * <li>
+ *     Call the method
+ *     {@link Context#grantUriPermission(String, Uri, int)
+ *     Context.grantUriPermission(package, Uri, mode_flags)} for the <code>content://</code>
+ *     {@link Uri}, using the desired mode flags. This grants temporary access permission for the
+ *     content URI to the specified package, according to the value of the
+ *     the <code>mode_flags</code> parameter, which you can set to
+ *     {@link Intent#FLAG_GRANT_READ_URI_PERMISSION}, {@link Intent#FLAG_GRANT_WRITE_URI_PERMISSION}
+ *     or both. The permission remains in effect until you revoke it by calling
+ *     {@link Context#revokeUriPermission(Uri, int) revokeUriPermission()} or until the device
+ *     reboots.
+ * </li>
+ * <li>
+ *     Put the content URI in an {@link Intent} by calling {@link Intent#setData(Uri) setData()}.
+ * </li>
+ * <li>
+ *     Next, call the method {@link Intent#setFlags(int) Intent.setFlags()} with either
+ *     {@link Intent#FLAG_GRANT_READ_URI_PERMISSION} or
+ *     {@link Intent#FLAG_GRANT_WRITE_URI_PERMISSION} or both.
+ * </li>
+ * <li>
+ *     Finally, send the {@link Intent} to
+ *     another app. Most often, you do this by calling
+ *     {@link android.app.Activity#setResult(int, Intent) setResult()}.
+ *     <p>
+ *     Permissions granted in an {@link Intent} remain in effect while the stack of the receiving
+ *     {@link android.app.Activity} is active. When the stack finishes, the permissions are
+ *     automatically removed. Permissions granted to one {@link android.app.Activity} in a client
+ *     app are automatically extended to other components of that app.
+ *     </p>
+ * </li>
+ * </ul>
+ * <h3 id="ServeUri">Serving a Content URI to Another App</h3>
+ * <p>
+ * There are a variety of ways to serve the content URI for a file to a client app. One common way
+ * is for the client app to start your app by calling
+ * {@link android.app.Activity#startActivityForResult(Intent, int, Bundle) startActivityResult()},
+ * which sends an {@link Intent} to your app to start an {@link android.app.Activity} in your app.
+ * In response, your app can immediately return a content URI to the client app or present a user
+ * interface that allows the user to pick a file. In the latter case, once the user picks the file
+ * your app can return its content URI. In both cases, your app returns the content URI in an
+ * {@link Intent} sent via {@link android.app.Activity#setResult(int, Intent) setResult()}.
+ * </p>
+ * <p>
+ *  You can also put the content URI in a {@link android.content.ClipData} object and then add the
+ *  object to an {@link Intent} you send to a client app. To do this, call
+ *  {@link Intent#setClipData(ClipData) Intent.setClipData()}. When you use this approach, you can
+ *  add multiple {@link android.content.ClipData} objects to the {@link Intent}, each with its own
+ *  content URI. When you call {@link Intent#setFlags(int) Intent.setFlags()} on the {@link Intent}
+ *  to set temporary access permissions, the same permissions are applied to all of the content
+ *  URIs.
+ * </p>
+ * <p class="note">
+ *  <strong>Note:</strong> The {@link Intent#setClipData(ClipData) Intent.setClipData()} method is
+ *  only available in platform version 16 (Android 4.1) and later. If you want to maintain
+ *  compatibility with previous versions, you should send one content URI at a time in the
+ *  {@link Intent}. Set the action to {@link Intent#ACTION_SEND} and put the URI in data by calling
+ *  {@link Intent#setData setData()}.
+ * </p>
+ * <h3 id="">More Information</h3>
+ * <p>
+ *    To learn more about FileProvider, see the Android training class
+ *    <a href="{@docRoot}training/secure-file-sharing/index.html">Sharing Files Securely with URIs</a>.
+ * </p>
+ */
+public class FileProvider extends ContentProvider {
+    private static final String[] COLUMNS = {
+            OpenableColumns.DISPLAY_NAME, OpenableColumns.SIZE };
+
+    private static final String
+            META_DATA_FILE_PROVIDER_PATHS = "android.support.FILE_PROVIDER_PATHS";
+
+    private static final String TAG_ROOT_PATH = "root-path";
+    private static final String TAG_FILES_PATH = "files-path";
+    private static final String TAG_CACHE_PATH = "cache-path";
+    private static final String TAG_EXTERNAL = "external-path";
+    private static final String TAG_EXTERNAL_FILES = "external-files-path";
+    private static final String TAG_EXTERNAL_CACHE = "external-cache-path";
+    private static final String TAG_EXTERNAL_MEDIA = "external-media-path";
+
+    private static final String ATTR_NAME = "name";
+    private static final String ATTR_PATH = "path";
+
+    private static final File DEVICE_ROOT = new File("/");
+
+    @GuardedBy("sCache")
+    private static HashMap<String, PathStrategy> sCache = new HashMap<String, PathStrategy>();
+
+    private PathStrategy mStrategy;
+
+    /**
+     * The default FileProvider implementation does not need to be initialized. If you want to
+     * override this method, you must provide your own subclass of FileProvider.
+     */
+    @Override
+    public boolean onCreate() {
+        return true;
+    }
+
+    /**
+     * After the FileProvider is instantiated, this method is called to provide the system with
+     * information about the provider.
+     *
+     * @param context A {@link Context} for the current component.
+     * @param info A {@link ProviderInfo} for the new provider.
+     */
+    @Override
+    public void attachInfo(@NonNull Context context, @NonNull ProviderInfo info) {
+        super.attachInfo(context, info);
+
+        // Sanity check our security
+        if (info.exported) {
+            throw new SecurityException("Provider must not be exported");
+        }
+        if (!info.grantUriPermissions) {
+            throw new SecurityException("Provider must grant uri permissions");
+        }
+
+        mStrategy = getPathStrategy(context, info.authority);
+    }
+
+    /**
+     * Return a content URI for a given {@link File}. Specific temporary
+     * permissions for the content URI can be set with
+     * {@link Context#grantUriPermission(String, Uri, int)}, or added
+     * to an {@link Intent} by calling {@link Intent#setData(Uri) setData()} and then
+     * {@link Intent#setFlags(int) setFlags()}; in both cases, the applicable flags are
+     * {@link Intent#FLAG_GRANT_READ_URI_PERMISSION} and
+     * {@link Intent#FLAG_GRANT_WRITE_URI_PERMISSION}. A FileProvider can only return a
+     * <code>content</code> {@link Uri} for file paths defined in their <code>&lt;paths&gt;</code>
+     * meta-data element. See the Class Overview for more information.
+     *
+     * @param context A {@link Context} for the current component.
+     * @param authority The authority of a {@link FileProvider} defined in a
+     *            {@code <provider>} element in your app's manifest.
+     * @param file A {@link File} pointing to the filename for which you want a
+     * <code>content</code> {@link Uri}.
+     * @return A content URI for the file.
+     * @throws IllegalArgumentException When the given {@link File} is outside
+     * the paths supported by the provider.
+     */
+    public static Uri getUriForFile(@NonNull Context context, @NonNull String authority,
+            @NonNull File file) {
+        final PathStrategy strategy = getPathStrategy(context, authority);
+        return strategy.getUriForFile(file);
+    }
+
+    /**
+     * Use a content URI returned by
+     * {@link #getUriForFile(Context, String, File) getUriForFile()} to get information about a file
+     * managed by the FileProvider.
+     * FileProvider reports the column names defined in {@link OpenableColumns}:
+     * <ul>
+     * <li>{@link OpenableColumns#DISPLAY_NAME}</li>
+     * <li>{@link OpenableColumns#SIZE}</li>
+     * </ul>
+     * For more information, see
+     * {@link ContentProvider#query(Uri, String[], String, String[], String)
+     * ContentProvider.query()}.
+     *
+     * @param uri A content URI returned by {@link #getUriForFile}.
+     * @param projection The list of columns to put into the {@link Cursor}. If null all columns are
+     * included.
+     * @param selection Selection criteria to apply. If null then all data that matches the content
+     * URI is returned.
+     * @param selectionArgs An array of {@link String}, containing arguments to bind to
+     * the <i>selection</i> parameter. The <i>query</i> method scans <i>selection</i> from left to
+     * right and iterates through <i>selectionArgs</i>, replacing the current "?" character in
+     * <i>selection</i> with the value at the current position in <i>selectionArgs</i>. The
+     * values are bound to <i>selection</i> as {@link String} values.
+     * @param sortOrder A {@link String} containing the column name(s) on which to sort
+     * the resulting {@link Cursor}.
+     * @return A {@link Cursor} containing the results of the query.
+     *
+     */
+    @Override
+    public Cursor query(@NonNull Uri uri, @Nullable String[] projection, @Nullable String selection,
+            @Nullable String[] selectionArgs,
+            @Nullable String sortOrder) {
+        // ContentProvider has already checked granted permissions
+        final File file = mStrategy.getFileForUri(uri);
+
+        if (projection == null) {
+            projection = COLUMNS;
+        }
+
+        String[] cols = new String[projection.length];
+        Object[] values = new Object[projection.length];
+        int i = 0;
+        for (String col : projection) {
+            if (OpenableColumns.DISPLAY_NAME.equals(col)) {
+                cols[i] = OpenableColumns.DISPLAY_NAME;
+                values[i++] = file.getName();
+            } else if (OpenableColumns.SIZE.equals(col)) {
+                cols[i] = OpenableColumns.SIZE;
+                values[i++] = file.length();
+            }
+        }
+
+        cols = copyOf(cols, i);
+        values = copyOf(values, i);
+
+        final MatrixCursor cursor = new MatrixCursor(cols, 1);
+        cursor.addRow(values);
+        return cursor;
+    }
+
+    /**
+     * Returns the MIME type of a content URI returned by
+     * {@link #getUriForFile(Context, String, File) getUriForFile()}.
+     *
+     * @param uri A content URI returned by
+     * {@link #getUriForFile(Context, String, File) getUriForFile()}.
+     * @return If the associated file has an extension, the MIME type associated with that
+     * extension; otherwise <code>application/octet-stream</code>.
+     */
+    @Override
+    public String getType(@NonNull Uri uri) {
+        // ContentProvider has already checked granted permissions
+        final File file = mStrategy.getFileForUri(uri);
+
+        final int lastDot = file.getName().lastIndexOf('.');
+        if (lastDot >= 0) {
+            final String extension = file.getName().substring(lastDot + 1);
+            final String mime = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension);
+            if (mime != null) {
+                return mime;
+            }
+        }
+
+        return "application/octet-stream";
+    }
+
+    /**
+     * By default, this method throws an {@link UnsupportedOperationException}. You must
+     * subclass FileProvider if you want to provide different functionality.
+     */
+    @Override
+    public Uri insert(@NonNull Uri uri, ContentValues values) {
+        throw new UnsupportedOperationException("No external inserts");
+    }
+
+    /**
+     * By default, this method throws an {@link UnsupportedOperationException}. You must
+     * subclass FileProvider if you want to provide different functionality.
+     */
+    @Override
+    public int update(@NonNull Uri uri, ContentValues values, @Nullable String selection,
+            @Nullable String[] selectionArgs) {
+        throw new UnsupportedOperationException("No external updates");
+    }
+
+    /**
+     * Deletes the file associated with the specified content URI, as
+     * returned by {@link #getUriForFile(Context, String, File) getUriForFile()}. Notice that this
+     * method does <b>not</b> throw an {@link IOException}; you must check its return value.
+     *
+     * @param uri A content URI for a file, as returned by
+     * {@link #getUriForFile(Context, String, File) getUriForFile()}.
+     * @param selection Ignored. Set to {@code null}.
+     * @param selectionArgs Ignored. Set to {@code null}.
+     * @return 1 if the delete succeeds; otherwise, 0.
+     */
+    @Override
+    public int delete(@NonNull Uri uri, @Nullable String selection,
+            @Nullable String[] selectionArgs) {
+        // ContentProvider has already checked granted permissions
+        final File file = mStrategy.getFileForUri(uri);
+        return file.delete() ? 1 : 0;
+    }
+
+    /**
+     * By default, FileProvider automatically returns the
+     * {@link ParcelFileDescriptor} for a file associated with a <code>content://</code>
+     * {@link Uri}. To get the {@link ParcelFileDescriptor}, call
+     * {@link android.content.ContentResolver#openFileDescriptor(Uri, String)
+     * ContentResolver.openFileDescriptor}.
+     *
+     * To override this method, you must provide your own subclass of FileProvider.
+     *
+     * @param uri A content URI associated with a file, as returned by
+     * {@link #getUriForFile(Context, String, File) getUriForFile()}.
+     * @param mode Access mode for the file. May be "r" for read-only access, "rw" for read and
+     * write access, or "rwt" for read and write access that truncates any existing file.
+     * @return A new {@link ParcelFileDescriptor} with which you can access the file.
+     */
+    @Override
+    public ParcelFileDescriptor openFile(@NonNull Uri uri, @NonNull String mode)
+            throws FileNotFoundException {
+        // ContentProvider has already checked granted permissions
+        final File file = mStrategy.getFileForUri(uri);
+        final int fileMode = modeToMode(mode);
+        return ParcelFileDescriptor.open(file, fileMode);
+    }
+
+    /**
+     * Return {@link PathStrategy} for given authority, either by parsing or
+     * returning from cache.
+     */
+    private static PathStrategy getPathStrategy(Context context, String authority) {
+        PathStrategy strat;
+        synchronized (sCache) {
+            strat = sCache.get(authority);
+            if (strat == null) {
+                try {
+                    strat = parsePathStrategy(context, authority);
+                } catch (IOException e) {
+                    throw new IllegalArgumentException(
+                            "Failed to parse " + META_DATA_FILE_PROVIDER_PATHS + " meta-data", e);
+                } catch (XmlPullParserException e) {
+                    throw new IllegalArgumentException(
+                            "Failed to parse " + META_DATA_FILE_PROVIDER_PATHS + " meta-data", e);
+                }
+                sCache.put(authority, strat);
+            }
+        }
+        return strat;
+    }
+
+    /**
+     * Parse and return {@link PathStrategy} for given authority as defined in
+     * {@link #META_DATA_FILE_PROVIDER_PATHS} {@code <meta-data>}.
+     *
+     * @see #getPathStrategy(Context, String)
+     */
+    private static PathStrategy parsePathStrategy(Context context, String authority)
+            throws IOException, XmlPullParserException {
+        final SimplePathStrategy strat = new SimplePathStrategy(authority);
+
+        final ProviderInfo info = context.getPackageManager()
+                .resolveContentProvider(authority, PackageManager.GET_META_DATA);
+        if (info == null) {
+            throw new IllegalArgumentException(
+                    "Couldn't find meta-data for provider with authority " + authority);
+        }
+
+        final XmlResourceParser in = info.loadXmlMetaData(
+                context.getPackageManager(), META_DATA_FILE_PROVIDER_PATHS);
+        if (in == null) {
+            throw new IllegalArgumentException(
+                    "Missing " + META_DATA_FILE_PROVIDER_PATHS + " meta-data");
+        }
+
+        int type;
+        while ((type = in.next()) != END_DOCUMENT) {
+            if (type == START_TAG) {
+                final String tag = in.getName();
+
+                final String name = in.getAttributeValue(null, ATTR_NAME);
+                String path = in.getAttributeValue(null, ATTR_PATH);
+
+                File target = null;
+                if (TAG_ROOT_PATH.equals(tag)) {
+                    target = DEVICE_ROOT;
+                } else if (TAG_FILES_PATH.equals(tag)) {
+                    target = context.getFilesDir();
+                } else if (TAG_CACHE_PATH.equals(tag)) {
+                    target = context.getCacheDir();
+                } else if (TAG_EXTERNAL.equals(tag)) {
+                    target = Environment.getExternalStorageDirectory();
+                } else if (TAG_EXTERNAL_FILES.equals(tag)) {
+                    File[] externalFilesDirs = context.getExternalFilesDirs(null);
+                    if (externalFilesDirs.length > 0) {
+                        target = externalFilesDirs[0];
+                    }
+                } else if (TAG_EXTERNAL_CACHE.equals(tag)) {
+                    File[] externalCacheDirs = context.getExternalCacheDirs();
+                    if (externalCacheDirs.length > 0) {
+                        target = externalCacheDirs[0];
+                    }
+                } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP
+                        && TAG_EXTERNAL_MEDIA.equals(tag)) {
+                    File[] externalMediaDirs = context.getExternalMediaDirs();
+                    if (externalMediaDirs.length > 0) {
+                        target = externalMediaDirs[0];
+                    }
+                }
+
+                if (target != null) {
+                    strat.addRoot(name, buildPath(target, path));
+                }
+            }
+        }
+
+        return strat;
+    }
+
+    /**
+     * Strategy for mapping between {@link File} and {@link Uri}.
+     * <p>
+     * Strategies must be symmetric so that mapping a {@link File} to a
+     * {@link Uri} and then back to a {@link File} points at the original
+     * target.
+     * <p>
+     * Strategies must remain consistent across app launches, and not rely on
+     * dynamic state. This ensures that any generated {@link Uri} can still be
+     * resolved if your process is killed and later restarted.
+     *
+     * @see SimplePathStrategy
+     */
+    interface PathStrategy {
+        /**
+         * Return a {@link Uri} that represents the given {@link File}.
+         */
+        Uri getUriForFile(File file);
+
+        /**
+         * Return a {@link File} that represents the given {@link Uri}.
+         */
+        File getFileForUri(Uri uri);
+    }
+
+    /**
+     * Strategy that provides access to files living under a narrow whitelist of
+     * filesystem roots. It will throw {@link SecurityException} if callers try
+     * accessing files outside the configured roots.
+     * <p>
+     * For example, if configured with
+     * {@code addRoot("myfiles", context.getFilesDir())}, then
+     * {@code context.getFileStreamPath("foo.txt")} would map to
+     * {@code content://myauthority/myfiles/foo.txt}.
+     */
+    static class SimplePathStrategy implements PathStrategy {
+        private final String mAuthority;
+        private final HashMap<String, File> mRoots = new HashMap<String, File>();
+
+        SimplePathStrategy(String authority) {
+            mAuthority = authority;
+        }
+
+        /**
+         * Add a mapping from a name to a filesystem root. The provider only offers
+         * access to files that live under configured roots.
+         */
+        void addRoot(String name, File root) {
+            if (TextUtils.isEmpty(name)) {
+                throw new IllegalArgumentException("Name must not be empty");
+            }
+
+            try {
+                // Resolve to canonical path to keep path checking fast
+                root = root.getCanonicalFile();
+            } catch (IOException e) {
+                throw new IllegalArgumentException(
+                        "Failed to resolve canonical path for " + root, e);
+            }
+
+            mRoots.put(name, root);
+        }
+
+        @Override
+        public Uri getUriForFile(File file) {
+            String path;
+            try {
+                path = file.getCanonicalPath();
+            } catch (IOException e) {
+                throw new IllegalArgumentException("Failed to resolve canonical path for " + file);
+            }
+
+            // Find the most-specific root path
+            Map.Entry<String, File> mostSpecific = null;
+            for (Map.Entry<String, File> root : mRoots.entrySet()) {
+                final String rootPath = root.getValue().getPath();
+                if (path.startsWith(rootPath) && (mostSpecific == null
+                        || rootPath.length() > mostSpecific.getValue().getPath().length())) {
+                    mostSpecific = root;
+                }
+            }
+
+            if (mostSpecific == null) {
+                throw new IllegalArgumentException(
+                        "Failed to find configured root that contains " + path);
+            }
+
+            // Start at first char of path under root
+            final String rootPath = mostSpecific.getValue().getPath();
+            if (rootPath.endsWith("/")) {
+                path = path.substring(rootPath.length());
+            } else {
+                path = path.substring(rootPath.length() + 1);
+            }
+
+            // Encode the tag and path separately
+            path = Uri.encode(mostSpecific.getKey()) + '/' + Uri.encode(path, "/");
+            return new Uri.Builder().scheme("content")
+                    .authority(mAuthority).encodedPath(path).build();
+        }
+
+        @Override
+        public File getFileForUri(Uri uri) {
+            String path = uri.getEncodedPath();
+
+            final int splitIndex = path.indexOf('/', 1);
+            final String tag = Uri.decode(path.substring(1, splitIndex));
+            path = Uri.decode(path.substring(splitIndex + 1));
+
+            final File root = mRoots.get(tag);
+            if (root == null) {
+                throw new IllegalArgumentException("Unable to find configured root for " + uri);
+            }
+
+            File file = new File(root, path);
+            try {
+                file = file.getCanonicalFile();
+            } catch (IOException e) {
+                throw new IllegalArgumentException("Failed to resolve canonical path for " + file);
+            }
+
+            if (!file.getPath().startsWith(root.getPath())) {
+                throw new SecurityException("Resolved path jumped beyond configured root");
+            }
+
+            return file;
+        }
+    }
+
+    /**
+     * Copied from ContentResolver.java
+     */
+    private static int modeToMode(String mode) {
+        int modeBits;
+        if ("r".equals(mode)) {
+            modeBits = ParcelFileDescriptor.MODE_READ_ONLY;
+        } else if ("w".equals(mode) || "wt".equals(mode)) {
+            modeBits = ParcelFileDescriptor.MODE_WRITE_ONLY
+                    | ParcelFileDescriptor.MODE_CREATE
+                    | ParcelFileDescriptor.MODE_TRUNCATE;
+        } else if ("wa".equals(mode)) {
+            modeBits = ParcelFileDescriptor.MODE_WRITE_ONLY
+                    | ParcelFileDescriptor.MODE_CREATE
+                    | ParcelFileDescriptor.MODE_APPEND;
+        } else if ("rw".equals(mode)) {
+            modeBits = ParcelFileDescriptor.MODE_READ_WRITE
+                    | ParcelFileDescriptor.MODE_CREATE;
+        } else if ("rwt".equals(mode)) {
+            modeBits = ParcelFileDescriptor.MODE_READ_WRITE
+                    | ParcelFileDescriptor.MODE_CREATE
+                    | ParcelFileDescriptor.MODE_TRUNCATE;
+        } else {
+            throw new IllegalArgumentException("Invalid mode: " + mode);
+        }
+        return modeBits;
+    }
+
+    private static File buildPath(File base, String... segments) {
+        File cur = base;
+        for (String segment : segments) {
+            if (segment != null) {
+                cur = new File(cur, segment);
+            }
+        }
+        return cur;
+    }
+
+    private static String[] copyOf(String[] original, int newLength) {
+        final String[] result = new String[newLength];
+        System.arraycopy(original, 0, result, 0, newLength);
+        return result;
+    }
+
+    private static Object[] copyOf(Object[] original, int newLength) {
+        final Object[] result = new Object[newLength];
+        System.arraycopy(original, 0, result, 0, newLength);
+        return result;
+    }
+}

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

@@ -28,6 +28,9 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
+import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.model.Account;
+
 public class GlobalUserPreferences{
 	private static final String TAG="GlobalUserPreferences";
 
@@ -54,7 +57,6 @@ public class GlobalUserPreferences{
 	public static boolean spectatorMode;
 	public static boolean autoHideFab;
 	public static boolean allowRemoteLoading;
-	public static boolean forwardReportDefault;
 	public static AutoRevealMode autoRevealEqualSpoilers;
 	public static boolean disableM3PillActiveIndicator;
 	public static boolean showNavigationLabels;
@@ -75,15 +77,20 @@ public class GlobalUserPreferences{
 	public static boolean hapticFeedback;
 	public static boolean replyLineAboveHeader;
 	public static boolean swapBookmarkWithBoostAction;
-	public static boolean loadRemoteAccountFollowers;
 	public static boolean mentionRebloggerAutomatically;
 	public static boolean showPostsWithoutAlt;
 	public static boolean showMediaPreview;
+	public static boolean removeTrackingParams;
 
 	public static SharedPreferences getPrefs(){
 		return MastodonApp.context.getSharedPreferences("global", Context.MODE_PRIVATE);
 	}
 
+	private static SharedPreferences getPreReplyPrefs(){
+		return MastodonApp.context.getSharedPreferences("pre_reply_sheets", Context.MODE_PRIVATE);
+	}
+
+
 	public static <T> T fromJson(String json, Type type, T orElse){
 		if(json==null) return orElse;
 		try{
@@ -129,7 +136,6 @@ public class GlobalUserPreferences{
 		autoHideFab=prefs.getBoolean("autoHideFab", true);
 		allowRemoteLoading=prefs.getBoolean("allowRemoteLoading", true);
 		autoRevealEqualSpoilers=AutoRevealMode.valueOf(prefs.getString("autoRevealEqualSpoilers", AutoRevealMode.THREADS.name()));
-		forwardReportDefault=prefs.getBoolean("forwardReportDefault", true);
 		disableM3PillActiveIndicator=prefs.getBoolean("disableM3PillActiveIndicator", false);
 		showNavigationLabels=prefs.getBoolean("showNavigationLabels", true);
 		displayPronounsInTimelines=prefs.getBoolean("displayPronounsInTimelines", true);
@@ -152,10 +158,10 @@ public class GlobalUserPreferences{
 		confirmBeforeReblog=prefs.getBoolean("confirmBeforeReblog", false);
 		hapticFeedback=prefs.getBoolean("hapticFeedback", true);
 		swapBookmarkWithBoostAction=prefs.getBoolean("swapBookmarkWithBoostAction", false);
-		loadRemoteAccountFollowers=prefs.getBoolean("loadRemoteAccountFollowers", true);
 		mentionRebloggerAutomatically=prefs.getBoolean("mentionRebloggerAutomatically", false);
 		showPostsWithoutAlt=prefs.getBoolean("showPostsWithoutAlt", true);
 		showMediaPreview=prefs.getBoolean("showMediaPreview", true);
+		removeTrackingParams=prefs.getBoolean("removeTrackingParams", true);
 
 		theme=ThemePreference.values()[prefs.getInt("theme", 0)];
 
@@ -205,7 +211,6 @@ public class GlobalUserPreferences{
 				.putBoolean("autoHideFab", autoHideFab)
 				.putBoolean("allowRemoteLoading", allowRemoteLoading)
 				.putString("autoRevealEqualSpoilers", autoRevealEqualSpoilers.name())
-				.putBoolean("forwardReportDefault", forwardReportDefault)
 				.putBoolean("disableM3PillActiveIndicator", disableM3PillActiveIndicator)
 				.putBoolean("showNavigationLabels", showNavigationLabels)
 				.putBoolean("displayPronounsInTimelines", displayPronounsInTimelines)
@@ -224,7 +229,6 @@ public class GlobalUserPreferences{
 				.putBoolean("replyLineAboveHeader", replyLineAboveHeader)
 				.putBoolean("confirmBeforeReblog", confirmBeforeReblog)
 				.putBoolean("swapBookmarkWithBoostAction", swapBookmarkWithBoostAction)
-				.putBoolean("loadRemoteAccountFollowers", loadRemoteAccountFollowers)
 				.putBoolean("hapticFeedback", hapticFeedback)
 				.putBoolean("mentionRebloggerAutomatically", mentionRebloggerAutomatically)
 				.putBoolean("showDividers", showDividers)
@@ -232,16 +236,46 @@ public class GlobalUserPreferences{
 				.putBoolean("enableDeleteNotifications", enableDeleteNotifications)
 				.putBoolean("showPostsWithoutAlt", showPostsWithoutAlt)
 				.putBoolean("showMediaPreview", showMediaPreview)
+				.putBoolean("removeTrackingParams", removeTrackingParams)
 
 				.apply();
 	}
 
+	public static boolean isOptedOutOfPreReplySheet(PreReplySheetType type, Account account, String accountID){
+		if(getPreReplyPrefs().getBoolean("opt_out_"+type, false))
+			return true;
+		if(account==null)
+			return false;
+		String accountKey=account.acct;
+		if(!accountKey.contains("@"))
+			accountKey+="@"+AccountSessionManager.get(accountID).domain;
+		return getPreReplyPrefs().getBoolean("opt_out_"+type+"_"+accountKey.toLowerCase(), false);
+	}
+
+	public static void optOutOfPreReplySheet(PreReplySheetType type, Account account, String accountID){
+		String key;
+		if(account==null){
+			key="opt_out_"+type;
+		}else{
+			String accountKey=account.acct;
+			if(!accountKey.contains("@"))
+				accountKey+="@"+AccountSessionManager.get(accountID).domain;
+			key="opt_out_"+type+"_"+accountKey.toLowerCase();
+		}
+		getPreReplyPrefs().edit().putBoolean(key, true).apply();
+	}
+
 	public enum ThemePreference{
 		AUTO,
 		LIGHT,
 		DARK
 	}
 
+	public enum PreReplySheetType{
+		OLD_POST,
+		NON_MUTUAL
+	}
+
 	public enum AutoRevealMode {
 		NEVER,
 		THREADS,
@@ -306,5 +340,4 @@ public class GlobalUserPreferences{
 	}
 
 	//endregion
-
 }

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

@@ -12,6 +12,7 @@ import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
 import android.net.Uri;
 import android.net.Uri;
+import android.os.BadParcelableException;
 import android.os.Build;
 import android.os.Bundle;
 import android.provider.MediaStore;
@@ -110,8 +111,6 @@ public class MainActivity extends FragmentStackActivity implements ProvidesAssis
 				fragment.setArguments(args);
 				showFragmentClearingBackStack(fragment);
 			}
-		}else if(intent.getBooleanExtra("compose", false)){
-			showCompose();
 		}else if(Intent.ACTION_VIEW.equals(intent.getAction())){
 			handleURL(intent.getData(), null);
 		}/*else if(intent.hasExtra(PackageInstaller.EXTRA_STATUS) && GithubSelfUpdater.needSelfUpdating()){
@@ -131,11 +130,11 @@ public class MainActivity extends FragmentStackActivity implements ProvidesAssis
 			session=AccountSessionManager.get(accountID);
 		if(session==null || !session.activated)
 			return;
-		openSearchQuery(uri.toString(), session.getID(), R.string.opening_link, false);
+		openSearchQuery(uri.toString(), session.getID(), R.string.opening_link, false, null);
 	}
 
-	public void openSearchQuery(String q, String accountID, int progressText, boolean fromSearch){
-		new GetSearchResults(q, null, true, null, 0, 0)
+	public void openSearchQuery(String q, String accountID, int progressText, boolean fromSearch, GetSearchResults.Type type){
+		new GetSearchResults(q, type, true, null, 0, 0)
 				.setCallback(new Callback<>(){
 					@Override
 					public void onSuccess(SearchResults result){
@@ -186,17 +185,6 @@ public class MainActivity extends FragmentStackActivity implements ProvidesAssis
 		showFragment(fragment);
 	}
 
-	private void showCompose(){
-		AccountSession session=AccountSessionManager.getInstance().getLastActiveAccount();
-		if(session==null || !session.activated)
-			return;
-		ComposeFragment compose=new ComposeFragment();
-		Bundle composeArgs=new Bundle();
-		composeArgs.putString("account", session.getID());
-		compose.setArguments(composeArgs);
-		showFragment(compose);
-	}
-
 	private void maybeRequestNotificationsPermission(){
 		if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.TIRAMISU && checkSelfPermission(Manifest.permission.POST_NOTIFICATIONS)!=PackageManager.PERMISSION_GRANTED){
 			requestPermissions(new String[]{Manifest.permission.POST_NOTIFICATIONS}, 100);
@@ -334,10 +322,14 @@ public class MainActivity extends FragmentStackActivity implements ProvidesAssis
 			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();
+				// Parcelables might not be compatible across app versions so this protects against possible crashes
+				// when a notification was received, then the app was updated, and then the user opened the notification
+				try{
+					Notification notification=Parcels.unwrap(intent.getParcelableExtra("notification"));
+					showFragmentForNotification(notification, session.getID());
+				}catch(BadParcelableException x){
+					Log.w(TAG, x);
+				}
 			} else if (Intent.ACTION_VIEW.equals(intent.getAction())){
 				handleURL(intent.getData(), null);
 			} else {

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

@@ -25,7 +25,7 @@ public class MastodonApp extends Application{
 		params.diskCacheSize=100*1024*1024;
 		params.maxMemoryCacheSize=Integer.MAX_VALUE;
 		ImageCache.setParams(params);
-		NetworkUtils.setUserAgent("MastodonAndroid/"+BuildConfig.VERSION_NAME);
+		NetworkUtils.setUserAgent("MoshidonAndroid/"+BuildConfig.VERSION_NAME);
 
 		PushSubscriptionManager.tryRegisterFCM();
 		GlobalUserPreferences.load();

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

@@ -101,7 +101,7 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 						}
 						String accountID=account.getID();
 						PushNotification pn=AccountSessionManager.getInstance().getAccount(accountID).getPushSubscriptionManager().decryptNotification(k, p, s);
-						new GetNotificationByID(pn.notificationId+"")
+						new GetNotificationByID(pn.notificationId)
 								.setCallback(new Callback<>(){
 									@Override
 									public void onSuccess(org.joinmastodon.android.model.Notification result){
@@ -133,7 +133,11 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 
 			if(intent.hasExtra("notification")){
 				org.joinmastodon.android.model.Notification notification=Parcels.unwrap(intent.getParcelableExtra("notification"));
-				String statusID=notification.status.id;
+
+				String statusID = null;
+				if(notification != null && notification.status != null)
+					statusID=notification.status.id;
+
 				if (statusID != null) {
 					AccountSessionManager accountSessionManager = AccountSessionManager.getInstance();
 					Preferences preferences = accountSessionManager.getAccount(accountID).preferences;
@@ -154,9 +158,9 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 		}
 	}
 
-	public void notifyUnifiedPush(Context context, String accountID, org.joinmastodon.android.model.Notification notification) {
+	public void notifyUnifiedPush(Context context, AccountSession account, org.joinmastodon.android.model.Notification notification) {
 		// push notifications are only created from the official push notification, so we create a fake from by transforming the notification
-		PushNotificationReceiver.this.notify(context, PushNotification.fromNotification(context, notification), accountID, notification);
+		PushNotificationReceiver.this.notify(context, PushNotification.fromNotification(context, account, notification), account.getID(), notification);
 	}
 
 	private void notify(Context context, PushNotification pn, String accountID, org.joinmastodon.android.model.Notification notification){

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

@@ -0,0 +1,38 @@
+package org.joinmastodon.android;
+
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.ParcelFileDescriptor;
+import android.util.Log;
+
+import java.io.FileNotFoundException;
+import java.util.Arrays;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+public class TweakedFileProvider extends FileProvider{
+	private static final String TAG="TweakedFileProvider";
+
+	@Override
+	public String getType(@NonNull Uri uri){
+		Log.d(TAG, "getType() called with: uri = ["+uri+"]");
+		if(uri.getPathSegments().get(0).equals("image_cache")){
+			Log.i(TAG, "getType: HERE!");
+			return "image/jpeg"; // might as well be a png but image decoding APIs don't care, needs to be image/* though
+		}
+		return super.getType(uri);
+	}
+
+	@Override
+	public Cursor query(@NonNull Uri uri, @Nullable String[] projection, @Nullable String selection, @Nullable String[] selectionArgs, @Nullable String sortOrder){
+		Log.d(TAG, "query() called with: uri = ["+uri+"], projection = ["+Arrays.toString(projection)+"], selection = ["+selection+"], selectionArgs = ["+Arrays.toString(selectionArgs)+"], sortOrder = ["+sortOrder+"]");
+		return super.query(uri, projection, selection, selectionArgs, sortOrder);
+	}
+
+	@Override
+	public ParcelFileDescriptor openFile(@NonNull Uri uri, @NonNull String mode) throws FileNotFoundException{
+		Log.d(TAG, "openFile() called with: uri = ["+uri+"], mode = ["+mode+"]");
+		return super.openFile(uri, mode);
+	}
+}

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

@@ -72,7 +72,7 @@ public class UnifiedPushNotificationReceiver extends MessagingReceiver{
 				result.items
 						.stream()
 						.findFirst()
-						.ifPresent(value->MastodonAPIController.runInBackground(()->new PushNotificationReceiver().notifyUnifiedPush(context, instance, value)));
+						.ifPresent(value->MastodonAPIController.runInBackground(()->new PushNotificationReceiver().notifyUnifiedPush(context, account, value)));
 			}
 
 			@Override

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

@@ -9,21 +9,32 @@ import android.os.Handler;
 import android.os.Looper;
 import android.util.Log;
 
+import com.google.gson.reflect.TypeToken;
+
 import org.joinmastodon.android.BuildConfig;
 import org.joinmastodon.android.MastodonApp;
+import org.joinmastodon.android.api.requests.lists.GetLists;
 import org.joinmastodon.android.api.requests.notifications.GetNotifications;
 import org.joinmastodon.android.api.requests.timelines.GetHomeTimeline;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.model.CacheablePaginatedResponse;
 import org.joinmastodon.android.model.FilterContext;
+import org.joinmastodon.android.model.FollowList;
 import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.model.Notification;
 import org.joinmastodon.android.model.PaginatedResponse;
 import org.joinmastodon.android.model.SearchResult;
 import org.joinmastodon.android.model.Status;
+import org.joinmastodon.android.ui.utils.UiUtils;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.EnumSet;
 import java.util.List;
 import java.util.Objects;
@@ -44,6 +55,7 @@ public class CacheController{
 	private final Runnable databaseCloseRunnable=this::closeDatabase;
 	private boolean loadingNotifications;
 	private final ArrayList<Callback<PaginatedResponse<List<Notification>>>> pendingNotificationsCallbacks=new ArrayList<>();
+	private List<FollowList> lists;
 
 	private static final int POST_FLAG_GAP_AFTER=1;
 
@@ -348,6 +360,99 @@ public class CacheController{
 		}, 0);
 	}
 
+	public void reloadLists(Callback<List<FollowList>> callback){
+		new GetLists()
+				.setCallback(new Callback<>(){
+					@Override
+					public void onSuccess(List<FollowList> result){
+						result.sort(Comparator.comparing(l->l.title));
+						lists=result;
+						if(callback!=null)
+							callback.onSuccess(result);
+						writeListsToFile();
+					}
+
+					@Override
+					public void onError(ErrorResponse error){
+						if(callback!=null)
+							callback.onError(error);
+					}
+				})
+				.exec(accountID);
+	}
+
+	private List<FollowList> loadListsFromFile(){
+		File file=getListsFile();
+		if(!file.exists())
+			return null;
+		try(InputStreamReader in=new InputStreamReader(new FileInputStream(file))){
+			return MastodonAPIController.gson.fromJson(in, new TypeToken<List<FollowList>>(){}.getType());
+		}catch(Exception x){
+			Log.w(TAG, "failed to read lists from cache file", x);
+			return null;
+		}
+	}
+
+	private void writeListsToFile(){
+		databaseThread.postRunnable(()->{
+			try(OutputStreamWriter out=new OutputStreamWriter(new FileOutputStream(getListsFile()))){
+				MastodonAPIController.gson.toJson(lists, out);
+			}catch(IOException x){
+				Log.w(TAG, "failed to write lists to cache file", x);
+			}
+		}, 0);
+	}
+
+	public void getLists(Callback<List<FollowList>> callback){
+		if(lists!=null){
+			if(callback!=null)
+				callback.onSuccess(lists);
+			return;
+		}
+		databaseThread.postRunnable(()->{
+			List<FollowList> lists=loadListsFromFile();
+			if(lists!=null){
+				this.lists=lists;
+				if(callback!=null)
+					uiHandler.post(()->callback.onSuccess(lists));
+				return;
+			}
+			reloadLists(callback);
+		}, 0);
+	}
+
+	public File getListsFile(){
+		return new File(MastodonApp.context.getFilesDir(), "lists_"+accountID+".json");
+	}
+
+	public void addList(FollowList list){
+		if(lists==null)
+			return;
+		lists.add(list);
+		lists.sort(Comparator.comparing(l->l.title));
+		writeListsToFile();
+	}
+
+	public void deleteList(String id){
+		if(lists==null)
+			return;
+		lists.removeIf(l->l.id.equals(id));
+		writeListsToFile();
+	}
+
+	public void updateList(FollowList list){
+		if(lists==null)
+			return;
+		for(int i=0;i<lists.size();i++){
+			if(lists.get(i).id.equals(list.id)){
+				lists.set(i, list);
+				lists.sort(Comparator.comparing(l->l.title));
+				writeListsToFile();
+				break;
+			}
+		}
+	}
+
 	private class DatabaseHelper extends SQLiteOpenHelper{
 
 		public DatabaseHelper(){

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

@@ -54,7 +54,9 @@ public class MastodonAPIController{
 			.create();
 	private static WorkerThread thread=new WorkerThread("MastodonAPIController");
 	private static OkHttpClient httpClient=new OkHttpClient.Builder()
-			.readTimeout(30, TimeUnit.SECONDS)
+			.connectTimeout(60, TimeUnit.SECONDS)
+			.writeTimeout(60, TimeUnit.SECONDS)
+			.readTimeout(60, TimeUnit.SECONDS)
 			.build();
 
 	private AccountSession session;
@@ -89,7 +91,11 @@ public class MastodonAPIController{
 		final boolean isBad = host == null || badDomains.stream().anyMatch(h -> h.equalsIgnoreCase(host) || host.toLowerCase().endsWith("." + h));
 		thread.postRunnable(()->{
 			try{
-//				if (isBad) throw new IllegalArgumentException();
+				if(isBad){
+					Log.i(TAG, "submitRequest: refusing to connect to bad domain: " + host);
+					throw new IllegalArgumentException("Failed to connect to domain");
+				}
+
 				if(req.canceled)
 					return;
 				Request.Builder builder=new Request.Builder()
@@ -122,15 +128,15 @@ public class MastodonAPIController{
 				}
 
 				if(BuildConfig.DEBUG)
-					Log.d(TAG, "["+(session==null ? "no-auth" : session.getID())+"] Sending request: "+hreq);
+					Log.d(TAG, logTag(session)+"Sending request: "+hreq);
 
 				call.enqueue(new Callback(){
 					@Override
 					public void onFailure(@NonNull Call call, @NonNull IOException e){
-						if(call.isCanceled())
+						if(req.canceled)
 							return;
 						if(BuildConfig.DEBUG)
-							Log.w(TAG, "["+(session==null ? "no-auth" : session.getID())+"] "+hreq+" failed", e);
+							Log.w(TAG, logTag(session)+""+hreq+" failed", e);
 						synchronized(req){
 							req.okhttpCall=null;
 						}
@@ -139,10 +145,10 @@ public class MastodonAPIController{
 
 					@Override
 					public void onResponse(@NonNull Call call, @NonNull Response response) throws IOException{
-						if(call.isCanceled())
+						if(req.canceled)
 							return;
 						if(BuildConfig.DEBUG)
-							Log.d(TAG, "["+(session==null ? "no-auth" : session.getID())+"] "+hreq+" received response: "+response);
+							Log.d(TAG, logTag(session)+hreq+" received response: "+response);
 						synchronized(req){
 							req.okhttpCall=null;
 						}
@@ -153,7 +159,7 @@ public class MastodonAPIController{
 								try{
 									if(BuildConfig.DEBUG){
 										JsonElement respJson=JsonParser.parseReader(reader);
-										Log.d(TAG, "["+(session==null ? "no-auth" : session.getID())+"] response body: "+respJson);
+										Log.d(TAG, logTag(session)+"response body: "+respJson);
 										if(req.respTypeToken!=null)
 											respObj=gson.fromJson(respJson, req.respTypeToken.getType());
 										else if(req.respClass!=null)
@@ -175,7 +181,7 @@ public class MastodonAPIController{
 										return;
 									}
 									if(BuildConfig.DEBUG)
-										Log.w(TAG, "["+(session==null ? "no-auth" : session.getID())+"] "+response+" error parsing or reading body", x);
+										Log.w(TAG, logTag(session)+response+" error parsing or reading body", x);
 									req.onError(x.getLocalizedMessage(), response.code(), x);
 									return;
 								}
@@ -184,19 +190,19 @@ public class MastodonAPIController{
 									req.validateAndPostprocessResponse(respObj, response);
 								}catch(IOException x){
 									if(BuildConfig.DEBUG)
-										Log.w(TAG, "["+(session==null ? "no-auth" : session.getID())+"] "+response+" error post-processing or validating response", x);
+										Log.w(TAG, logTag(session)+response+" error post-processing or validating response", x);
 									req.onError(x.getLocalizedMessage(), response.code(), x);
 									return;
 								}
 
 								if(BuildConfig.DEBUG)
-									Log.d(TAG, "["+(session==null ? "no-auth" : session.getID())+"] "+response+" parsed successfully: "+respObj);
+									Log.d(TAG, logTag(session)+response+" parsed successfully: "+respObj);
 
 								req.onSuccess(respObj);
 							}else{
 								try{
 									JsonObject error=JsonParser.parseReader(reader).getAsJsonObject();
-									Log.w(TAG, "["+(session==null ? "no-auth" : session.getID())+"] "+response+" received error: "+error);
+									Log.w(TAG, logTag(session)+response+" received error: "+error);
 									if(error.has("details")){
 										MastodonDetailedErrorResponse err=new MastodonDetailedErrorResponse(error.get("error").getAsString(), response.code(), null);
 										HashMap<String, List<MastodonDetailedErrorResponse.FieldError>> details=new HashMap<>();
@@ -231,7 +237,7 @@ public class MastodonAPIController{
 				});
 			}catch(Exception x){
 				if(BuildConfig.DEBUG)
-					Log.w(TAG, "["+(session==null ? "no-auth" : session.getID())+"] error creating and sending http request", x);
+					Log.w(TAG, logTag(session)+"error creating and sending http request", x);
 				req.onError(x.getLocalizedMessage(), 0, x);
 			}
 		}, 0);
@@ -244,4 +250,8 @@ public class MastodonAPIController{
 	public static OkHttpClient getHttpClient(){
 		return httpClient;
 	}
+
+	private static String logTag(AccountSession session){
+		return "["+(session==null ? "no-auth" : session.getID())+"] ";
+	}
 }

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

@@ -180,6 +180,8 @@ public abstract class MastodonAPIRequest<T> extends APIRequest<T>{
 	}
 
 	public RequestBody getRequestBody() throws IOException{
+		if(requestBody instanceof RequestBody rb)
+			return rb;
 		return requestBody==null ? null : new JsonObjectRequestBody(requestBody);
 	}
 

mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/CheckInviteLink.java

@@ -0,0 +1,22 @@
+package org.joinmastodon.android.api.requests.accounts;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.api.RequiredField;
+import org.joinmastodon.android.model.BaseModel;
+
+public class CheckInviteLink extends MastodonAPIRequest<CheckInviteLink.Response>{
+	public CheckInviteLink(String path){
+		super(HttpMethod.GET, path, Response.class);
+		addHeader("Accept", "application/json");
+	}
+
+	@Override
+	protected String getPathPrefix(){
+		return "";
+	}
+
+	public static class Response extends BaseModel{
+		@RequiredField
+		public String inviteCode;
+	}
+}

mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/GetAccountLists.java

@@ -0,0 +1,14 @@
+package org.joinmastodon.android.api.requests.accounts;
+
+import com.google.gson.reflect.TypeToken;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.model.FollowList;
+
+import java.util.List;
+
+public class GetAccountLists extends MastodonAPIRequest<List<FollowList>>{
+	public GetAccountLists(String id){
+		super(HttpMethod.GET, "/accounts/"+id+"/lists", new TypeToken<>(){});
+	}
+}

mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/RegisterAccount.java

@@ -4,22 +4,23 @@ import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.Token;
 
 public class RegisterAccount extends MastodonAPIRequest<Token>{
-	public RegisterAccount(String username, String email, String password, String locale, String reason, String timezone){
+	public RegisterAccount(String username, String email, String password, String locale, String reason, String timezone, String inviteCode){
 		super(HttpMethod.POST, "/accounts", Token.class);
-		setRequestBody(new Body(username, email, password, locale, reason, timezone));
+		setRequestBody(new Body(username, email, password, locale, reason, timezone, inviteCode));
 	}
 
 	private static class Body{
-		public String username, email, password, locale, reason, timeZone;
+		public String username, email, password, locale, reason, timeZone, inviteCode;
 		public boolean agreement=true;
 
-		public Body(String username, String email, String password, String locale, String reason, String timeZone){
+		public Body(String username, String email, String password, String locale, String reason, String timeZone, String inviteCode){
 			this.username=username;
 			this.email=email;
 			this.password=password;
 			this.locale=locale;
 			this.reason=reason;
 			this.timeZone=timeZone;
+			this.inviteCode=inviteCode;
 		}
 	}
 }

mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/SearchAccounts.java

@@ -0,0 +1,23 @@
+package org.joinmastodon.android.api.requests.accounts;
+
+import com.google.gson.reflect.TypeToken;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.model.Account;
+
+import java.util.List;
+
+public class SearchAccounts extends MastodonAPIRequest<List<Account>>{
+	public SearchAccounts(String q, int limit, int offset, boolean resolve, boolean following){
+		super(HttpMethod.GET, "/accounts/search", new TypeToken<>(){});
+		addQueryParameter("q", q);
+		if(limit>0)
+			addQueryParameter("limit", limit+"");
+		if(offset>0)
+			addQueryParameter("offset", offset+"");
+		if(resolve)
+			addQueryParameter("resolve", "true");
+		if(following)
+			addQueryParameter("following", "true");
+	}
+}

mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/SetAccountMuted.java

@@ -4,15 +4,21 @@ import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.Relationship;
 
 public class SetAccountMuted extends MastodonAPIRequest<Relationship>{
-	public SetAccountMuted(String id, boolean muted, long duration){
+	public SetAccountMuted(String id, boolean muted, long duration, boolean muteNotifications){
 		super(HttpMethod.POST, "/accounts/"+id+"/"+(muted ? "mute" : "unmute"), Relationship.class);
-		setRequestBody(new Request(duration));
+		if(muted)
+			setRequestBody(new Request(duration, muteNotifications));
+		else{
+			setRequestBody(new Object());
+		}
 	}
 
 	private static class Request{
 		public long duration;
-		public Request(long duration){
+		public boolean muteNotifications;
+		public Request(long duration, boolean muteNotifications){
 			this.duration=duration;
+			this.muteNotifications=muteNotifications;
 		}
 	}
 }

mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/UpdateAccountCredentials.java

@@ -22,6 +22,7 @@ public class UpdateAccountCredentials extends MastodonAPIRequest<Account>{
 	private Uri avatar, cover;
 	private File avatarFile, coverFile;
 	private List<AccountField> fields;
+	private Boolean discoverable, indexable;
 
 	public UpdateAccountCredentials(String displayName, String bio, Uri avatar, Uri cover, List<AccountField> fields){
 		super(HttpMethod.PATCH, "/accounts/update_credentials", Account.class);
@@ -41,6 +42,12 @@ public class UpdateAccountCredentials extends MastodonAPIRequest<Account>{
 		this.fields=fields;
 	}
 
+	public UpdateAccountCredentials setDiscoverableIndexable(boolean discoverable, boolean indexable){
+		this.discoverable=discoverable;
+		this.indexable=indexable;
+		return this;
+	}
+
 	@Override
 	public RequestBody getRequestBody() throws IOException{
 		MultipartBody.Builder bldr=new MultipartBody.Builder()
@@ -58,15 +65,21 @@ public class UpdateAccountCredentials extends MastodonAPIRequest<Account>{
 		}else if(coverFile!=null){
 			bldr.addFormDataPart("header", coverFile.getName(), new ResizedImageRequestBody(Uri.fromFile(coverFile), 1500*500, null));
 		}
-		if(fields.isEmpty()){
-			bldr.addFormDataPart("fields_attributes[0][name]", "").addFormDataPart("fields_attributes[0][value]", "");
-		}else{
-			int i=0;
-			for(AccountField field:fields){
-				bldr.addFormDataPart("fields_attributes["+i+"][name]", field.name).addFormDataPart("fields_attributes["+i+"][value]", field.value);
-				i++;
+		if(fields!=null){
+			if(fields.isEmpty()){
+				bldr.addFormDataPart("fields_attributes[0][name]", "").addFormDataPart("fields_attributes[0][value]", "");
+			}else{
+				int i=0;
+				for(AccountField field:fields){
+					bldr.addFormDataPart("fields_attributes["+i+"][name]", field.name).addFormDataPart("fields_attributes["+i+"][value]", field.value);
+					i++;
+				}
 			}
 		}
+		if(discoverable!=null)
+			bldr.addFormDataPart("discoverable", discoverable.toString());
+		if(indexable!=null)
+			bldr.addFormDataPart("indexable", indexable.toString());
 
 		return bldr.build();
 	}

mastodon/src/main/java/org/joinmastodon/android/api/requests/filters/KeywordAttribute.java

@@ -2,6 +2,9 @@ package org.joinmastodon.android.api.requests.filters;
 
 import com.google.gson.annotations.SerializedName;
 
+import androidx.annotation.Keep;
+
+@Keep
 class KeywordAttribute{
 	public String id;
 	@SerializedName("_destroy")

mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/AddAccountsToList.java

@@ -1,17 +1,19 @@
 package org.joinmastodon.android.api.requests.lists;
 
-import org.joinmastodon.android.api.MastodonAPIRequest;
-import java.util.List;
+import org.joinmastodon.android.api.ResultlessMastodonAPIRequest;
 
-public class AddAccountsToList extends MastodonAPIRequest<Object> {
-    public AddAccountsToList(String listId, List<String> accountIds){
-        super(HttpMethod.POST, "/lists/"+listId+"/accounts", Object.class);
-        Request req = new Request();
-        req.accountIds = accountIds;
-        setRequestBody(req);
-    }
+import java.nio.charset.StandardCharsets;
+import java.util.Collection;
 
-    public static class Request{
-        public List<String> accountIds;
-    }
+import okhttp3.FormBody;
+
+public class AddAccountsToList extends ResultlessMastodonAPIRequest{
+	public AddAccountsToList(String listID, Collection<String> accountIDs){
+		super(HttpMethod.POST, "/lists/"+listID+"/accounts");
+		FormBody.Builder builder=new FormBody.Builder(StandardCharsets.UTF_8);
+		for(String id:accountIDs){
+			builder.add("account_ids[]", id);
+		}
+		setRequestBody(builder.build());
+	}
 }

mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/CreateList.java

@@ -1,21 +1,23 @@
 package org.joinmastodon.android.api.requests.lists;
 
 import org.joinmastodon.android.api.MastodonAPIRequest;
-import org.joinmastodon.android.model.ListTimeline;
+import org.joinmastodon.android.model.FollowList;
 
-public class CreateList extends MastodonAPIRequest<ListTimeline> {
-	public CreateList(String title, boolean exclusive, ListTimeline.RepliesPolicy repliesPolicy) {
-		super(HttpMethod.POST, "/lists", ListTimeline.class);
-		Request req = new Request();
-		req.title = title;
-		req.exclusive = exclusive;
-		req.repliesPolicy = repliesPolicy;
-		setRequestBody(req);
+public class CreateList extends MastodonAPIRequest<FollowList>{
+	public CreateList(String title, FollowList.RepliesPolicy repliesPolicy, boolean exclusive){
+		super(HttpMethod.POST, "/lists", FollowList.class);
+		setRequestBody(new Request(title, repliesPolicy, exclusive));
 	}
 
-	public static class Request {
+	private static class Request{
 		public String title;
+		public FollowList.RepliesPolicy repliesPolicy;
 		public boolean exclusive;
-		public ListTimeline.RepliesPolicy repliesPolicy;
+
+		public Request(String title, FollowList.RepliesPolicy repliesPolicy, boolean exclusive){
+			this.title=title;
+			this.repliesPolicy=repliesPolicy;
+			this.exclusive=exclusive;
+		}
 	}
 }

mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/DeleteList.java

@@ -1,10 +1,9 @@
 package org.joinmastodon.android.api.requests.lists;
 
-import org.joinmastodon.android.api.MastodonAPIRequest;
-import org.joinmastodon.android.model.ListTimeline;
+import org.joinmastodon.android.api.ResultlessMastodonAPIRequest;
 
-public class DeleteList extends MastodonAPIRequest<Object> {
-	public DeleteList(String id) {
-		super(HttpMethod.DELETE, "/lists/" + id, Object.class);
+public class DeleteList extends ResultlessMastodonAPIRequest{
+	public DeleteList(String id){
+		super(HttpMethod.DELETE, "/lists/"+id);
 	}
 }

mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/GetList.java

@@ -1,10 +1,10 @@
 package org.joinmastodon.android.api.requests.lists;
 
 import org.joinmastodon.android.api.MastodonAPIRequest;
-import org.joinmastodon.android.model.ListTimeline;
+import org.joinmastodon.android.model.FollowList;
 
-public class GetList extends MastodonAPIRequest<ListTimeline> {
+public class GetList extends MastodonAPIRequest<FollowList> {
 	public GetList(String id) {
-		super(HttpMethod.GET, "/lists/" + id, ListTimeline.class);
+		super(HttpMethod.GET, "/lists/" + id, FollowList.class);
 	}
 }

mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/GetListAccounts.java

@@ -0,0 +1,17 @@
+package org.joinmastodon.android.api.requests.lists;
+
+import android.text.TextUtils;
+
+import com.google.gson.reflect.TypeToken;
+
+import org.joinmastodon.android.api.requests.HeaderPaginationRequest;
+import org.joinmastodon.android.model.Account;
+
+public class GetListAccounts extends HeaderPaginationRequest<Account>{
+	public GetListAccounts(String listID, String maxID, int limit){
+		super(HttpMethod.GET, "/lists/"+listID+"/accounts", new TypeToken<>(){});
+		if(!TextUtils.isEmpty(maxID))
+			addQueryParameter("max_id", maxID);
+		addQueryParameter("limit", String.valueOf(limit));
+	}
+}

mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/GetLists.java

@@ -3,11 +3,11 @@ package org.joinmastodon.android.api.requests.lists;
 import com.google.gson.reflect.TypeToken;
 
 import org.joinmastodon.android.api.MastodonAPIRequest;
-import org.joinmastodon.android.model.ListTimeline;
+import org.joinmastodon.android.model.FollowList;
 
 import java.util.List;
 
-public class GetLists extends MastodonAPIRequest<List<ListTimeline>>{
+public class GetLists extends MastodonAPIRequest<List<FollowList>>{
     public GetLists() {
         super(HttpMethod.GET, "/lists", new TypeToken<>(){});
     }

mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/RemoveAccountsFromList.java

@@ -1,17 +1,19 @@
 package org.joinmastodon.android.api.requests.lists;
 
-import org.joinmastodon.android.api.MastodonAPIRequest;
-import java.util.List;
+import org.joinmastodon.android.api.ResultlessMastodonAPIRequest;
 
-public class RemoveAccountsFromList extends MastodonAPIRequest<Object> {
-    public RemoveAccountsFromList(String listId, List<String> accountIds){
-        super(HttpMethod.DELETE, "/lists/"+listId+"/accounts", Object.class);
-        Request req = new Request();
-        req.accountIds = accountIds;
-        setRequestBody(req);
-    }
+import java.nio.charset.StandardCharsets;
+import java.util.Collection;
 
-    public static class Request{
-        public List<String> accountIds;
-    }
+import okhttp3.FormBody;
+
+public class RemoveAccountsFromList extends ResultlessMastodonAPIRequest{
+	public RemoveAccountsFromList(String listID, Collection<String> accountIDs){
+		super(HttpMethod.DELETE, "/lists/"+listID+"/accounts");
+		FormBody.Builder builder=new FormBody.Builder(StandardCharsets.UTF_8);
+		for(String id:accountIDs){
+			builder.add("account_ids[]", id);
+		}
+		setRequestBody(builder.build());
+	}
 }

mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/UpdateList.java

@@ -1,15 +1,23 @@
 package org.joinmastodon.android.api.requests.lists;
 
 import org.joinmastodon.android.api.MastodonAPIRequest;
-import org.joinmastodon.android.model.ListTimeline;
+import org.joinmastodon.android.model.FollowList;
 
-public class UpdateList extends MastodonAPIRequest<ListTimeline> {
-	public UpdateList(String id, String title, boolean exclusive, ListTimeline.RepliesPolicy repliesPolicy) {
-		super(HttpMethod.PUT, "/lists/" + id, ListTimeline.class);
-		CreateList.Request req = new CreateList.Request();
-		req.title = title;
-		req.exclusive = exclusive;
-		req.repliesPolicy = repliesPolicy;
-		setRequestBody(req);
+public class UpdateList extends MastodonAPIRequest<FollowList>{
+	public UpdateList(String listID, String title, FollowList.RepliesPolicy repliesPolicy, boolean exclusive){
+		super(HttpMethod.PUT, "/lists/"+listID, FollowList.class);
+		setRequestBody(new Request(title, repliesPolicy, exclusive));
+	}
+
+	private static class Request{
+		public String title;
+		public FollowList.RepliesPolicy repliesPolicy;
+		public boolean exclusive;
+
+		public Request(String title, FollowList.RepliesPolicy repliesPolicy, boolean exclusive){
+			this.title=title;
+			this.repliesPolicy=repliesPolicy;
+			this.exclusive=exclusive;
+		}
 	}
 }

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

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

mastodon/src/main/java/org/joinmastodon/android/api/requests/tags/GetFollowedTags.java

@@ -0,0 +1,16 @@
+package org.joinmastodon.android.api.requests.tags;
+
+import com.google.gson.reflect.TypeToken;
+
+import org.joinmastodon.android.api.requests.HeaderPaginationRequest;
+import org.joinmastodon.android.model.Hashtag;
+
+public class GetFollowedTags extends HeaderPaginationRequest<Hashtag>{
+	public GetFollowedTags(String maxID, int limit){
+		super(HttpMethod.GET, "/followed_tags", new TypeToken<>(){});
+		if(maxID!=null)
+			addQueryParameter("max_id", maxID);
+		if(limit>0)
+			addQueryParameter("limit", limit+"");
+	}
+}

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

@@ -10,7 +10,7 @@ import org.joinmastodon.android.model.Status;
 import java.util.List;
 
 public class GetPublicTimeline extends MastodonAPIRequest<List<Status>>{
-	public GetPublicTimeline(boolean local, boolean remote, String maxID, int limit, String replyVisibility){
+	public GetPublicTimeline(boolean local, boolean remote, String maxID, String minID, int limit, String sinceID, String replyVisibility){
 		super(HttpMethod.GET, "/timelines/public", new TypeToken<>(){});
 		if(local)
 			addQueryParameter("local", "true");
@@ -18,6 +18,10 @@ public class GetPublicTimeline extends MastodonAPIRequest<List<Status>>{
 			addQueryParameter("remote", "true");
 		if(!TextUtils.isEmpty(maxID))
 			addQueryParameter("max_id", maxID);
+		if(!TextUtils.isEmpty(minID))
+			addQueryParameter("min_id", minID);
+		if(!TextUtils.isEmpty(sinceID))
+			addQueryParameter("since_id", sinceID);
 		if(limit>0)
 			addQueryParameter("limit", limit+"");
 		if(replyVisibility != null)

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

@@ -0,0 +1,23 @@
+package org.joinmastodon.android.api.requests.timelines;
+
+import androidx.annotation.NonNull;
+
+import com.google.gson.reflect.TypeToken;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.model.Status;
+
+import java.util.List;
+
+public class GetTrendingLinksTimeline extends MastodonAPIRequest<List<Status>>{
+	public GetTrendingLinksTimeline(@NonNull String url, String maxID, String minID, int limit){
+		super(HttpMethod.GET, "/timelines/link/", new TypeToken<>(){});
+		addQueryParameter("url", url);
+		if(maxID!=null)
+			addQueryParameter("max_id", maxID);
+		if(minID!=null)
+			addQueryParameter("min_id", minID);
+		if(limit>0)
+			addQueryParameter("limit", ""+limit);
+	}
+}

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

@@ -50,6 +50,7 @@ public class AccountLocalPreferences{
 	public ShowEmojiReactions showEmojiReactions;
 	public ColorPreference color;
 	public ArrayList<Emoji> recentCustomEmoji;
+	public boolean preReplySheet;
 
 	private final static Type recentLanguagesType=new TypeToken<ArrayList<String>>() {}.getType();
 	private final static Type timelinesType=new TypeToken<ArrayList<TimelineDefinition>>() {}.getType();
@@ -68,6 +69,7 @@ public class AccountLocalPreferences{
 		revealCWs=prefs.getBoolean("revealCWs", false);
 		hideSensitiveMedia=prefs.getBoolean("hideSensitive", true);
 		serverSideFiltersSupported=prefs.getBoolean("serverSideFilters", false);
+//		preReplySheet=prefs.getBoolean("preReplySheet", false);
 
 		// MEGALODON
 		showReplies=prefs.getBoolean("showReplies", true);
@@ -112,6 +114,9 @@ public class AccountLocalPreferences{
 				.putBoolean("hideSensitive", hideSensitiveMedia)
 				.putBoolean("serverSideFilters", serverSideFiltersSupported)
 
+				//TODO figure this stuff out
+//				.putBoolean("preReplySheet", preReplySheet)
+
 				// MEGALODON
 				.putBoolean("showReplies", showReplies)
 				.putBoolean("showBoosts", showBoosts)

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

@@ -21,11 +21,13 @@ import org.joinmastodon.android.api.requests.markers.SaveMarkers;
 import org.joinmastodon.android.api.requests.oauth.RevokeOauthToken;
 import org.joinmastodon.android.events.NotificationsMarkerUpdatedEvent;
 import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.model.AltTextFilter;
 import org.joinmastodon.android.model.Application;
 import org.joinmastodon.android.model.FilterAction;
 import org.joinmastodon.android.model.FilterContext;
 import org.joinmastodon.android.model.FilterResult;
 import org.joinmastodon.android.model.Instance;
+import org.joinmastodon.android.model.FollowList;
 import org.joinmastodon.android.model.LegacyFilter;
 import org.joinmastodon.android.model.Preferences;
 import org.joinmastodon.android.model.PushSubscription;
@@ -34,7 +36,9 @@ import org.joinmastodon.android.model.TimelineMarkers;
 import org.joinmastodon.android.model.Token;
 import org.joinmastodon.android.utils.ObjectIdComparator;
 
+import java.io.File;
 import java.util.ArrayList;
+import java.util.EnumSet;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
@@ -70,6 +74,7 @@ public class AccountSession{
 	private transient SharedPreferences prefs;
 	private transient boolean preferencesNeedSaving;
 	private transient AccountLocalPreferences localPreferences;
+	private transient List<FollowList> lists;
 
 	AccountSession(Token token, Account self, Application app, String domain, boolean activated, AccountActivationInfo activationInfo){
 		this.token=token;
@@ -310,8 +315,11 @@ public class AccountSession{
 			return true;
 		// Even with server-side filters, clients are expected to remove statuses that match a filter that hides them
 		if(getLocalPreferences().serverSideFiltersSupported){
+			// Moshidon: this code path in CustomLocalTimelines makes the app crash, so this check is here
+			if (s.filtered == null)
+				return false;
 			for(FilterResult filter : s.filtered){
-				if(filter.filter.isActive() && filter.filter.filterAction==FilterAction.HIDE)
+				if(filter.filter.isActive() && filter.filter.filterAction==FilterAction.HIDE && filter.filter.context.contains(context))
 					return true;
 			}
 		}else if(wordFilters!=null){
@@ -323,6 +331,21 @@ public class AccountSession{
 		return false;
 	}
 
+	public List<FilterResult> getClientSideFilters(Status status) {
+		List<FilterResult> filters = new ArrayList<>();
+
+		// filter post that have no alt text
+		// it only applies when activated in the settings
+		AltTextFilter altTextFilter=new AltTextFilter(FilterAction.WARN, EnumSet.allOf(FilterContext.class));
+		if(altTextFilter.matches(status)){
+			FilterResult filterResult=new FilterResult();
+			filterResult.filter=altTextFilter;
+			filterResult.keywordMatches=List.of();
+			filters.add(filterResult);
+		}
+		return filters;
+	}
+
 	public void updateAccountInfo(){
 		AccountSessionManager.getInstance().updateSessionLocalInfo(this);
 	}
@@ -343,4 +366,12 @@ public class AccountSession{
 				.map(instance->"https://"+domain+(instance.isAkkoma() ? "/images/avi.png" : "/avatars/original/missing.png"))
 				.orElse("");
 	}
+
+	public boolean isNotificationsMentionsOnly(){
+		return getRawLocalPreferences().getBoolean("notificationsMentionsOnly", false);
+	}
+
+	public void setNotificationsMentionsOnly(boolean mentionsOnly){
+		getRawLocalPreferences().edit().putBoolean("notificationsMentionsOnly", mentionsOnly).apply();
+	}
 }

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

@@ -1,7 +1,5 @@
 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;
@@ -17,7 +15,7 @@ import android.util.Log;
 
 import org.joinmastodon.android.BuildConfig;
 import org.joinmastodon.android.E;
-import org.joinmastodon.android.GlobalUserPreferences;
+import org.joinmastodon.android.ChooseAccountForComposeActivity;
 import org.joinmastodon.android.MainActivity;
 import org.joinmastodon.android.MastodonApp;
 import org.joinmastodon.android.R;
@@ -96,6 +94,7 @@ public class AccountSessionManager{
 
 	private AccountSessionManager(){
 		prefs=MastodonApp.context.getSharedPreferences("account_manager", Context.MODE_PRIVATE);
+		// This file should not be backed up, otherwise the app may start with accounts already logged in. See res/xml/backup_rules.xml
 		File file=new File(MastodonApp.context.getFilesDir(), "accounts.json");
 		if(!file.exists())
 			return;
@@ -216,12 +215,17 @@ public class AccountSessionManager{
 	public void removeAccount(String id){
 		AccountSession session=getAccount(id);
 		session.getCacheController().closeDatabase();
+		session.getCacheController().getListsFile().delete();
 		MastodonApp.context.deleteDatabase(id+".db");
 		MastodonApp.context.getSharedPreferences(id, 0).edit().clear().commit();
 		if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.N){
 			MastodonApp.context.deleteSharedPreferences(id);
 		}else{
-			new File(MastodonApp.context.getDir("shared_prefs", Context.MODE_PRIVATE), id+".xml").delete();
+			String dataDir=MastodonApp.context.getApplicationInfo().dataDir;
+			if(dataDir!=null){
+				File prefsDir=new File(dataDir, "shared_prefs");
+				new File(prefsDir, id+".xml").delete();
+			}
 		}
 		sessions.remove(id);
 		if(lastActiveAccountID.equals(id)){
@@ -485,15 +489,19 @@ public class AccountSessionManager{
 		if(Build.VERSION.SDK_INT<26)
 			return;
 		ShortcutManager sm=MastodonApp.context.getSystemService(ShortcutManager.class);
-		if((sm.getDynamicShortcuts().isEmpty() || BuildConfig.DEBUG) && !sessions.isEmpty()){
+
+		Intent intent = new Intent(MastodonApp.context, ChooseAccountForComposeActivity.class)
+				.setAction(Intent.ACTION_CHOOSER)
+				.putExtra("compose", true);
+
+		// This was done so that the old shortcuts get updated to the new implementation.
+		if((sm.getDynamicShortcuts().isEmpty() || sm.getDynamicShortcuts().get(0).getIntent() != intent || BuildConfig.DEBUG ) && !sessions.isEmpty()){
 			// There are no shortcuts, but there are accounts. Add a compose shortcut.
 			ShortcutInfo info=new ShortcutInfo.Builder(MastodonApp.context, "compose")
 					.setActivity(ComponentName.createRelative(MastodonApp.context, MainActivity.class.getName()))
 					.setShortLabel(MastodonApp.context.getString(R.string.new_post))
 					.setIcon(Icon.createWithResource(MastodonApp.context, R.mipmap.ic_shortcut_compose))
-					.setIntent(new Intent(MastodonApp.context, MainActivity.class)
-							.setAction(Intent.ACTION_MAIN)
-							.putExtra("compose", true))
+					.setIntent(intent)
 					.build();
 			sm.setDynamicShortcuts(Collections.singletonList(info));
 		}else if(sessions.isEmpty()){

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

@@ -0,0 +1,15 @@
+package org.joinmastodon.android.events;
+
+import org.joinmastodon.android.model.Account;
+
+public class AccountAddedToListEvent{
+	public final String accountID;
+	public final String listID;
+	public final Account account;
+
+	public AccountAddedToListEvent(String accountID, String listID, Account account){
+		this.accountID=accountID;
+		this.listID=listID;
+		this.account=account;
+	}
+}

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

@@ -0,0 +1,13 @@
+package org.joinmastodon.android.events;
+
+public class AccountRemovedFromListEvent{
+	public final String accountID;
+	public final String listID;
+	public final String targetAccountID;
+
+	public AccountRemovedFromListEvent(String accountID, String listID, String targetAccountID){
+		this.accountID=accountID;
+		this.listID=listID;
+		this.targetAccountID=targetAccountID;
+	}
+}

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

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

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

@@ -0,0 +1,13 @@
+package org.joinmastodon.android.events;
+
+import org.joinmastodon.android.model.FollowList;
+
+public class ListCreatedEvent{
+	public final String accountID;
+	public final FollowList list;
+
+	public ListCreatedEvent(String accountID, FollowList list){
+		this.accountID=accountID;
+		this.list=list;
+	}
+}

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

@@ -1,9 +1,11 @@
 package org.joinmastodon.android.events;
 
-public class ListDeletedEvent {
-	public final String id;
+public class ListDeletedEvent{
+	public final String accountID;
+	public final String listID;
 
-	public ListDeletedEvent(String id) {
-		this.id = id;
+	public ListDeletedEvent(String accountID, String listID){
+		this.accountID=accountID;
+		this.listID=listID;
 	}
 }

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

@@ -1,14 +1,14 @@
 package org.joinmastodon.android.events;
 
-import org.joinmastodon.android.model.ListTimeline;
+import org.joinmastodon.android.model.FollowList;
 
 public class ListUpdatedCreatedEvent {
 	public final String id;
 	public final String title;
-	public final ListTimeline.RepliesPolicy repliesPolicy;
+	public final FollowList.RepliesPolicy repliesPolicy;
 	public final boolean exclusive;
 
-	public ListUpdatedCreatedEvent(String id, String title, boolean exclusive, ListTimeline.RepliesPolicy repliesPolicy) {
+	public ListUpdatedCreatedEvent(String id, String title, boolean exclusive, FollowList.RepliesPolicy repliesPolicy) {
 		this.id = id;
 		this.title = title;
 		this.exclusive = exclusive;

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

@@ -0,0 +1,13 @@
+package org.joinmastodon.android.events;
+
+import org.joinmastodon.android.model.FollowList;
+
+public class ListUpdatedEvent{
+	public final String accountID;
+	public final FollowList list;
+
+	public ListUpdatedEvent(String accountID, FollowList list){
+		this.accountID=accountID;
+		this.list=list;
+	}
+}

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

@@ -0,0 +1,114 @@
+package org.joinmastodon.android.fragments;
+
+import android.os.Bundle;
+import android.widget.TextView;
+
+import org.joinmastodon.android.E;
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.ResultlessMastodonAPIRequest;
+import org.joinmastodon.android.api.requests.accounts.GetAccountLists;
+import org.joinmastodon.android.api.requests.lists.AddAccountsToList;
+import org.joinmastodon.android.api.requests.lists.RemoveAccountsFromList;
+import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.events.AccountAddedToListEvent;
+import org.joinmastodon.android.events.AccountRemovedFromListEvent;
+import org.joinmastodon.android.fragments.settings.BaseSettingsFragment;
+import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.model.FollowList;
+import org.joinmastodon.android.model.viewmodel.CheckableListItem;
+import org.joinmastodon.android.ui.utils.UiUtils;
+import org.parceler.Parcels;
+
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import androidx.recyclerview.widget.RecyclerView;
+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 AddAccountToListsFragment extends BaseSettingsFragment<FollowList>{
+	private Account account;
+
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		setTitle(R.string.add_user_to_list_title);
+		account=Parcels.unwrap(getArguments().getParcelable("targetAccount"));
+		loadData();
+	}
+
+	@Override
+	protected void doLoadData(int offset, int count){
+		AccountSessionManager.get(accountID).getCacheController().getLists(new SimpleCallback<>(this){
+			@Override
+			public void onSuccess(List<FollowList> allLists){
+				if(getActivity()==null)
+					return;
+				loadAccountLists(allLists);
+			}
+		});
+	}
+
+	private void loadAccountLists(final List<FollowList> allLists){
+		currentRequest=new GetAccountLists(account.id)
+				.setCallback(new SimpleCallback<>(this){
+					@Override
+					public void onSuccess(List<FollowList> result){
+						Set<String> lists=result.stream().map(l->l.id).collect(Collectors.toSet());
+						onDataLoaded(allLists.stream()
+								.map(l->new CheckableListItem<>(l.title, null, CheckableListItem.Style.CHECKBOX, lists.contains(l.id),
+										R.drawable.ic_list_alt_24px, AddAccountToListsFragment.this::onItemClick, l))
+								.collect(Collectors.toList()), false);
+					}
+				})
+				.exec(accountID);
+	}
+
+	@Override
+	protected int indexOfItemsAdapter(){
+		return 1;
+	}
+
+	@Override
+	protected RecyclerView.Adapter<?> getAdapter(){
+		TextView topText=new TextView(getActivity());
+		topText.setTextAppearance(R.style.m3_body_medium);
+		topText.setTextColor(UiUtils.getThemeColor(getActivity(), R.attr.colorM3OnSurface));
+		topText.setPadding(V.dp(16), V.dp(8), V.dp(16), V.dp(8));
+		topText.setText(getString(R.string.manage_user_lists, account.getDisplayUsername()));
+
+		MergeRecyclerAdapter mergeAdapter=new MergeRecyclerAdapter();
+		mergeAdapter.addAdapter(new SingleViewRecyclerAdapter(topText));
+		mergeAdapter.addAdapter(super.getAdapter());
+		return mergeAdapter;
+	}
+
+	private void onItemClick(CheckableListItem<FollowList> item){
+		boolean add=!item.checked;
+		ResultlessMastodonAPIRequest req=add ? new AddAccountsToList(item.parentObject.id, Set.of(account.id)) : new RemoveAccountsFromList(item.parentObject.id, Set.of(account.id));
+		req.setCallback(new Callback<>(){
+					@Override
+					public void onSuccess(Void result){
+						item.checked=add;
+						rebindItem(item);
+						if(add){
+							E.post(new AccountAddedToListEvent(accountID, item.parentObject.id, account));
+						}else{
+							E.post(new AccountRemovedFromListEvent(accountID, item.parentObject.id, account.id));
+						}
+					}
+
+					@Override
+					public void onError(ErrorResponse error){
+						error.showToast(getActivity());
+					}
+				})
+				.wrapProgress(getActivity(), R.string.loading, false)
+				.exec(accountID);
+	}
+}

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

@@ -0,0 +1,176 @@
+package org.joinmastodon.android.fragments;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+import android.widget.Spinner;
+
+import org.joinmastodon.android.E;
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.lists.DeleteList;
+import org.joinmastodon.android.api.requests.lists.GetListAccounts;
+import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.events.ListDeletedEvent;
+import org.joinmastodon.android.fragments.settings.BaseSettingsFragment;
+import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.model.FollowList;
+import org.joinmastodon.android.model.HeaderPaginationList;
+import org.joinmastodon.android.model.viewmodel.AvatarPileListItem;
+import org.joinmastodon.android.model.viewmodel.CheckableListItem;
+import org.joinmastodon.android.model.viewmodel.ListItem;
+import org.joinmastodon.android.ui.views.FloatingHintEditTextLayout;
+import org.parceler.Parcels;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import androidx.recyclerview.widget.RecyclerView;
+import me.grishka.appkit.Nav;
+import me.grishka.appkit.api.APIRequest;
+import me.grishka.appkit.api.Callback;
+import me.grishka.appkit.api.ErrorResponse;
+import me.grishka.appkit.imageloader.requests.UrlImageLoaderRequest;
+import me.grishka.appkit.utils.MergeRecyclerAdapter;
+import me.grishka.appkit.utils.SingleViewRecyclerAdapter;
+import me.grishka.appkit.utils.V;
+
+public abstract class BaseEditListFragment extends BaseSettingsFragment<Void>{
+	protected FollowList followList;
+	protected AvatarPileListItem<Void> membersItem;
+	protected CheckableListItem<Void> exclusiveItem;
+	protected FloatingHintEditTextLayout titleEditLayout;
+	protected EditText titleEdit;
+	protected Spinner showRepliesSpinner;
+	private APIRequest<?> getMembersRequest;
+
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		followList=Parcels.unwrap(getArguments().getParcelable("list"));
+
+		membersItem=new AvatarPileListItem<>(getString(R.string.list_members), null, List.of(), 0, i->onMembersClick(), null, false);
+		List<ListItem<Void>> items=new ArrayList<>();
+		if(followList!=null){
+			items.add(membersItem);
+		}
+		exclusiveItem=new CheckableListItem<>(R.string.list_exclusive, R.string.list_exclusive_subtitle, CheckableListItem.Style.SWITCH, followList!=null && followList.exclusive, this::toggleCheckableItem);
+		items.add(exclusiveItem);
+		onDataLoaded(items);
+	}
+
+	@Override
+	public void onDestroy(){
+		super.onDestroy();
+		if(getMembersRequest!=null)
+			getMembersRequest.cancel();
+	}
+
+	@Override
+	protected void doLoadData(int offset, int count){}
+
+	@Override
+	protected RecyclerView.Adapter<?> getAdapter(){
+		LinearLayout topView=new LinearLayout(getActivity());
+		topView.setOrientation(LinearLayout.VERTICAL);
+
+		titleEditLayout=(FloatingHintEditTextLayout) getActivity().getLayoutInflater().inflate(R.layout.floating_hint_edit_text, topView, false);
+		titleEdit=titleEditLayout.findViewById(R.id.edit);
+		titleEdit.setHint(R.string.list_name);
+		titleEditLayout.updateHint();
+		if(followList!=null)
+			titleEdit.setText(followList.title);
+		topView.addView(titleEditLayout);
+
+		FloatingHintEditTextLayout showRepliesLayout=(FloatingHintEditTextLayout) getActivity().getLayoutInflater().inflate(R.layout.floating_hint_spinner, topView, false);
+		showRepliesSpinner=showRepliesLayout.findViewById(R.id.spinner);
+		showRepliesLayout.setHint(R.string.list_show_replies_to);
+		topView.addView(showRepliesLayout);
+		ArrayAdapter<String> spinnerAdapter=new ArrayAdapter<>(getActivity(), R.layout.item_spinner, List.of(
+				getString(R.string.list_replies_no_one),
+				getString(R.string.list_replies_members),
+				getString(R.string.list_replies_anyone)
+		));
+		showRepliesSpinner.setAdapter(spinnerAdapter);
+		showRepliesSpinner.setSelection(switch(followList!=null ? followList.repliesPolicy : FollowList.RepliesPolicy.LIST){
+			case FOLLOWED -> 2;
+			case LIST -> 1;
+			case NONE -> 0;
+		});
+		ViewGroup.MarginLayoutParams llp=(ViewGroup.MarginLayoutParams)showRepliesLayout.getLabel().getLayoutParams();
+		llp.setMarginStart(llp.getMarginStart()+V.dp(16));
+
+		MergeRecyclerAdapter adapter=new MergeRecyclerAdapter();
+		adapter.addAdapter(new SingleViewRecyclerAdapter(topView));
+		adapter.addAdapter(super.getAdapter());
+		return adapter;
+	}
+
+	@Override
+	protected int indexOfItemsAdapter(){
+		return 1;
+	}
+
+	protected void doDeleteList(){
+		new DeleteList(followList.id)
+				.setCallback(new Callback<>(){
+					@Override
+					public void onSuccess(Void result){
+						AccountSessionManager.get(accountID).getCacheController().deleteList(followList.id);
+						E.post(new ListDeletedEvent(accountID, followList.id));
+						Nav.finish(BaseEditListFragment.this);
+					}
+
+					@Override
+					public void onError(ErrorResponse error){
+						Activity activity=getActivity();
+						if(activity==null)
+							return;
+						error.showToast(activity);
+					}
+				})
+				.wrapProgress(getActivity(), R.string.loading, true)
+				.exec(accountID);
+	}
+
+	private void onMembersClick(){
+		Bundle args=new Bundle();
+		args.putString("account", accountID);
+		args.putParcelable("list", Parcels.wrap(followList));
+		Nav.go(getActivity(), ListMembersFragment.class, args);
+	}
+
+	protected void loadMembers(){
+		getMembersRequest=new GetListAccounts(followList.id, null, 3)
+				.setCallback(new Callback<>(){
+					@Override
+					public void onSuccess(HeaderPaginationList<Account> result){
+						getMembersRequest=null;
+						membersItem.avatars=new ArrayList<>();
+						for(int i=0;i<Math.min(3, result.size());i++){
+							Account acc=result.get(i);
+							membersItem.avatars.add(new UrlImageLoaderRequest(acc.avatarStatic, V.dp(32), V.dp(32)));
+						}
+						rebindItem(membersItem);
+						imgLoader.updateImages();
+					}
+
+					@Override
+					public void onError(ErrorResponse error){
+						getMembersRequest=null;
+					}
+				})
+				.exec(accountID);
+	}
+
+	protected FollowList.RepliesPolicy getSelectedRepliesPolicy(){
+		return switch(showRepliesSpinner.getSelectedItemPosition()){
+			case 0 -> FollowList.RepliesPolicy.NONE;
+			case 1 -> FollowList.RepliesPolicy.LIST;
+			case 2 -> FollowList.RepliesPolicy.FOLLOWED;
+			default -> throw new IllegalStateException("Unexpected value: "+showRepliesSpinner.getSelectedItemPosition());
+		};
+	}
+}

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

@@ -9,6 +9,7 @@ import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
+import android.util.Pair;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowInsets;
@@ -23,23 +24,26 @@ 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.CacheController;
 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.Notification;
 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.NonMutualPreReplySheet;
+import org.joinmastodon.android.ui.OldPostPreReplySheet;
 import org.joinmastodon.android.ui.displayitems.AccountStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.ExtendedFooterStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.FooterStatusDisplayItem;
@@ -63,8 +67,9 @@ import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.utils.ProvidesAssistContent;
 import org.joinmastodon.android.utils.TypedObjectPool;
 
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
@@ -73,14 +78,9 @@ import java.util.Set;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.recyclerview.widget.RecyclerView;
-
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
-import me.grishka.appkit.fragments.BaseRecyclerFragment;
 import me.grishka.appkit.imageloader.ImageLoaderRecyclerAdapter;
 import me.grishka.appkit.imageloader.ImageLoaderViewHolder;
 import me.grishka.appkit.imageloader.requests.ImageLoaderRequest;
@@ -145,6 +145,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		for(T s:items){
 			displayItems.addAll(buildDisplayItems(s));
 		}
+		loadRelationships(items.stream().map(DisplayItemsParent::getAccountID).filter(Objects::nonNull).collect(Collectors.toSet()));
 	}
 
 	@Override
@@ -166,6 +167,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		}
 		if(notify)
 			adapter.notifyItemRangeInserted(0, offset);
+		loadRelationships(items.stream().map(DisplayItemsParent::getAccountID).filter(Objects::nonNull).collect(Collectors.toSet()));
 		return offset;
 	}
 
@@ -222,7 +224,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 	@Override
 	public void openPhotoViewer(String parentID, Status _status, int attachmentIndex, MediaGridStatusDisplayItem.Holder gridHolder){
 		final Status status=_status.getContentStatus();
-		currentPhotoViewer=new PhotoViewer(getActivity(), status.mediaAttachments, attachmentIndex, new PhotoViewer.Listener(){
+		currentPhotoViewer=new PhotoViewer(getActivity(), status.mediaAttachments, attachmentIndex, status, accountID, new PhotoViewer.Listener(){
 			private MediaAttachmentViewController transitioningHolder;
 
 			@Override
@@ -288,6 +290,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 			@Override
 			public void photoViewerDismissed(){
 				currentPhotoViewer=null;
+				gridHolder.itemView.setHasTransientState(false);
 			}
 
 			@Override
@@ -299,12 +302,13 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 				return gridHolder.getViewController(index);
 			}
 		});
+		gridHolder.itemView.setHasTransientState(true);
 	}
 
 
 	public void openPreviewlessMediaPhotoViewer(String parentID, Status _status, int attachmentIndex, PreviewlessMediaGridStatusDisplayItem.Holder gridHolder){
 		final Status status=_status.getContentStatus();
-		currentPhotoViewer=new PhotoViewer(getActivity(), status.mediaAttachments, attachmentIndex, new PhotoViewer.Listener(){
+		currentPhotoViewer=new PhotoViewer(getActivity(), status.mediaAttachments, attachmentIndex, status, accountID, new PhotoViewer.Listener(){
 			private PreviewlessMediaAttachmentViewController transitioningHolder;
 
 			@Override
@@ -574,6 +578,25 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 			}
 			i++;
 		}
+
+		// This is a temporary measure to deal with the app crashing when the poll isn't updated.
+		// This is needed because of a possible id mismatch that screws with things
+		if(firstOptionIndex==-1 || footerIndex==-1){
+			for(StatusDisplayItem item:displayItems){
+				if(status.id.equals(itemID)){
+					if(item instanceof SpoilerStatusDisplayItem){
+						spoilerItem=(SpoilerStatusDisplayItem) item;
+					}else if(item instanceof PollOptionStatusDisplayItem && firstOptionIndex==-1){
+						firstOptionIndex=i;
+					}else if(item instanceof PollFooterStatusDisplayItem){
+						footerIndex=i;
+						break;
+					}
+				}
+				i++;
+			}
+		}
+
 		if(firstOptionIndex==-1 || footerIndex==-1)
 			throw new IllegalStateException("Can't find all poll items in displayItems");
 		List<StatusDisplayItem> pollItems=displayItems.subList(firstOptionIndex, footerIndex+1);
@@ -635,11 +658,30 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 	}
 
 	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);
+		int firstOptionIndex=-1, footerIndex=-1;
+		int i=0;
+		for(StatusDisplayItem item:displayItems){
+			if(item.parentID.equals(holder.getItemID())){
+				if(item instanceof PollOptionStatusDisplayItem && firstOptionIndex==-1){
+					firstOptionIndex=i;
+				}else if(item instanceof PollFooterStatusDisplayItem){
+					footerIndex=i;
+					break;
 				}
 			}
+			i++;
+		}
+		if(firstOptionIndex==-1 || footerIndex==-1)
+			throw new IllegalStateException("Can't find all poll items in displayItems");
+		List<StatusDisplayItem> pollItems=displayItems.subList(firstOptionIndex, footerIndex+1);
+
+		for(StatusDisplayItem item:pollItems){
+			if (item instanceof PollOptionStatusDisplayItem) {
+				((PollOptionStatusDisplayItem) item).isAnimating=true;
+				((PollOptionStatusDisplayItem) item).showResults=shown;
+				adapter.notifyItemRangeChanged(firstOptionIndex, pollItems.size());
+			}
+		}
 	}
 
 	protected void submitPollVote(String parentID, String pollID, List<Integer> choices){
@@ -667,6 +709,42 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		toggleSpoiler(status, isForQuote, holder.getItemID());
 	}
 
+	public void updateStatusWithQuote(DisplayItemsParent parent) {
+		Pair<Integer, Integer> items=findAllItemsOfParent(parent);
+		if (items==null)
+			return;
+
+		// Only StatusListFragments/NotificationsListFragments can display status with quotes
+		assert (this instanceof StatusListFragment) || (this instanceof NotificationsListFragment);
+		List<StatusDisplayItem> oldItems = displayItems.subList(items.first, items.second+1);
+		List<StatusDisplayItem> newItems=this.buildDisplayItems((T) parent);
+		int prevSize=oldItems.size();
+		oldItems.clear();
+		displayItems.addAll(items.first, newItems);
+
+		// Update the cache
+		final CacheController cache=AccountSessionManager.get(accountID).getCacheController();
+		if (parent instanceof Status) {
+			cache.updateStatus((Status) parent);
+		} else if (parent instanceof Notification) {
+			cache.updateNotification((Notification) parent);
+		}
+
+		adapter.notifyItemRangeRemoved(items.first, prevSize);
+		adapter.notifyItemRangeInserted(items.first, newItems.size());
+	}
+
+	public void removeStatus(DisplayItemsParent parent) {
+		Pair<Integer, Integer> items=findAllItemsOfParent(parent);
+		if (items==null)
+			return;
+
+		List<StatusDisplayItem> statusDisplayItems = displayItems.subList(items.first, items.second+1);
+		int prevSize=statusDisplayItems.size();
+		statusDisplayItems.clear();
+		adapter.notifyItemRangeRemoved(items.first, prevSize);
+	}
+
 	public void onVisibilityIconClick(HeaderStatusDisplayItem.Holder holder) {
 		Status status = holder.getItem().status;
 		if(holder.getItem().hasVisibilityToggle) holder.animateVisibilityToggle(false);
@@ -702,6 +780,8 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 			displayItems.addAll(index+1, spoilerItem.contentItems);
 			adapter.notifyItemRangeInserted(index+1, spoilerItem.contentItems.size());
 		}else{
+			if(spoilers.size()>1 && !isForQuote && status.quote.spoilerRevealed)
+				toggleSpoiler(status.quote, true, itemID);
 			displayItems.subList(index+1, index+1+spoilerItem.contentItems.size()).clear();
 			adapter.notifyItemRangeRemoved(index+1, spoilerItem.contentItems.size());
 		}
@@ -714,19 +794,33 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		list.invalidateItemDecorations();
 	}
 
-	public void onEnableExpandable(TextStatusDisplayItem.Holder holder, boolean expandable) {
+	public void onEnableExpandable(TextStatusDisplayItem.Holder holder, boolean expandable, boolean isForQuote) {
 		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();
+			List<HeaderStatusDisplayItem.Holder> headers=findAllHoldersOfType(holder.getItemID(), HeaderStatusDisplayItem.Holder.class);
+			if(headers!=null && !headers.isEmpty()){
+				HeaderStatusDisplayItem.Holder header=headers.size() > 1 && isForQuote ? headers.get(1) : headers.get(0);
+				if(header!=null) header.bindCollapseButton();
+			}
 		}
 	}
 
-	public void onToggleExpanded(Status status, String itemID) {
+	public void onToggleExpanded(Status status, boolean isForQuote, String itemID) {
 		status.textExpanded = !status.textExpanded;
-		notifyItemChanged(itemID, TextStatusDisplayItem.class);
-		HeaderStatusDisplayItem.Holder header=findHolderOfType(itemID, HeaderStatusDisplayItem.Holder.class);
+		// TODO: simplify this to a single case
+		if(!isForQuote)
+			// using the adapter directly to update the item does not work for non-quoted texts
+			notifyItemChanged(itemID, TextStatusDisplayItem.class);
+		else{
+			List<TextStatusDisplayItem.Holder> textItems=findAllHoldersOfType(itemID, TextStatusDisplayItem.Holder.class);
+			TextStatusDisplayItem.Holder text=textItems.size()>1 ? textItems.get(1) : textItems.get(0);
+			adapter.notifyItemChanged(text.getAbsoluteAdapterPosition());
+		}
+		List<HeaderStatusDisplayItem.Holder> headers=findAllHoldersOfType(itemID, HeaderStatusDisplayItem.Holder.class);
+		if (headers.isEmpty())
+			return;
+		HeaderStatusDisplayItem.Holder header=headers.size() > 1 && isForQuote ? headers.get(1) : headers.get(0);
 		if(header!=null) header.animateExpandToggle();
 		else notifyItemChanged(itemID, HeaderStatusDisplayItem.class);
 	}
@@ -734,12 +828,14 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 	public void onGapClick(GapStatusDisplayItem.Holder item, boolean downwards){}
 
 	public void onWarningClick(WarningFilteredStatusDisplayItem.Holder warning){
-		int startPos = warning.getAbsoluteAdapterPosition();
+		WarningFilteredStatusDisplayItem filterItem=findItemOfType(warning.getItemID(), WarningFilteredStatusDisplayItem.class);
+		int startPos=displayItems.indexOf(filterItem);
 		displayItems.remove(startPos);
 		displayItems.addAll(startPos, warning.filteredItems);
 		adapter.notifyItemRangeInserted(startPos, warning.filteredItems.size() - 1);
 		if (startPos == 0) scrollToTop();
 		warning.getItem().status.filterRevealed = true;
+		list.invalidateItemDecorations();
 	}
 
 	@Override
@@ -756,6 +852,9 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 	}
 
 	protected void loadRelationships(Set<String> ids){
+		if(ids.isEmpty())
+			return;
+		ids=ids.stream().filter(id->!relationships.containsKey(id)).collect(Collectors.toSet());
 		if(ids.isEmpty())
 			return;
 		// TODO somehow manage these and cancel outstanding requests on refresh
@@ -849,6 +948,23 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		return null;
 	}
 
+	@Nullable
+	protected Pair<Integer, Integer> findAllItemsOfParent(DisplayItemsParent parent){
+		int startIndex=-1;
+		int endIndex=-1;
+		for(int i=0; i<displayItems.size(); i++){
+			StatusDisplayItem item = displayItems.get(i);
+			if(item.parentID.equals(parent.getID())) {
+				startIndex= startIndex==-1 ? i : startIndex;
+				endIndex=i;
+			}
+		}
+
+		if(startIndex==-1 || endIndex==-1)
+			return null;
+		return Pair.create(startIndex, endIndex);
+	}
+
 	protected <I extends StatusDisplayItem, H extends StatusDisplayItem.Holder<I>> List<H> findAllHoldersOfType(String id, Class<H> type){
 		ArrayList<H> holders=new ArrayList<>();
 		for(int i=0;i<list.getChildCount();i++){
@@ -1047,6 +1163,26 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		adapter.notifyDataSetChanged();
 	}
 
+	public void maybeShowPreReplySheet(Status status, Runnable proceed){
+		Relationship rel=getRelationship(status.account.id);
+		if(!GlobalUserPreferences.isOptedOutOfPreReplySheet(GlobalUserPreferences.PreReplySheetType.NON_MUTUAL, status.account, accountID) &&
+				!status.account.id.equals(AccountSessionManager.get(accountID).self.id) && rel!=null && !rel.followedBy && status.account.followingCount>=1){
+			new NonMutualPreReplySheet(getActivity(), notAgain->{
+				GlobalUserPreferences.optOutOfPreReplySheet(GlobalUserPreferences.PreReplySheetType.NON_MUTUAL, notAgain ? null : status.account, accountID);
+				proceed.run();
+			}, status.account, accountID).show();
+		}else if(!GlobalUserPreferences.isOptedOutOfPreReplySheet(GlobalUserPreferences.PreReplySheetType.OLD_POST, null, null) &&
+				status.createdAt.isBefore(Instant.now().minus(90, ChronoUnit.DAYS))){
+			new OldPostPreReplySheet(getActivity(), notAgain->{
+				if(notAgain)
+					GlobalUserPreferences.optOutOfPreReplySheet(GlobalUserPreferences.PreReplySheetType.OLD_POST, null, null);
+				proceed.run();
+			}, status).show();
+		}else{
+			proceed.run();
+		}
+	}
+
 	protected void onModifyItemViewHolder(BindableViewHolder<StatusDisplayItem> holder){}
 
 	@Override

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

@@ -7,6 +7,9 @@ import static org.joinmastodon.android.api.requests.statuses.CreateStatus.getDra
 
 import android.Manifest;
 import android.animation.ObjectAnimator;
+import android.animation.Animator;
+import android.animation.AnimatorSet;
+import android.animation.ObjectAnimator;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.DatePickerDialog;
@@ -62,6 +65,7 @@ import com.twitter.twittertext.TwitterTextEmojiRegex;
 import org.joinmastodon.android.E;
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
+import org.joinmastodon.android.TweakedFileProvider;
 import org.joinmastodon.android.api.MastodonErrorResponse;
 import org.joinmastodon.android.api.requests.statuses.CreateStatus;
 import org.joinmastodon.android.api.requests.statuses.DeleteStatus;
@@ -75,7 +79,7 @@ import org.joinmastodon.android.events.ScheduledStatusDeletedEvent;
 import org.joinmastodon.android.events.StatusCountersUpdatedEvent;
 import org.joinmastodon.android.events.StatusCreatedEvent;
 import org.joinmastodon.android.events.StatusUpdatedEvent;
-import org.joinmastodon.android.fragments.account_list.ComposeAccountSearchFragment;
+import org.joinmastodon.android.fragments.account_list.AccountSearchFragment;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.ContentType;
 import org.joinmastodon.android.model.Emoji;
@@ -95,7 +99,7 @@ import org.joinmastodon.android.ui.text.ComposeAutocompleteSpan;
 import org.joinmastodon.android.ui.text.ComposeHashtagOrMentionSpan;
 import org.joinmastodon.android.ui.text.HtmlParser;
 import org.joinmastodon.android.ui.utils.SimpleTextWatcher;
-import org.joinmastodon.android.utils.FileProvider;
+import org.joinmastodon.android.utils.Tracking;
 import org.joinmastodon.android.utils.TransferSpeedTracker;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.ui.viewcontrollers.ComposeAutocompleteViewController;
@@ -135,12 +139,14 @@ 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.fragments.CustomTransitionsFragment;
 import me.grishka.appkit.fragments.OnBackPressedListener;
 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 ComposeFragment extends MastodonToolbarFragment implements OnBackPressedListener, ComposeEditText.SelectionListener, HasAccountID {
+public class ComposeFragment extends MastodonToolbarFragment implements OnBackPressedListener, ComposeEditText.SelectionListener, HasAccountID, CustomTransitionsFragment {
 
 	private static final int MEDIA_RESULT=717;
 	public static final int IMAGE_DESCRIPTION_RESULT=363;
@@ -507,7 +513,8 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		}
 
 		int typeIndex=contentType.ordinal();
-		contentTypePopup.getMenu().findItem(typeIndex).setChecked(true);
+		if (contentTypePopup.getMenu().findItem(typeIndex) != null)
+			contentTypePopup.getMenu().findItem(typeIndex).setChecked(true);
 		contentTypeBtn.setSelected(typeIndex != ContentType.UNSPECIFIED.ordinal() && typeIndex != ContentType.PLAIN.ordinal());
 
 		autocompleteViewController=new ComposeAutocompleteViewController(getActivity(), accountID);
@@ -527,7 +534,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			public void onLaunchAccountSearch(){
 				Bundle args=new Bundle();
 				args.putString("account", accountID);
-				Nav.goForResult(getActivity(), ComposeAccountSearchFragment.class, args, AUTOCOMPLETE_ACCOUNT_RESULT, ComposeFragment.this);
+				Nav.goForResult(getActivity(), AccountSearchFragment.class, args, AUTOCOMPLETE_ACCOUNT_RESULT, ComposeFragment.this);
 			}
 		});
 		View autocompleteView=autocompleteViewController.getView();
@@ -1169,6 +1176,8 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 
 	private void actuallyPublish(boolean preview){
 		String text=mainEditText.getText().toString();
+		if(GlobalUserPreferences.removeTrackingParams)
+			text=Tracking.cleanUrlsInText(text);
 		CreateStatus.Request req=new CreateStatus.Request();
 		if("bottom".equals(postLang.encoding)){
 			text=new StatusTextEncoder(Bottom::encode).encode(text);
@@ -1293,7 +1302,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 					.setPositiveButton(R.string.ok, (a, b)->{})
 					.show();
 			handlePublishError(null);
-			publishButton.setEnabled(false);
+			(GlobalUserPreferences.relocatePublishButton ? publishButtonRelocated : publishButton).setEnabled(false);
 		}
 
 		if (replyTo == null) updateRecentLanguages();
@@ -1320,7 +1329,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		result.preview=true;
 		wm.removeView(sendingOverlay);
 		sendingOverlay=null;
-		publishButton.setEnabled(true);
+		(GlobalUserPreferences.relocatePublishButton ? publishButtonRelocated : publishButton).setEnabled(true);
 		V.setVisibilityAnimated(sendProgress, View.GONE);
 		InputMethodManager imm=getActivity().getSystemService(InputMethodManager.class);
 		imm.hideSoftInputFromWindow(contentView.getWindowToken(), 0);
@@ -1499,7 +1508,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 	private void openCamera() throws IOException {
 		if (getContext().checkSelfPermission(Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED) {
 			File photoFile = File.createTempFile("img", ".jpg");
-			photoUri = FileProvider.getUriForFile(getContext(), getContext().getPackageName() + ".fileprovider", photoFile);
+			photoUri = UiUtils.getFileProviderUri(getContext(), photoFile);
 
 			Intent cameraIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
 			cameraIntent.putExtra(MediaStore.EXTRA_OUTPUT, photoUri);
@@ -1657,7 +1666,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			}
 		}
 		UiUtils.enablePopupMenuIcons(getActivity(), visibilityPopup);
-		if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.P) m.setGroupDividerEnabled(true);
+		if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.P && !UiUtils.isEMUI() && !UiUtils.isMagic()) m.setGroupDividerEnabled(true);
 		visibilityPopup.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener(){
 			@Override
 			public boolean onMenuItemClick(MenuItem item){
@@ -1806,8 +1815,26 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		return new String[]{"image/jpeg", "image/gif", "image/png", "video/mp4"};
 	}
 
+	private String sanitizeMediaDescription(String description){
+		if(description == null){
+			return null;
+		}
+
+		// The Gboard android keyboard attaches this text whenever the user
+		// pastes something from the keyboard's suggestion bar.
+		// Due to different end user locales, the exact text may vary, but at
+		// least in version 13.4.08, all of the translations contained the
+		// string "Gboard".
+		if (description.contains("Gboard")){
+			return null;
+		}
+
+		return description;
+	}
+
 	@Override
 	public boolean onAddMediaAttachmentFromEditText(Uri uri, String description){
+		description = sanitizeMediaDescription(description);
 		return mediaViewController.addMediaAttachment(uri, description);
 	}
 
@@ -1850,6 +1877,8 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		Editable e=mainEditText.getText();
 		int start=e.getSpanStart(currentAutocompleteSpan);
 		int end=e.getSpanEnd(currentAutocompleteSpan);
+		if(start==-1 || end==-1)
+			return;
 		e.replace(start, end, text+" ");
 		finishAutocomplete();
 		InputConnection conn=mainEditText.getCurrentInputConnection();
@@ -1918,4 +1947,35 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		languageButton.setText(opt.language.getLanguageName());
 		languageButton.setContentDescription(getActivity().getString(R.string.sk_post_language, opt.language.getDefaultName()));
 	}
+
+	@Override
+	public Animator onCreateEnterTransition(View prev, View container){
+		AnimatorSet anim=new AnimatorSet();
+		if(getArguments().getBoolean("fromThreadFragment")){
+			anim.playTogether(
+					ObjectAnimator.ofFloat(container, View.ALPHA, 0f, 1f),
+					ObjectAnimator.ofFloat(container, View.TRANSLATION_Y, V.dp(200), 0)
+			);
+		}else{
+			anim.playTogether(
+					ObjectAnimator.ofFloat(container, View.ALPHA, 0f, 1f),
+					ObjectAnimator.ofFloat(container, View.TRANSLATION_X, V.dp(100), 0)
+			);
+		}
+		anim.setDuration(300);
+		anim.setInterpolator(CubicBezierInterpolator.DEFAULT);
+		return anim;
+	}
+
+	@Override
+	public Animator onCreateExitTransition(View prev, View container){
+		AnimatorSet anim=new AnimatorSet();
+		anim.playTogether(
+				ObjectAnimator.ofFloat(container, View.TRANSLATION_X, V.dp(100)),
+				ObjectAnimator.ofFloat(container, View.ALPHA, 0)
+		);
+		anim.setDuration(200);
+		anim.setInterpolator(CubicBezierInterpolator.DEFAULT);
+		return anim;
+	}
 }

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

@@ -7,10 +7,7 @@ import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.media.MediaMetadataRetriever;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
-import android.text.SpannableStringBuilder;
-import android.text.style.BulletSpan;
 import android.util.Log;
 import android.view.ContextThemeWrapper;
 import android.view.LayoutInflater;
@@ -135,20 +132,9 @@ public class ComposeImageDescriptionFragment extends MastodonToolbarFragment imp
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item){
 		if(item.getItemId()==R.id.help){
-			SpannableStringBuilder msg=new SpannableStringBuilder(getText(R.string.alt_text_help));
-			BulletSpan[] spans=msg.getSpans(0, msg.length(), BulletSpan.class);
-			for(BulletSpan span:spans){
-				BulletSpan betterSpan;
-				if(Build.VERSION.SDK_INT<Build.VERSION_CODES.Q)
-					betterSpan=new BulletSpan(V.dp(10), UiUtils.getThemeColor(themeWrapper, R.attr.colorM3OnSurface));
-				else
-					betterSpan=new BulletSpan(V.dp(10), UiUtils.getThemeColor(themeWrapper, R.attr.colorM3OnSurface), V.dp(1.5f));
-				msg.setSpan(betterSpan, msg.getSpanStart(span), msg.getSpanEnd(span), msg.getSpanFlags(span));
-				msg.removeSpan(span);
-			}
 			new M3AlertDialogBuilder(themeWrapper)
 					.setTitle(R.string.what_is_alt_text)
-					.setMessage(msg)
+					.setMessage(UiUtils.fixBulletListInString(themeWrapper, R.string.alt_text_help))
 					.setPositiveButton(R.string.ok, null)
 					.show();
 		}
@@ -185,7 +171,7 @@ public class ComposeImageDescriptionFragment extends MastodonToolbarFragment imp
 		fakeAttachment.meta.width=width;
 		fakeAttachment.meta.height=height;
 
-		photoViewer=new PhotoViewer(getActivity(), Collections.singletonList(fakeAttachment), 0, new PhotoViewer.Listener(){
+		photoViewer=new PhotoViewer(getActivity(), Collections.singletonList(fakeAttachment), 0, null, accountID, new PhotoViewer.Listener(){
 			@Override
 			public void setPhotoViewVisibility(int index, boolean visible){
 				image.setAlpha(visible ? 1f : 0f);

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

@@ -0,0 +1,330 @@
+package org.joinmastodon.android.fragments;
+
+import android.content.res.TypedArray;
+import android.net.Uri;
+import android.os.Bundle;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewStub;
+import android.view.WindowInsets;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.Button;
+import android.widget.FrameLayout;
+import android.widget.TextView;
+
+import org.joinmastodon.android.E;
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.lists.AddAccountsToList;
+import org.joinmastodon.android.api.requests.lists.GetListAccounts;
+import org.joinmastodon.android.api.requests.lists.RemoveAccountsFromList;
+import org.joinmastodon.android.events.FinishListCreationFragmentEvent;
+import org.joinmastodon.android.fragments.account_list.AddNewListMembersFragment;
+import org.joinmastodon.android.fragments.account_list.BaseAccountListFragment;
+import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.model.FollowList;
+import org.joinmastodon.android.model.HeaderPaginationList;
+import org.joinmastodon.android.model.viewmodel.AccountViewModel;
+import org.joinmastodon.android.ui.utils.UiUtils;
+import org.joinmastodon.android.ui.viewholders.AccountViewHolder;
+import org.joinmastodon.android.ui.views.CurlyArrowEmptyView;
+import org.parceler.Parcels;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+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.fragments.OnBackPressedListener;
+import me.grishka.appkit.fragments.WindowInsetsAwareFragment;
+import me.grishka.appkit.utils.CubicBezierInterpolator;
+import me.grishka.appkit.utils.V;
+import me.grishka.appkit.views.FragmentRootLinearLayout;
+
+public class CreateListAddMembersFragment extends BaseAccountListFragment implements OnBackPressedListener, AddNewListMembersFragment.Listener{
+	private FollowList followList;
+	private Button nextButton;
+	private View buttonBar;
+	private FragmentRootLinearLayout rootView;
+	private FrameLayout searchFragmentContainer;
+	private FrameLayout fragmentContentWrap;
+	private AddNewListMembersFragment searchFragment;
+	private WindowInsets lastInsets;
+	private boolean dismissingSearchFragment;
+	private HashSet<String> accountIDsInList=new HashSet<>();
+
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		setTitle(R.string.manage_list_members);
+		setSubtitle(getString(R.string.step_x_of_y, 2, 2));
+		setLayout(R.layout.fragment_login);
+		setEmptyText(R.string.list_no_members);
+		setHasOptionsMenu(true);
+
+		followList=Parcels.unwrap(getArguments().getParcelable("list"));
+		if(savedInstanceState!=null || getArguments().getBoolean("needLoadMembers", false)){
+			loadData();
+		}else{
+			onDataLoaded(List.of());
+		}
+	}
+
+	@Override
+	protected void doLoadData(int offset, int count){
+		currentRequest=new GetListAccounts(followList.id, null, 0)
+				.setCallback(new SimpleCallback<>(this){
+					@Override
+					public void onSuccess(HeaderPaginationList<Account> result){
+						for(Account acc:result)
+							accountIDsInList.add(acc.id);
+						onDataLoaded(result.stream().map(a->new AccountViewModel(a, accountID)).collect(Collectors.toList()));
+					}
+				})
+				.exec(accountID);
+	}
+
+	@Override
+	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState){
+		View view=super.onCreateView(inflater, container, savedInstanceState);
+		FrameLayout wrapper=new FrameLayout(getActivity());
+		wrapper.addView(view);
+		rootView=(FragmentRootLinearLayout) view;
+		fragmentContentWrap=wrapper;
+		return wrapper;
+	}
+
+	@Override
+	public void onViewCreated(View view, Bundle savedInstanceState){
+		nextButton=view.findViewById(R.id.btn_next);
+		nextButton.setOnClickListener(this::onNextClick);
+		nextButton.setText(R.string.done);
+		buttonBar=view.findViewById(R.id.button_bar);
+
+		super.onViewCreated(view, savedInstanceState);
+	}
+
+	@Override
+	public void onApplyWindowInsets(WindowInsets insets){
+		lastInsets=insets;
+		if(searchFragment!=null)
+			searchFragment.onApplyWindowInsets(insets);
+		insets=UiUtils.applyBottomInsetToFixedView(buttonBar, insets);
+		rootView.dispatchApplyWindowInsets(insets);
+	}
+
+	@Override
+	protected List<View> getViewsForElevationEffect(){
+		return List.of(getToolbar(), buttonBar);
+	}
+
+	@Override
+	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater){
+		MenuItem item=menu.add(R.string.add_list_member);
+		item.setIcon(R.drawable.ic_fluent_add_24_regular);
+		item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item){
+		if(searchFragmentContainer!=null)
+			return true;
+
+		searchFragmentContainer=new FrameLayout(getActivity());
+		searchFragmentContainer.setId(R.id.search_fragment);
+		fragmentContentWrap.addView(searchFragmentContainer);
+
+		Bundle args=new Bundle();
+		args.putString("account", accountID);
+		args.putParcelable("list", Parcels.wrap(followList));
+		args.putBoolean("_can_go_back", true);
+		searchFragment=new AddNewListMembersFragment(this);
+		searchFragment.setArguments(args);
+		getChildFragmentManager().beginTransaction().add(R.id.search_fragment, searchFragment).commit();
+		getChildFragmentManager().executePendingTransactions();
+		if(lastInsets!=null)
+			searchFragment.onApplyWindowInsets(lastInsets);
+		searchFragmentContainer.setTranslationX(V.dp(100));
+		searchFragmentContainer.setAlpha(0f);
+		searchFragmentContainer.animate().translationX(0).alpha(1).setDuration(300).withLayer().setInterpolator(CubicBezierInterpolator.DEFAULT).withEndAction(()->{
+			rootView.setVisibility(View.GONE);
+		}).start();
+		return true;
+	}
+
+	@Override
+	protected void initializeEmptyView(View contentView){
+		ViewStub emptyStub=contentView.findViewById(R.id.empty);
+		emptyStub.setLayoutResource(R.layout.empty_with_arrow);
+		super.initializeEmptyView(contentView);
+		TextView emptySecondary=contentView.findViewById(R.id.empty_text_secondary);
+		emptySecondary.setText(R.string.list_find_users);
+		CurlyArrowEmptyView arrowView=(CurlyArrowEmptyView) emptyView;
+		arrowView.setGravityAndOffsets(Gravity.TOP | Gravity.END, 24, 2);
+	}
+
+	@Override
+	protected void setStatusBarColor(int color){
+		rootView.setStatusBarColor(color);
+	}
+
+	@Override
+	protected void setNavigationBarColor(int color){
+		rootView.setNavigationBarColor(color);
+	}
+
+	private void dismissSearchFragment(){
+		if(searchFragment==null || dismissingSearchFragment)
+			return;
+		dismissingSearchFragment=true;
+		rootView.setVisibility(View.VISIBLE);
+		searchFragmentContainer.animate().translationX(V.dp(100)).alpha(0).setDuration(200).withLayer().setInterpolator(CubicBezierInterpolator.DEFAULT).withEndAction(()->{
+			getChildFragmentManager().beginTransaction().remove(searchFragment).commit();
+			getChildFragmentManager().executePendingTransactions();
+			fragmentContentWrap.removeView(searchFragmentContainer);
+			searchFragmentContainer=null;
+			searchFragment=null;
+			dismissingSearchFragment=false;
+		}).start();
+		getActivity().getSystemService(InputMethodManager.class).hideSoftInputFromWindow(contentView.getWindowToken(), 0);
+	}
+
+	private void onNextClick(View v){
+		E.post(new FinishListCreationFragmentEvent(accountID, followList.id));
+		Nav.finish(this);
+	}
+
+	@Override
+	public boolean onBackPressed(){
+		if(searchFragment!=null){
+			dismissSearchFragment();
+			return true;
+		}
+		return false;
+	}
+
+	@Override
+	public boolean isAccountInList(AccountViewModel account){
+		return accountIDsInList.contains(account.account.id);
+	}
+
+	@Override
+	public void addAccountToList(AccountViewModel account, Runnable onDone){
+		new AddAccountsToList(followList.id, Set.of(account.account.id))
+				.setCallback(new Callback<>(){
+					@Override
+					public void onSuccess(Void result){
+						accountIDsInList.add(account.account.id);
+						if(onDone!=null)
+							onDone.run();
+						int i=0;
+						for(AccountViewModel acc:data){
+							if(acc.account.id.equals(account.account.id)){
+								list.getAdapter().notifyItemChanged(i);
+								return;
+							}
+							i++;
+						}
+						int pos=data.size();
+						data.add(account);
+						list.getAdapter().notifyItemInserted(pos);
+					}
+
+					@Override
+					public void onError(ErrorResponse error){
+						error.showToast(getActivity());
+					}
+				})
+				.exec(accountID);
+	}
+
+	@Override
+	public void removeAccountAccountFromList(AccountViewModel account, Runnable onDone){
+		new RemoveAccountsFromList(followList.id, Set.of(account.account.id))
+				.setCallback(new Callback<>(){
+					@Override
+					public void onSuccess(Void result){
+						accountIDsInList.remove(account.account.id);
+						if(onDone!=null)
+							onDone.run();
+						int i=0;
+						for(AccountViewModel acc:data){
+							if(acc.account.id.equals(account.account.id)){
+								list.getAdapter().notifyItemChanged(i);
+								return;
+							}
+							i++;
+						}
+					}
+
+					@Override
+					public void onError(ErrorResponse error){
+						error.showToast(getActivity());
+					}
+				})
+				.exec(accountID);
+	}
+
+	@Override
+	protected void onConfigureViewHolder(AccountViewHolder holder){
+		holder.setStyle(AccountViewHolder.AccessoryType.CUSTOM_BUTTON, false);
+		holder.setOnLongClickListener(vh->false);
+		Button button=holder.getButton();
+		button.setPadding(V.dp(24), 0, V.dp(24), 0);
+		button.setMinimumWidth(0);
+		button.setMinWidth(0);
+		button.setOnClickListener(v->{
+			holder.setActionProgressVisible(true);
+			holder.itemView.setHasTransientState(true);
+			Runnable onDone=()->{
+				holder.setActionProgressVisible(false);
+				holder.itemView.setHasTransientState(false);
+			};
+			AccountViewModel account=holder.getItem();
+			if(isAccountInList(account)){
+				removeAccountAccountFromList(account, onDone);
+			}else{
+				addAccountToList(account, onDone);
+			}
+		});
+	}
+
+	@Override
+	protected void onBindViewHolder(AccountViewHolder holder){
+		Button button=holder.getButton();
+		int textRes, styleRes;
+		if(isAccountInList(holder.getItem())){
+			textRes=R.string.remove;
+			styleRes=R.style.Widget_Mastodon_M3_Button_Tonal_Error;
+		}else{
+			textRes=R.string.add;
+			styleRes=R.style.Widget_Mastodon_M3_Button_Filled;
+		}
+		button.setText(textRes);
+		TypedArray ta=button.getContext().obtainStyledAttributes(styleRes, new int[]{android.R.attr.background});
+		button.setBackground(ta.getDrawable(0));
+		ta.recycle();
+		ta=button.getContext().obtainStyledAttributes(styleRes, new int[]{android.R.attr.textColor});
+		button.setTextColor(ta.getColorStateList(0));
+		ta.recycle();
+	}
+
+	@Override
+	protected void loadRelationships(List<AccountViewModel> accounts){
+		// no-op
+	}
+
+	@Override
+	public Uri getWebUri(Uri.Builder base){
+		// TODO this
+		return null;
+	}
+}

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

@@ -0,0 +1,149 @@
+package org.joinmastodon.android.fragments;
+
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.View;
+import android.view.WindowInsets;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.Button;
+
+import com.squareup.otto.Subscribe;
+
+import org.joinmastodon.android.E;
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.lists.CreateList;
+import org.joinmastodon.android.api.requests.lists.UpdateList;
+import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.events.FinishListCreationFragmentEvent;
+import org.joinmastodon.android.events.ListCreatedEvent;
+import org.joinmastodon.android.events.ListUpdatedEvent;
+import org.joinmastodon.android.model.FollowList;
+import org.joinmastodon.android.ui.utils.UiUtils;
+import org.parceler.Parcels;
+
+import java.util.List;
+
+import me.grishka.appkit.Nav;
+import me.grishka.appkit.api.Callback;
+import me.grishka.appkit.api.ErrorResponse;
+
+public class CreateListFragment extends BaseEditListFragment{
+	private Button nextButton;
+	private View buttonBar;
+	private FollowList followList;
+
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		setTitle(R.string.create_list);
+		setSubtitle(getString(R.string.step_x_of_y, 1, 2));
+		setLayout(R.layout.fragment_login);
+		if(savedInstanceState!=null)
+			followList=Parcels.unwrap(savedInstanceState.getParcelable("list"));
+		E.register(this);
+	}
+
+	@Override
+	public void onDestroy(){
+		super.onDestroy();
+		E.unregister(this);
+	}
+
+	@Override
+	protected int getNavigationIconDrawableResource(){
+		return R.drawable.ic_baseline_arrow_drop_down_18;
+	}
+
+	@Override
+	public boolean wantsCustomNavigationIcon(){
+		return true;
+	}
+
+	@Override
+	public void onViewCreated(View view, Bundle savedInstanceState){
+		nextButton=view.findViewById(R.id.btn_next);
+		nextButton.setOnClickListener(this::onNextClick);
+		nextButton.setText(R.string.create);
+		buttonBar=view.findViewById(R.id.button_bar);
+		super.onViewCreated(view, savedInstanceState);
+	}
+
+	@Override
+	public void onApplyWindowInsets(WindowInsets insets){
+		super.onApplyWindowInsets(UiUtils.applyBottomInsetToFixedView(buttonBar, insets));
+	}
+
+	@Override
+	protected List<View> getViewsForElevationEffect(){
+		return List.of(getToolbar(), buttonBar);
+	}
+
+	@Override
+	public void onSaveInstanceState(Bundle outState){
+		super.onSaveInstanceState(outState);
+		outState.putParcelable("list", Parcels.wrap(followList));
+	}
+
+	private void onNextClick(View v){
+		String title=titleEdit.getText().toString().trim();
+		if(TextUtils.isEmpty(title)){
+			titleEditLayout.setErrorState(getString(R.string.required_form_field_blank));
+			return;
+		}
+		if(followList==null){
+			new CreateList(title, getSelectedRepliesPolicy(), exclusiveItem.checked)
+					.setCallback(new Callback<>(){
+						@Override
+						public void onSuccess(FollowList result){
+							followList=result;
+							proceed(false);
+							E.post(new ListCreatedEvent(accountID, result));
+							AccountSessionManager.get(accountID).getCacheController().addList(result);
+						}
+
+						@Override
+						public void onError(ErrorResponse error){
+							error.showToast(getActivity());
+						}
+					})
+					.wrapProgress(getActivity(), R.string.loading, true)
+					.exec(accountID);
+		}else if(!title.equals(followList.title) || getSelectedRepliesPolicy()!=followList.repliesPolicy || exclusiveItem.checked!=followList.exclusive){
+			new UpdateList(followList.id, title, getSelectedRepliesPolicy(), exclusiveItem.checked)
+					.setCallback(new Callback<>(){
+						@Override
+						public void onSuccess(FollowList result){
+							followList=result;
+							proceed(true);
+							E.post(new ListUpdatedEvent(accountID, result));
+							AccountSessionManager.get(accountID).getCacheController().updateList(result);
+						}
+
+						@Override
+						public void onError(ErrorResponse error){
+							error.showToast(getActivity());
+						}
+					})
+					.wrapProgress(getActivity(), R.string.loading, true)
+					.exec(accountID);
+		}else{
+			proceed(true);
+		}
+	}
+
+	private void proceed(boolean needLoadMembers){
+		Bundle args=new Bundle();
+		args.putString("account", accountID);
+		args.putParcelable("list", Parcels.wrap(followList));
+		args.putBoolean("needLoadMembers", needLoadMembers);
+		Nav.go(getActivity(), CreateListAddMembersFragment.class, args);
+		getActivity().getSystemService(InputMethodManager.class).hideSoftInputFromWindow(contentView.getWindowToken(), 0);
+	}
+
+	@Subscribe
+	public void onFinishListCreationFragment(FinishListCreationFragmentEvent ev){
+		if(ev.accountID.equals(accountID) && followList!=null && ev.listID.equals(followList.id)){
+			Nav.finish(this);
+		}
+	}
+}

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

@@ -7,16 +7,14 @@ import android.view.MenuInflater;
 
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.timelines.GetPublicTimeline;
-import org.joinmastodon.android.model.Filter;
+import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.model.FilterContext;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.model.TimelineDefinition;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.utils.ProvidesAssistContent;
-import org.joinmastodon.android.utils.StatusFilterPredicate;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 import me.grishka.appkit.api.SimpleCallback;
 
@@ -46,14 +44,14 @@ public class CustomLocalTimelineFragment extends PinnableStatusListFragment impl
 
     @Override
     protected void doLoadData(int offset, int count){
-        currentRequest=new GetPublicTimeline(true, false, refreshing ? null : maxID, count, getLocalPrefs().timelineReplyVisibility)
+        currentRequest=new GetPublicTimeline(true, false, refreshing ? null : maxID, null, count, null, 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, FilterContext.PUBLIC)).collect(Collectors.toList());
+						AccountSessionManager.get(accountID).filterStatuses(result, FilterContext.PUBLIC);
                         result.stream().forEach(status -> {
                             status.account.acct += "@"+domain;
                             status.mentions.forEach(mention -> mention.id = null);
@@ -82,12 +80,15 @@ public class CustomLocalTimelineFragment extends PinnableStatusListFragment impl
 
     @Override
     protected FilterContext getFilterContext() {
-        return null;
+        return FilterContext.PUBLIC;
     }
 
     @Override
     public Uri getWebUri(Uri.Builder base) {
-        return Uri.parse(domain);
+		return new Uri.Builder()
+				.scheme("https")
+				.authority(domain)
+				.build();
     }
 
     @Override

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

@@ -0,0 +1,67 @@
+package org.joinmastodon.android.fragments;
+
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+
+import org.joinmastodon.android.E;
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.lists.UpdateList;
+import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.events.ListUpdatedEvent;
+import org.joinmastodon.android.model.FollowList;
+import org.joinmastodon.android.ui.M3AlertDialogBuilder;
+
+import me.grishka.appkit.api.Callback;
+import me.grishka.appkit.api.ErrorResponse;
+
+public class EditListFragment extends BaseEditListFragment{
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		setTitle(R.string.edit_list);
+		loadMembers();
+		setHasOptionsMenu(true);
+	}
+
+	@Override
+	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater){
+		menu.add(R.string.delete_list);
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item){
+		new M3AlertDialogBuilder(getActivity())
+				.setTitle(R.string.delete_list)
+				.setMessage(getString(R.string.delete_list_confirm, followList.title))
+				.setPositiveButton(R.string.delete, (dlg, which)->doDeleteList())
+				.setNegativeButton(R.string.cancel, null)
+				.show();
+		return true;
+	}
+
+	@Override
+	public void onDestroy(){
+		super.onDestroy();
+		String newTitle=titleEdit.getText().toString();
+		FollowList.RepliesPolicy newRepliesPolicy=getSelectedRepliesPolicy();
+		boolean newExclusive=exclusiveItem.checked;
+		if(!newTitle.equals(followList.title) || newRepliesPolicy!=followList.repliesPolicy || newExclusive!=followList.exclusive){
+			new UpdateList(followList.id, newTitle, newRepliesPolicy, newExclusive)
+					.setCallback(new Callback<>(){
+						@Override
+						public void onSuccess(FollowList result){
+							AccountSessionManager.get(accountID).getCacheController().updateList(result);
+							E.post(new ListUpdatedEvent(accountID, result));
+						}
+
+						@Override
+						public void onError(ErrorResponse error){
+							// TODO handle errors somehow
+						}
+					})
+					.exec(accountID);
+		}
+	}
+}

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

@@ -41,17 +41,14 @@ import org.joinmastodon.android.api.requests.lists.GetLists;
 import org.joinmastodon.android.api.requests.tags.GetFollowedHashtags;
 import org.joinmastodon.android.api.session.AccountLocalPreferences;
 import org.joinmastodon.android.api.session.AccountSessionManager;
-import org.joinmastodon.android.api.session.AccountSession;
-import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.model.CustomLocalTimeline;
+import org.joinmastodon.android.model.FollowList;
 import org.joinmastodon.android.model.Hashtag;
 import org.joinmastodon.android.model.HeaderPaginationList;
-import org.joinmastodon.android.model.ListTimeline;
 import org.joinmastodon.android.model.TimelineDefinition;
 import org.joinmastodon.android.ui.DividerItemDecoration;
 import org.joinmastodon.android.ui.M3AlertDialogBuilder;
 import org.joinmastodon.android.ui.utils.UiUtils;
-import org.joinmastodon.android.ui.views.TextInputFrameLayout;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -74,7 +71,7 @@ public class EditTimelinesFragment extends MastodonRecyclerFragment<TimelineDefi
 	private Menu optionsMenu;
 	private boolean updated;
 	private final Map<MenuItem, TimelineDefinition> timelineByMenuItem=new HashMap<>();
-	private final List<ListTimeline> listTimelines=new ArrayList<>();
+	private final List<FollowList> followLists =new ArrayList<>();
 	private final List<Hashtag> hashtags=new ArrayList<>();
 	private MenuItem addHashtagItem;
     private final List<CustomLocalTimeline> localTimelines = new ArrayList<>();
@@ -94,8 +91,8 @@ public class EditTimelinesFragment extends MastodonRecyclerFragment<TimelineDefi
 
 		new GetLists().setCallback(new Callback<>(){
 			@Override
-			public void onSuccess(List<ListTimeline> result){
-				listTimelines.addAll(result);
+			public void onSuccess(List<FollowList> result){
+				followLists.addAll(result);
 				updateOptionsMenu();
 			}
 
@@ -224,7 +221,7 @@ public class EditTimelinesFragment extends MastodonRecyclerFragment<TimelineDefi
         makeBackItem(hashtagsMenu);
 
 		TimelineDefinition.getAllTimelines(accountID).stream().forEach(tl->addTimelineToOptions(tl, timelinesMenu));
-		listTimelines.stream().map(TimelineDefinition::ofList).forEach(tl->addTimelineToOptions(tl, listsMenu));
+		followLists.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));
 
@@ -399,7 +396,7 @@ public class EditTimelinesFragment extends MastodonRecyclerFragment<TimelineDefi
 					tl.setTitle(name);
 					if(item == null || item.getType()==TimelineDefinition.TimelineType.HASHTAG){
 						tl.setTagOptions(
-								mainHashtag,
+								TextUtils.isEmpty(mainHashtag) ? name : mainHashtag,
 								tagsAny.getChipValues(),
 								tagsAll.getChipValues(),
 								tagsNone.getChipValues(),

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

@@ -297,8 +297,8 @@ public class FollowRequestsListFragment extends MastodonRecyclerFragment<FollowR
 				cover.setImageDrawable(image);
 			}else{
 				item.emojiHelper.setImageDrawable(index-2, image);
-				name.invalidate();
-				bio.invalidate();
+				name.setText(name.getText());
+				bio.setText(bio.getText());
 			}
 			if(image instanceof Animatable a && !a.isRunning())
 				a.start();
@@ -319,7 +319,18 @@ public class FollowRequestsListFragment extends MastodonRecyclerFragment<FollowR
 
 		private void onFollowRequestButtonClick(View v) {
 			itemView.setHasTransientState(true);
-			UiUtils.handleFollowRequest((Activity) v.getContext(), item.account, accountID, null, v == acceptButton, relationship, rel -> {
+			UiUtils.handleFollowRequest((Activity) v.getContext(), item.account, accountID, null, v == acceptButton, relationship, (Boolean visible) -> {
+				if(v==acceptButton){
+					acceptButton.setTextVisible(!visible);
+					acceptProgress.setVisibility(visible ? View.VISIBLE : View.GONE);
+					acceptButton.setClickable(!visible);
+				}else{
+					rejectButton.setTextVisible(!visible);
+					rejectProgress.setVisibility(visible ? View.VISIBLE : View.GONE);
+					rejectButton.setClickable(!visible);
+				}
+				itemView.setHasTransientState(false);
+			}, rel -> {
 				if(getContext()==null) return;
 				itemView.setHasTransientState(false);
 				relationships.put(item.account.id, rel);

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

@@ -32,6 +32,8 @@ 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.api.session.AccountSessionManager;
+import org.joinmastodon.android.model.FilterContext;
 import org.joinmastodon.android.model.Hashtag;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.model.TimelineDefinition;
@@ -63,6 +65,7 @@ public class HashtagTimelineFragment extends PinnableStatusListFragment{
 	private MenuItem followMenuItem, pinMenuItem, muteMenuItem;
 	private boolean followRequestRunning;
 	private boolean toolbarContentVisible;
+	private String maxID;
 
 	private List<String> any;
 	private List<String> all;
@@ -98,7 +101,7 @@ public class HashtagTimelineFragment extends PinnableStatusListFragment{
 	}
 
 	private void updateMuteState(boolean newMute) {
-		muteMenuItem.setTitle(getString(newMute ? R.string.unmute_user : R.string.mute_user, "#" + hashtag));
+		muteMenuItem.setTitle(getString(newMute ? R.string.unmute_user : R.string.mute_user, "#" + hashtagName));
 		muteMenuItem.setIcon(newMute ? R.drawable.ic_fluent_speaker_2_24_regular : R.drawable.ic_fluent_speaker_off_24_regular);
 	}
 
@@ -229,7 +232,7 @@ 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/") + hashtagName).build();
 	}
 
 	@Override

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

@@ -5,8 +5,6 @@ import android.app.Fragment;
 import android.app.NotificationManager;
 import android.app.assist.AssistContent;
 import android.graphics.drawable.RippleDrawable;
-import android.content.Intent;
-import android.graphics.Outline;
 import android.os.Build;
 import android.os.Bundle;
 import android.service.notification.StatusBarNotification;
@@ -37,7 +35,7 @@ import org.joinmastodon.android.fragments.onboarding.OnboardingFollowSuggestions
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Notification;
 import org.joinmastodon.android.model.PaginatedResponse;
-import org.joinmastodon.android.ui.AccountSwitcherSheet;
+import org.joinmastodon.android.ui.sheets.AccountSwitcherSheet;
 import org.joinmastodon.android.ui.OutlineProviders;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.ui.views.TabBar;
@@ -163,6 +161,8 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 		notificationsBadge=tabBar.findViewById(R.id.notifications_badge);
 		notificationsBadge.setVisibility(View.GONE);
 
+		tabBar.selectTab(currentTab);
+
 		if(savedInstanceState==null){
 			getChildFragmentManager().beginTransaction()
 					.add(me.grishka.appkit.R.id.fragment_wrap, homeTabFragment)
@@ -184,7 +184,6 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 				});
 			}
 		}
-		tabBar.selectTab(currentTab);
 
 		return content;
 	}
@@ -312,11 +311,6 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 			discoverFragment.openSearch();
 			return true;
 		}
-		if(tab==R.id.tab_home){
-			Bundle args=new Bundle();
-			args.putString("account", accountID);
-			Nav.go(getActivity(), OnboardingFollowSuggestionsFragment.class, args);
-		}
 		return false;
 	}
 

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

@@ -53,7 +53,7 @@ import org.joinmastodon.android.fragments.settings.SettingsMainFragment;
 import org.joinmastodon.android.model.Announcement;
 import org.joinmastodon.android.model.Hashtag;
 import org.joinmastodon.android.model.HeaderPaginationList;
-import org.joinmastodon.android.model.ListTimeline;
+import org.joinmastodon.android.model.FollowList;
 import org.joinmastodon.android.model.TimelineDefinition;
 import org.joinmastodon.android.ui.SimpleViewHolder;
 import org.joinmastodon.android.ui.utils.UiUtils;
@@ -95,7 +95,7 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab
 	private ImageView collapsedChevron;
 	private TextView timelineTitle;
 	private PopupMenu switcherPopup;
-	private final Map<Integer, ListTimeline> listItems = new HashMap<>();
+	private final Map<Integer, FollowList> listItems = new HashMap<>();
 	private final Map<Integer, Hashtag> hashtagsItems = new HashMap<>();
 	private List<TimelineDefinition> timelinesList;
 	private int count;
@@ -270,7 +270,7 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab
 
 		new GetLists().setCallback(new Callback<>() {
 			@Override
-			public void onSuccess(List<ListTimeline> lists) {
+			public void onSuccess(List<FollowList> lists) {
 				updateList(lists, listItems);
 			}
 
@@ -408,7 +408,7 @@ 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() && !UiUtils.isMagic())
 			m.setGroupDividerEnabled(true);
 	}
 
@@ -512,7 +512,7 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab
 		Bundle args=new Bundle();
 		args.putString("account", accountID);
 		int id = item.getItemId();
-		ListTimeline list;
+		FollowList list;
 		Hashtag hashtag;
 
 		if (item.getItemId() == R.id.menu_back) {
@@ -701,13 +701,13 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab
 
 	@Subscribe
 	public void onListDeletedEvent(ListDeletedEvent event) {
-		handleListEvent(listItems, l -> l.id.equals(event.id), false, null);
+		handleListEvent(listItems, l -> l.id.equals(event.listID), false, null);
 	}
 
 	@Subscribe
 	public void onListUpdatedCreatedEvent(ListUpdatedCreatedEvent event) {
 		handleListEvent(listItems, l -> l.id.equals(event.id), true, () -> {
-			ListTimeline list = new ListTimeline();
+			FollowList list = new FollowList();
 			list.id = event.id;
 			list.title = event.title;
 			list.repliesPolicy = event.repliesPolicy;

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

@@ -0,0 +1,324 @@
+package org.joinmastodon.android.fragments;
+
+import android.net.Uri;
+import android.os.Bundle;
+import android.view.ActionMode;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.WindowInsets;
+import android.widget.ImageButton;
+
+import com.squareup.otto.Subscribe;
+
+import org.joinmastodon.android.E;
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.api.requests.HeaderPaginationRequest;
+import org.joinmastodon.android.api.requests.lists.AddAccountsToList;
+import org.joinmastodon.android.api.requests.lists.GetListAccounts;
+import org.joinmastodon.android.api.requests.lists.RemoveAccountsFromList;
+import org.joinmastodon.android.events.AccountAddedToListEvent;
+import org.joinmastodon.android.events.AccountRemovedFromListEvent;
+import org.joinmastodon.android.fragments.account_list.AddListMembersFragment;
+import org.joinmastodon.android.fragments.account_list.PaginatedAccountListFragment;
+import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.model.FollowList;
+import org.joinmastodon.android.model.viewmodel.AccountViewModel;
+import org.joinmastodon.android.ui.M3AlertDialogBuilder;
+import org.joinmastodon.android.ui.utils.ActionModeHelper;
+import org.joinmastodon.android.ui.utils.UiUtils;
+import org.joinmastodon.android.ui.viewholders.AccountViewHolder;
+import org.parceler.Parcels;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+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.utils.V;
+
+public class ListMembersFragment extends PaginatedAccountListFragment{
+	private static final int ADD_MEMBER_RESULT=600;
+
+	private ImageButton fab;
+	private FollowList followList;
+	private boolean inSelectionMode;
+	private Set<String> selectedAccounts=new HashSet<>();
+	private ActionMode actionMode;
+	private MenuItem deleteItem;
+
+	public ListMembersFragment(){
+		setListLayoutId(R.layout.recycler_fragment_with_fab);
+	}
+
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		followList=Parcels.unwrap(getArguments().getParcelable("list"));
+		setTitle(R.string.list_members);
+		setHasOptionsMenu(true);
+		E.register(this);
+	}
+
+	@Override
+	public void onDestroy(){
+		super.onDestroy();
+		E.unregister(this);
+	}
+
+	@Override
+	public HeaderPaginationRequest<Account> onCreateRequest(String maxID, int count){
+		return new GetListAccounts(followList.id, maxID, count);
+	}
+
+	@Override
+	protected MastodonAPIRequest loadRemoteInfo(){
+		return null;
+	}
+
+	@Override
+	public Object getCurrentInfo(){
+		return null;
+	}
+
+	@Override
+	public String getRemoteDomain(){
+		return null;
+	}
+
+	@Override
+	protected void onConfigureViewHolder(AccountViewHolder holder){
+		super.onConfigureViewHolder(holder);
+		holder.setStyle(inSelectionMode ? AccountViewHolder.AccessoryType.CHECKBOX : AccountViewHolder.AccessoryType.MENU, false);
+		holder.setOnClickListener(this::onItemClick);
+		holder.setOnLongClickListener(this::onItemLongClick);
+		holder.getContextMenu().getMenu().add(0, R.id.remove_from_list, 0, R.string.remove_from_list);
+		holder.setOnCustomMenuItemSelectedListener(item->onItemMenuItemSelected(holder, item));
+	}
+
+	@Override
+	protected void onBindViewHolder(AccountViewHolder holder){
+		super.onBindViewHolder(holder);
+		holder.setStyle(inSelectionMode ? AccountViewHolder.AccessoryType.CHECKBOX : AccountViewHolder.AccessoryType.MENU, false);
+		if(inSelectionMode){
+			holder.setChecked(selectedAccounts.contains(holder.getItem().account.id));
+		}
+	}
+
+	@Override
+	public boolean wantsLightStatusBar(){
+		if(actionMode!=null)
+			return UiUtils.isDarkTheme();
+		return super.wantsLightStatusBar();
+	}
+
+	@Override
+	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater){
+		inflater.inflate(R.menu.selectable_list, menu);
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item){
+		int id=item.getItemId();
+		if(id==R.id.select){
+			enterSelectionMode();
+		}else if(id==R.id.select_all){
+			for(AccountViewModel a:(ArrayList<AccountViewModel>)data){
+				selectedAccounts.add(a.account.id);
+			}
+			enterSelectionMode();
+		}
+		return true;
+	}
+
+	@Override
+	public void onViewCreated(View view, Bundle savedInstanceState){
+		super.onViewCreated(view, savedInstanceState);
+		fab=view.findViewById(R.id.fab);
+		fab.setImageResource(R.drawable.ic_fluent_add_24_regular);
+		fab.setContentDescription(getString(R.string.add_list_member));
+		fab.setOnClickListener(v->onFabClick());
+	}
+
+	@Override
+	public void onApplyWindowInsets(WindowInsets insets){
+		super.onApplyWindowInsets(insets);
+		UiUtils.applyBottomInsetToFAB(fab, insets);
+	}
+
+	@Override
+	public void onFragmentResult(int reqCode, boolean success, Bundle result){
+		if(reqCode==ADD_MEMBER_RESULT && success){
+			Account acc=Objects.requireNonNull(Parcels.unwrap(result.getParcelable("selectedAccount")));
+			addAccounts(List.of(acc));
+		}
+	}
+
+	@Subscribe
+	public void onAccountRemovedFromList(AccountRemovedFromListEvent ev){
+		if(ev.accountID.equals(accountID) && ev.listID.equals(followList.id)){
+			removeAccountRows(Set.of(ev.targetAccountID));
+		}
+	}
+
+	@Subscribe
+	public void onAccountAddedToList(AccountAddedToListEvent ev){
+		if(ev.accountID.equals(accountID) && ev.listID.equals(followList.id)){
+			data.add(new AccountViewModel(ev.account, accountID));
+			list.getAdapter().notifyItemInserted(data.size()-1);
+		}
+	}
+
+	private void onFabClick(){
+		Bundle args=new Bundle();
+		args.putString("account", accountID);
+		Nav.goForResult(getActivity(), AddListMembersFragment.class, args, ADD_MEMBER_RESULT, this);
+	}
+
+	private void onItemClick(AccountViewHolder holder){
+		if(inSelectionMode){
+			String id=holder.getItem().account.id;
+			if(selectedAccounts.contains(id)){
+				selectedAccounts.remove(id);
+				holder.setChecked(false);
+			}else{
+				selectedAccounts.add(id);
+				holder.setChecked(true);
+			}
+			updateActionModeTitle();
+			deleteItem.setEnabled(!selectedAccounts.isEmpty());
+			return;
+		}
+		Bundle args=new Bundle();
+		args.putString("account", accountID);
+		args.putParcelable("profileAccount", Parcels.wrap(holder.getItem().account));
+		Nav.go(getActivity(), ProfileFragment.class, args);
+	}
+
+	private boolean onItemLongClick(AccountViewHolder holder){
+		if(inSelectionMode)
+			return false;
+		selectedAccounts.add(holder.getItem().account.id);
+		enterSelectionMode();
+		return true;
+	}
+
+	private void onItemMenuItemSelected(AccountViewHolder holder, MenuItem item){
+		int id=item.getItemId();
+		if(id==R.id.remove_from_list){
+			new M3AlertDialogBuilder(getActivity())
+					.setTitle(R.string.confirm_remove_list_member)
+					.setPositiveButton(R.string.remove, (dlg, which)->removeAccounts(Set.of(holder.getItem().account.id)))
+					.setNegativeButton(R.string.cancel, null)
+					.show();
+		}
+	}
+
+	private void updateItemsForSelectionModeTransition(){
+		list.getAdapter().notifyItemRangeChanged(0, data.size());
+	}
+
+	private void enterSelectionMode(){
+		inSelectionMode=true;
+		updateItemsForSelectionModeTransition();
+		V.setVisibilityAnimated(fab, View.INVISIBLE);
+		actionMode=ActionModeHelper.startActionMode(this, ()->elevationOnScrollListener.getCurrentStatusBarColor(), new ActionMode.Callback(){
+			@Override
+			public boolean onCreateActionMode(ActionMode mode, Menu menu){
+				return true;
+			}
+
+			@Override
+			public boolean onPrepareActionMode(ActionMode mode, Menu menu){
+				mode.getMenuInflater().inflate(R.menu.settings_filter_words_action_mode, menu);
+				deleteItem=menu.findItem(R.id.delete);
+				return true;
+			}
+
+			@Override
+			public boolean onActionItemClicked(ActionMode mode, MenuItem item){
+				new M3AlertDialogBuilder(getActivity())
+						.setTitle(R.string.confirm_remove_list_members)
+						.setPositiveButton(R.string.remove, (dlg, which)->removeAccounts(new HashSet<>(selectedAccounts)))
+						.setNegativeButton(R.string.cancel, null)
+						.show();
+				return true;
+			}
+
+			@Override
+			public void onDestroyActionMode(ActionMode mode){
+				actionMode=null;
+				inSelectionMode=false;
+				selectedAccounts.clear();
+				updateItemsForSelectionModeTransition();
+				V.setVisibilityAnimated(fab, View.VISIBLE);
+			}
+		});
+		updateActionModeTitle();
+	}
+
+	private void updateActionModeTitle(){
+		actionMode.setTitle(getResources().getQuantityString(R.plurals.x_items_selected, selectedAccounts.size(), selectedAccounts.size()));
+	}
+
+	private void removeAccounts(Set<String> ids){
+		new RemoveAccountsFromList(followList.id, ids)
+				.setCallback(new Callback<>(){
+					@Override
+					public void onSuccess(Void result){
+						if(inSelectionMode)
+							actionMode.finish();
+						removeAccountRows(ids);
+					}
+
+					@Override
+					public void onError(ErrorResponse error){
+						error.showToast(getActivity());
+					}
+				})
+				.wrapProgress(getActivity(), R.string.loading, true)
+				.exec(accountID);
+	}
+
+	private void addAccounts(Collection<Account> accounts){
+		new AddAccountsToList(followList.id, accounts.stream().map(a->a.id).collect(Collectors.toSet()))
+				.setCallback(new Callback<>(){
+					@Override
+					public void onSuccess(Void result){
+						for(Account acc:accounts){
+							data.add(new AccountViewModel(acc, accountID));
+						}
+						list.getAdapter().notifyItemRangeInserted(data.size()-accounts.size(), accounts.size());
+					}
+
+					@Override
+					public void onError(ErrorResponse error){
+						error.showToast(getActivity());
+					}
+				})
+				.wrapProgress(getActivity(), R.string.loading, true)
+				.exec(accountID);
+	}
+
+	private void removeAccountRows(Set<String> ids){
+		for(int i=data.size()-1;i>=0;i--){
+			if(ids.contains(((ArrayList<AccountViewModel>)data).get(i).account.id)){
+				data.remove(i);
+				list.getAdapter().notifyItemRemoved(i);
+			}
+		}
+	}
+
+	@Override
+	public Uri getWebUri(Uri.Builder base){
+		return null;
+	}
+}

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

@@ -20,7 +20,7 @@ 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;
-import org.joinmastodon.android.model.ListTimeline;
+import org.joinmastodon.android.model.FollowList;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.model.TimelineDefinition;
 import org.joinmastodon.android.ui.M3AlertDialogBuilder;
@@ -39,7 +39,7 @@ public class ListTimelineFragment extends PinnableStatusListFragment {
     private String listID;
     private String listTitle;
     @Nullable
-    private ListTimeline.RepliesPolicy repliesPolicy;
+    private FollowList.RepliesPolicy repliesPolicy;
     private boolean exclusive;
 
     @Override
@@ -54,19 +54,19 @@ public class ListTimelineFragment extends PinnableStatusListFragment {
         listID = args.getString("listID");
         listTitle = args.getString("listTitle");
         exclusive = args.getBoolean("listIsExclusive");
-        repliesPolicy = ListTimeline.RepliesPolicy.values()[args.getInt("repliesPolicy", 0)];
+        repliesPolicy = FollowList.RepliesPolicy.values()[args.getInt("repliesPolicy", 0)];
 
         setTitle(listTitle);
         setHasOptionsMenu(true);
 
         new GetList(listID).setCallback(new Callback<>() {
             @Override
-            public void onSuccess(ListTimeline listTimeline) {
+            public void onSuccess(FollowList followList) {
                 if(getActivity()==null) return;
                 // TODO: save updated info
-                if (!listTimeline.title.equals(listTitle)) setTitle(listTimeline.title);
-                if (listTimeline.repliesPolicy != null && !listTimeline.repliesPolicy.equals(repliesPolicy)) {
-                    repliesPolicy = listTimeline.repliesPolicy;
+                if (!followList.title.equals(listTitle)) setTitle(followList.title);
+                if (followList.repliesPolicy != null && !followList.repliesPolicy.equals(repliesPolicy)) {
+                    repliesPolicy = followList.repliesPolicy;
                 }
             }
 
@@ -97,9 +97,9 @@ public class ListTimelineFragment extends PinnableStatusListFragment {
                     .setPositiveButton(R.string.save, (d, which) -> {
                         String newTitle = editor.getTitle().trim();
                         setTitle(newTitle);
-                        new UpdateList(listID, newTitle, editor.isExclusive(), editor.getRepliesPolicy()).setCallback(new Callback<>() {
+                        new UpdateList(listID, newTitle, editor.getRepliesPolicy(), editor.isExclusive()).setCallback(new Callback<>() {
                             @Override
-                            public void onSuccess(ListTimeline list) {
+                            public void onSuccess(FollowList list) {
                                 if(getActivity()==null) return;
                                 setTitle(list.title);
                                 listTitle = list.title;
@@ -119,7 +119,7 @@ public class ListTimelineFragment extends PinnableStatusListFragment {
                     .show();
         } else if (item.getItemId() == R.id.delete) {
             UiUtils.confirmDeleteList(getActivity(), accountID, listID, listTitle, () -> {
-                E.post(new ListDeletedEvent(listID));
+                E.post(new ListDeletedEvent(accountID, listID));
                 Nav.finish(this);
             });
         }

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

@@ -18,13 +18,14 @@ import com.squareup.otto.Subscribe;
 import org.joinmastodon.android.E;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.api.ResultlessMastodonAPIRequest;
 import org.joinmastodon.android.api.requests.lists.AddAccountsToList;
 import org.joinmastodon.android.api.requests.lists.CreateList;
 import org.joinmastodon.android.api.requests.lists.GetLists;
 import org.joinmastodon.android.api.requests.lists.RemoveAccountsFromList;
 import org.joinmastodon.android.events.ListDeletedEvent;
 import org.joinmastodon.android.events.ListUpdatedCreatedEvent;
-import org.joinmastodon.android.model.ListTimeline;
+import org.joinmastodon.android.model.FollowList;
 import org.joinmastodon.android.ui.DividerItemDecoration;
 import org.joinmastodon.android.ui.M3AlertDialogBuilder;
 import org.joinmastodon.android.ui.views.ListEditor;
@@ -42,7 +43,7 @@ import me.grishka.appkit.api.SimpleCallback;
 import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.views.UsableRecyclerView;
 
-public class ListsFragment extends MastodonRecyclerFragment<ListTimeline> implements ScrollableToTop, ProvidesAssistContent.ProvidesWebUri {
+public class ListsFragment extends MastodonRecyclerFragment<FollowList> implements ScrollableToTop, ProvidesAssistContent.ProvidesWebUri {
 	private String accountID;
 	private String profileAccountId;
 	private final HashMap<String, Boolean> userInListBefore = new HashMap<>();
@@ -97,9 +98,9 @@ public class ListsFragment extends MastodonRecyclerFragment<ListTimeline> implem
 					.setIcon(R.drawable.ic_fluent_people_add_28_regular)
 					.setView(editor)
 					.setPositiveButton(R.string.sk_create, (d, which) ->
-							new CreateList(editor.getTitle(), editor.isExclusive(), editor.getRepliesPolicy()).setCallback(new Callback<>() {
+							new CreateList(editor.getTitle(), editor.getRepliesPolicy(), editor.isExclusive()).setCallback(new Callback<>() {
 								@Override
-								public void onSuccess(ListTimeline list) {
+								public void onSuccess(FollowList list) {
 									data.add(0, list);
 									adapter.notifyItemRangeInserted(0, 1);
 									E.post(new ListUpdatedCreatedEvent(list.id, list.title, list.exclusive, list.repliesPolicy));
@@ -120,10 +121,10 @@ public class ListsFragment extends MastodonRecyclerFragment<ListTimeline> implem
 	private void saveListMembership(String listId, boolean isMember) {
 		userInList.put(listId, isMember);
 		List<String> accountIdList = Collections.singletonList(profileAccountId);
-		MastodonAPIRequest<Object> req = isMember ? new AddAccountsToList(listId, accountIdList) : new RemoveAccountsFromList(listId, accountIdList);
+		ResultlessMastodonAPIRequest req = isMember ? new AddAccountsToList(listId, accountIdList) : new RemoveAccountsFromList(listId, accountIdList);
 		req.setCallback(new Callback<>() {
 			@Override
-			public void onSuccess(Object o) {}
+			public void onSuccess(Void o) {}
 
 			@Override
 			public void onError(ErrorResponse error) {
@@ -139,19 +140,19 @@ public class ListsFragment extends MastodonRecyclerFragment<ListTimeline> implem
 		currentRequest=(profileAccountId != null ? new GetLists(profileAccountId) : new GetLists())
 				.setCallback(new SimpleCallback<>(this) {
 					@Override
-					public void onSuccess(List<ListTimeline> lists) {
+					public void onSuccess(List<FollowList> lists) {
 						if(getActivity()==null) return;
-						for (ListTimeline l : lists) userInListBefore.put(l.id, true);
+						for (FollowList l : lists) userInListBefore.put(l.id, true);
 						userInList.putAll(userInListBefore);
 						if (profileAccountId == null || !lists.isEmpty()) onDataLoaded(lists, false);
 						if (profileAccountId == null) return;
 
 						currentRequest=new GetLists().setCallback(new SimpleCallback<>(ListsFragment.this) {
 							@Override
-							public void onSuccess(List<ListTimeline> allLists) {
+							public void onSuccess(List<FollowList> allLists) {
 								if(getActivity()==null) return;
-								List<ListTimeline> newLists = new ArrayList<>();
-								for (ListTimeline l : allLists) {
+								List<FollowList> newLists = new ArrayList<>();
+								for (FollowList l : allLists) {
 									if (lists.stream().noneMatch(e -> e.id.equals(l.id))) newLists.add(l);
 									if (!userInListBefore.containsKey(l.id)) {
 										userInListBefore.put(l.id, false);
@@ -169,8 +170,8 @@ public class ListsFragment extends MastodonRecyclerFragment<ListTimeline> implem
 	@Subscribe
 	public void onListDeletedEvent(ListDeletedEvent event) {
 		for (int i = 0; i < data.size(); i++) {
-			ListTimeline item = data.get(i);
-			if (item.id.equals(event.id)) {
+			FollowList item = data.get(i);
+			if (item.id.equals(event.listID)) {
 				data.remove(i);
 				adapter.notifyItemRemoved(i);
 				break;
@@ -181,7 +182,7 @@ public class ListsFragment extends MastodonRecyclerFragment<ListTimeline> implem
 	@Subscribe
 	public void onListUpdatedCreatedEvent(ListUpdatedCreatedEvent event) {
 		for (int i = 0; i < data.size(); i++) {
-			ListTimeline item = data.get(i);
+			FollowList item = data.get(i);
 			if (item.id.equals(event.id)) {
 				item.title = event.title;
 				item.repliesPolicy = event.repliesPolicy;
@@ -230,7 +231,7 @@ public class ListsFragment extends MastodonRecyclerFragment<ListTimeline> implem
 		}
 	}
 
-	private class ListViewHolder extends BindableViewHolder<ListTimeline> implements UsableRecyclerView.Clickable{
+	private class ListViewHolder extends BindableViewHolder<FollowList> implements UsableRecyclerView.Clickable{
 		private final TextView title;
 		private final CheckBox listToggle;
 
@@ -241,7 +242,7 @@ public class ListsFragment extends MastodonRecyclerFragment<ListTimeline> implem
 		}
 
 		@Override
-		public void onBind(ListTimeline item) {
+		public void onBind(FollowList item) {
 			title.setText(item.title);
 			title.setCompoundDrawablesRelativeWithIntrinsicBounds(itemView.getContext().getDrawable(
 					item.exclusive ? R.drawable.ic_fluent_rss_24_regular : R.drawable.ic_fluent_people_24_regular

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

@@ -0,0 +1,95 @@
+package org.joinmastodon.android.fragments;
+
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.tags.GetFollowedTags;
+import org.joinmastodon.android.api.requests.tags.SetTagFollowed;
+import org.joinmastodon.android.fragments.settings.BaseSettingsFragment;
+import org.joinmastodon.android.model.Hashtag;
+import org.joinmastodon.android.model.HeaderPaginationList;
+import org.joinmastodon.android.model.viewmodel.ListItemWithOptionsMenu;
+import org.joinmastodon.android.ui.M3AlertDialogBuilder;
+import org.joinmastodon.android.ui.utils.UiUtils;
+
+import java.util.stream.Collectors;
+
+import me.grishka.appkit.api.Callback;
+import me.grishka.appkit.api.ErrorResponse;
+import me.grishka.appkit.api.SimpleCallback;
+
+public class ManageFollowedHashtagsFragment extends BaseSettingsFragment<Hashtag> implements ListItemWithOptionsMenu.OptionsMenuListener<Hashtag>{
+	private String maxID;
+
+	public ManageFollowedHashtagsFragment(){
+		super(100);
+	}
+
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		setTitle(R.string.manage_hashtags);
+		loadData();
+	}
+
+	@Override
+	protected void doLoadData(int offset, int count){
+		currentRequest=new GetFollowedTags(offset>0 ? maxID : null, count)
+				.setCallback(new SimpleCallback<>(this){
+					@Override
+					public void onSuccess(HeaderPaginationList<Hashtag> result){
+						maxID=null;
+						if(result.nextPageUri!=null)
+							maxID=result.nextPageUri.getQueryParameter("max_id");
+						onDataLoaded(result.stream().map(t->{
+							int posts=t.getWeekPosts();
+							return new ListItemWithOptionsMenu<>(t.name, getResources().getQuantityString(R.plurals.x_posts_recently, posts, posts), ManageFollowedHashtagsFragment.this,
+									R.drawable.ic_fluent_tag_24_regular, ManageFollowedHashtagsFragment.this::onItemClick, t, false);
+						}).collect(Collectors.toList()), maxID!=null);
+					}
+				})
+				.exec(accountID);
+	}
+
+	@Override
+	public void onConfigureListItemOptionsMenu(ListItemWithOptionsMenu<Hashtag> item, Menu menu){
+		menu.clear();
+		menu.add(getString(R.string.unfollow_user, "#"+item.parentObject.name));
+	}
+
+	@Override
+	public void onListItemOptionSelected(ListItemWithOptionsMenu<Hashtag> item, MenuItem menuItem){
+		new M3AlertDialogBuilder(getActivity())
+				.setTitle(getString(R.string.unfollow_confirmation, "#"+item.parentObject.name))
+				.setPositiveButton(R.string.unfollow, (dlg, which)->doUnfollow(item))
+				.setNegativeButton(R.string.cancel, null)
+				.show();
+	}
+
+	private void onItemClick(ListItemWithOptionsMenu<Hashtag> item){
+		UiUtils.openHashtagTimeline(getActivity(), accountID, item.parentObject);
+	}
+
+	private void doUnfollow(ListItemWithOptionsMenu<Hashtag> item){
+		new SetTagFollowed(item.parentObject.name, false)
+				.setCallback(new Callback<>(){
+					@Override
+					public void onSuccess(Hashtag result){
+						int index=data.indexOf(item);
+						if(index==-1)
+							return;
+						data.remove(index);
+						list.getAdapter().notifyItemRemoved(index);
+					}
+
+					@Override
+					public void onError(ErrorResponse error){
+						error.showToast(getActivity());
+					}
+				})
+				.wrapProgress(getActivity(), R.string.loading, true)
+				.exec(accountID);
+	}
+}

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

@@ -0,0 +1,199 @@
+package org.joinmastodon.android.fragments;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.WindowInsets;
+import android.widget.ImageButton;
+
+import com.squareup.otto.Subscribe;
+
+import org.joinmastodon.android.E;
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.lists.DeleteList;
+import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.events.ListCreatedEvent;
+import org.joinmastodon.android.events.ListDeletedEvent;
+import org.joinmastodon.android.events.ListUpdatedEvent;
+import org.joinmastodon.android.fragments.settings.BaseSettingsFragment;
+import org.joinmastodon.android.model.FollowList;
+import org.joinmastodon.android.model.viewmodel.ListItem;
+import org.joinmastodon.android.model.viewmodel.ListItemWithOptionsMenu;
+import org.joinmastodon.android.ui.M3AlertDialogBuilder;
+import org.joinmastodon.android.ui.utils.UiUtils;
+import org.parceler.Parcels;
+
+import java.util.Comparator;
+import java.util.List;
+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;
+
+public class ManageListsFragment extends BaseSettingsFragment<FollowList> implements ListItemWithOptionsMenu.OptionsMenuListener<FollowList>{
+	private ImageButton fab;
+
+	public ManageListsFragment(){
+		setListLayoutId(R.layout.recycler_fragment_with_fab);
+	}
+
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		setTitle(R.string.manage_lists);
+		loadData();
+		setRefreshEnabled(true);
+		E.register(this);
+	}
+
+	@Override
+	public void onDestroy(){
+		super.onDestroy();
+		E.unregister(this);
+	}
+
+	@Override
+	protected void doLoadData(int offset, int count){
+		Callback<List<FollowList>> callback=new SimpleCallback<>(this){
+			@Override
+			public void onSuccess(List<FollowList> result){
+				onDataLoaded(result.stream().map(ManageListsFragment.this::makeItem).collect(Collectors.toList()), false);
+			}
+		};
+		if(refreshing){
+			AccountSessionManager.get(accountID)
+					.getCacheController()
+					.reloadLists(callback);
+		}else{
+			AccountSessionManager.get(accountID)
+					.getCacheController()
+					.getLists(callback);
+		}
+	}
+
+	private ListItem<FollowList> makeItem(FollowList l){
+		return new ListItemWithOptionsMenu<>(l.title, null, ManageListsFragment.this, R.drawable.ic_list_alt_24px, ManageListsFragment.this::onListClick, l, false);
+	}
+
+	private void onListClick(ListItemWithOptionsMenu<FollowList> item){
+		Bundle args=new Bundle();
+		args.putString("account", accountID);
+		args.putParcelable("list", Parcels.wrap(item.parentObject));
+		Nav.go(getActivity(), ListTimelineFragment.class, args);
+	}
+
+	@Override
+	public void onConfigureListItemOptionsMenu(ListItemWithOptionsMenu<FollowList> item, Menu menu){
+		menu.add(0, R.id.edit, 0, R.string.edit_list);
+		menu.add(0, R.id.delete, 1, R.string.delete_list);
+	}
+
+	@Override
+	public void onListItemOptionSelected(ListItemWithOptionsMenu<FollowList> item, MenuItem menuItem){
+		int id=menuItem.getItemId();
+		if(id==R.id.edit){
+			Bundle args=new Bundle();
+			args.putString("account", accountID);
+			args.putParcelable("list", Parcels.wrap(item.parentObject));
+			Nav.go(getActivity(), EditListFragment.class, args);
+		}else if(id==R.id.delete){
+			new M3AlertDialogBuilder(getActivity())
+					.setTitle(R.string.delete_list)
+					.setMessage(getString(R.string.delete_list_confirm, item.parentObject.title))
+					.setPositiveButton(R.string.delete, (dlg, which)->doDeleteList(item.parentObject))
+					.setNegativeButton(R.string.cancel, null)
+					.show();
+		}
+	}
+
+	@Override
+	public void onViewCreated(View view, Bundle savedInstanceState){
+		super.onViewCreated(view, savedInstanceState);
+		fab=view.findViewById(R.id.fab);
+		fab.setImageResource(R.drawable.ic_fluent_add_24_regular);
+		fab.setContentDescription(getString(R.string.create_list));
+		fab.setOnClickListener(v->onFabClick());
+	}
+
+	@Override
+	public void onApplyWindowInsets(WindowInsets insets){
+		super.onApplyWindowInsets(insets);
+		UiUtils.applyBottomInsetToFAB(fab, insets);
+	}
+
+	private void doDeleteList(FollowList list){
+		new DeleteList(list.id)
+				.setCallback(new Callback<>(){
+					@Override
+					public void onSuccess(Void result){
+						for(int i=0;i<data.size();i++){
+							if(data.get(i).parentObject==list){
+								data.remove(i);
+								itemsAdapter.notifyItemRemoved(i);
+								AccountSessionManager.get(accountID).getCacheController().deleteList(list.id);
+								break;
+							}
+						}
+					}
+
+					@Override
+					public void onError(ErrorResponse error){
+						Activity activity=getActivity();
+						if(activity==null)
+							return;
+						error.showToast(activity);
+					}
+				})
+				.wrapProgress(getActivity(), R.string.loading, true)
+				.exec(accountID);
+	}
+
+	@Subscribe
+	public void onListUpdated(ListUpdatedEvent ev){
+		if(!ev.accountID.equals(accountID))
+			return;
+		for(ListItem<FollowList> item:data){
+			if(item.parentObject.id.equals(ev.list.id)){
+				item.parentObject=ev.list;
+				item.title=ev.list.title;
+				rebindItem(item);
+				break;
+			}
+		}
+	}
+
+	@Subscribe
+	public void onListDeleted(ListDeletedEvent ev){
+		if(!ev.accountID.equals(accountID))
+			return;
+		int i=0;
+		for(ListItem<FollowList> item:data){
+			if(item.parentObject.id.equals(ev.listID)){
+				data.remove(i);
+				itemsAdapter.notifyItemRemoved(i);
+				break;
+			}
+			i++;
+		}
+	}
+
+	@Subscribe
+	public void onListCreated(ListCreatedEvent ev){
+		if(!ev.accountID.equals(accountID))
+			return;
+		ListItem<FollowList> item=makeItem(ev.list);
+		data.add(item);
+		((List<ListItem<FollowList>>)data).sort(Comparator.comparing(l->l.parentObject.title));
+		itemsAdapter.notifyItemInserted(data.indexOf(item));
+	}
+
+	private void onFabClick(){
+		Bundle args=new Bundle();
+		args.putString("account", accountID);
+		Nav.go(getActivity(), CreateListFragment.class, args);
+	}
+}

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

@@ -7,6 +7,7 @@ import android.widget.TextView;
 import android.widget.Toolbar;
 
 import org.joinmastodon.android.R;
+import org.joinmastodon.android.ui.BetterItemAnimator;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.utils.ElevationOnScrollListener;
 

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

@@ -7,6 +7,10 @@ import android.graphics.Rect;
 import android.net.Uri;
 import android.os.Bundle;
 import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 
 import com.squareup.otto.Subscribe;
@@ -14,6 +18,7 @@ import com.squareup.otto.Subscribe;
 import org.joinmastodon.android.E;
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.markers.SaveMarkers;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.events.EmojiReactionsUpdatedEvent;
 import org.joinmastodon.android.events.PollUpdatedEvent;
@@ -47,12 +52,13 @@ import androidx.recyclerview.widget.RecyclerView;
 import me.grishka.appkit.api.SimpleCallback;
 import me.grishka.appkit.utils.MergeRecyclerAdapter;
 
-public class NotificationsListFragment extends BaseStatusListFragment<Notification> {
+public class NotificationsListFragment extends BaseStatusListFragment<Notification>{
 	private boolean onlyMentions;
-	private boolean onlyPosts;
 	private String maxID;
 	private boolean reloadingFromCache;
 	private DiscoverInfoBannerHelper bannerHelper;
+	private String unreadMarker, realUnreadMarker;
+	private MenuItem markAllReadItem;
 
 	@Override
 	protected boolean wantsComposeButton() {
@@ -63,13 +69,8 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
 		E.register(this);
-		if(savedInstanceState!=null){
-			onlyMentions=savedInstanceState.getBoolean("onlyMentions", false);
-			onlyPosts=savedInstanceState.getBoolean("onlyPosts", false);
-		}
-		if (onlyPosts) {
-			bannerHelper=new DiscoverInfoBannerHelper(DiscoverInfoBannerHelper.BannerType.POST_NOTIFICATIONS, accountID);
-		}
+		onlyMentions=getArguments().getBoolean("onlyMentions", false);
+		setHasOptionsMenu(true);
 	}
 
 	@Override
@@ -81,14 +82,12 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 	@Override
 	public void onAttach(Activity activity){
 		super.onAttach(activity);
-		onlyMentions=getArguments().getBoolean("onlyMentions", false);
-		onlyPosts=getArguments().getBoolean("onlyPosts", false);
 		setTitle(R.string.notifications);
 	}
 
 	@Override
 	protected List<StatusDisplayItem> buildDisplayItems(Notification n){
-		if(!onlyMentions && !onlyPosts){
+		if(!onlyMentions){
 			switch(n.type){
 				case MENTION -> {
 					if(!getLocalPrefs().notificationFilters.mention)
@@ -164,7 +163,7 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 	protected void doLoadData(int offset, int count){
 		AccountSessionManager.getInstance()
 				.getAccount(accountID).getCacheController()
-				.getNotifications(offset>0 ? maxID : null, count, onlyMentions, onlyPosts, refreshing && !reloadingFromCache, new SimpleCallback<>(this){
+				.getNotifications(offset>0 ? maxID : null, count, onlyMentions, false, refreshing && !reloadingFromCache, new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(PaginatedResponse<List<Notification>> result){
 						if(getActivity()==null)
@@ -186,7 +185,7 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 					}
 				});
 	}
-	
+
 	@Override
 	protected void onRelationshipsLoaded(){
 		if(getActivity()==null)
@@ -201,13 +200,10 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 	@Override
 	protected void onShown(){
 		super.onShown();
-		if(!dataLoading){
-			if(onlyMentions){
-				refresh();
-			}else{
-				reloadingFromCache=true;
-				refresh();
-			}
+		unreadMarker=realUnreadMarker=AccountSessionManager.get(accountID).getLastKnownNotificationsMarker();
+		if(!dataLoading && canRefreshWithoutUpsettingUser()){
+			reloadingFromCache=true;
+			refresh();
 		}
 	}
 
@@ -268,13 +264,6 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 		}
 	}
 
-	@Override
-	public void onSaveInstanceState(Bundle outState){
-		super.onSaveInstanceState(outState);
-		outState.putBoolean("onlyMentions", onlyMentions);
-		outState.putBoolean("onlyPosts", onlyPosts);
-	}
-
 	private Notification getNotificationByID(String id){
 		for(Notification n:data){
 			if(n.id.equals(id))
@@ -380,11 +369,38 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 		adapter.notifyItemRangeRemoved(index, lastIndex-index);
 	}
 
+
 	@Override
 	protected boolean needDividerForExtraItem(View child, View bottomSibling, RecyclerView.ViewHolder holder, RecyclerView.ViewHolder siblingHolder){
 		return super.needDividerForExtraItem(child, bottomSibling, holder, siblingHolder) || (siblingHolder!=null && siblingHolder.getAbsoluteAdapterPosition()>=adapter.getItemCount());
 	}
 
+	@Override
+	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater){
+		inflater.inflate(R.menu.notifications, menu);
+		markAllReadItem=menu.findItem(R.id.mark_all_read);
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item){
+		if(item.getItemId()==R.id.mark_all_read){
+			markAsRead();
+			resetUnreadBackground();
+		}
+		return true;
+	}
+
+	private void markAsRead(){
+		if(data.isEmpty())
+			return;
+		String id=data.get(0).id;
+		if(ObjectIdComparator.INSTANCE.compare(id, realUnreadMarker)>0){
+			new SaveMarkers(null, id).exec(accountID);
+			AccountSessionManager.get(accountID).setNotificationsMarker(id, true);
+			realUnreadMarker=id;
+		}
+	}
+
 	void resetUnreadBackground(){
 		if (getParentFragment() instanceof NotificationsFragment nf) {
 			nf.unreadMarker=nf.realUnreadMarker;
@@ -396,13 +412,20 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 	public void onRefresh(){
 		super.onRefresh();
 		if (getParentFragment() instanceof NotificationsFragment nf) {
-			if (!onlyMentions && !onlyPosts) nf.markAsRead();
+			if (!onlyMentions) nf.markAsRead();
 			else AccountSessionManager.get(accountID).reloadNotificationsMarker(m->{
 				nf.unreadMarker=nf.realUnreadMarker=m;
 				nf.updateMarkAllReadButton();
 			});
 		}
 		resetUnreadBackground();
+		AccountSessionManager.get(accountID).reloadNotificationsMarker(m->{
+			unreadMarker=realUnreadMarker=m;
+		});
+	}
+
+	private void updateMarkAllReadButton(){
+		markAllReadItem.setEnabled(!data.isEmpty() && realUnreadMarker!=null && !realUnreadMarker.equals(data.get(0).id));
 	}
 
 	@Override
@@ -420,4 +443,20 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 				? "/users/" + getSession().self.username + "/interactions"
 				: "/notifications").build();
 	}
+
+	private boolean canRefreshWithoutUpsettingUser(){
+		// TODO maybe reload notifications the same way we reload the home timelines, i.e. with gaps and stuff
+		if(data.size()<=itemsPerPage)
+			return true;
+		for(int i=list.getChildCount()-1;i>=0;i--){
+			if(list.getChildViewHolder(list.getChildAt(i)) instanceof StatusDisplayItem.Holder<?> itemHolder){
+				String id=itemHolder.getItemID();
+				for(int j=0;j<data.size();j++){
+					if(data.get(j).id.equals(id))
+						return j<itemsPerPage; // Can refresh the list without losing scroll position if it is within the first page
+				}
+			}
+		}
+		return true;
+	}
 }

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

@@ -8,6 +8,8 @@ import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.Fragment;
 import android.app.assist.AssistContent;
+import android.content.ClipData;
+import android.content.ClipboardManager;
 import android.content.Intent;
 import android.content.res.ColorStateList;
 import android.content.res.Configuration;
@@ -21,12 +23,9 @@ 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;
@@ -43,8 +42,6 @@ import android.view.ViewOutlineProvider;
 import android.view.ViewTreeObserver;
 import android.view.WindowInsets;
 import android.view.inputmethod.InputMethodManager;
-import android.view.animation.TranslateAnimation;
-import android.widget.Button;
 import android.widget.EditText;
 import android.widget.FrameLayout;
 import android.widget.ImageButton;
@@ -72,11 +69,9 @@ 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;
 import org.joinmastodon.android.model.Account;
@@ -90,6 +85,7 @@ import org.joinmastodon.android.ui.OutlineProviders;
 import org.joinmastodon.android.ui.SimpleViewHolder;
 import org.joinmastodon.android.ui.SingleImagePhotoViewerListener;
 import org.joinmastodon.android.ui.photoviewer.PhotoViewer;
+import org.joinmastodon.android.ui.sheets.DecentralizationExplainerSheet;
 import org.joinmastodon.android.ui.tabs.TabLayout;
 import org.joinmastodon.android.ui.tabs.TabLayoutMediator;
 import org.joinmastodon.android.ui.text.CustomEmojiSpan;
@@ -143,7 +139,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 	private ImageView avatar;
 	private CoverImageView cover;
 	private View avatarBorder;
-	private TextView name, username, bio, followersCount, followersLabel, followingCount, followingLabel;
+	private TextView name, username, usernameDomain, bio, followersCount, followersLabel, followingCount, followingLabel;
 	private ImageView lockIcon, botIcon;
 	private ProgressBarButton actionButton, notifyButton;
 	private ViewPager2 pager;
@@ -154,7 +150,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 	private SwipeRefreshLayout refreshLayout;
 	private View followersBtn, followingBtn;
 	private EditText nameEdit, bioEdit;
-	private ProgressBar actionProgress, notifyProgress, noteSaveProgress;
+	private ProgressBar actionProgress, notifyProgress;
 	private FrameLayout[] tabViews;
 	private TabLayoutMediator tabLayoutMediator;
 	private TextView followsYouView;
@@ -197,7 +193,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 
 	// profile note
 	private FrameLayout noteWrap;
-	private ImageButton noteSaveBtn;
 	private EditText noteEdit;
 
 	@Override
@@ -220,7 +215,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			if(!isOwnProfile)
 				loadRelationship();
 			else if (isInstanceAkkoma()) {
-				maxFields = getInstance().get().pleroma.metadata.fieldsLimits.maxFields;
+				maxFields = (int) getInstance().get().pleroma.metadata.fieldsLimits.maxFields;
 			}
 		}else{
 			profileAccountID=getArguments().getString("profileAccountID");
@@ -250,6 +245,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		name=content.findViewById(R.id.name);
 		usernameWrap=content.findViewById(R.id.username_wrap);
 		username=content.findViewById(R.id.username);
+		usernameDomain=content.findViewById(R.id.username_domain);
 		lockIcon=content.findViewById(R.id.lock_icon);
 		botIcon=content.findViewById(R.id.bot_icon);
 		bio=content.findViewById(R.id.bio);
@@ -271,7 +267,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		bioEditWrap=content.findViewById(R.id.bio_edit_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);
@@ -288,46 +283,14 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 
 		noteEdit=content.findViewById(R.id.note_edit);
 		noteWrap=content.findViewById(R.id.note_edit_wrap);
-		noteSaveBtn=content.findViewById(R.id.note_save_btn);
-
-		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){
 				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()){
+			}else{
 				showFab();
-				hideNoteSaveBtnIfNotDirty();
-			}
-		});
-
-		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);
-			}
-
-			@Override
-			public void afterTextChanged(Editable s){}
-		});
-
-		noteSaveBtn.setOnFocusChangeListener((v, hasFocus)->{
-			if(!hasFocus && !noteEdit.hasFocus()){
-				showFab();
-				hideNoteSaveBtnIfNotDirty();
+				savePrivateNote(noteEdit.getText().toString());
 			}
 		});
 
@@ -435,28 +398,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		followingBtn.setOnClickListener(this::onFollowersOrFollowingClick);
 
 		content.findViewById(R.id.username_wrap).setOnClickListener(v->{
-			try {
-				new GetInstance()
-						.setCallback(new Callback<>(){
-							@Override
-							public void onSuccess(Instance result){
-								Bundle args = new Bundle();
-								args.putParcelable("instance", Parcels.wrap(result));
-								args.putString("account", accountID);
-								Nav.go(getActivity(), SettingsServerFragment.class, args);
-							}
-
-							@Override
-							public void onError(ErrorResponse error){
-								error.showToast(getContext());
-							}
-						})
-						.wrapProgress((Activity) getContext(), R.string.loading, true)
-						.execRemote(Uri.parse(account.url).getHost());
-			} catch (NullPointerException ignored) {
-				// maybe the url was malformed?
-				Toast.makeText(getContext(), R.string.error, Toast.LENGTH_SHORT).show();
-			}
+			new DecentralizationExplainerSheet(getActivity(), accountID, account).show();
 		});
 
 		content.findViewById(R.id.username_wrap).setOnLongClickListener(v->{
@@ -464,7 +406,8 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			if(!usernameString.contains("@")){
 				usernameString+="@"+domain;
 			}
-			UiUtils.copyText(username, '@'+usernameString);
+			getActivity().getSystemService(ClipboardManager.class).setPrimaryClip(ClipData.newPlainText(null, "@"+usernameString));
+			UiUtils.maybeShowTextCopiedToast(getActivity());
 			return true;
 		});
 
@@ -492,13 +435,17 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		nameEdit.addTextChangedListener(new SimpleTextWatcher(e->editDirty=true));
 		bioEdit.addTextChangedListener(new SimpleTextWatcher(e->editDirty=true));
 
-		return sizeWrapper;
-	}
 
-	private void hideNoteSaveBtnIfNotDirty(){
-		if(noteEdit.getText().toString().equals(relationship.note)){
-			V.setVisibilityAnimated(noteSaveBtn, View.INVISIBLE);
-		}
+//		qrCodeButton.setOnClickListener(v->{
+//			Bundle args=new Bundle();
+//			args.putString("account", accountID);
+//			args.putParcelable("targetAccount", Parcels.wrap(account));
+//			ProfileQrCodeFragment qf=new ProfileQrCodeFragment();
+//			qf.setArguments(args);
+//			qf.show(getChildFragmentManager(), "qrDialog");
+//		});
+
+		return sizeWrapper;
 	}
 
 	private void showPrivateNote(){
@@ -517,8 +464,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			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) {
@@ -529,8 +474,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			@Override
 			public void onError(ErrorResponse error) {
 				error.showToast(getContext());
-				V.setVisibilityAnimated(noteSaveProgress, View.GONE);
-				V.setVisibilityAnimated(noteSaveBtn, View.VISIBLE);
 			}
 		}).exec(accountID);
 	}
@@ -693,6 +636,13 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			getChildFragmentManager().putFragment(outState, "pinnedPosts", pinnedPostsFragment);
 	}
 
+	@Override
+	public void onHidden(){
+		if (relationship != null && !noteEdit.getText().toString().equals(relationship.note)){
+			savePrivateNote(noteEdit.getText().toString());
+		}
+	}
+
 	@Override
 	public void onConfigurationChanged(Configuration newConfig){
 		super.onConfigurationChanged(newConfig);
@@ -755,13 +705,18 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			}
 		}
 
-		boolean isSelf=AccountSessionManager.getInstance().isSelf(accountID, account);
+//		boolean isSelf=AccountSessionManager.getInstance().isSelf(accountID, account);
 
-		String acct = ((isSelf || account.isRemote)
-					? account.getFullyQualifiedName()
-					: account.acct);
+//		String acct = ((isSelf || account.isRemote)
+//					? account.getFullyQualifiedName()
+//					: account.acct);
 
-		username.setText('@'+acct);
+		username.setText("@"+account.username);
+
+		String domain=account.getDomain();
+		if(TextUtils.isEmpty(domain))
+			domain=AccountSessionManager.get(accountID).domain;
+		usernameDomain.setText(domain);
 
 		lockIcon.setVisibility(account.locked ? View.VISIBLE : View.GONE);
 		lockIcon.setImageTintList(ColorStateList.valueOf(username.getCurrentTextColor()));
@@ -780,7 +735,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)
@@ -812,7 +767,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		}
 
 		for(AccountField field:account.fields){
-			field.parsedValue=ssb=HtmlParser.parse(field.value, account.emojis, Collections.emptyList(), Collections.emptyList(), accountID);
+			field.parsedValue=ssb=HtmlParser.parse(field.value, account.emojis, Collections.emptyList(), Collections.emptyList(), accountID, account);
 			field.valueEmojis=ssb.getSpans(0, ssb.length(), CustomEmojiSpan.class);
 			ssb=new SpannableStringBuilder(field.name);
 			HtmlParser.parseCustomEmoji(ssb, account.emojis);
@@ -857,23 +812,17 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			return;
 		inflater.inflate(isOwnProfile ? R.menu.profile_own : R.menu.profile, menu);
 		if(isOwnProfile){
-			UiUtils.enableOptionsMenuIcons(getActivity(), menu, R.id.scheduled, R.id.bookmarks, R.id.favorites);
+			UiUtils.enableOptionsMenuIcons(getActivity(), menu, R.id.scheduled, R.id.bookmarks);
 		}else{
-			UiUtils.enableOptionsMenuIcons(getActivity(), menu, R.id.bookmarks, R.id.followed_hashtags, R.id.favorites, R.id.scheduled);
+			UiUtils.enableOptionsMenuIcons(getActivity(), menu, R.id.edit_note);
 		}
 		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){
-			accountsMenu.clear();
-			UiUtils.populateAccountsMenu(accountID, accountsMenu, s-> UiUtils.openURL(
-					getActivity(), s.getID(), account.url, false
-			));
-		}
+		menu.findItem(R.id.open_with_account).setVisible(hasMultipleAccounts);
 
 		if(isOwnProfile) {
 			if (isInstancePixelfed()) menu.findItem(R.id.scheduled).setVisible(false);
+			menu.findItem(R.id.favorites).setIcon(GlobalUserPreferences.likeIcon ? R.drawable.ic_fluent_heart_20_regular : R.drawable.ic_fluent_star_20_regular);
+			UiUtils.insetPopupMenuIcon(getContext(), menu.findItem(R.id.favorites));
 			return;
 		}
 
@@ -902,18 +851,15 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		}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);
+		boolean canAddNote = noteWrap.getVisibility()==View.GONE && (relationship.note==null || relationship.note.isEmpty());
+		menu.findItem(R.id.edit_note).setTitle(canAddNote ? R.string.sk_add_note : R.string.sk_delete_note);
 	}
 
 	@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, account.url);
-			startActivity(Intent.createChooser(intent, item.getTitle()));
+			UiUtils.openSystemShareSheet(getActivity(), account);
 		}else if(id==R.id.mute){
 			UiUtils.confirmToggleMuteUser(getActivity(), accountID, account, relationship.muting, this::updateRelationship);
 		}else if(id==R.id.block){
@@ -994,8 +940,13 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 					InputMethodManager imm=getActivity().getSystemService(InputMethodManager.class);
 					imm.showSoftInput(noteEdit, 0);
 				}, 100);
-			}else if(relationship.note.isEmpty()){
+			}else if(relationship.note.isEmpty() && noteEdit.getText().toString().isEmpty()){
 				hidePrivateNote();
+				noteEdit.clearFocus();
+				noteEdit.postDelayed(()->{
+					InputMethodManager imm=getActivity().getSystemService(InputMethodManager.class);
+					imm.hideSoftInputFromWindow(noteEdit.getWindowToken(), 0);
+				}, 100);
 				UiUtils.beginLayoutTransition(scrollableContent);
 			}else{
 				new M3AlertDialogBuilder(getActivity())
@@ -1005,6 +956,10 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 						.show();
 			}
 			invalidateOptionsMenu();
+		}else if(id==R.id.open_with_account){
+			UiUtils.pickAccount(getActivity(), accountID, R.string.sk_open_with_account, R.drawable.ic_fluent_person_swap_24_regular, session ->UiUtils.openURL(
+					getActivity(), session.getID(), account.url, false
+			), null);
 		}
 		return true;
 	}
@@ -1038,13 +993,10 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		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));
 		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);
 	}
 
@@ -1399,7 +1351,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 				return;
 			int radius=V.dp(25);
 			currentPhotoViewer=new PhotoViewer(getActivity(), createFakeAttachments(TextUtils.isEmpty(account.avatar) ? getSession().getDefaultAvatarUrl() : account.avatar, ava), 0,
-					new SingleImagePhotoViewerListener(avatar, avatarBorder, new int[]{radius, radius, radius, radius}, this, ()->currentPhotoViewer=null, ()->ava, null, null));
+					null, accountID, new SingleImagePhotoViewerListener(avatar, avatarBorder, new int[]{radius, radius, radius, radius}, this, ()->currentPhotoViewer=null, ()->ava, null, null));
 		}
 	}
 
@@ -1411,7 +1363,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			if(drawable==null || drawable instanceof ColorDrawable)
 				return;
 			currentPhotoViewer=new PhotoViewer(getActivity(), createFakeAttachments(account.header, drawable), 0,
-					new SingleImagePhotoViewerListener(cover, cover, null, this, ()->currentPhotoViewer=null, ()->drawable, ()->avatarBorder.setTranslationZ(2), ()->avatarBorder.setTranslationZ(0)));
+					null, accountID, new SingleImagePhotoViewerListener(cover, cover, null, this, ()->currentPhotoViewer=null, ()->drawable, ()->avatarBorder.setTranslationZ(2), ()->avatarBorder.setTranslationZ(0)));
 		}
 	}
 
@@ -1635,8 +1587,9 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		public void setImage(int index, Drawable image){
 			CustomEmojiSpan span=index>=item.nameEmojis.length ? item.valueEmojis[index-item.nameEmojis.length] : item.nameEmojis[index];
 			span.setDrawable(image);
-			title.invalidate();
-			value.invalidate();
+			title.setText(title.getText());
+			value.setText(value.getText());
+			toolbarTitleView.setText(toolbarTitleView.getText());
 		}
 
 		@Override

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

@@ -85,7 +85,7 @@ public class ScheduledStatusListFragment extends BaseStatusListFragment<Schedule
 
 	@Override
 	protected List<StatusDisplayItem> buildDisplayItems(ScheduledStatus s) {
-		return StatusDisplayItem.buildItems(this, s.toStatus(), accountID, s, knownAccounts, null,
+		return StatusDisplayItem.buildItems(this, s.toFormattedStatus(accountID), accountID, s, knownAccounts, null,
 				StatusDisplayItem.FLAG_NO_EMOJI_REACTIONS |
 						StatusDisplayItem.FLAG_NO_FOOTER |
 						StatusDisplayItem.FLAG_NO_TRANSLATE);

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

@@ -1,7 +1,12 @@
 package org.joinmastodon.android.fragments;
 
+import android.app.ProgressDialog;
+import android.content.ClipData;
+import android.content.ClipboardManager;
 import android.graphics.drawable.ColorDrawable;
+import android.net.Uri;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -11,6 +16,8 @@ import android.widget.ProgressBar;
 
 import org.joinmastodon.android.MastodonApp;
 import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.MastodonErrorResponse;
+import org.joinmastodon.android.api.requests.accounts.CheckInviteLink;
 import org.joinmastodon.android.api.requests.catalog.GetCatalogDefaultInstances;
 import org.joinmastodon.android.api.requests.instance.GetInstance;
 import org.joinmastodon.android.fragments.onboarding.InstanceCatalogSignupFragment;
@@ -20,6 +27,7 @@ import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.model.catalog.CatalogDefaultInstance;
 import org.joinmastodon.android.ui.InterpolatingMotionEffect;
 import org.joinmastodon.android.ui.M3AlertDialogBuilder;
+import org.joinmastodon.android.ui.text.HtmlParser;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.ui.views.ProgressBarButton;
 import org.joinmastodon.android.ui.views.SizeListenerFrameLayout;
@@ -48,6 +56,9 @@ public class SplashFragment extends AppKitFragment{
 	private ProgressBar defaultServerProgress;
 	private String chosenDefaultServer=DEFAULT_SERVER;
 	private boolean loadingDefaultServer, loadedDefaultServer;
+	private Uri currentInviteLink;
+	private ProgressDialog instanceLoadingProgress;
+	private String inviteCode;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState){
@@ -110,19 +121,65 @@ public class SplashFragment extends AppKitFragment{
 		Bundle extras=new Bundle();
 		boolean isSignup=v.getId()==R.id.btn_get_started;
 		extras.putBoolean("signup", isSignup);
+		extras.putString("defaultServer", chosenDefaultServer);
 		Nav.go(getActivity(), isSignup ? InstanceCatalogSignupFragment.class : InstanceChooserLoginFragment.class, extras);
 	}
 
 	private void onJoinDefaultServerClick(View v){
 		if(loadingDefaultServer)
 			return;
+		instanceLoadingProgress=new ProgressDialog(getActivity());
+		instanceLoadingProgress.setCancelable(false);
+		instanceLoadingProgress.setMessage(getString(R.string.loading_instance));
+		instanceLoadingProgress.show();
+		if(currentInviteLink!=null){
+			new CheckInviteLink(currentInviteLink.getPath())
+					.setCallback(new Callback<>(){
+						@Override
+						public void onSuccess(CheckInviteLink.Response result){
+							inviteCode=result.inviteCode;
+							proceedWithServerDomain(currentInviteLink.getHost());
+						}
+
+						@Override
+						public void onError(ErrorResponse error){
+							if(getActivity()==null)
+								return;
+							instanceLoadingProgress.dismiss();
+							instanceLoadingProgress=null;
+							if(error instanceof MastodonErrorResponse mer){
+								switch(mer.httpStatus){
+									case 401 -> new M3AlertDialogBuilder(getActivity())
+											.setTitle(R.string.expired_invite_link)
+											.setMessage(getString(R.string.expired_clipboard_invite_link_alert, currentInviteLink.getHost(), chosenDefaultServer))
+											.setPositiveButton(R.string.ok, null)
+											.show();
+									case 404 -> new M3AlertDialogBuilder(getActivity())
+											.setTitle(R.string.invalid_invite_link)
+											.setMessage(getString(R.string.invalid_clipboard_invite_link_alert, currentInviteLink.getHost(), chosenDefaultServer))
+											.setPositiveButton(R.string.ok, null)
+											.show();
+									default -> error.showToast(getActivity());
+								}
+							}
+						}
+					})
+					.execNoAuth(currentInviteLink.getHost());
+			return;
+		}
+		proceedWithServerDomain(chosenDefaultServer);
+	}
+
+	private void proceedWithServerDomain(String domain){
 		new GetInstance()
 				.setCallback(new Callback<>(){
 					@Override
 					public void onSuccess(Instance result){
 						if(getActivity()==null)
 							return;
-						if(!result.registrations){
+						instanceLoadingProgress.dismiss();
+						instanceLoadingProgress=null;
+						if(!result.registrations && TextUtils.isEmpty(inviteCode)){
 							new M3AlertDialogBuilder(getActivity())
 									.setTitle(R.string.error)
 									.setMessage(R.string.instance_signup_closed)
@@ -132,6 +189,8 @@ public class SplashFragment extends AppKitFragment{
 						}
 						Bundle args=new Bundle();
 						args.putParcelable("instance", Parcels.wrap(result));
+						if(inviteCode!=null)
+							args.putString("inviteCode", inviteCode);
 						Nav.go(getActivity(), InstanceRulesFragment.class, args);
 					}
 
@@ -139,11 +198,12 @@ public class SplashFragment extends AppKitFragment{
 					public void onError(ErrorResponse error){
 						if(getActivity()==null)
 							return;
+						instanceLoadingProgress.dismiss();
+						instanceLoadingProgress=null;
 						error.showToast(getActivity());
 					}
 				})
-				.wrapProgress(getActivity(), R.string.loading_instance, true)
-				.execNoAuth(chosenDefaultServer);
+				.execNoAuth(domain);
 	}
 
 	private void onLearnMoreClick(View v){
@@ -198,7 +258,18 @@ public class SplashFragment extends AppKitFragment{
 	}
 
 	private void loadAndChooseDefaultServer(){
-		loadingDefaultServer=true;
+		ClipData clipData=getActivity().getSystemService(ClipboardManager.class).getPrimaryClip();
+		if(clipData!=null && clipData.getItemCount()>0){
+			CharSequence clipText=clipData.getItemAt(0).coerceToText(getActivity());
+			if(HtmlParser.INVITE_LINK_PATTERN.matcher(clipText).find()){
+				currentInviteLink=Uri.parse(clipText.toString());
+				defaultServerButton.setText(getString(R.string.join_server_x_with_invite, currentInviteLink.getHost()));
+			}
+		}else{
+			loadingDefaultServer=true;
+			defaultServerButton.setTextVisible(false);
+			defaultServerProgress.setVisibility(View.VISIBLE);
+		}
 		new GetCatalogDefaultInstances()
 				.setCallback(new Callback<>(){
 					@Override
@@ -241,7 +312,7 @@ public class SplashFragment extends AppKitFragment{
 		chosenDefaultServer=domain;
 		loadingDefaultServer=false;
 		loadedDefaultServer=true;
-		if(defaultServerButton!=null && getActivity()!=null){
+		if(defaultServerButton!=null && getActivity()!=null && currentInviteLink==null){
 			defaultServerButton.setTextVisible(true);
 			defaultServerProgress.setVisibility(View.GONE);
 			defaultServerButton.setText(getString(R.string.join_default_server, chosenDefaultServer));

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

@@ -3,8 +3,8 @@ package org.joinmastodon.android.fragments;
 import android.app.Activity;
 import android.net.Uri;
 import android.os.Bundle;
-import android.view.View;
 
+import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.statuses.GetStatusEditHistory;
 import org.joinmastodon.android.model.FilterContext;
@@ -13,7 +13,6 @@ 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;
@@ -26,6 +25,8 @@ import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
+import me.grishka.appkit.api.Callback;
+import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.api.SimpleCallback;
 import name.fraser.neil.plaintext.diff_match_patch;
 
@@ -54,12 +55,47 @@ public class StatusEditHistoryFragment extends StatusListFragment{
 					public void onSuccess(List<Status> result){
 						if(getActivity()==null) return;
 						Collections.sort(result, Comparator.comparing((Status s)->s.createdAt).reversed());
+						if(result.size()<=1&& GlobalUserPreferences.allowRemoteLoading) {
+							//server send only a single edit, which is always the original status
+							//try to get the complete history from the remote server
+							loadRemoteData(result);
+							return;
+						}
 						onDataLoaded(result, false);
 					}
 				})
 				.exec(accountID);
 	}
 
+	void loadRemoteData(List<Status> prevData){
+		String remoteURL = Uri.parse(url).getHost();
+		String[] parts=url.split("/");
+
+		if(parts.length==0||remoteURL==null) {
+			onDataLoaded(prevData, false);
+			setSubtitle(getContext().getString(R.string.sk_no_remote_info_hint));
+			return;
+		}
+
+		new GetStatusEditHistory(parts[parts.length-1])
+				.setCallback(new Callback<>(){
+					@Override
+					public void onSuccess(List<Status> result){
+						if(getActivity()==null) return;
+						Collections.sort(result, Comparator.comparing((Status s)->s.createdAt).reversed());
+						onDataLoaded(result, false);
+					}
+
+					@Override
+					public void onError(ErrorResponse errorResponse){
+						//fallback to previously loaded data
+						onDataLoaded(prevData, false);
+						setSubtitle(getContext().getString(R.string.sk_no_remote_info_hint));
+					}
+				})
+				.execNoAuth(remoteURL);
+	}
+
 	@Override
 	protected List<StatusDisplayItem> buildDisplayItems(Status s){
 		List<StatusDisplayItem> items=new ArrayList<>();

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

@@ -61,7 +61,9 @@ public abstract class StatusListFragment extends BaseStatusListFragment<Status>
 			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);
+		/* MOSHIDON: we make the filterContext null in the main status in the thread fragment, so that the main status is never filtered (because you just clicked on it).
+		This also restores old behavior that got lost to time and changes in the filter system	*/
+		return StatusDisplayItem.buildItems(this, s, accountID, s, knownAccounts, isMainThreadStatus ? null : getFilterContext(), isMainThreadStatus ? 0 : flags);
 	}
 
 	protected abstract FilterContext getFilterContext();

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

@@ -2,11 +2,19 @@ package org.joinmastodon.android.fragments;
 
 import android.net.Uri;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowInsets;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
+import org.joinmastodon.android.GlobalUserPreferences;
 import com.squareup.otto.Subscribe;
 
 import org.joinmastodon.android.E;
@@ -23,6 +31,7 @@ import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.FilterContext;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.model.StatusContext;
+import org.joinmastodon.android.ui.OutlineProviders;
 import org.joinmastodon.android.ui.BetterItemAnimator;
 import org.joinmastodon.android.ui.displayitems.ExtendedFooterStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.FooterStatusDisplayItem;
@@ -50,7 +59,13 @@ import java.util.stream.Collectors;
 
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
+import androidx.recyclerview.widget.RecyclerView;
+import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.SimpleCallback;
+import me.grishka.appkit.imageloader.ViewImageLoader;
+import me.grishka.appkit.imageloader.requests.UrlImageLoaderRequest;
+import me.grishka.appkit.utils.MergeRecyclerAdapter;
+import me.grishka.appkit.utils.SingleViewRecyclerAdapter;
 import me.grishka.appkit.utils.V;
 
 public class ThreadFragment extends StatusListFragment implements ProvidesAssistContent {
@@ -58,10 +73,16 @@ public class ThreadFragment extends StatusListFragment implements ProvidesAssist
 	private final HashMap<String, NeighborAncestryInfo> ancestryMap = new HashMap<>();
 	private StatusContext result;
 	protected boolean contextInitiallyRendered, transitionFinished, preview;
+	private FrameLayout replyContainer;
+	private LinearLayout replyButton;
+	private ImageView replyButtonAva;
+	private TextView replyButtonText;
+	private int lastBottomInset;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
+		setLayout(R.layout.fragment_thread);
 		mainStatus=Parcels.unwrap(getArguments().getParcelable("status"));
 		replyTo=Parcels.unwrap(getArguments().getParcelable("inReplyTo"));
 		Account inReplyToAccount=Parcels.unwrap(getArguments().getParcelable("inReplyToAccount"));
@@ -143,10 +164,10 @@ public class ThreadFragment extends StatusListFragment implements ProvidesAssist
 				}
 			}
 		}
-    
+
 		for (int deleteThisItem : deleteTheseItems) itemsToModify.remove(deleteThisItem);
 		if(s.id.equals(mainStatus.id)) {
-			items.add(new ExtendedFooterStatusDisplayItem(s.id, this, accountID, s.getContentStatus()));
+			itemsToModify.add(itemsToModify.size()-1, new ExtendedFooterStatusDisplayItem(s.id, this, accountID, s.getContentStatus()));
 		}
 		return items;
 	}
@@ -207,12 +228,16 @@ public class ThreadFragment extends StatusListFragment implements ProvidesAssist
 				s.spoilerRevealed = oldStatus.spoilerRevealed;
 				s.sensitiveRevealed = oldStatus.sensitiveRevealed;
 				s.filterRevealed = oldStatus.filterRevealed;
+				s.textExpanded = oldStatus.textExpanded;
 			}
 			if (GlobalUserPreferences.autoRevealEqualSpoilers != AutoRevealMode.NEVER &&
-					s.spoilerText != null &&
-					s.spoilerText.equals(mainStatus.spoilerText)) {
-				if (GlobalUserPreferences.autoRevealEqualSpoilers == AutoRevealMode.DISCUSSIONS || Objects.equals(mainStatus.account.id, s.account.id)) {
-					s.spoilerRevealed = mainStatus.spoilerRevealed;
+					s.spoilerText != null){
+				if (s.spoilerText.equals(mainStatus.spoilerText) ||
+						(s.spoilerText.toLowerCase().startsWith("re: ") &&
+								s.spoilerText.substring(4).equals(mainStatus.spoilerText))){
+					if (GlobalUserPreferences.autoRevealEqualSpoilers == AutoRevealMode.DISCUSSIONS || Objects.equals(mainStatus.account.id, s.account.id)) {
+						s.spoilerRevealed = mainStatus.spoilerRevealed;
+					}
 				}
 			}
 		}
@@ -283,6 +308,13 @@ public class ThreadFragment extends StatusListFragment implements ProvidesAssist
 		updatedStatus.filterRevealed = mainStatus.filterRevealed;
 		updatedStatus.spoilerRevealed = mainStatus.spoilerRevealed;
 		updatedStatus.sensitiveRevealed = mainStatus.sensitiveRevealed;
+		updatedStatus.textExpanded = mainStatus.textExpanded;
+		if(updatedStatus.quote!=null && mainStatus.quote!=null){
+			updatedStatus.quote.filterRevealed = mainStatus.quote.filterRevealed;
+			updatedStatus.quote.spoilerRevealed = mainStatus.quote.spoilerRevealed;
+			updatedStatus.quote.sensitiveRevealed = mainStatus.quote.sensitiveRevealed;
+			updatedStatus.quote.textExpanded = mainStatus.quote.textExpanded;
+		}
 
 		// returning fired event object to facilitate testing
 		Object event;
@@ -387,6 +419,22 @@ public class ThreadFragment extends StatusListFragment implements ProvidesAssist
 	@Override
 	public void onViewCreated(View view, Bundle savedInstanceState){
 		super.onViewCreated(view, savedInstanceState);
+		replyContainer=view.findViewById(R.id.reply_button_wrapper);
+		replyButton=replyContainer.findViewById(R.id.reply_button);
+		replyButtonText=replyButton.findViewById(R.id.reply_btn_text);
+		replyButtonAva=replyButton.findViewById(R.id.avatar);
+		replyButton.setOutlineProvider(OutlineProviders.roundedRect(20));
+		replyButton.setClipToOutline(true);
+		replyButtonText.setText(HtmlParser.parseCustomEmoji(getString(R.string.reply_to_user, mainStatus.account.displayName), mainStatus.account.emojis));
+		UiUtils.loadCustomEmojiInTextView(replyButtonText);
+		replyButtonAva.setOutlineProvider(OutlineProviders.OVAL);
+		replyButtonAva.setClipToOutline(true);
+		replyButton.setOnClickListener(v->openReply(mainStatus, accountID));
+		replyButton.setOnLongClickListener(this::onReplyLongClick);
+		Account self=AccountSessionManager.get(accountID).self;
+		if(!TextUtils.isEmpty(self.avatar)){
+			ViewImageLoader.loadWithoutAnimation(replyButtonAva, getResources().getDrawable(R.drawable.image_placeholder), new UrlImageLoaderRequest(self.avatar, V.dp(24), V.dp(24)));
+		}
 		UiUtils.loadCustomEmojiInTextView(toolbarTitleView);
 		showContent();
 		if(!loaded)
@@ -526,4 +574,36 @@ public class ThreadFragment extends StatusListFragment implements ProvidesAssist
 		}
 		super.onErrorRetryClick();
 	}
+
+	@Override
+	public void onApplyWindowInsets(WindowInsets insets){
+		lastBottomInset=insets.getSystemWindowInsetBottom();
+		super.onApplyWindowInsets(UiUtils.applyBottomInsetToFixedView(replyContainer, insets));
+	}
+
+	private void openReply(Status status, String accountID){
+		maybeShowPreReplySheet(status, ()->{
+			Bundle args=new Bundle();
+			args.putString("account", accountID);
+			args.putParcelable("replyTo", Parcels.wrap(status));
+			args.putBoolean("fromThreadFragment", true);
+			Nav.go(getActivity(), ComposeFragment.class, args);
+		});
+	}
+	private boolean onReplyLongClick(View v) {
+		if(mainStatus.preview) return false;
+		if (AccountSessionManager.getInstance().getLoggedInAccounts().size() < 2) return false;
+		UiUtils.pickAccount(v.getContext(), accountID, R.string.sk_reply_as, R.drawable.ic_fluent_arrow_reply_28_regular, session -> {
+			String pickedAccountID = session.getID();
+				UiUtils.lookupStatus(v.getContext(), mainStatus, pickedAccountID, accountID, status -> {
+				if (status == null) return;
+				openReply(status, pickedAccountID);
+			});
+		}, null);
+		return true;
+	}
+
+	public int getSnackbarOffset(){
+		return replyContainer.getHeight()-lastBottomInset;
+	}
 }

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

@@ -6,7 +6,9 @@ import android.text.TextUtils;
 import android.view.View;
 
 import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.api.requests.search.GetSearchResults;
+import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.SearchResults;
 import org.joinmastodon.android.model.viewmodel.AccountViewModel;
 import org.joinmastodon.android.ui.SearchViewHelper;
@@ -14,13 +16,14 @@ import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.ui.viewholders.AccountViewHolder;
 import org.parceler.Parcels;
 
+import java.util.List;
 import java.util.stream.Collectors;
 
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.SimpleCallback;
 
-public class ComposeAccountSearchFragment extends BaseAccountListFragment{
-	private String currentQuery;
+public class AccountSearchFragment extends BaseAccountListFragment{
+	protected String currentQuery;
 	private boolean resultDelivered;
 	private SearchViewHelper searchViewHelper;
 
@@ -29,12 +32,11 @@ public class ComposeAccountSearchFragment extends BaseAccountListFragment{
 		super.onCreate(savedInstanceState);
 		setRefreshEnabled(false);
 		setEmptyText("");
-		dataLoaded();
 	}
 
 	@Override
 	public void onViewCreated(View view, Bundle savedInstanceState){
-		searchViewHelper=new SearchViewHelper(getActivity(), getToolbarContext(), getString(R.string.search_hint));
+		searchViewHelper=new SearchViewHelper(getActivity(), getToolbarContext(), getSearchViewPlaceholder());
 		searchViewHelper.setListeners(this::onQueryChanged, null);
 		searchViewHelper.addDivider(contentView);
 		super.onViewCreated(view, savedInstanceState);
@@ -52,13 +54,21 @@ public class ComposeAccountSearchFragment extends BaseAccountListFragment{
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(SearchResults result){
-						setEmptyText(R.string.no_search_results);
-						onDataLoaded(result.accounts.stream().map(a->new AccountViewModel(a, accountID)).collect(Collectors.toList()), false);
+						AccountSearchFragment.this.onSuccess(result.accounts);
 					}
 				})
 				.exec(accountID);
 	}
 
+	protected void onSuccess(List<Account> result){
+		setEmptyText(R.string.no_search_results);
+		onDataLoaded(result.stream().map(a->new AccountViewModel(a, accountID)).collect(Collectors.toList()), false);
+	}
+
+	protected String getSearchViewPlaceholder(){
+		return getString(R.string.search_hint);
+	}
+
 	@Override
 	protected void onUpdateToolbar(){
 		super.onUpdateToolbar();

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

@@ -0,0 +1,37 @@
+package org.joinmastodon.android.fragments.account_list;
+
+import android.os.Bundle;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.accounts.SearchAccounts;
+import org.joinmastodon.android.model.Account;
+
+import java.util.List;
+
+import me.grishka.appkit.api.SimpleCallback;
+
+public class AddListMembersFragment extends AccountSearchFragment{
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		dataLoaded();
+	}
+
+	@Override
+	protected void doLoadData(int offset, int count){
+		refreshing=true;
+		currentRequest=new SearchAccounts(currentQuery, 0, 0, false, true)
+				.setCallback(new SimpleCallback<>(this){
+					@Override
+					public void onSuccess(List<Account> result){
+						AddListMembersFragment.this.onSuccess(result);
+					}
+				})
+				.exec(accountID);
+	}
+
+	@Override
+	protected String getSearchViewPlaceholder(){
+		return getString(R.string.search_among_people_you_follow);
+	}
+}

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

@@ -0,0 +1,125 @@
+package org.joinmastodon.android.fragments.account_list;
+
+import android.annotation.SuppressLint;
+import android.content.res.TypedArray;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.widget.Button;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.accounts.GetAccountFollowing;
+import org.joinmastodon.android.api.requests.accounts.SearchAccounts;
+import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.model.HeaderPaginationList;
+import org.joinmastodon.android.model.viewmodel.AccountViewModel;
+import org.joinmastodon.android.ui.viewholders.AccountViewHolder;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+import me.grishka.appkit.api.SimpleCallback;
+import me.grishka.appkit.utils.V;
+
+@SuppressLint("ValidFragment") // This shouldn't be part of any saved states anyway
+public class AddNewListMembersFragment extends AccountSearchFragment{
+	private Listener listener;
+	private String maxID;
+
+	public AddNewListMembersFragment(Listener listener){
+		this.listener=listener;
+	}
+
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		loadData();
+	}
+
+	@Override
+	protected void doLoadData(int offset, int count){
+		if(TextUtils.isEmpty(currentQuery)){
+			currentRequest=new GetAccountFollowing(AccountSessionManager.get(accountID).self.id, offset>0 ? maxID : null, count)
+					.setCallback(new SimpleCallback<>(this){
+						@Override
+						public void onSuccess(HeaderPaginationList<Account> result){
+							setEmptyText("");
+							onDataLoaded(result.stream().map(a->new AccountViewModel(a, accountID)).collect(Collectors.toList()), result.nextPageUri!=null);
+							maxID=result.getNextPageMaxID();
+						}
+					})
+					.exec(accountID);
+		}else{
+			refreshing=true;
+			currentRequest=new SearchAccounts(currentQuery, 0, 0, false, true)
+					.setCallback(new SimpleCallback<>(this){
+						@Override
+						public void onSuccess(List<Account> result){
+							AddNewListMembersFragment.this.onSuccess(result);
+						}
+					})
+					.exec(accountID);
+		}
+	}
+
+	@Override
+	protected String getSearchViewPlaceholder(){
+		return getString(R.string.search_among_people_you_follow);
+	}
+
+	@Override
+	protected void onConfigureViewHolder(AccountViewHolder holder){
+		holder.setStyle(AccountViewHolder.AccessoryType.CUSTOM_BUTTON, false);
+		holder.setOnLongClickListener(vh->false);
+		Button button=holder.getButton();
+		button.setPadding(V.dp(24), 0, V.dp(24), 0);
+		button.setMinimumWidth(0);
+		button.setMinWidth(0);
+		button.setOnClickListener(v->{
+			holder.setActionProgressVisible(true);
+			holder.itemView.setHasTransientState(true);
+			Runnable onDone=()->{
+				holder.setActionProgressVisible(false);
+				holder.itemView.setHasTransientState(false);
+				onBindViewHolder(holder);
+			};
+			AccountViewModel account=holder.getItem();
+			if(listener.isAccountInList(account)){
+				listener.removeAccountAccountFromList(account, onDone);
+			}else{
+				listener.addAccountToList(account, onDone);
+			}
+		});
+	}
+
+	@Override
+	protected void onBindViewHolder(AccountViewHolder holder){
+		Button button=holder.getButton();
+		int textRes, styleRes;
+		if(listener.isAccountInList(holder.getItem())){
+			textRes=R.string.remove;
+			styleRes=R.style.Widget_Mastodon_M3_Button_Tonal_Error;
+		}else{
+			textRes=R.string.add;
+			styleRes=R.style.Widget_Mastodon_M3_Button_Filled;
+		}
+		button.setText(textRes);
+		TypedArray ta=button.getContext().obtainStyledAttributes(styleRes, new int[]{android.R.attr.background});
+		button.setBackground(ta.getDrawable(0));
+		ta.recycle();
+		ta=button.getContext().obtainStyledAttributes(styleRes, new int[]{android.R.attr.textColor});
+		button.setTextColor(ta.getColorStateList(0));
+		ta.recycle();
+	}
+
+	@Override
+	protected void loadRelationships(List<AccountViewModel> accounts){
+		// no-op
+	}
+
+	public interface Listener{
+		boolean isAccountInList(AccountViewModel account);
+		void addAccountToList(AccountViewModel account, Runnable onDone);
+		void removeAccountAccountFromList(AccountViewModel account, Runnable onDone);
+	}
+}

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

@@ -39,6 +39,7 @@ public abstract class BaseAccountListFragment extends MastodonRecyclerFragment<A
 	protected HashMap<String, Relationship> relationships=new HashMap<>();
 	protected String accountID;
 	protected ArrayList<APIRequest<?>> relationshipsRequests=new ArrayList<>();
+	protected int itemLayoutRes=R.layout.item_account_list;
 
 	public BaseAccountListFragment(){
 		super(40);
@@ -74,6 +75,8 @@ public abstract class BaseAccountListFragment extends MastodonRecyclerFragment<A
 
 	protected void loadRelationships(List<AccountViewModel> accounts){
 		Set<String> ids=accounts.stream().map(ai->ai.account.id).collect(Collectors.toSet());
+		if(ids.isEmpty())
+			return;
 		GetAccountRelationships req=new GetAccountRelationships(ids);
 		relationshipsRequests.add(req);
 		req.setCallback(new Callback<>(){
@@ -124,13 +127,6 @@ public abstract class BaseAccountListFragment extends MastodonRecyclerFragment<A
 		Toolbar toolbar=getToolbar();
 		if(toolbar!=null && toolbar.getNavigationIcon()!=null){
 			toolbar.setNavigationContentDescription(R.string.back);
-			if(hasSubtitle()){
-				toolbar.setTitleTextAppearance(getActivity(), R.style.m3_title_medium);
-				toolbar.setSubtitleTextAppearance(getActivity(), R.style.m3_body_medium);
-				int color=UiUtils.getThemeColor(getActivity(), android.R.attr.textColorPrimary);
-				toolbar.setTitleTextColor(color);
-				toolbar.setSubtitleTextColor(color);
-			}
 		}
 	}
 
@@ -162,6 +158,7 @@ public abstract class BaseAccountListFragment extends MastodonRecyclerFragment<A
 	}
 
 	protected void onConfigureViewHolder(AccountViewHolder holder){}
+	protected void onBindViewHolder(AccountViewHolder holder){}
 
 	protected class AccountsAdapter extends UsableRecyclerView.Adapter<AccountViewHolder> implements ImageLoaderRecyclerAdapter{
 		public AccountsAdapter(){
@@ -171,7 +168,7 @@ public abstract class BaseAccountListFragment extends MastodonRecyclerFragment<A
 		@NonNull
 		@Override
 		public AccountViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType){
-			AccountViewHolder holder=new AccountViewHolder(BaseAccountListFragment.this, parent, relationships);
+			AccountViewHolder holder=new AccountViewHolder(BaseAccountListFragment.this, parent, relationships, itemLayoutRes);
 			onConfigureViewHolder(holder);
 			return holder;
 		}
@@ -179,6 +176,7 @@ public abstract class BaseAccountListFragment extends MastodonRecyclerFragment<A
 		@Override
 		public void onBindViewHolder(AccountViewHolder holder, int position){
 			holder.bind(data.get(position));
+			BaseAccountListFragment.this.onBindViewHolder(holder);
 			super.onBindViewHolder(holder, position);
 		}
 

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

@@ -279,8 +279,8 @@ public class DiscoverAccountsFragment extends MastodonRecyclerFragment<DiscoverA
 				cover.setImageDrawable(image);
 			}else{
 				item.emojiHelper.setImageDrawable(index-2, image);
-				name.invalidate();
-				bio.invalidate();
+				name.setText(name.getText());
+				bio.setText(bio.getText());
 			}
 			if(image instanceof Animatable a && !a.isRunning())
 				a.start();

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

@@ -1,6 +1,7 @@
 package org.joinmastodon.android.fragments.discover;
 
 import android.app.Fragment;
+import android.app.assist.AssistContent;
 import android.os.Build;
 import android.os.Bundle;
 import android.text.TextUtils;
@@ -24,6 +25,7 @@ import org.joinmastodon.android.ui.SimpleViewHolder;
 import org.joinmastodon.android.ui.tabs.TabLayout;
 import org.joinmastodon.android.ui.tabs.TabLayoutMediator;
 import org.joinmastodon.android.ui.utils.UiUtils;
+import org.joinmastodon.android.utils.ProvidesAssistContent;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -35,7 +37,7 @@ import me.grishka.appkit.fragments.BaseRecyclerFragment;
 import me.grishka.appkit.fragments.OnBackPressedListener;
 import me.grishka.appkit.utils.V;
 
-public class DiscoverFragment extends AppKitFragment implements ScrollableToTop, OnBackPressedListener, IsOnTop {
+public class DiscoverFragment extends AppKitFragment implements ScrollableToTop, OnBackPressedListener, IsOnTop, ProvidesAssistContent{
 	private static final int QUERY_RESULT=937;
 
 	private TabLayout tabLayout;
@@ -80,8 +82,8 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 		for(int i=0;i<tabViews.length;i++){
 			FrameLayout tabView=new FrameLayout(getActivity());
 			tabView.setId(switch(i){
-				case 0 -> R.id.discover_hashtags;
-				case 1 -> R.id.discover_posts;
+				case 0 -> R.id.discover_posts;
+				case 1 -> R.id.discover_hashtags;
 				case 2 -> R.id.discover_news;
 				case 3 -> R.id.discover_users;
 				default -> throw new IllegalStateException("Unexpected value: "+i);
@@ -125,8 +127,8 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 			accountsFragment.setArguments(args);
 
 			getChildFragmentManager().beginTransaction()
-					.add(R.id.discover_hashtags, hashtagsFragment)
 					.add(R.id.discover_posts, postsFragment)
+					.add(R.id.discover_hashtags, hashtagsFragment)
 					.add(R.id.discover_news, newsFragment)
 					.add(R.id.discover_users, accountsFragment)
 					.commit();
@@ -136,8 +138,8 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 			@Override
 			public void onConfigureTab(@NonNull TabLayout.Tab tab, int position){
 				tab.setText(switch(position){
-					case 0 -> R.string.hashtags;
-					case 1 -> R.string.posts;
+					case 0 -> R.string.posts;
+					case 1 -> R.string.hashtags;
 					case 2 -> R.string.news;
 					case 3 -> R.string.for_you;
 					default -> throw new IllegalStateException("Unexpected value: "+position);
@@ -258,8 +260,8 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 
 	private Fragment getFragmentForPage(int page){
 		return switch(page){
-			case 0 -> hashtagsFragment;
-			case 1 -> postsFragment;
+			case 0 -> postsFragment;
+			case 1 -> hashtagsFragment;
 			case 2 -> newsFragment;
 			case 3 -> accountsFragment;
 			default -> throw new IllegalStateException("Unexpected value: "+page);
@@ -291,6 +293,13 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 		}
 	}
 
+	@Override
+	public void onProvideAssistContent(AssistContent assistContent) {
+		callFragmentToProvideAssistContent(searchActive
+				? searchFragment
+				: getFragmentForPage(pager.getCurrentItem()), assistContent);
+	}
+
 	private class DiscoverPagerAdapter extends RecyclerView.Adapter<SimpleViewHolder>{
 		@NonNull
 		@Override

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

@@ -2,6 +2,7 @@ package org.joinmastodon.android.fragments.discover;
 
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
+import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.view.View;
@@ -19,6 +20,8 @@ import org.joinmastodon.android.ui.OutlineProviders;
 import org.joinmastodon.android.ui.drawables.BlurhashCrossfadeDrawable;
 import org.joinmastodon.android.ui.utils.DiscoverInfoBannerHelper;
 import org.joinmastodon.android.ui.utils.UiUtils;
+import org.joinmastodon.android.utils.ProvidesAssistContent;
+import org.parceler.Parcels;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -27,6 +30,7 @@ import java.util.stream.Collectors;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
+import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.SimpleCallback;
 import me.grishka.appkit.fragments.BaseRecyclerFragment;
 import me.grishka.appkit.imageloader.ImageLoaderRecyclerAdapter;
@@ -40,7 +44,7 @@ import me.grishka.appkit.utils.SingleViewRecyclerAdapter;
 import me.grishka.appkit.utils.V;
 import me.grishka.appkit.views.UsableRecyclerView;
 
-public class DiscoverNewsFragment extends BaseRecyclerFragment<CardViewModel> implements ScrollableToTop, IsOnTop{
+public class DiscoverNewsFragment extends BaseRecyclerFragment<CardViewModel> implements ScrollableToTop, IsOnTop, ProvidesAssistContent.ProvidesWebUri{
 	private String accountID;
 	private DiscoverInfoBannerHelper bannerHelper;
 	private MergeRecyclerAdapter mergeAdapter;
@@ -115,6 +119,16 @@ public class DiscoverNewsFragment extends BaseRecyclerFragment<CardViewModel> im
 		return isRecyclerViewOnTop(list);
 	}
 
+	@Override
+	public String getAccountID() {
+		return accountID;
+	}
+
+	@Override
+	public Uri getWebUri(Uri.Builder base) {
+		return isInstanceAkkoma() ? null : base.path("/explore/links").build();
+	}
+
 	private class LinksAdapter extends UsableRecyclerView.Adapter<BaseLinkViewHolder> implements ImageLoaderRecyclerAdapter{
 		private final List<CardViewModel> data;
 
@@ -203,7 +217,16 @@ public class DiscoverNewsFragment extends BaseRecyclerFragment<CardViewModel> im
 
 		@Override
 		public void onClick(){
-			UiUtils.launchWebBrowser(getActivity(), item.url);
+			//TODO: enable timeline for all servers once 4.3.0 is released
+			if(getInstance().isEmpty() ||
+					!getInstance().get().checkVersion(4,3,0)){
+				UiUtils.launchWebBrowser(getActivity(), item.url);
+				return;
+			}
+			Bundle args=new Bundle();
+			args.putString("account", accountID);
+			args.putParcelable("trendingLink", Parcels.wrap(item));
+			Nav.go(getActivity(), DiscoverTrendingLinkTimelineFragment.class, args);
 		}
 	}
 

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

@@ -18,7 +18,7 @@ import me.grishka.appkit.utils.MergeRecyclerAdapter;
 
 public class DiscoverPostsFragment extends StatusListFragment{
 	private DiscoverInfoBannerHelper bannerHelper;
-	private int offset;
+	private int realOffset=0;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState){
@@ -26,26 +26,23 @@ public class DiscoverPostsFragment extends StatusListFragment{
 		bannerHelper=new DiscoverInfoBannerHelper(DiscoverInfoBannerHelper.BannerType.TRENDING_POSTS, accountID);
 	}
 
-
 	@Override
-	protected void doLoadData(int o, int count){
-		if(refreshing) offset=0;
-		currentRequest=new GetTrendingStatuses(offset, count)
+	protected void doLoadData(int offset, int count){
+		currentRequest=new GetTrendingStatuses(offset==0 ? 0 : realOffset, count)
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(List<Status> result){
 						if(getActivity()==null) return;
-						boolean empty=result.isEmpty();
-						offset+=result.size();
+						realOffset+=result.size();
 						AccountSessionManager.get(accountID).filterStatuses(result, getFilterContext());
-						onDataLoaded(result, !empty);
+						onDataLoaded(result, !result.isEmpty());
 						bannerHelper.onBannerBecameVisible();
 					}
 				}).exec(accountID);
 	}
 
 	@Override
-	protected RecyclerView.Adapter<?> getAdapter(){
+	protected RecyclerView.Adapter getAdapter(){
 		MergeRecyclerAdapter adapter=new MergeRecyclerAdapter();
 		bannerHelper.maybeAddBanner(list, adapter);
 		adapter.addAdapter(super.getAdapter());

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

@@ -0,0 +1,209 @@
+package org.joinmastodon.android.fragments.discover;
+
+import android.app.Activity;
+import android.net.Uri;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.timelines.GetTrendingLinksTimeline;
+import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.fragments.ComposeFragment;
+import org.joinmastodon.android.fragments.HomeTabFragment;
+import org.joinmastodon.android.fragments.StatusListFragment;
+import org.joinmastodon.android.model.Card;
+import org.joinmastodon.android.model.FilterContext;
+import org.joinmastodon.android.model.Status;
+import org.joinmastodon.android.ui.utils.UiUtils;
+import org.parceler.Parcels;
+
+import java.util.List;
+
+import me.grishka.appkit.Nav;
+import me.grishka.appkit.api.SimpleCallback;
+import me.grishka.appkit.utils.MergeRecyclerAdapter;
+import me.grishka.appkit.utils.SingleViewRecyclerAdapter;
+import me.grishka.appkit.utils.V;
+
+//TODO: replace this implementation when upstream implements their own design
+public class DiscoverTrendingLinkTimelineFragment extends StatusListFragment{
+	private Card trendingLink;
+	private TextView headerTitle, headerSubtitle;
+	private Button openLinkButton;
+	private boolean toolbarContentVisible;
+
+	private Menu optionsMenu;
+	private MenuInflater optionsMenuInflater;
+
+	@Override
+	protected boolean wantsComposeButton() {
+		return true;
+	}
+
+	@Override
+	public void onAttach(Activity activity){
+		super.onAttach(activity);
+		trendingLink=Parcels.unwrap(getArguments().getParcelable("trendingLink"));
+		setTitle(trendingLink.title);
+		setHasOptionsMenu(true);
+	}
+
+
+	@Override
+	protected void doLoadData(int offset, int count){
+		currentRequest=new GetTrendingLinksTimeline(trendingLink.url, getMaxID(), null, count)
+				.setCallback(new SimpleCallback<>(this){
+					@Override
+					public void onSuccess(List<Status> result){
+						if(getActivity()==null) return;
+						boolean more=applyMaxID(result);
+						AccountSessionManager.get(accountID).filterStatuses(result, getFilterContext());
+						onDataLoaded(result, more);
+					}
+				})
+				.exec(accountID);
+	}
+
+	@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);
+		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, trendingLink.url);
+	}
+
+	@Override
+	public void onFabClick(View v){
+		Bundle args=new Bundle();
+		args.putString("account", accountID);
+		args.putString("prefilledText", trendingLink.url);
+		Nav.go(getActivity(), ComposeFragment.class, args);
+	}
+
+	@Override
+	protected void onSetFabBottomInset(int inset){
+		((ViewGroup.MarginLayoutParams) fab.getLayoutParams()).bottomMargin=V.dp(16)+inset;
+	}
+
+	@Override
+	protected FilterContext getFilterContext() {
+		return FilterContext.PUBLIC;
+	}
+
+	@Override
+	public Uri getWebUri(Uri.Builder base) {
+		return base.path("/links").appendPath(trendingLink.url).build();
+	}
+
+	@Override
+	protected RecyclerView.Adapter getAdapter(){
+		View header=getActivity().getLayoutInflater().inflate(R.layout.header_trending_link_timeline, list, false);
+		headerTitle=header.findViewById(R.id.title);
+		headerSubtitle=header.findViewById(R.id.subtitle);
+		openLinkButton=header.findViewById(R.id.profile_action_btn);
+
+		headerTitle.setText(trendingLink.title);
+		openLinkButton.setVisibility(View.GONE);
+		openLinkButton.setOnClickListener(v->{
+			if(trendingLink==null)
+				return;
+			openLink();
+		});
+		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.trending_links_timeline, optionsMenu);
+		MenuItem openLinkMenuItem=optionsMenu.findItem(R.id.open_link);
+		openLinkMenuItem.setVisible(toolbarContentVisible);
+	}
+
+	@Override
+	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater){
+		inflater.inflate(R.menu.trending_links_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.open_link && trendingLink!=null) {
+			openLink();
+		}
+		return true;
+	}
+
+	@Override
+	protected void onUpdateToolbar(){
+		super.onUpdateToolbar();
+		toolbarTitleView.setAlpha(toolbarContentVisible ? 1f : 0f);
+		createOptionsMenu();
+	}
+
+	private void updateHeader(){
+		if(trendingLink==null || getActivity()==null)
+			return;
+		//TODO: update to show mastodon account once fully implemented upstream
+		headerSubtitle.setText(getContext().getString(R.string.article_by_author, TextUtils.isEmpty(trendingLink.authorName)? trendingLink.providerName : trendingLink.authorName));
+		openLinkButton.setVisibility(View.VISIBLE);
+	}
+
+	private void openLink() {
+		UiUtils.launchWebBrowser(getActivity(), trendingLink.url);
+	}
+}

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

@@ -29,7 +29,7 @@ public class FederatedTimelineFragment extends StatusListFragment{
 
 	@Override
 	protected void doLoadData(int offset, int count){
-		currentRequest=new GetPublicTimeline(false, false, getMaxID(), count, getLocalPrefs().timelineReplyVisibility)
+		currentRequest=new GetPublicTimeline(false, false, getMaxID(), null, count, null, getLocalPrefs().timelineReplyVisibility)
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(List<Status> result){

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

@@ -29,7 +29,7 @@ public class LocalTimelineFragment extends StatusListFragment{
 
 	@Override
 	protected void doLoadData(int offset, int count){
-		currentRequest=new GetPublicTimeline(true, false, getMaxID(), count, getLocalPrefs().timelineReplyVisibility)
+		currentRequest=new GetPublicTimeline(true, false, getMaxID(), null, count, null, getLocalPrefs().timelineReplyVisibility)
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(List<Status> result){

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

@@ -143,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 SimpleCallback<>(this){
+				.setCallback(new SimpleCallback<SearchResults>(this){
 					@Override
 					public void onSuccess(SearchResults result){
 						ArrayList<SearchResult> results=new ArrayList<>();
@@ -164,7 +164,10 @@ public class SearchFragment extends BaseStatusListFragment<SearchResult>{
 						}
 						prevDisplayItems=new ArrayList<>(displayItems);
 						unfilteredResults=results;
+						boolean wasRefreshing=refreshing;
 						onDataLoaded(filterSearchResults(results), type!=null && !results.isEmpty());
+						if(wasRefreshing)
+							list.scrollToPosition(0);
 					}
 				})
 				.setTimeout(180000) // 3 minutes (searches can take a long time)

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

@@ -10,6 +10,7 @@ import android.graphics.Outline;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.LayerDrawable;
+import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.text.TextUtils;
@@ -26,6 +27,7 @@ import android.widget.Toast;
 import android.widget.Toolbar;
 
 import org.joinmastodon.android.GlobalUserPreferences;
+import org.joinmastodon.android.MainActivity;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.search.GetSearchResults;
 import org.joinmastodon.android.api.session.AccountSessionManager;
@@ -434,7 +436,7 @@ public class SearchQueryFragment extends MastodonRecyclerFragment<SearchResultVi
 	}
 
 	private void onOpenURLClick(ListItem<?> item_){
-		UiUtils.openURL(getContext(), accountID, searchViewHelper.getQuery(), false);
+		((MainActivity)getActivity()).handleURL(Uri.parse(searchViewHelper.getQuery()), accountID);
 	}
 
 	private void onGoToHashtagClick(ListItem<?> item_){

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

@@ -1,5 +1,6 @@
 package org.joinmastodon.android.fragments.discover;
 
+import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.view.View;
@@ -13,6 +14,7 @@ import org.joinmastodon.android.fragments.ScrollableToTop;
 import org.joinmastodon.android.model.Hashtag;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.ui.views.HashtagChartView;
+import org.joinmastodon.android.utils.ProvidesAssistContent;
 
 import java.util.List;
 
@@ -23,7 +25,7 @@ import me.grishka.appkit.fragments.BaseRecyclerFragment;
 import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.views.UsableRecyclerView;
 
-public class TrendingHashtagsFragment extends BaseRecyclerFragment<Hashtag> implements ScrollableToTop, IsOnTop{
+public class TrendingHashtagsFragment extends BaseRecyclerFragment<Hashtag> implements ScrollableToTop, IsOnTop, ProvidesAssistContent.ProvidesWebUri{
 	private String accountID;
 
 	public TrendingHashtagsFragment(){
@@ -65,6 +67,16 @@ public class TrendingHashtagsFragment extends BaseRecyclerFragment<Hashtag> impl
 		return isRecyclerViewOnTop(list);
 	}
 
+	@Override
+	public String getAccountID() {
+		return accountID;
+	}
+
+	@Override
+	public Uri getWebUri(Uri.Builder base) {
+		return isInstanceAkkoma() ? null : base.path("/explore/tags").build();
+	}
+
 	private class HashtagsAdapter extends RecyclerView.Adapter<HashtagViewHolder>{
 		@NonNull
 		@Override

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

@@ -24,7 +24,7 @@ import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.settings.SettingsMainFragment;
 import org.joinmastodon.android.model.Account;
-import org.joinmastodon.android.ui.AccountSwitcherSheet;
+import org.joinmastodon.android.ui.sheets.AccountSwitcherSheet;
 import org.joinmastodon.android.ui.utils.UiUtils;
 
 import java.io.File;

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

@@ -137,6 +137,9 @@ public class GoogleMadeMeAddThisFragment extends ToolbarFragment{
 	protected void onButtonClick(){
 		Bundle args=new Bundle();
 		args.putParcelable("instance", Parcels.wrap(instance));
+		if(getArguments().containsKey("inviteCode")){
+			args.putString("inviteCode", getArguments().getString("inviteCode"));
+		}
 		Nav.goForResult(getActivity(), SignupFragment.class, args, SIGNUP_REQUEST, this);
 	}
 

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

@@ -3,7 +3,6 @@ package org.joinmastodon.android.fragments.onboarding;
 import android.app.Activity;
 import android.app.ProgressDialog;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.KeyEvent;
@@ -38,6 +37,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -48,7 +48,6 @@ import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.utils.MergeRecyclerAdapter;
-import me.grishka.appkit.utils.V;
 import okhttp3.Call;
 import okhttp3.Request;
 import okhttp3.Response;
@@ -61,6 +60,7 @@ abstract class InstanceCatalogFragment extends MastodonRecyclerFragment<CatalogI
 	protected EditText searchEdit;
 	protected Runnable searchDebouncer=this::onSearchChangedDebounced;
 	protected String currentSearchQuery;
+	protected String currentSearchQueryButWithCasePreserved;
 	protected String loadingInstanceDomain;
 	protected HashMap<String, Instance> instancesCache=new HashMap<>();
 	protected View buttonBar;
@@ -91,6 +91,7 @@ abstract class InstanceCatalogFragment extends MastodonRecyclerFragment<CatalogI
 		if(event!=null && event.getAction()!=KeyEvent.ACTION_DOWN)
 			return true;
 		currentSearchQuery=searchEdit.getText().toString().toLowerCase().trim();
+		currentSearchQueryButWithCasePreserved=searchEdit.getText().toString().trim();
 		updateFilteredList();
 		searchEdit.removeCallbacks(searchDebouncer);
 		Instance instance=instancesCache.get(normalizeInstanceDomain(getCurrentSearchQuery()));
@@ -105,6 +106,7 @@ abstract class InstanceCatalogFragment extends MastodonRecyclerFragment<CatalogI
 
 	protected void onSearchChangedDebounced(){
 		currentSearchQuery=searchEdit.getText().toString().toLowerCase().trim();
+		currentSearchQueryButWithCasePreserved=searchEdit.getText().toString().trim();
 		updateFilteredList();
 		loadInstanceInfo(getCurrentSearchQuery(), false);
 	}
@@ -156,6 +158,10 @@ abstract class InstanceCatalogFragment extends MastodonRecyclerFragment<CatalogI
 	}
 
 	protected void loadInstanceInfo(String _domain, boolean isFromRedirect){
+		loadInstanceInfo(_domain, isFromRedirect, null);
+	}
+
+	protected void loadInstanceInfo(String _domain, boolean isFromRedirect, Consumer<Object> onError){
 		if(TextUtils.isEmpty(_domain))
 			return;
 		String domain=normalizeInstanceDomain(_domain);
@@ -180,7 +186,10 @@ abstract class InstanceCatalogFragment extends MastodonRecyclerFragment<CatalogI
 		try{
 			new URI("https://"+domain+"/api/v1/instance"); // Validate the host by trying to parse the URI
 		}catch(URISyntaxException x){
-			showInstanceInfoLoadError(domain, x);
+			if(onError!=null)
+				onError.accept(x);
+			else
+				showInstanceInfoLoadError(domain, x);
 			if(fakeInstance!=null){
 				fakeInstance.description=getString(R.string.error);
 				if(filteredData.size()>0 && filteredData.get(0)==fakeInstance){
@@ -200,10 +209,11 @@ abstract class InstanceCatalogFragment extends MastodonRecyclerFragment<CatalogI
 				loadingInstanceDomain=null;
 				result.uri=domain; // needed for instances that use domain redirection
 				instancesCache.put(domain, result);
+				if(instanceProgressDialog!=null || onError!=null)
+					proceedWithAuthOrSignup(result);
 				if(instanceProgressDialog!=null){
 					instanceProgressDialog.dismiss();
 					instanceProgressDialog=null;
-					proceedWithAuthOrSignup(result);
 				}
 				if(Objects.equals(domain, getCurrentSearchQuery()) || Objects.equals(getCurrentSearchQuery(), redirects.get(domain)) || Objects.equals(getCurrentSearchQuery(), redirectsInverse.get(domain))){
 					boolean found=false;
@@ -230,11 +240,14 @@ abstract class InstanceCatalogFragment extends MastodonRecyclerFragment<CatalogI
 			public void onError(ErrorResponse error){
 				loadingInstanceRequest=null;
 				if(!isFromRedirect && error instanceof MastodonErrorResponse me && me.httpStatus==404){
-					fetchDomainFromHostMetaAndMaybeRetry(domain, error);
+					fetchDomainFromHostMetaAndMaybeRetry(domain, error, onError);
 					return;
 				}
 				loadingInstanceDomain=null;
-				showInstanceInfoLoadError(domain, error);
+				if(onError!=null)
+					onError.accept(error);
+				else
+					showInstanceInfoLoadError(domain, error);
 				if(fakeInstance!=null && getActivity()!=null){
 					fakeInstance.description=getString(R.string.error);
 					if(filteredData.size()>0 && filteredData.get(0)==fakeInstance){
@@ -283,7 +296,7 @@ abstract class InstanceCatalogFragment extends MastodonRecyclerFragment<CatalogI
 		}
 	}
 
-	private void fetchDomainFromHostMetaAndMaybeRetry(String domain, Object origError){
+	private void fetchDomainFromHostMetaAndMaybeRetry(String domain, Object origError, Consumer<Object> onError){
 		String url="https://"+domain+"/.well-known/host-meta";
 		Request req=new Request.Builder()
 				.url(url)
@@ -297,7 +310,12 @@ abstract class InstanceCatalogFragment extends MastodonRecyclerFragment<CatalogI
 				Activity a=getActivity();
 				if(a==null)
 					return;
-				a.runOnUiThread(()->showInstanceInfoLoadError(domain, e));
+				a.runOnUiThread(()->{
+					if(onError!=null)
+						onError.accept(e);
+					else
+						showInstanceInfoLoadError(domain, e);
+				});
 			}
 
 			@Override
@@ -309,7 +327,13 @@ abstract class InstanceCatalogFragment extends MastodonRecyclerFragment<CatalogI
 					return;
 				try(response){
 					if(!response.isSuccessful()){
-						a.runOnUiThread(()->showInstanceInfoLoadError(domain, response.code()+" "+response.message()));
+						a.runOnUiThread(()->{
+							String err=response.code()+" "+response.message();
+							if(onError!=null)
+								onError.accept(err);
+							else
+								showInstanceInfoLoadError(domain, err);
+						});
 						return;
 					}
 					InputSource source=new InputSource(response.body().charStream());
@@ -328,9 +352,19 @@ abstract class InstanceCatalogFragment extends MastodonRecyclerFragment<CatalogI
 							}
 						}
 					}
-					a.runOnUiThread(()->showInstanceInfoLoadError(domain, origError));
+					a.runOnUiThread(()->{
+						if(onError!=null)
+							onError.accept(origError);
+						else
+							showInstanceInfoLoadError(domain, origError);
+					});
 				}catch(Exception x){
-					a.runOnUiThread(()->showInstanceInfoLoadError(domain, x));
+					a.runOnUiThread(()->{
+						if(onError!=null)
+							onError.accept(x);
+						else
+							showInstanceInfoLoadError(domain, x);
+					});
 				}
 			}
 		});

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

@@ -1,8 +1,13 @@
 package org.joinmastodon.android.fragments.onboarding;
 
 import android.annotation.SuppressLint;
+import android.app.AlertDialog;
+import android.content.ClipData;
+import android.content.ClipboardManager;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.res.ColorStateList;
+import android.net.Uri;
 import android.os.Bundle;
 import android.text.Editable;
 import android.text.TextUtils;
@@ -12,6 +17,8 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowInsets;
 import android.view.inputmethod.InputMethodManager;
+import android.widget.Button;
+import android.widget.EditText;
 import android.widget.HorizontalScrollView;
 import android.widget.ImageButton;
 import android.widget.LinearLayout;
@@ -19,9 +26,12 @@ import android.widget.PopupMenu;
 import android.widget.RadioButton;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.api.MastodonErrorResponse;
+import org.joinmastodon.android.api.requests.accounts.CheckInviteLink;
 import org.joinmastodon.android.api.requests.catalog.GetCatalogCategories;
 import org.joinmastodon.android.api.requests.catalog.GetCatalogInstances;
 import org.joinmastodon.android.model.Instance;
@@ -29,6 +39,8 @@ import org.joinmastodon.android.model.catalog.CatalogCategory;
 import org.joinmastodon.android.model.catalog.CatalogInstance;
 import org.joinmastodon.android.ui.BetterItemAnimator;
 import org.joinmastodon.android.ui.M3AlertDialogBuilder;
+import org.joinmastodon.android.ui.text.HtmlParser;
+import org.joinmastodon.android.ui.utils.SimpleTextWatcher;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.ui.views.FilterChipView;
 import org.joinmastodon.android.utils.ElevationOnScrollListener;
@@ -40,7 +52,9 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Locale;
+import java.util.Objects;
 import java.util.Random;
+import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
 import androidx.annotation.NonNull;
@@ -77,6 +91,9 @@ public class InstanceCatalogSignupFragment extends InstanceCatalogFragment imple
 	private CatalogInstance.Region chosenRegion;
 	private CategoryChoice categoryChoice=CategoryChoice.GENERAL;
 
+	private String inviteCode, inviteCodeHost;
+	private AlertDialog currentInviteLinkAlert;
+
 	public InstanceCatalogSignupFragment(){
 		super(R.layout.fragment_onboarding_common, 10);
 	}
@@ -317,7 +334,7 @@ public class InstanceCatalogSignupFragment extends InstanceCatalogFragment imple
 		focusThing=view.findViewById(R.id.focus_thing);
 		focusThing.requestFocus();
 
-		view.findViewById(R.id.btn_random_instance).setOnClickListener(this::onPickRandomInstanceClick);
+		view.findViewById(R.id.btn_use_invite).setOnClickListener(this::onUseInviteClick);
 		nextButton.setEnabled(chosenInstance!=null);
 	}
 
@@ -351,91 +368,191 @@ public class InstanceCatalogSignupFragment extends InstanceCatalogFragment imple
 
 	@Override
 	protected void proceedWithAuthOrSignup(Instance instance){
+		if(currentInviteLinkAlert!=null){
+			currentInviteLinkAlert.dismiss();
+		}else if(!TextUtils.isEmpty(currentSearchQuery) && HtmlParser.INVITE_LINK_PATTERN.matcher(currentSearchQueryButWithCasePreserved).find()){
+			if(TextUtils.isEmpty(inviteCode) || !Objects.equals(instance.uri, inviteCodeHost)){
+				Uri inviteLink=Uri.parse(currentSearchQueryButWithCasePreserved);
+				new CheckInviteLink(inviteLink.getPath())
+						.setCallback(new Callback<>(){
+							@Override
+							public void onSuccess(CheckInviteLink.Response result){
+								inviteCodeHost=inviteLink.getHost();
+								inviteCode=result.inviteCode;
+								proceedWithAuthOrSignup(instance);
+							}
+
+							@Override
+							public void onError(ErrorResponse error){
+								if(getActivity()==null)
+									return;
+								if(error instanceof MastodonErrorResponse mer){
+									switch(mer.httpStatus){
+										case 401 -> new M3AlertDialogBuilder(getActivity())
+												.setTitle(R.string.expired_invite_link)
+												.setMessage(getString(R.string.expired_clipboard_invite_link_alert, inviteLink.getHost(), getArguments().getString("defaultServer")))
+												.setPositiveButton(R.string.ok, null)
+												.show();
+										case 404 -> new M3AlertDialogBuilder(getActivity())
+												.setTitle(R.string.invalid_invite_link)
+												.setMessage(getString(R.string.invalid_clipboard_invite_link_alert, inviteLink.getHost(), getArguments().getString("defaultServer")))
+												.setPositiveButton(R.string.ok, null)
+												.show();
+										default -> error.showToast(getActivity());
+									}
+								}
+							}
+						})
+						.wrapProgress(getActivity(), R.string.loading_instance, true)
+						.execNoAuth(inviteLink.getHost());
+				return;
+			}
+		}
 		getActivity().getSystemService(InputMethodManager.class).hideSoftInputFromWindow(contentView.getWindowToken(), 0);
-		if(!instance.registrations){
-			new M3AlertDialogBuilder(getActivity())
-					.setTitle(R.string.error)
-					.setMessage(R.string.instance_signup_closed)
-					.setPositiveButton(R.string.ok, null)
-					.show();
+		if(!instance.registrations && (TextUtils.isEmpty(inviteCode) || !Objects.equals(instance.uri, inviteCodeHost))){
+			if(instance.invitesEnabled){
+				showInviteLinkAlert(instance.uri);
+			}else{
+				new M3AlertDialogBuilder(getActivity())
+						.setTitle(R.string.error)
+						.setMessage(R.string.instance_signup_closed)
+						.setPositiveButton(R.string.ok, null)
+						.show();
+			}
 			return;
 		}
 		Bundle args=new Bundle();
 		args.putParcelable("instance", Parcels.wrap(instance));
+		if(!TextUtils.isEmpty(inviteCode) && Objects.equals(instance.uri, inviteCodeHost))
+			args.putString("inviteCode", inviteCode);
 		Nav.go(getActivity(), InstanceRulesFragment.class, args);
 	}
 
-	private void onPickRandomInstanceClick(View v){
-		String lang=Locale.getDefault().getLanguage();
-		List<CatalogInstance> instances=data.stream().filter(ci->!ci.approvalRequired && ("general".equals(ci.category) || (ci.categories!=null && ci.categories.contains("general"))) && (lang.equals(ci.language) || (ci.languages!=null && ci.languages.contains(lang)))).collect(Collectors.toList());
-		if(instances.isEmpty()){
-			instances=data.stream().filter(ci->!ci.approvalRequired && ("general".equals(ci.category) || (ci.categories!=null && ci.categories.contains("general")))).collect(Collectors.toList());
-		}
-		if(instances.isEmpty()){
-			instances=data.stream().filter(ci->("general".equals(ci.category) || (ci.categories!=null && ci.categories.contains("general")))).collect(Collectors.toList());
-		}
-		if(instances.isEmpty()){
-			return;
-		}
-		chosenInstance=instances.get(new Random().nextInt(instances.size()));
-		onNextClick(v);
+	private void onUseInviteClick(View v){
+		showInviteLinkAlert(null);
 	}
 
-//	private String getEmojiForCategory(String category){
-//		return switch(category){
-//			case "all" -> "💬";
-//			case "academia" -> "📚";
-//			case "activism" -> "✊";
-//			case "food" -> "🍕";
-//			case "furry" -> "🦁";
-//			case "games" -> "🕹";
-//			case "general" -> "🐘";
-//			case "journalism" -> "📰";
-//			case "lgbt" -> "🏳️‍🌈";
-//			case "regional" -> "📍";
-//			case "art" -> "🎨";
-//			case "music" -> "🎼";
-//			case "tech" -> "📱";
-//			default -> "❓";
-//		};
-//	}
+	private void showInviteLinkAlert(String domain){
+		AlertDialog alert=new M3AlertDialogBuilder(getActivity())
+				.setView(R.layout.alert_invite_link)
+				.setPositiveButton(R.string.next, null)
+				.setNegativeButton(R.string.cancel, null)
+				.create();
 
-	private int getEmojiForCategory(String category){
-		return switch(category){
-			case "all" -> R.drawable.ic_category_all;
-			case "academia" -> R.drawable.ic_category_academia;
-			case "activism" -> R.drawable.ic_category_activism;
-			case "food" -> R.drawable.ic_category_food;
-			case "furry" -> R.drawable.ic_category_furry;
-			case "games" -> R.drawable.ic_category_games;
-			case "general" -> R.drawable.ic_category_general;
-			case "journalism" -> R.drawable.ic_category_journalism;
-			case "lgbt" -> R.drawable.ic_category_lgbt;
-			case "regional" -> R.drawable.ic_category_regional;
-			case "art" -> R.drawable.ic_category_art;
-			case "music" -> R.drawable.ic_category_music;
-			case "tech" -> R.drawable.ic_category_tech;
-			default -> R.drawable.ic_category_unknown;
-		};
-	}
+		Button next=alert.getButton(AlertDialog.BUTTON_POSITIVE);
+		EditText edit=alert.findViewById(R.id.edit);
+		TextView supportingText=alert.findViewById(R.id.supporting_text);
+		TextView label=alert.findViewById(R.id.label);
+		TextView subtitle=alert.findViewById(R.id.subtitle);
+		ImageButton clear=alert.findViewById(R.id.clear);
+		clear.setVisibility(View.GONE);
 
-	private int getTitleForCategory(String category){
-		return switch(category){
-			case "all" -> R.string.category_all;
-			case "academia" -> R.string.category_academia;
-			case "activism" -> R.string.category_activism;
-			case "food" -> R.string.category_food;
-			case "furry" -> R.string.category_furry;
-			case "games" -> R.string.category_games;
-			case "general" -> R.string.category_general;
-			case "journalism" -> R.string.category_journalism;
-			case "lgbt" -> R.string.category_lgbt;
-			case "regional" -> R.string.category_regional;
-			case "art" -> R.string.category_art;
-			case "music" -> R.string.category_music;
-			case "tech" -> R.string.category_tech;
-			default -> 0;
+		if(TextUtils.isEmpty(domain)){
+			subtitle.setVisibility(View.GONE);
+		}else{
+			subtitle.setText(getString(R.string.need_invite_to_join_server, domain));
+		}
+
+		Consumer<String> errorSetter=err->{
+			supportingText.setText(err);
+			int errorColor=UiUtils.getThemeColor(getActivity(), R.attr.colorM3Error);
+			supportingText.setTextColor(errorColor);
+			label.setTextColor(errorColor);
+			edit.setBackgroundResource(R.drawable.bg_m3_filled_text_field_error);
 		};
+
+		next.setOnClickListener(_v->{
+			Uri inviteLink=Uri.parse(edit.getText().toString());
+			if(TextUtils.isEmpty(inviteLink.getHost()) || TextUtils.isEmpty(inviteLink.getPath())){
+				errorSetter.accept(getString(R.string.this_invite_is_invalid));
+				return;
+			}
+			UiUtils.showProgressForAlertButton(next, true);
+			new CheckInviteLink(inviteLink.getPath())
+					.setCallback(new Callback<>(){
+						@Override
+						public void onSuccess(CheckInviteLink.Response result){
+							if(getActivity()==null || !alert.isShowing())
+								return;
+
+							String host=inviteLink.getHost();
+							inviteCode=result.inviteCode;
+							inviteCodeHost=host;
+
+							Instance instance=instancesCache.get(normalizeInstanceDomain(host));
+							if(instance==null){
+								loadInstanceInfo(host, false, err->{
+									String errorStr;
+									if(err instanceof String str){
+										errorStr=str;
+									}else if(err instanceof Throwable x){
+										errorStr=x.getMessage();
+									}else if(err instanceof MastodonErrorResponse mer){
+										errorStr=mer.error;
+									}else{
+										errorStr=getString(R.string.error);
+									}
+									errorSetter.accept(errorStr);
+									UiUtils.showProgressForAlertButton(next, false);
+								});
+							}else{
+								proceedWithAuthOrSignup(instance);
+							}
+						}
+
+						@Override
+						public void onError(ErrorResponse error){
+							if(getActivity()==null || !alert.isShowing())
+								return;
+							UiUtils.showProgressForAlertButton(next, false);
+							if(error instanceof MastodonErrorResponse mer){
+								errorSetter.accept(switch(mer.httpStatus){
+									case 404 -> getString(R.string.this_invite_is_invalid);
+									case 401 -> getString(R.string.this_invite_has_expired);
+									default -> mer.error;
+								});
+							}
+						}
+					})
+					.execNoAuth(inviteLink.getHost());
+		});
+		next.setEnabled(false);
+		edit.addTextChangedListener(new SimpleTextWatcher(e->{
+			boolean wasEmpty=!next.isEnabled();
+			next.setEnabled(e.length()>0);
+			if(supportingText.length()>0){
+				supportingText.setText("");
+				int regularColor=UiUtils.getThemeColor(getActivity(), R.attr.colorM3OnSurfaceVariant);
+				supportingText.setTextColor(regularColor);
+				label.setTextColor(regularColor);
+				edit.setBackgroundResource(R.drawable.bg_m3_filled_text_field);
+			}
+			if(wasEmpty!=(e.length()==0)){
+				int padEnd;
+				if(e.length()==0){
+					clear.setVisibility(View.GONE);
+					padEnd=V.dp(16);
+				}else{
+					clear.setVisibility(View.VISIBLE);
+					padEnd=V.dp(48);
+				}
+				edit.setPaddingRelative(edit.getPaddingStart(), edit.getPaddingTop(), padEnd, edit.getPaddingBottom());
+			}
+		}));
+		clear.setOnClickListener(_v->edit.setText(""));
+
+		ClipData clipData=getActivity().getSystemService(ClipboardManager.class).getPrimaryClip();
+		if(clipData!=null && clipData.getItemCount()>0){
+			CharSequence clipText=clipData.getItemAt(0).coerceToText(getActivity());
+			if(HtmlParser.INVITE_LINK_PATTERN.matcher(clipText).find()){
+				edit.setText(clipText);
+				supportingText.setText(R.string.invite_link_pasted);
+			}
+		}
+
+		currentInviteLinkAlert=alert;
+		alert.setOnDismissListener(dialog->currentInviteLinkAlert=null);
+		alert.show();
 	}
 
 	@Override
@@ -444,8 +561,14 @@ public class InstanceCatalogSignupFragment extends InstanceCatalogFragment imple
 		filteredData.clear();
 		if(searchQueryMode){
 			if(!TextUtils.isEmpty(currentSearchQuery)){
+				String actualQuery;
+				if(currentSearchQuery.startsWith("https:")){
+					actualQuery=Uri.parse(currentSearchQuery).getHost();
+				}else{
+					actualQuery=currentSearchQuery;
+				}
 				for(CatalogInstance instance:data){
-					if(instance.domain.contains(currentSearchQuery)){
+					if(instance.domain.contains(actualQuery)){
 						filteredData.add(instance);
 					}
 				}

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

@@ -111,6 +111,9 @@ public class InstanceRulesFragment extends ToolbarFragment implements ProvidesAs
 	protected void onButtonClick(){
 		Bundle args=new Bundle();
 		args.putParcelable("instance", Parcels.wrap(instance));
+		if(getArguments().containsKey("inviteCode")){
+			args.putString("inviteCode", getArguments().getString("inviteCode"));
+		}
 		Nav.goForResult(getActivity(), GoogleMadeMeAddThisFragment.class, args, RULES_REQUEST, this);
 	}
 

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

@@ -5,6 +5,7 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.view.View;
 import android.view.WindowInsets;
+import android.widget.TextView;
 
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.accounts.GetFollowSuggestions;
@@ -13,35 +14,38 @@ import org.joinmastodon.android.fragments.account_list.BaseAccountListFragment;
 import org.joinmastodon.android.model.FollowSuggestion;
 import org.joinmastodon.android.model.Relationship;
 import org.joinmastodon.android.model.viewmodel.AccountViewModel;
+import org.joinmastodon.android.ui.OutlineProviders;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.ui.viewholders.AccountViewHolder;
-import org.joinmastodon.android.utils.ElevationOnScrollListener;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import androidx.recyclerview.widget.RecyclerView;
 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.views.FragmentRootLinearLayout;
+import me.grishka.appkit.utils.MergeRecyclerAdapter;
+import me.grishka.appkit.utils.SingleViewRecyclerAdapter;
+import me.grishka.appkit.utils.V;
 
 public class OnboardingFollowSuggestionsFragment extends BaseAccountListFragment{
 	private String accountID;
 	private View buttonBar;
-	private ElevationOnScrollListener onScrollListener;
 	private int numRunningFollowRequests=0;
 
 	public OnboardingFollowSuggestionsFragment(){
 		super(R.layout.fragment_onboarding_follow_suggestions, 40);
+		itemLayoutRes=R.layout.item_account_list;
 	}
 
 	@Override
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
 		setRetainInstance(true);
-		setTitle(R.string.popular_on_mastodon);
+		setTitle(R.string.onboarding_recommendations_title);
 		accountID=getArguments().getString("account");
 		loadData();
 	}
@@ -50,7 +54,6 @@ public class OnboardingFollowSuggestionsFragment extends BaseAccountListFragment
 	public void onViewCreated(View view, Bundle savedInstanceState){
 		super.onViewCreated(view, savedInstanceState);
 		buttonBar=view.findViewById(R.id.button_bar);
-		list.addOnScrollListener(onScrollListener=new ElevationOnScrollListener((FragmentRootLinearLayout) view, buttonBar, getToolbar()));
 
 		view.findViewById(R.id.btn_next).setOnClickListener(UiUtils.rateLimitedClickListener(this::onFollowAllClick));
 //		view.findViewById(R.id.btn_skip).setOnClickListener(UiUtils.rateLimitedClickListener(v->proceed()));
@@ -59,9 +62,7 @@ public class OnboardingFollowSuggestionsFragment extends BaseAccountListFragment
 	@Override
 	protected void onUpdateToolbar(){
 		super.onUpdateToolbar();
-		if(onScrollListener!=null){
-			onScrollListener.setViews(buttonBar, getToolbar());
-		}
+		getToolbar().setContentInsetsRelative(V.dp(56), 0);
 	}
 
 	@Override
@@ -70,7 +71,7 @@ public class OnboardingFollowSuggestionsFragment extends BaseAccountListFragment
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(List<FollowSuggestion> result){
-						onDataLoaded(result.stream().map(fs->new AccountViewModel(fs.account, accountID)).collect(Collectors.toList()), false);
+						onDataLoaded(result.stream().map(fs->new AccountViewModel(fs.account, accountID).stripLinksFromBio()).collect(Collectors.toList()), false);
 					}
 				})
 				.exec(accountID);
@@ -81,6 +82,20 @@ public class OnboardingFollowSuggestionsFragment extends BaseAccountListFragment
 		super.onApplyWindowInsets(UiUtils.applyBottomInsetToFixedView(buttonBar, insets));
 	}
 
+	@Override
+	protected RecyclerView.Adapter<?> getAdapter(){
+//		Unused in Moshidon
+//		TextView introText=new TextView(getActivity());
+//		introText.setTextAppearance(R.style.m3_body_large);
+//		introText.setTextColor(UiUtils.getThemeColor(getActivity(), R.attr.colorM3OnSurface));
+//		introText.setPaddingRelative(V.dp(56), 0, V.dp(24), V.dp(8));
+//		introText.setText(R.string.onboarding_recommendations_intro);
+		MergeRecyclerAdapter mergeAdapter=new MergeRecyclerAdapter();
+//		mergeAdapter.addAdapter(new SingleViewRecyclerAdapter(introText));
+		mergeAdapter.addAdapter(super.getAdapter());
+		return mergeAdapter;
+	}
+
 	private void onFollowAllClick(View v){
 		if(!loaded || relationships.isEmpty())
 			return;
@@ -156,6 +171,7 @@ public class OnboardingFollowSuggestionsFragment extends BaseAccountListFragment
 	protected void onConfigureViewHolder(AccountViewHolder holder){
 		super.onConfigureViewHolder(holder);
 		holder.setStyle(AccountViewHolder.AccessoryType.BUTTON, true);
+		holder.avatar.setOutlineProvider(OutlineProviders.roundedRect(8));
 	}
 
 	@Override

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

@@ -11,6 +11,7 @@ import android.view.WindowInsets;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.ScrollView;
 
 import org.joinmastodon.android.R;
@@ -19,12 +20,17 @@ import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.HomeFragment;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.AccountField;
+import org.joinmastodon.android.model.viewmodel.CheckableListItem;
+import org.joinmastodon.android.ui.M3AlertDialogBuilder;
 import org.joinmastodon.android.ui.OutlineProviders;
+import org.joinmastodon.android.ui.adapters.GenericListItemsAdapter;
 import org.joinmastodon.android.ui.utils.UiUtils;
+import org.joinmastodon.android.ui.viewholders.ListItemViewHolder;
 import org.joinmastodon.android.ui.views.ReorderableLinearLayout;
 import org.joinmastodon.android.utils.ElevationOnScrollListener;
 
 import java.util.ArrayList;
+import java.util.List;
 
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.Callback;
@@ -35,7 +41,7 @@ import me.grishka.appkit.imageloader.requests.UrlImageLoaderRequest;
 import me.grishka.appkit.utils.V;
 import me.grishka.appkit.views.FragmentRootLinearLayout;
 
-public class OnboardingProfileSetupFragment extends ToolbarFragment implements ReorderableLinearLayout.OnDragListener{
+public class OnboardingProfileSetupFragment extends ToolbarFragment{
 	private Button btn;
 	private View buttonBar;
 	private String accountID;
@@ -43,9 +49,9 @@ public class OnboardingProfileSetupFragment extends ToolbarFragment implements R
 	private ScrollView scroller;
 	private EditText nameEdit, bioEdit;
 	private ImageView avaImage, coverImage;
-	private Button addRow;
-	private ReorderableLinearLayout profileFieldsLayout;
 	private Uri avatarUri, coverUri;
+	private LinearLayout scrollContent;
+	private CheckableListItem<Void> discoverableItem;
 
 	private static final int AVATAR_RESULT=348;
 	private static final int COVER_RESULT=183;
@@ -73,8 +79,6 @@ public class OnboardingProfileSetupFragment extends ToolbarFragment implements R
 		bioEdit=view.findViewById(R.id.bio);
 		avaImage=view.findViewById(R.id.avatar);
 		coverImage=view.findViewById(R.id.header);
-		addRow=view.findViewById(R.id.add_row);
-		profileFieldsLayout=view.findViewById(R.id.profile_fields);
 
 		btn=view.findViewById(R.id.btn_next);
 		btn.setOnClickListener(v->onButtonClick());
@@ -86,31 +90,20 @@ public class OnboardingProfileSetupFragment extends ToolbarFragment implements R
 		Account account=AccountSessionManager.getInstance().getAccount(accountID).self;
 		if(savedInstanceState==null){
 			nameEdit.setText(account.displayName);
-			makeFieldsRow();
-		}else{
-			ArrayList<String> fieldTitles=savedInstanceState.getStringArrayList("fieldTitles");
-			ArrayList<String> fieldValues=savedInstanceState.getStringArrayList("fieldValues");
-			for(int i=0;i<fieldTitles.size();i++){
-				View row=makeFieldsRow();
-				EditText title=row.findViewById(R.id.title);
-				EditText content=row.findViewById(R.id.content);
-				title.setText(fieldTitles.get(i));
-				content.setText(fieldValues.get(i));
-			}
-			if(fieldTitles.size()==4)
-				addRow.setVisibility(View.GONE);
 		}
 
-		addRow.setOnClickListener(v->{
-			makeFieldsRow();
-			if(profileFieldsLayout.getChildCount()==4){
-				addRow.setVisibility(View.GONE);
-			}
-		});
-		profileFieldsLayout.setDragListener(this);
 		avaImage.setOnClickListener(v->startActivityForResult(UiUtils.getMediaPickerIntent(new String[]{"image/*"}, 1), AVATAR_RESULT));
 		coverImage.setOnClickListener(v->startActivityForResult(UiUtils.getMediaPickerIntent(new String[]{"image/*"}, 1), COVER_RESULT));
 
+		scrollContent=view.findViewById(R.id.scrollable_content);
+		discoverableItem=new CheckableListItem<>(R.string.make_profile_discoverable, 0, CheckableListItem.Style.SWITCH_SEPARATED, true, R.drawable.ic_campaign_24px, item->showDiscoverabilityAlert());
+		GenericListItemsAdapter<Void> fakeAdapter=new GenericListItemsAdapter<>(List.of(discoverableItem));
+		ListItemViewHolder<?> holder=fakeAdapter.onCreateViewHolder(scrollContent, fakeAdapter.getItemViewType(0));
+		fakeAdapter.bindViewHolder(holder, 0);
+		holder.itemView.setBackground(UiUtils.getThemeDrawable(getActivity(), android.R.attr.selectableItemBackground));
+		holder.itemView.setOnClickListener(v->holder.onClick());
+		scrollContent.addView(holder.itemView);
+
 		return view;
 	}
 
@@ -129,17 +122,8 @@ public class OnboardingProfileSetupFragment extends ToolbarFragment implements R
 	}
 
 	protected void onButtonClick(){
-		ArrayList<AccountField> fields=new ArrayList<>();
-		for(int i=0;i<profileFieldsLayout.getChildCount();i++){
-			View row=profileFieldsLayout.getChildAt(i);
-			EditText title=row.findViewById(R.id.title);
-			EditText content=row.findViewById(R.id.content);
-			AccountField fld=new AccountField();
-			fld.name=title.getText().toString();
-			fld.value=content.getText().toString();
-			fields.add(fld);
-		}
-		new UpdateAccountCredentials(nameEdit.getText().toString(), bioEdit.getText().toString(), avatarUri, coverUri, fields)
+		new UpdateAccountCredentials(nameEdit.getText().toString(), bioEdit.getText().toString(), avatarUri, coverUri, null)
+				.setDiscoverableIndexable(discoverableItem.checked, discoverableItem.checked)
 				.setCallback(new Callback<>(){
 					@Override
 					public void onSuccess(Account result){
@@ -163,39 +147,6 @@ public class OnboardingProfileSetupFragment extends ToolbarFragment implements R
 		super.onApplyWindowInsets(UiUtils.applyBottomInsetToFixedView(buttonBar, insets));
 	}
 
-	private View makeFieldsRow(){
-		View view=LayoutInflater.from(getActivity()).inflate(R.layout.onboarding_profile_field, profileFieldsLayout, false);
-		profileFieldsLayout.addView(view);
-		view.findViewById(R.id.dragger_thingy).setOnLongClickListener(v->{
-			profileFieldsLayout.startDragging(view);
-			return true;
-		});
-		view.findViewById(R.id.delete).setOnClickListener(v->{
-			profileFieldsLayout.removeView(view);
-			if(addRow.getVisibility()==View.GONE)
-				addRow.setVisibility(View.VISIBLE);
-		});
-		return view;
-	}
-
-	@Override
-	public void onSwapItems(int oldIndex, int newIndex){}
-
-	@Override
-	public void onSaveInstanceState(Bundle outState){
-		super.onSaveInstanceState(outState);
-		ArrayList<String> fieldTitles=new ArrayList<>(), fieldValues=new ArrayList<>();
-		for(int i=0;i<profileFieldsLayout.getChildCount();i++){
-			View row=profileFieldsLayout.getChildAt(i);
-			EditText title=row.findViewById(R.id.title);
-			EditText content=row.findViewById(R.id.content);
-			fieldTitles.add(title.getText().toString());
-			fieldValues.add(content.getText().toString());
-		}
-		outState.putStringArrayList("fieldTitles", fieldTitles);
-		outState.putStringArrayList("fieldValues", fieldValues);
-	}
-
 	@Override
 	public void onActivityResult(int requestCode, int resultCode, Intent data){
 		if(resultCode!=Activity.RESULT_OK)
@@ -215,4 +166,12 @@ public class OnboardingProfileSetupFragment extends ToolbarFragment implements R
 		img.setForeground(null);
 		ViewImageLoader.load(img, null, new UrlImageLoaderRequest(uri, size, size));
 	}
+
+	private void showDiscoverabilityAlert(){
+		new M3AlertDialogBuilder(getActivity())
+				.setTitle(R.string.discoverability)
+				.setMessage(R.string.discoverability_help)
+				.setPositiveButton(R.string.ok, null)
+				.show();
+	}
 }

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

@@ -1,18 +1,15 @@
 package org.joinmastodon.android.fragments.onboarding;
 
 import android.app.ProgressDialog;
-import android.graphics.Typeface;
 import android.os.Build;
 import android.os.Bundle;
+import android.os.LocaleList;
 import android.text.Editable;
-import android.text.Html;
-import android.text.SpannableString;
 import android.text.SpannableStringBuilder;
 import android.text.Spanned;
 import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.text.style.TypefaceSpan;
-import android.text.style.URLSpan;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -46,10 +43,13 @@ import org.jsoup.select.NodeVisitor;
 import org.parceler.Parcels;
 
 import java.time.ZoneId;
+import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 import androidx.annotation.Nullable;
@@ -58,7 +58,6 @@ import me.grishka.appkit.api.APIRequest;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.fragments.ToolbarFragment;
-import me.grishka.appkit.utils.V;
 import me.grishka.appkit.views.FragmentRootLinearLayout;
 
 public class SignupFragment extends ToolbarFragment{
@@ -79,6 +78,7 @@ public class SignupFragment extends ToolbarFragment{
 	private ProgressDialog progressDialog;
 	private HashSet<EditText> errorFields=new HashSet<>();
 	private ElevationOnScrollListener onScrollListener;
+	private Set<String> serverSupportedTimezones, serverSupportedLocales;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState){
@@ -87,6 +87,8 @@ public class SignupFragment extends ToolbarFragment{
 		instance=Parcels.unwrap(getArguments().getParcelable("instance"));
 		createAppAndGetToken();
 		setTitle(R.string.signup_title);
+		serverSupportedTimezones=Arrays.stream(getResources().getStringArray(R.array.server_supported_timezones)).collect(Collectors.toSet());
+		serverSupportedLocales=Arrays.stream(getResources().getStringArray(R.array.server_supported_locales)).collect(Collectors.toSet());
 	}
 
 	@Nullable
@@ -190,7 +192,36 @@ public class SignupFragment extends ToolbarFragment{
 			edit.setError(null);
 		}
 		errorFields.clear();
-		new RegisterAccount(username, email, password.getText().toString(), getResources().getConfiguration().locale.getLanguage(), reason.getText().toString(), ZoneId.systemDefault().getId())
+		String locale=null;
+		String timezone=ZoneId.systemDefault().getId();
+
+		if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.N){
+			LocaleList localeList=getResources().getConfiguration().getLocales();
+			for(int i=0;i<localeList.size();i++){
+				Locale l=localeList.get(i);
+				if(serverSupportedLocales.contains(l.toLanguageTag())){
+					locale=l.toLanguageTag();
+					break;
+				}else if(serverSupportedLocales.contains(l.getLanguage())){
+					locale=l.getLanguage();
+					break;
+				}
+			}
+		}else{
+			Locale l=getResources().getConfiguration().locale;
+			if(serverSupportedLocales.contains(l.toLanguageTag())){
+				locale=l.toLanguageTag();
+			}else if(serverSupportedLocales.contains(l.getLanguage())){
+				locale=l.getLanguage();
+			}
+		}
+
+		if(!serverSupportedTimezones.contains(timezone))
+			timezone=null;
+
+		String inviteCode=getArguments().getString("inviteCode");
+
+		new RegisterAccount(username, email, password.getText().toString(), locale, reason.getText().toString(), timezone, inviteCode)
 				.setCallback(new Callback<>(){
 					@Override
 					public void onSuccess(Token result){
@@ -271,7 +302,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, null), spanStart, ssb.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+								ssb.setSpan(new LinkSpan("", SignupFragment.this::onGoBackLinkClick, LinkSpan.Type.CUSTOM, null, null, null, null), spanStart, ssb.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
 								ssb.setSpan(new TypefaceSpan("sans-serif-medium"), spanStart, ssb.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
 							}
 						}