re-add deleted strings

for grishka's code style must prevail

README.md

@@ -1,11 +1,19 @@
-# Mastodon for Android
+# Forked Mastodon for Android
+[![Crowdin](https://badges.crowdin.net/mastodon-for-android/localized.svg)](https://crowdin.com/project/mastodon-for-android)
 
-<a href="https://play.google.com/store/apps/details?id=org.joinmastodon.android"><img src="img/google-play-badge.png" height="50"></a>
-
-This is the repository for the official Android app for Mastodon.
+This is the repository for an officially forked Android app for Mastodon.
 
 Learn more about this app in the [blog post](https://blog.joinmastodon.org/2022/02/official-mastodon-for-android-app-is-coming-soon/).
 
+## Changes
+
+* [Enable "Unlisted" as a visibility option](https://github.com/sk22/mastodon-android-fork/tree/feature/enable-unlisted)
+  ([Pull request](https://github.com/mastodon/mastodon-android/pull/103)) and
+  [set as default](https://github.com/sk22/mastodon-android-fork/tree/feature/enable-unlisted-as-default)
+* [Add "Federation" tab and change Discover tab order](https://github.com/sk22/mastodon-android-fork/tree/feature/add-federated-timeline)
+* [Add image description button and viewer](https://github.com/sk22/mastodon-android-fork/tree/feature/display-alt-text) ([Pull request](https://github.com/mastodon/mastodon-android/pull/129))
+* [Implement pinning posts and displaying pinned posts](https://github.com/sk22/mastodon-android-fork/tree/feature/pin-posts) ([Pull request](https://github.com/mastodon/mastodon-android/pull/140))
+
 ## Building
 
 As this app is using Java 17 features, you need JDK 17 or newer to build it. Other than that, everything is pretty standard. You can either import the project into Android Studio and build it from there, or run the following command in the project directory:
@@ -16,4 +24,4 @@ As this app is using Java 17 features, you need JDK 17 or newer to build it. Oth
 
 ## License
 
-This project is released under the [GPL-3 License](./LICENSE).
+This project is released under the [GPL-3 License](./LICENSE).

fastlane/metadata/android/ar-SA/full_description.txt

@@ -0,0 +1,16 @@
+ماستودون هي أكبر شبكة اجتماعية لا مركزيَّة على الإنترنت. بدلاً من كونها على موقع ويب واحد مركزي، هي عبارة عن شبكة من ملايين المستخدمين في مجتمعات مُستقلَّة يمكنهم جميعًا التفاعل مع بعضهم البعض بسلاسة. بغض النظر عن اهتماماتك، يمكنك مقابلة أشخاص متحمسين ينشرون عنها في ماستودون!
+
+اِنضم إلَى مُجتَمع وأنشئ مِلَفَّكَ التَّعريفِيّ. ابحث عن أشخاص رائعين، تابعهم واقرأ منشوراتهم في خطٍّ زمني خالٍ من الإعلانات. عبِّر عَن نَفسِكَ باِستخدام رُموزٍ تَعبيرِيَّةٍ مُخصَّصَة، أو صُوَر، أو صُوَرٍ مُتحَرِّكَة، أو مَقاطِعٍ مَرئِّيَة أو مَقاطِعٍ صَوتِيَّةٍ فِي مَنشوراتٍ ذَاتُ خَمسِمائَة حَرف. رُدّ على سَلاسِلِ المَنشوراتِ، وأعِد تَدوينَ مَنشُوراتِ أيِّ شَخصٍ لِمُشارَكَةِ الأُمُورِ الرَّائِعَة. اِبحَث عَن حِساباتٍ جَديدَةٍ لِمُتابَعَتِها، وَعَن وُسُومٍ شَائِعَةٍ لِتَوسيعِ شَبَكَتِك.
+
+ماستودون مبني بتركيز على الأمان والخصوصيَّة. حدِّد ما إذا أردتَ مُشارَكَةَ مَنشُوراتِكَ مَعَ مُتابِعيك، أو الأشخاصِ الَّذينَ أشَرتَ إليهِم فَقَط أو العالَمَ بأسرِه. تتيح لك تحذيرات المحتوى إخفاء المنشورات التي تحتوي على مواد حساسة أو محفِّزَة حتى تكون مستعد للتفاعل مع محتواها. لكل مجتمع إرشاداته الخاصة ومشرفيه الخاصين للحفاظ على أمان أعضائه، كما تُساعد أدوات الحظر والإبلاغ القوية في منع إساءة الاستخدام.
+
+مَزيدٌ مِنَ المَزايَا:
+
+• النمط الداكِن: قراءة المنشورات في النمط المضيء، الداكِن أو الأسود الحقيقي
+• استطلاعات الرأي: اسأل المُتابعين عن آرائِهِم وسَتُسجَّل الأصوات
+• الاستكشاف: الأوسِمَة والحِسابات الرائجة على بُعد نقرة واحِدَة
+• الإشعارات: احصل على الجديد بشأن المُتابعات، الرُدود وعمليات إعادة التدوين
+• المشاركة: انشر مباشرة على ماستودون من أي لوح مُشاركة في أي تطبيق
+• الجاذبية: جالب الحظ لدينا هو فيل رائع، سَتراه يظهر فجأة في السطح بين الفينة والأُخرى
+
+مَاستودُون هي مُنَظَّمَةُ غَيرُ رِبحِيَّةٍ مُسَجَّلَة. مُساهَمَاتُكَ هِي الدَّاعِمُ المُباشِرُ لعَمَلِيَّةِ التَّطوير. لا توجد إعلانات، لا تسييل ولا رأس مال استثماري، نحن نخطط للبقاء على هذا النحو.

fastlane/metadata/android/ar-SA/short_description.txt

@@ -0,0 +1 @@
+شَبَكةٌ اِجتِماعِيَّةٌ لَا مَركزِيَّة

fastlane/metadata/android/ar-SA/title.txt

@@ -0,0 +1 @@
+مَاستودُون

fastlane/metadata/android/fi-FI/full_description.txt

@@ -0,0 +1,16 @@
+Mastodon is the largest decentralized social network on the internet. Instead of a single website, it’s a network of millions of users in independent communities that can all interact with one another, seamlessly. No matter what you’re into, you can meet passionate people posting about it on Mastodon!
+
+Join a community and create your profile. Find and and follow fascinating folks and read their posts in an ad-free, chronological timeline. Express yourself with custom emoji, images, GIFs, videos, and audio in 500-character posts. Reply to threads and reblog posts from anyone to share great stuff. Find new accounts to follow and trending hashtags to expand your network.
+
+Mastodon is built with a focus on privacy and safety. Decide whether your posts are shared with your followers, just the people you mention, or the whole world. Content warnings let you hide posts containing sensitive or triggering material until you're ready to engage with them. Each community has its own guidelines and moderators to keep its members safe, and robust blocking and reporting tools help prevent abuse.
+
+More features:
+
+• Dark Mode: Read posts in light, dark, or true black mode
+• Polls: Ask followers for their opinion and tally the votes
+• Explore: Trending hashtags and accounts are a tap away
+• Notifications: Get notified about new follows, replies, and reblogs
+• Sharing: Post directly to Mastodon from any share sheet in any app
+• Cuteness: Our mascot is an adorable elephant, and you'll see them pop up from time to time
+
+Mastodon is a registered nonprofit and development is supported directly by your donations. There’s no advertising, no monetization, and no venture capital, and we plan to keep it that way.

fastlane/metadata/android/fi-FI/short_description.txt

@@ -0,0 +1 @@
+Decentralized social network

fastlane/metadata/android/fi-FI/title.txt

@@ -0,0 +1 @@
+Mastodon

fastlane/metadata/android/hy-AM/full_description.txt

@@ -0,0 +1,16 @@
+Mastodon is the largest decentralized social network on the internet. Instead of a single website, it’s a network of millions of users in independent communities that can all interact with one another, seamlessly. No matter what you’re into, you can meet passionate people posting about it on Mastodon!
+
+Join a community and create your profile. Find and and follow fascinating folks and read their posts in an ad-free, chronological timeline. Express yourself with custom emoji, images, GIFs, videos, and audio in 500-character posts. Reply to threads and reblog posts from anyone to share great stuff. Find new accounts to follow and trending hashtags to expand your network.
+
+Mastodon is built with a focus on privacy and safety. Decide whether your posts are shared with your followers, just the people you mention, or the whole world. Content warnings let you hide posts containing sensitive or triggering material until you're ready to engage with them. Each community has its own guidelines and moderators to keep its members safe, and robust blocking and reporting tools help prevent abuse.
+
+More features:
+
+• Dark Mode: Read posts in light, dark, or true black mode
+• Polls: Ask followers for their opinion and tally the votes
+• Explore: Trending hashtags and accounts are a tap away
+• Notifications: Get notified about new follows, replies, and reblogs
+• Sharing: Post directly to Mastodon from any share sheet in any app
+• Cuteness: Our mascot is an adorable elephant, and you'll see them pop up from time to time
+
+Mastodon is a registered nonprofit and development is supported directly by your donations. There’s no advertising, no monetization, and no venture capital, and we plan to keep it that way.

fastlane/metadata/android/hy-AM/short_description.txt

@@ -0,0 +1 @@
+Decentralized social network

fastlane/metadata/android/hy-AM/title.txt

@@ -0,0 +1 @@
+Mastodon

fastlane/metadata/android/ja-JP/full_description.txt

@@ -1,16 +1,16 @@
-Mastodon is the largest decentralized social network on the internet. Instead of a single website, it’s a network of millions of users in independent communities that can all interact with one another, seamlessly. No matter what you’re into, you can meet passionate people posting about it on Mastodon!
+Mastodonは、インターネット上で最大の分散型ソーシャルネットワークです。 Mastodonは単一のウェブサイトではなく、それぞれ独立したコミュニティに参加している何百万人ものユーザーによって構成されたネットワークなのです。ユーザーたちはその中で、誰もがお互いとシームレスにやり取りできます。 あなたの興味関心がどんな分野にあっても、きっとMastodonのどこかで同じ情熱を投稿している仲間がいますよ！
 
-Join a community and create your profile. Find and and follow fascinating folks and read their posts in an ad-free, chronological timeline. Express yourself with custom emoji, images, GIFs, videos, and audio in 500-character posts. Reply to threads and reblog posts from anyone to share great stuff. Find new accounts to follow and trending hashtags to expand your network.
+まずはコミュニティに参加して、自分のプロフィールを作成しましょう。 そして素敵なユーザーを見つけて、フォローして、タイムラインで投稿を見てみましょう。タイムラインには広告なんてありませんし、順番も時系列順ですのでご安心を。 あるいは、500文字まで使える投稿で自分を表現してみましょう。カスタム絵文字や画像、GIF、動画、音声も使用できます。 スレッドに返事したり、他の誰かの面白い投稿をブーストして共有したりすることもできます。 新しいアカウントとホットなタグを見つけて、あなた自身のネットワークを広げていきましょう！
 
-Mastodon is built with a focus on privacy and safety. Decide whether your posts are shared with your followers, just the people you mention, or the whole world. Content warnings let you hide posts containing sensitive or triggering material until you're ready to engage with them. Each community has its own guidelines and moderators to keep its members safe, and robust blocking and reporting tools help prevent abuse.
+Mastondonはプライバシーと安全性を重視しています。 自分の投稿をフォロワー限定公開にするのか、メンションした特定のユーザーにだけ共有するのか、全世界に大放流するのかは、すべてあなた次第。 また、入力中の投稿について「ちょっとセンシティブな内容だな」と思ったら、閲覧注意機能で内容を伏せることで、見たくない人に配慮した投稿が作成できます。 そして、各コミュニティにはそれぞれのガイドラインと管理者・モデレーターが存在し、コミュニティメンバーの安全を守っています。強力なブロック・通報機能も、不正利用の防止をお手伝いします。
 
-More features:
+その他の機能：
 
-• Dark Mode: Read posts in light, dark, or true black mode
-• Polls: Ask followers for their opinion and tally the votes
-• Explore: Trending hashtags and accounts are a tap away
-• Notifications: Get notified about new follows, replies, and reblogs
-• Sharing: Post directly to Mastodon from any share sheet in any app
-• Cuteness: Our mascot is an adorable elephant, and you'll see them pop up from time to time
+• ダークモード対応：ライトモードだけでなく、ダークモードや「真っ黒」モードで投稿を閲覧
+• 投票機能：フォロワーたちの意見を投票形式で集計
+• 探索：話題のハッシュタグやアカウントに1タップでアクセス
+• 通知設定：新しいフォローやリプライ、ブーストがあった時に通知
+• 共有：どのアプリからでも、「共有」メニューを通じてMastodonへ直接投稿
+• 癒し：Mastodonが誇る象のマスコット（かわいい）が、画面にお邪魔したり、しなかったり
 
-Mastodon is a registered nonprofit and development is supported directly by your donations. There’s no advertising, no monetization, and no venture capital, and we plan to keep it that way.
+Mastodonは公認の非営利アプリです。開発は全てユーザーの寄付から成り立っています。 広告なし、アフィリエイトなし、第三者組織による出資なし。今でも、そしてこれからもそんなアプリであり続けるために、我々は日々努力し続けています。

fastlane/metadata/android/ja-JP/short_description.txt

@@ -1 +1 @@
-Decentralized social network
+分散型ソーシャルネットワーク

fastlane/metadata/android/kab-KAB/full_description.txt

@@ -0,0 +1,16 @@
+Mastodon d azeṭṭa anmetti asrummsan meqqren deg internet. Ideg ara yili d asmel web asuf, d azeṭṭa n yimelyan n yiseqdacen deg temɣiwin tilelliyin i izemren ad myigwent gar-asent, s wudem afrawan. Akken ibɣu yili usentel i tḥemmleḍ, tzemreḍ ad temlileḍ imdanen i d-isuffuɣen ɣef usentel-nni ɣef Mastodon!
+
+Rnu ɣer temɣiwent syen snulfu-d amaɣnu-inek. Af, rnu ḍfer imdanen yelhan. Teɣreḍ tisuffaɣ-nsen deg yizirig n wakud war adellel. Mmel iḥulfan-ik s yimujiten, tugniwin, GIFs, tividyutin d yimeslawen udmawanen deg tsuffaɣ n 500 yisekkilen. Ttekki deg usqerdec, talseḍ asuffeɣ n tsuffaɣ n yimdanen i beṭṭu n taktiwin igerrzen. Af imiḍanen ara tḍefreḍ akked hashtags mucaεen i wakken ad tesnerniḍ azeṭṭa-inek.
+
+Mastodon yettwabna s tikci n wazal i tbaḍnit d tɣellist. Gzem-itt deg ṛṛay ma yella tisuffaɣ-inek·inem ad ttwabḍunt akked yineḍfaren-ik·im, akked yimdanen kan i d-tbedreḍ neɣ akked yimdanen meṛṛa. Ilɣa n ugbur ad ak·akem-yeǧǧ d teffreḍ tisuffaɣ ideg yella ugbur amḥalfu neɣ yir agbur alamma d asmi ara twejdeḍ ad tkecmeḍ ɣer-sen. Yal tamɣiwent ɣur-s ilugan-ines d yiseɣyaden-is i wakken ad teḍmentaɣellist n yiεeggalen-is, akked yifecka iǧehden i usewḥel d tummla n yineqqisen mgal yir aseqdec.
+
+Ugar n temahilin:
+
+• Askar aberkan: Γeṛ tisuffaɣ deg uskar aceεlal, aberkan neɣ aberkan aḥeqqani
+• Isenqaden: Ssuter ṛṛay n yineḍfaren syen smiḍen afran
+• Snirem: Hashtags d yimiḍanen mucaεen llan ɣef wafus
+• Ilɣa: Ṭṭef ilɣa ɣef yineḍfaren, tiririyin d wallus n usuffeɣ imaynuten
+• Beṭṭu: Azen srid ɣer Mastodon seg kra n tferkit n beṭṭu deg kra n usnas
+• Ucbiḥ: Lfal-nneɣ d ilu icebḥen aṭas, ad t-tetttwaliḍ yettban-d sya ɣer da
+
+Mastodon d takebbanit ur nettnadi ara ɣef tedrimt, asnerni-ines yettili-d s tewsa-nni i as-tettmuddum. Ulac adellel, ur njemmeε tadrimt, ur nesεi win aɣ-d-yettakken tadrimt. Akka i nettxemmim ad nkemmel abrid-nneɣ.

fastlane/metadata/android/kab-KAB/short_description.txt

@@ -0,0 +1 @@
+Azeṭṭa anmetti asrummsan

fastlane/metadata/android/kab-KAB/title.txt

@@ -0,0 +1 @@
+Mastodon

fastlane/metadata/android/ko-KR/full_description.txt

@@ -4,9 +4,9 @@ Join a community and create your profile. Find and and follow fascinating folks
 
 Mastodon is built with a focus on privacy and safety. Decide whether your posts are shared with your followers, just the people you mention, or the whole world. Content warnings let you hide posts containing sensitive or triggering material until you're ready to engage with them. Each community has its own guidelines and moderators to keep its members safe, and robust blocking and reporting tools help prevent abuse.
 
-More features:
+더 많은 기능:
 
-• Dark Mode: Read posts in light, dark, or true black mode
+• 다크모드: 게시물을 밝음, 어두움, 진정한 검정 모드에서 읽으세요
 • Polls: Ask followers for their opinion and tally the votes
 • Explore: Trending hashtags and accounts are a tap away
 • Notifications: Get notified about new follows, replies, and reblogs

fastlane/metadata/android/ko-KR/short_description.txt

@@ -1 +1 @@
-Decentralized social network
+분산화된 소셜 네트워크

fastlane/metadata/android/ko-KR/title.txt

@@ -1 +1 @@
-Mastodon
+마스토돈

fastlane/metadata/android/pt-PT/full_description.txt

@@ -1,4 +1,4 @@
-Mastodon is the largest decentralized social network on the internet. Instead of a single website, it’s a network of millions of users in independent communities that can all interact with one another, seamlessly. No matter what you’re into, you can meet passionate people posting about it on Mastodon!
+O Mastodon é a maior rede social descentralizada da Internet. Em vez de ser um único site, é uma rede de milhões de utilizadores em comunidades independentes que podem facilmente interagir uns com os outros. No matter what you’re into, you can meet passionate people posting about it on Mastodon!
 
 Join a community and create your profile. Find and and follow fascinating folks and read their posts in an ad-free, chronological timeline. Express yourself with custom emoji, images, GIFs, videos, and audio in 500-character posts. Reply to threads and reblog posts from anyone to share great stuff. Find new accounts to follow and trending hashtags to expand your network.
 

fastlane/metadata/android/pt-PT/short_description.txt

@@ -1 +1 @@
-Decentralized social network
+Rede social descentralizada

fastlane/metadata/android/ru-RU/full_description.txt

@@ -1,16 +1,16 @@
-Mastodon is the largest decentralized social network on the internet. Instead of a single website, it’s a network of millions of users in independent communities that can all interact with one another, seamlessly. No matter what you’re into, you can meet passionate people posting about it on Mastodon!
+Mastodon — это крупнейшая распределённая социальная сеть в интернете. Вместо одного сайта, это сеть из независимых сообществ с миллионами пользователей, которые могут бесшовно взаимодействовать друг с другом. Вне зависимости от того, чем вы увлекаетесь, вы всегда найдёте себе единомышленников в Mastodon!
 
-Join a community and create your profile. Find and and follow fascinating folks and read their posts in an ad-free, chronological timeline. Express yourself with custom emoji, images, GIFs, videos, and audio in 500-character posts. Reply to threads and reblog posts from anyone to share great stuff. Find new accounts to follow and trending hashtags to expand your network.
+Вступите в сообщество по интересу и создайте свой профиль. Ищите и подписывайтесь на увлекательных пользователей, читайте их посты без рекламы в хронологической ленте. Выражайте себя в 500-символьных постах, дополняя их пользовательскими эмодзи, изображениями, гифками, видео и аудио. Участвуйте в обсуждениях и продвигайте отличные посты от других людей. Расширяйте свой кругозор, находя новых интересных людей и следя за актуальными хэштегами.
 
-Mastodon is built with a focus on privacy and safety. Decide whether your posts are shared with your followers, just the people you mention, or the whole world. Content warnings let you hide posts containing sensitive or triggering material until you're ready to engage with them. Each community has its own guidelines and moderators to keep its members safe, and robust blocking and reporting tools help prevent abuse.
+Mastodon создан с акцентом на конфиденциальность и безопасность. Решайте с кем вы хотите поделиться своими постами: своими подписчиками, только упомянутыми людьми или же вообще со всем миром. Предупреждения о содержимом позволят вам скрыть посты содержащие материалы деликатного или шокирующего характера. В каждом сообществе свои правила и модераторы, следящие за порядком, а надёжные инструменты блокировки и система жалоб помогают предотвращать злоупотребление.
 
-More features:
+Ещё больше возможностей:
 
-• Dark Mode: Read posts in light, dark, or true black mode
-• Polls: Ask followers for their opinion and tally the votes
-• Explore: Trending hashtags and accounts are a tap away
-• Notifications: Get notified about new follows, replies, and reblogs
-• Sharing: Post directly to Mastodon from any share sheet in any app
-• Cuteness: Our mascot is an adorable elephant, and you'll see them pop up from time to time
+• Темы на любой вкус: читайте посты в светлом, тёмном или OLED режимах
+• Спрашивайте мнение подписчиков и подсчитывайте их голоса с опросами
+• Найдите актуальные хэштеги, интересные посты и профили во вкладке «Обзор»
+• Будьте в курсе происходящего с уведомлениями о новых подписчиках, ответах и продвижениях
+• Делитесь в Mastodon содержимым из любого приложения
+• Умиляйтесь с нашим талисманом, восхитительным слонёнком, которого можно встретить и тут и там
 
-Mastodon is a registered nonprofit and development is supported directly by your donations. There’s no advertising, no monetization, and no venture capital, and we plan to keep it that way.
+Mastodon является зарегистрированной некоммерческой организацией, его разработка поддерживается непосредственно вашими пожертвованиями. У нас нет рекламы, монетизации и венчурного капитала, и мы не планируем это менять.

fastlane/metadata/android/th-TH/full_description.txt

@@ -0,0 +1,16 @@
+Mastodon is the largest decentralized social network on the internet. Instead of a single website, it’s a network of millions of users in independent communities that can all interact with one another, seamlessly. No matter what you’re into, you can meet passionate people posting about it on Mastodon!
+
+Join a community and create your profile. Find and and follow fascinating folks and read their posts in an ad-free, chronological timeline. Express yourself with custom emoji, images, GIFs, videos, and audio in 500-character posts. Reply to threads and reblog posts from anyone to share great stuff. Find new accounts to follow and trending hashtags to expand your network.
+
+Mastodon is built with a focus on privacy and safety. Decide whether your posts are shared with your followers, just the people you mention, or the whole world. Content warnings let you hide posts containing sensitive or triggering material until you're ready to engage with them. Each community has its own guidelines and moderators to keep its members safe, and robust blocking and reporting tools help prevent abuse.
+
+More features:
+
+• Dark Mode: Read posts in light, dark, or true black mode
+• Polls: Ask followers for their opinion and tally the votes
+• Explore: Trending hashtags and accounts are a tap away
+• Notifications: Get notified about new follows, replies, and reblogs
+• Sharing: Post directly to Mastodon from any share sheet in any app
+• Cuteness: Our mascot is an adorable elephant, and you'll see them pop up from time to time
+
+Mastodon is a registered nonprofit and development is supported directly by your donations. There’s no advertising, no monetization, and no venture capital, and we plan to keep it that way.

fastlane/metadata/android/th-TH/short_description.txt

@@ -0,0 +1 @@
+เครือข่ายสังคมแบบกระจายศูนย์

fastlane/metadata/android/th-TH/title.txt

@@ -0,0 +1 @@
+Mastodon

fastlane/metadata/android/vi-VN/full_description.txt

@@ -1,8 +1,8 @@
-Mastodon là mạng xã hội liên hợp lớn nhất trên internet. Thay vì một trang web duy nhất, nó là một mạng lưới hàng triệu người dùng trong các cộng đồng độc lập, tất cả đều có thể tương tác với nhau một cách liền mạch. Bất kể bạn thích gì, bạn đều có thể gặp gỡ những người đăng tút về nó trên Mastodon!
+Mastodon là mạng xã hội liên hợp lớn nhất trên internet. Thay vì một trang web duy nhất, nó là một mạng lưới hàng triệu người dùng trong các máy chủ độc lập, tất cả đều có thể tương tác với nhau một cách liền mạch. Bất kể bạn thích gì, bạn đều có thể gặp gỡ những người đăng tút về nó trên Mastodon!
 
-Tham gia một cộng đồng và tạo trang hồ sơ của bạn. Tìm, theo dõi những người thú vị và đọc tút của họ theo trình tự thời gian, không có quảng cáo. Thể hiện bản thân bằng emoji, hình ảnh, GIF, video và âm thanh trong tút tối đa 500 ký tự. Trả lời tút và đăng lại tút từ bất kỳ ai để chia sẻ những điều tuyệt vời. Tìm những người dùng mới để theo dõi và các hashtag xu hướng để mở rộng mạng lưới của bạn.
+Tham gia một máy chủ và tạo trang hồ sơ của bạn. Tìm, theo dõi những người thú vị và đọc tút của họ theo trình tự thời gian, không có quảng cáo. Thể hiện bản thân bằng emoji, hình ảnh, GIF, video và âm thanh trong tút tối đa 500 ký tự. Trả lời tút và đăng lại tút từ bất kỳ ai để chia sẻ những điều tuyệt vời. Tìm những người dùng mới để theo dõi và các hashtag xu hướng để mở rộng mạng lưới của bạn.
 
-Mastodon được xây dựng tập trung vào sự riêng tư và an toàn. Quyết định xem tút của bạn được chia sẻ với những người theo dõi, chỉ những người bạn nhắc đến hay cả thế giới. Nội dung ẩn cho phép bạn ẩn các tút chứa nội dung nhạy cảm hoặc chơi chữ cho đến khi bạn sẵn sàng tương tác với chúng. Mỗi cộng đồng có các nguyên tắc riêng và kiểm duyệt viên riêng để giữ an toàn cho các thành viên, song song với các công cụ chặn và báo cáo mạnh mẽ giúp ngăn chặn hành vi bậy.
+Mastodon được xây dựng tập trung vào sự riêng tư và an toàn. Quyết định xem tút của bạn được chia sẻ với những người theo dõi, chỉ những người bạn nhắc đến hay cả thế giới. Nội dung ẩn cho phép bạn ẩn các tút chứa nội dung nhạy cảm hoặc chơi chữ cho đến khi bạn sẵn sàng tương tác với chúng. Mỗi máy chủ có các nguyên tắc riêng và kiểm duyệt viên riêng để giữ an toàn cho các thành viên, song song với các công cụ chặn và báo cáo mạnh mẽ giúp ngăn chặn hành vi bậy.
 
 Tính năng khác:
 

fastlane/metadata/android/zh-TW/full_description.txt

@@ -1,16 +1,16 @@
-Mastodon is the largest decentralized social network on the internet. Instead of a single website, it’s a network of millions of users in independent communities that can all interact with one another, seamlessly. No matter what you’re into, you can meet passionate people posting about it on Mastodon!
+Mastodon 是網際網路上最大的去中心化社交網路。 它是一個由能無縫互動的獨立社群中，數百萬使用者組成的網路，而非單一網站。 無論您對什麼事情感興趣，您都能在 Mastodon 上遇到充滿熱情的人們討論該話題。
 
-Join a community and create your profile. Find and and follow fascinating folks and read their posts in an ad-free, chronological timeline. Express yourself with custom emoji, images, GIFs, videos, and audio in 500-character posts. Reply to threads and reblog posts from anyone to share great stuff. Find new accounts to follow and trending hashtags to expand your network.
+加入社群並建立您的個人檔案。 尋找並追蹤迷人的夥伴，並在無廣告、按時間順序排列的時間軸上閱讀他們的貼文。 在 500 個字元的貼文中使用自訂表情符號、GIF、視訊與音訊來表達您自己。 回覆任何人的話題與轉發貼文以分享精彩內容。 尋找要追蹤的新帳號與熱門主題標籤來拓展您的網路。
 
-Mastodon is built with a focus on privacy and safety. Decide whether your posts are shared with your followers, just the people you mention, or the whole world. Content warnings let you hide posts containing sensitive or triggering material until you're ready to engage with them. Each community has its own guidelines and moderators to keep its members safe, and robust blocking and reporting tools help prevent abuse.
+Mastodon 以隱私與安全為要。 決定您的貼文要與您的追蹤者分享、只與您提及的人們分享，又或是與全世界分享。 內容警告可讓您隱藏包含敏感或可能觸發強烈情緒反應的貼文，直到您準備好與它們進行互動。 每個社群都有它們自己的指導方針與管理原來確保其成員安全，強大的封鎖與回報工具有助於防止濫用。
 
-More features:
+更多功能：
 
-• Dark Mode: Read posts in light, dark, or true black mode
-• Polls: Ask followers for their opinion and tally the votes
-• Explore: Trending hashtags and accounts are a tap away
-• Notifications: Get notified about new follows, replies, and reblogs
-• Sharing: Post directly to Mastodon from any share sheet in any app
-• Cuteness: Our mascot is an adorable elephant, and you'll see them pop up from time to time
+• 深色模式：以淺色、深色或純黑色模式閱讀貼文
+• 投票：詢問追蹤的意見並計票
+• 探索：僅需輕點一下，即可看到熱門主題標籤與帳號
+• 通知：取得關於新追蹤、回覆與轉發的通知
+• 分享：從任何應用程式中的分享表中直接發表貼文到 Mastodon 中
+• 可愛：我們的吉祥物是一隻可愛的大象，您會不時看到牠出現
 
-Mastodon is a registered nonprofit and development is supported directly by your donations. There’s no advertising, no monetization, and no venture capital, and we plan to keep it that way.
+Mastodon 是一家註冊的非營利組織，您的捐款會直接支援開發工作。 沒有廣告、沒有貨幣化、沒有風險投資，我們計畫維持這種狀態。

fastlane/metadata/android/zh-TW/short_description.txt

@@ -1 +1 @@
-Decentralized social network
+去中心化社群網路

mastodon/build.gradle

@@ -6,11 +6,11 @@ plugins {
 android {
 	compileSdk 31
 	defaultConfig {
-		applicationId "org.joinmastodon.android"
+		applicationId "org.joinmastodon.android.sk"
 		minSdk 23
 		targetSdk 31
-		versionCode 33
-		versionName "1.0.3"
+		versionCode 11
+		versionName '1.1.1+fork.11'
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 	}
 
@@ -58,7 +58,7 @@ dependencies {
 	implementation 'me.grishka.litex:dynamicanimation:1.1.0-alpha03'
 	implementation 'me.grishka.litex:viewpager:1.0.0'
 	implementation 'me.grishka.litex:viewpager2:1.0.0'
-	implementation 'me.grishka.appkit:appkit:1.2.2'
+	implementation 'me.grishka.appkit:appkit:1.2.6'
 	implementation 'com.google.code.gson:gson:2.8.9'
 	implementation 'org.jsoup:jsoup:1.14.3'
 	implementation 'com.squareup:otto:1.3.8'

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

@@ -9,6 +9,7 @@ import android.util.Log;
 import org.joinmastodon.android.api.ObjectValidationException;
 import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.fragments.ComposeFragment;
 import org.joinmastodon.android.fragments.HomeFragment;
 import org.joinmastodon.android.fragments.ProfileFragment;
 import org.joinmastodon.android.fragments.SplashFragment;
@@ -56,6 +57,8 @@ public class MainActivity extends FragmentStackActivity{
 				if(intent.getBooleanExtra("fromNotification", false) && intent.hasExtra("notification")){
 					Notification notification=Parcels.unwrap(intent.getParcelableExtra("notification"));
 					showFragmentForNotification(notification, session.getID());
+				}else if(intent.getBooleanExtra("compose", false)){
+					showCompose();
 				}
 			}
 		}
@@ -91,6 +94,8 @@ public class MainActivity extends FragmentStackActivity{
 				fragment.setArguments(args);
 				showFragmentClearingBackStack(fragment);
 			}
+		}else if(intent.getBooleanExtra("compose", false)){
+			showCompose();
 		}
 	}
 
@@ -115,4 +120,15 @@ public class MainActivity extends FragmentStackActivity{
 		fragment.setArguments(args);
 		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);
+	}
 }

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

@@ -18,6 +18,7 @@ import android.util.Log;
 
 import org.joinmastodon.android.api.MastodonAPIController;
 import org.joinmastodon.android.api.requests.notifications.GetNotificationByID;
+import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.PushNotification;
@@ -52,10 +53,23 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 			String k=intent.getStringExtra("k");
 			String p=intent.getStringExtra("p");
 			String s=intent.getStringExtra("s");
-			String accountID=intent.getStringExtra("x");
-			if(!TextUtils.isEmpty(accountID) && !TextUtils.isEmpty(k) && !TextUtils.isEmpty(p) && !TextUtils.isEmpty(s)){
+			String pushAccountID=intent.getStringExtra("x");
+			if(!TextUtils.isEmpty(pushAccountID) && !TextUtils.isEmpty(k) && !TextUtils.isEmpty(p) && !TextUtils.isEmpty(s)){
 				MastodonAPIController.runInBackground(()->{
 					try{
+						List<AccountSession> accounts=AccountSessionManager.getInstance().getLoggedInAccounts();
+						AccountSession account=null;
+						for(AccountSession acc:accounts){
+							if(pushAccountID.equals(acc.pushAccountID)){
+								account=acc;
+								break;
+							}
+						}
+						if(account==null){
+							Log.w(TAG, "onReceive: account for id '"+pushAccountID+"' not found");
+							return;
+						}
+						String accountID=account.getID();
 						PushNotification pn=AccountSessionManager.getInstance().getAccount(accountID).getPushSubscriptionManager().decryptNotification(k, p, s);
 						new GetNotificationByID(pn.notificationId+"")
 								.setCallback(new Callback<>(){

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

@@ -14,11 +14,13 @@ import org.joinmastodon.android.MastodonApp;
 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.Filter;
 import org.joinmastodon.android.model.Notification;
 import org.joinmastodon.android.model.PaginatedResponse;
 import org.joinmastodon.android.model.SearchResult;
 import org.joinmastodon.android.model.Status;
+import org.joinmastodon.android.utils.StatusFilterPredicate;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -41,6 +43,8 @@ public class CacheController{
 	private DatabaseHelper db;
 	private final Runnable databaseCloseRunnable=this::closeDatabase;
 
+	private static final int POST_FLAG_GAP_AFTER=1;
+
 	static{
 		databaseThread.start();
 	}
@@ -49,14 +53,14 @@ public class CacheController{
 		this.accountID=accountID;
 	}
 
-	public void getHomeTimeline(String maxID, int count, boolean forceReload, Callback<PaginatedResponse<List<Status>>> callback){
+	public void getHomeTimeline(String maxID, int count, boolean forceReload, Callback<CacheablePaginatedResponse<List<Status>>> callback){
 		cancelDelayedClose();
 		databaseThread.postRunnable(()->{
 			try{
 				List<Filter> filters=AccountSessionManager.getInstance().getAccount(accountID).wordFilters.stream().filter(f->f.context.contains(Filter.FilterContext.HOME)).collect(Collectors.toList());
 				if(!forceReload){
 					SQLiteDatabase db=getOrOpenDatabase();
-					try(Cursor cursor=db.query("home_timeline", new String[]{"json"}, maxID==null ? null : "`id`<?", maxID==null ? null : new String[]{maxID}, null, null, "`id` DESC", count+"")){
+					try(Cursor cursor=db.query("home_timeline", new String[]{"json", "flags"}, maxID==null ? null : "`id`<?", maxID==null ? null : new String[]{maxID}, null, null, "`id` DESC", count+"")){
 						if(cursor.getCount()==count){
 							ArrayList<Status> result=new ArrayList<>();
 							cursor.moveToFirst();
@@ -65,6 +69,8 @@ public class CacheController{
 							do{
 								Status status=MastodonAPIController.gson.fromJson(cursor.getString(0), Status.class);
 								status.postprocess();
+								int flags=cursor.getInt(1);
+								status.hasGapAfter=((flags & POST_FLAG_GAP_AFTER)!=0);
 								newMaxID=status.id;
 								for(Filter filter:filters){
 									if(filter.matches(status.getContentStatus().content))
@@ -73,25 +79,18 @@ public class CacheController{
 								result.add(status);
 							}while(cursor.moveToNext());
 							String _newMaxID=newMaxID;
-							uiHandler.post(()->callback.onSuccess(new PaginatedResponse<>(result, _newMaxID)));
+							uiHandler.post(()->callback.onSuccess(new CacheablePaginatedResponse<>(result, _newMaxID, true)));
 							return;
 						}
 					}catch(IOException x){
 						Log.w(TAG, "getHomeTimeline: corrupted status object in database", x);
 					}
 				}
-				new GetHomeTimeline(maxID, null, count)
+				new GetHomeTimeline(maxID, null, count, null)
 						.setCallback(new Callback<>(){
 							@Override
 							public void onSuccess(List<Status> result){
-								callback.onSuccess(new PaginatedResponse<>(result.stream().filter(post->{
-									for(Filter filter:filters){
-										if(filter.matches(post.getContentStatus().content)){
-											return false;
-										}
-									}
-									return true;
-								}).collect(Collectors.toList()), result.isEmpty() ? null : result.get(result.size()-1).id));
+								callback.onSuccess(new CacheablePaginatedResponse<>(result.stream().filter(new StatusFilterPredicate(filters)).collect(Collectors.toList()), result.isEmpty() ? null : result.get(result.size()-1).id, false));
 								putHomeTimeline(result, maxID==null);
 							}
 
@@ -110,14 +109,18 @@ public class CacheController{
 		}, 0);
 	}
 
-	private void putHomeTimeline(List<Status> posts, boolean clear){
+	public void putHomeTimeline(List<Status> posts, boolean clear){
 		runOnDbThread((db)->{
 			if(clear)
 				db.delete("home_timeline", null, null);
-			ContentValues values=new ContentValues(2);
+			ContentValues values=new ContentValues(3);
 			for(Status s:posts){
 				values.put("id", s.id);
 				values.put("json", MastodonAPIController.gson.toJson(s));
+				int flags=0;
+				if(s.hasGapAfter)
+					flags|=POST_FLAG_GAP_AFTER;
+				values.put("flags", flags);
 				db.insertWithOnConflict("home_timeline", null, values, SQLiteDatabase.CONFLICT_REPLACE);
 			}
 		});
@@ -230,6 +233,12 @@ public class CacheController{
 		});
 	}
 
+	public void deleteStatus(String id){
+		runOnDbThread((db)->{
+			db.delete("home_timeline", "`id`=?", new String[]{id});
+		});
+	}
+
 	public void clearRecentSearches(){
 		runOnDbThread((db)->db.delete("recent_searches", null, null));
 	}

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

@@ -1,14 +1,10 @@
 package org.joinmastodon.android.api;
 
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
 import android.util.Log;
 
 import com.google.gson.FieldNamingPolicy;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonIOException;
 import com.google.gson.JsonObject;
@@ -16,11 +12,9 @@ import com.google.gson.JsonParser;
 import com.google.gson.JsonSyntaxException;
 
 import org.joinmastodon.android.BuildConfig;
-import org.joinmastodon.android.MastodonApp;
 import org.joinmastodon.android.api.gson.IsoInstantTypeAdapter;
 import org.joinmastodon.android.api.gson.IsoLocalDateTypeAdapter;
 import org.joinmastodon.android.api.session.AccountSession;
-import org.joinmastodon.android.model.BaseModel;
 
 import java.io.IOException;
 import java.io.Reader;
@@ -144,7 +138,7 @@ public class MastodonAPIController{
 								}
 
 								try{
-									req.validateAndPostprocessResponse(respObj);
+									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);

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

@@ -28,6 +28,7 @@ import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
 import okhttp3.Call;
 import okhttp3.RequestBody;
+import okhttp3.Response;
 
 public abstract class MastodonAPIRequest<T> extends APIRequest<T>{
 	private static final String TAG="MastodonAPIRequest";
@@ -75,9 +76,14 @@ public abstract class MastodonAPIRequest<T> extends APIRequest<T>{
 	}
 
 	public MastodonAPIRequest<T> exec(String accountID){
-		account=AccountSessionManager.getInstance().getAccount(accountID);
-		domain=account.domain;
-		account.getApiController().submitRequest(this);
+		try{
+			account=AccountSessionManager.getInstance().getAccount(accountID);
+			domain=account.domain;
+			account.getApiController().submitRequest(this);
+		}catch(Exception x){
+			Log.e(TAG, "exec: this shouldn't happen, but it still did", x);
+			invokeErrorCallback(new MastodonErrorResponse(x.getLocalizedMessage(), -1));
+		}
 		return this;
 	}
 
@@ -153,7 +159,7 @@ public abstract class MastodonAPIRequest<T> extends APIRequest<T>{
 	}
 
 	@CallSuper
-	public void validateAndPostprocessResponse(T respObj) throws IOException{
+	public void validateAndPostprocessResponse(T respObj, Response httpResponse) throws IOException{
 		if(respObj instanceof BaseModel){
 			((BaseModel) respObj).postprocess();
 		}else if(respObj instanceof List){

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

@@ -26,6 +26,8 @@ public class MastodonErrorResponse extends ErrorResponse{
 
 	@Override
 	public void showToast(Context context){
+		if(context==null)
+			return;
 		Toast.makeText(context, error, Toast.LENGTH_SHORT).show();
 	}
 }

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

@@ -121,16 +121,12 @@ public class PushSubscriptionManager{
 		return !TextUtils.isEmpty(deviceToken);
 	}
 
-	public void registerAccountForPush(){
-		registerAccountForPush(null);
-	}
-
 	public void registerAccountForPush(PushSubscription subscription){
 		if(TextUtils.isEmpty(deviceToken))
 			throw new IllegalStateException("No device push token available");
 		MastodonAPIController.runInBackground(()->{
 			Log.d(TAG, "registerAccountForPush: started for "+accountID);
-			String encodedPublicKey, encodedAuthKey;
+			String encodedPublicKey, encodedAuthKey, pushAccountID;
 			try{
 				KeyPairGenerator generator=KeyPairGenerator.getInstance("EC");
 				ECGenParameterSpec spec=new ECGenParameterSpec(EC_CURVE_NAME);
@@ -140,13 +136,17 @@ public class PushSubscriptionManager{
 				privateKey=keyPair.getPrivate();
 				encodedPublicKey=Base64.encodeToString(serializeRawPublicKey(publicKey), Base64.URL_SAFE | Base64.NO_WRAP | Base64.NO_PADDING);
 				authKey=new byte[16];
-				new SecureRandom().nextBytes(authKey);
+				SecureRandom secureRandom=new SecureRandom();
+				secureRandom.nextBytes(authKey);
+				byte[] randomAccountID=new byte[16];
+				secureRandom.nextBytes(randomAccountID);
 				AccountSession session=AccountSessionManager.getInstance().tryGetAccount(accountID);
 				if(session==null)
 					return;
 				session.pushPrivateKey=Base64.encodeToString(privateKey.getEncoded(), Base64.URL_SAFE | Base64.NO_WRAP | Base64.NO_PADDING);
 				session.pushPublicKey=Base64.encodeToString(publicKey.getEncoded(), Base64.URL_SAFE | Base64.NO_WRAP | Base64.NO_PADDING);
 				session.pushAuthKey=encodedAuthKey=Base64.encodeToString(authKey, Base64.URL_SAFE | Base64.NO_WRAP | Base64.NO_PADDING);
+				session.pushAccountID=pushAccountID=Base64.encodeToString(randomAccountID, Base64.URL_SAFE | Base64.NO_WRAP | Base64.NO_PADDING);
 				AccountSessionManager.getInstance().writeAccountsFile();
 			}catch(NoSuchAlgorithmException|InvalidAlgorithmParameterException e){
 				Log.e(TAG, "registerAccountForPush: error generating encryption key", e);
@@ -157,7 +157,7 @@ public class PushSubscriptionManager{
 					encodedAuthKey,
 					subscription==null ? PushSubscription.Alerts.ofAll() : subscription.alerts,
 					subscription==null ? PushSubscription.Policy.ALL : subscription.policy,
-					accountID)
+					pushAccountID)
 					.setCallback(new Callback<>(){
 						@Override
 						public void onSuccess(PushSubscription result){
@@ -367,7 +367,7 @@ public class PushSubscriptionManager{
 	private static void registerAllAccountsForPush(boolean forceReRegister){
 		for(AccountSession session:AccountSessionManager.getInstance().getLoggedInAccounts()){
 			if(session.pushSubscription==null || forceReRegister)
-				session.getPushSubscriptionManager().registerAccountForPush();
+				session.getPushSubscriptionManager().registerAccountForPush(session.pushSubscription);
 			else if(session.needUpdatePushSettings)
 				session.getPushSubscriptionManager().updatePushSettings(session.pushSubscription);
 		}

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

@@ -58,6 +58,7 @@ public class StatusInteractionController{
 			status.favouritesCount++;
 		else
 			status.favouritesCount--;
+		E.post(new StatusCountersUpdatedEvent(status));
 	}
 
 	public void setReblogged(Status status, boolean reblogged){
@@ -95,5 +96,6 @@ public class StatusInteractionController{
 			status.reblogsCount++;
 		else
 			status.reblogsCount--;
+		E.post(new StatusCountersUpdatedEvent(status));
 	}
 }

mastodon/src/main/java/org/joinmastodon/android/api/requests/HeaderPaginationRequest.java

@@ -0,0 +1,57 @@
+package org.joinmastodon.android.api.requests;
+
+import android.net.Uri;
+import android.text.TextUtils;
+
+import com.google.gson.reflect.TypeToken;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.model.HeaderPaginationList;
+
+import java.io.IOException;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import okhttp3.Response;
+
+public abstract class HeaderPaginationRequest<I> extends MastodonAPIRequest<HeaderPaginationList<I>>{
+	private static final Pattern LINK_HEADER_PATTERN=Pattern.compile("(?:(?:,\\s*)?<([^>]+)>|;\\s*(\\w+)=['\"](\\w+)['\"])");
+
+	public HeaderPaginationRequest(HttpMethod method, String path, Class<HeaderPaginationList<I>> respClass){
+		super(method, path, respClass);
+	}
+
+	public HeaderPaginationRequest(HttpMethod method, String path, TypeToken<HeaderPaginationList<I>> respTypeToken){
+		super(method, path, respTypeToken);
+	}
+
+	@Override
+	public void validateAndPostprocessResponse(HeaderPaginationList<I> respObj, Response httpResponse) throws IOException{
+		super.validateAndPostprocessResponse(respObj, httpResponse);
+		String link=httpResponse.header("Link");
+		if(!TextUtils.isEmpty(link)){
+			Matcher matcher=LINK_HEADER_PATTERN.matcher(link);
+			String url=null;
+			while(matcher.find()){
+				if(url==null){
+					String _url=matcher.group(1);
+					if(_url==null)
+						continue;
+					url=_url;
+				}else{
+					String paramName=matcher.group(2);
+					String paramValue=matcher.group(3);
+					if(paramName==null || paramValue==null)
+						return;
+					if("rel".equals(paramName)){
+						switch(paramValue){
+							case "next" -> respObj.nextPageUri=Uri.parse(url);
+							case "prev" -> respObj.prevPageUri=Uri.parse(url);
+						}
+						url=null;
+					}
+				}
+			}
+		}
+	}
+}

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

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

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

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

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

@@ -21,6 +21,7 @@ public class GetAccountStatuses extends MastodonAPIRequest<List<Status>>{
 		switch(filter){
 			case DEFAULT -> addQueryParameter("exclude_replies", "true");
 			case INCLUDE_REPLIES -> {}
+			case PINNED -> addQueryParameter("pinned", "true");
 			case MEDIA -> addQueryParameter("only_media", "true");
 			case NO_REBLOGS -> {
 				addQueryParameter("exclude_replies", "true");
@@ -32,6 +33,7 @@ public class GetAccountStatuses extends MastodonAPIRequest<List<Status>>{
 	public enum Filter{
 		DEFAULT,
 		INCLUDE_REPLIES,
+		PINNED,
 		MEDIA,
 		NO_REBLOGS
 	}

mastodon/src/main/java/org/joinmastodon/android/api/requests/oauth/CreateOAuthApp.java

@@ -11,9 +11,9 @@ public class CreateOAuthApp extends MastodonAPIRequest<Application>{
 	}
 
 	private static class Request{
-		public String clientName="Mastodon for Android";
+		public String clientName="Mastodon for Android (Fork)";
 		public String redirectUris=AccountSessionManager.REDIRECT_URI;
 		public String scopes=AccountSessionManager.SCOPE;
-		public String website="https://app.joinmastodon.org/android";
+		public String website="https://github.com/sk22/mastodon-android-fork";
 	}
 }

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

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

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

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

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

@@ -0,0 +1,11 @@
+package org.joinmastodon.android.api.requests.statuses;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.model.Status;
+
+public class SetStatusPinned extends MastodonAPIRequest<Status>{
+	public SetStatusPinned(String id, boolean pinned){
+		super(HttpMethod.POST, "/statuses/"+id+"/"+(pinned ? "pin" : "unpin"), Status.class);
+		setRequestBody(new Object());
+	}
+}

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

@@ -8,12 +8,14 @@ import org.joinmastodon.android.model.Status;
 import java.util.List;
 
 public class GetHomeTimeline extends MastodonAPIRequest<List<Status>>{
-	public GetHomeTimeline(String maxID, String minID, int limit){
+	public GetHomeTimeline(String maxID, String minID, int limit, String sinceID){
 		super(HttpMethod.GET, "/timelines/home", new TypeToken<>(){});
 		if(maxID!=null)
 			addQueryParameter("max_id", maxID);
 		if(minID!=null)
 			addQueryParameter("min_id", minID);
+		if(sinceID!=null)
+			addQueryParameter("since_id", sinceID);
 		if(limit>0)
 			addQueryParameter("limit", ""+limit);
 	}

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

@@ -27,6 +27,7 @@ public class AccountSession{
 	public boolean needUpdatePushSettings;
 	public long filtersLastUpdated;
 	public List<Filter> wordFilters=new ArrayList<>();
+	public String pushAccountID;
 	private transient MastodonAPIController apiController;
 	private transient StatusInteractionController statusInteractionController;
 	private transient CacheController cacheController;

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

@@ -2,15 +2,22 @@ package org.joinmastodon.android.api.session;
 
 import android.app.Activity;
 import android.app.NotificationManager;
+import android.content.ComponentName;
 import android.content.Context;
+import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.pm.ShortcutInfo;
+import android.content.pm.ShortcutManager;
+import android.graphics.drawable.Icon;
 import android.net.Uri;
 import android.os.Build;
 import android.util.Log;
 
 import com.google.gson.JsonParseException;
 
+import org.joinmastodon.android.BuildConfig;
 import org.joinmastodon.android.E;
+import org.joinmastodon.android.MainActivity;
 import org.joinmastodon.android.MastodonApp;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.MastodonAPIController;
@@ -85,11 +92,12 @@ public class AccountSessionManager{
 				domains.add(session.domain.toLowerCase());
 				sessions.put(session.getID(), session);
 			}
-		}catch(IOException|JsonParseException x){
+		}catch(Exception x){
 			Log.e(TAG, "Error loading accounts", x);
 		}
 		lastActiveAccountID=prefs.getString("lastActiveAccount", null);
 		MastodonAPIController.runInBackground(()->readInstanceInfo(domains));
+		maybeUpdateShortcuts();
 	}
 
 	public void addAccount(Instance instance, Token token, Account self, Application app, boolean active){
@@ -100,8 +108,9 @@ public class AccountSessionManager{
 		writeAccountsFile();
 		updateInstanceEmojis(instance, instance.uri);
 		if(PushSubscriptionManager.arePushNotificationsAvailable()){
-			session.getPushSubscriptionManager().registerAccountForPush();
+			session.getPushSubscriptionManager().registerAccountForPush(null);
 		}
+		maybeUpdateShortcuts();
 	}
 
 	public synchronized void writeAccountsFile(){
@@ -181,6 +190,7 @@ public class AccountSessionManager{
 			NotificationManager nm=MastodonApp.context.getSystemService(NotificationManager.class);
 			nm.deleteNotificationChannelGroup(id);
 		}
+		maybeUpdateShortcuts();
 	}
 
 	@NonNull
@@ -358,7 +368,7 @@ public class AccountSessionManager{
 				customEmojis.put(domain, groupCustomEmojis(emojis));
 				instances.put(domain, emojis.instance);
 				instancesLastUpdated.put(domain, emojis.lastUpdated);
-			}catch(IOException|JsonParseException x){
+			}catch(Exception x){
 				Log.w(TAG, "Error reading instance info file for "+domain, x);
 			}
 		}
@@ -395,6 +405,29 @@ public class AccountSessionManager{
 		writeAccountsFile();
 	}
 
+	private void maybeUpdateShortcuts(){
+		if(Build.VERSION.SDK_INT<26)
+			return;
+		ShortcutManager sm=MastodonApp.context.getSystemService(ShortcutManager.class);
+		if((sm.getDynamicShortcuts().isEmpty() || 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))
+					.build();
+			sm.setDynamicShortcuts(Collections.singletonList(info));
+		}else if(sessions.isEmpty()){
+			// There are shortcuts, but no accounts. Disable existing shortcuts.
+			sm.disableShortcuts(Collections.singletonList("compose"), MastodonApp.context.getString(R.string.err_not_logged_in));
+		}else{
+			sm.enableShortcuts(Collections.singletonList("compose"));
+		}
+	}
+
 	private static class SessionsStorageWrapper{
 		public List<AccountSession> accounts;
 	}

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

@@ -5,7 +5,7 @@ import org.joinmastodon.android.model.Status;
 public class StatusCountersUpdatedEvent{
 	public String id;
 	public int favorites, reblogs, replies;
-	public boolean favorited, reblogged;
+	public boolean favorited, reblogged, pinned;
 
 	public StatusCountersUpdatedEvent(Status s){
 		id=s.id;
@@ -14,5 +14,6 @@ public class StatusCountersUpdatedEvent{
 		replies=s.repliesCount;
 		favorited=s.favourited;
 		reblogged=s.reblogged;
+		pinned=s.pinned;
 	}
 }

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

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

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

@@ -8,8 +8,10 @@ import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.accounts.GetAccountStatuses;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.events.StatusCreatedEvent;
+import org.joinmastodon.android.events.StatusUnpinnedEvent;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Status;
+import org.joinmastodon.android.ui.displayitems.HeaderStatusDisplayItem;
 import org.parceler.Parcels;
 
 import java.util.Collections;
@@ -76,6 +78,7 @@ public class AccountTimelineFragment extends StatusListFragment{
 	protected void onStatusCreated(StatusCreatedEvent ev){
 		if(!AccountSessionManager.getInstance().isSelf(accountID, ev.status.account))
 			return;
+		if(filter==GetAccountStatuses.Filter.PINNED) return;
 		if(filter==GetAccountStatuses.Filter.DEFAULT){
 			// Keep replies to self, discard all other replies
 			if(ev.status.inReplyToAccountId!=null && !ev.status.inReplyToAccountId.equals(AccountSessionManager.getInstance().getAccount(accountID).self.id))
@@ -86,4 +89,24 @@ public class AccountTimelineFragment extends StatusListFragment{
 		}
 		prependItems(Collections.singletonList(ev.status), true);
 	}
+
+	protected void onStatusUnpinned(StatusUnpinnedEvent ev){
+		if(!ev.accountID.equals(accountID) || filter!=GetAccountStatuses.Filter.PINNED)
+			return;
+
+		Status status=getStatusByID(ev.id);
+		data.remove(status);
+		preloadedData.remove(status);
+		HeaderStatusDisplayItem item=findItemOfType(ev.id, HeaderStatusDisplayItem.class);
+		if(item==null)
+			return;
+		int index=displayItems.indexOf(item);
+		int lastIndex;
+		for(lastIndex=index;lastIndex<displayItems.size();lastIndex++){
+			if(!displayItems.get(lastIndex).parentID.equals(ev.id))
+				break;
+		}
+		displayItems.subList(index, lastIndex).clear();
+		adapter.notifyItemRangeRemoved(index, lastIndex-index);
+	}
 }

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

@@ -31,6 +31,8 @@ import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.BetterItemAnimator;
 import org.joinmastodon.android.ui.PhotoLayoutHelper;
 import org.joinmastodon.android.ui.TileGridLayoutManager;
+import org.joinmastodon.android.ui.displayitems.ExtendedFooterStatusDisplayItem;
+import org.joinmastodon.android.ui.displayitems.GapStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.HeaderStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.ImageStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.PollFooterStatusDisplayItem;
@@ -281,6 +283,10 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 				list.getDecoratedBoundsWithMargins(view, outRect);
 				RecyclerView.ViewHolder holder=list.getChildViewHolder(view);
 				if(holder instanceof StatusDisplayItem.Holder){
+					if(((StatusDisplayItem.Holder<?>) holder).getItem().getType()==StatusDisplayItem.Type.GAP){
+						outRect.setEmpty();
+						return;
+					}
 					String id=((StatusDisplayItem.Holder<?>) holder).getItemID();
 					for(int i=0;i<list.getChildCount();i++){
 						View child=list.getChildAt(i);
@@ -358,6 +364,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 	public abstract void onItemClick(String id);
 
 	protected void updatePoll(String itemID, Status status, Poll poll){
+		status.poll=poll;
 		int firstOptionIndex=-1, footerIndex=-1;
 		int i=0;
 		for(StatusDisplayItem item:displayItems){
@@ -454,9 +461,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		HeaderStatusDisplayItem.Holder header=findHolderOfType(itemID, HeaderStatusDisplayItem.Holder.class);
 		if(header!=null)
 			header.rebind();
-		for(ImageStatusDisplayItem.Holder photo:(List<ImageStatusDisplayItem.Holder>)findAllHoldersOfType(itemID, ImageStatusDisplayItem.Holder.class)){
-			photo.setRevealed(true);
-		}
+		updateImagesSpoilerState(status, itemID);
 	}
 
 	public void onVisibilityIconClick(HeaderStatusDisplayItem.Holder holder){
@@ -465,15 +470,30 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		if(!TextUtils.isEmpty(status.spoilerText)){
 			TextStatusDisplayItem.Holder text=findHolderOfType(holder.getItemID(), TextStatusDisplayItem.Holder.class);
 			if(text!=null){
-				adapter.notifyItemChanged(text.getAbsoluteAdapterPosition()+getMainAdapterOffset());
+				adapter.notifyItemChanged(text.getAbsoluteAdapterPosition());
 			}
 		}
 		holder.rebind();
-		for(ImageStatusDisplayItem.Holder<?> photo:(List<ImageStatusDisplayItem.Holder>)findAllHoldersOfType(holder.getItemID(), ImageStatusDisplayItem.Holder.class)){
+		updateImagesSpoilerState(status, holder.getItemID());
+	}
+
+	protected void updateImagesSpoilerState(Status status, String itemID){
+		ArrayList<Integer> updatedPositions=new ArrayList<>();
+		for(ImageStatusDisplayItem.Holder photo:(List<ImageStatusDisplayItem.Holder>)findAllHoldersOfType(itemID, ImageStatusDisplayItem.Holder.class)){
 			photo.setRevealed(status.spoilerRevealed);
+			updatedPositions.add(photo.getAbsoluteAdapterPosition()-getMainAdapterOffset());
+		}
+		int i=0;
+		for(StatusDisplayItem item:displayItems){
+			if(itemID.equals(item.parentID) && item instanceof ImageStatusDisplayItem && !updatedPositions.contains(i)){
+				adapter.notifyItemChanged(i);
+			}
+			i++;
 		}
 	}
 
+	public void onGapClick(GapStatusDisplayItem.Holder item){}
+
 	public String getAccountID(){
 		return accountID;
 	}
@@ -653,8 +673,8 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 				View bottomSibling=parent.getChildAt(i+1);
 				RecyclerView.ViewHolder holder=parent.getChildViewHolder(child);
 				RecyclerView.ViewHolder siblingHolder=parent.getChildViewHolder(bottomSibling);
-				if(holder instanceof StatusDisplayItem.Holder && siblingHolder instanceof StatusDisplayItem.Holder
-						&& !((StatusDisplayItem.Holder<?>) holder).getItemID().equals(((StatusDisplayItem.Holder<?>) siblingHolder).getItemID())){
+				if(holder instanceof StatusDisplayItem.Holder<?> ih && siblingHolder instanceof StatusDisplayItem.Holder<?> sh
+						&& (!ih.getItemID().equals(sh.getItemID()) || sh instanceof ExtendedFooterStatusDisplayItem.Holder) && ih.getItem().getType()!=StatusDisplayItem.Type.GAP){
 					drawDivider(child, bottomSibling, holder, siblingHolder, parent, c, dividerPaint);
 				}
 			}

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

@@ -167,7 +167,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 	private ImageView sendError;
 	private View sendingOverlay;
 	private WindowManager wm;
-	private StatusPrivacy statusVisibility=StatusPrivacy.PUBLIC;
+	private StatusPrivacy statusVisibility=StatusPrivacy.UNLISTED;
 	private ComposeAutocompleteSpan currentAutocompleteSpan;
 	private FrameLayout mainEditTextWrap;
 	private ComposeAutocompleteViewController autocompleteViewController;
@@ -382,6 +382,8 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 
 			@Override
 			public void onTextChanged(CharSequence s, int start, int before, int count){
+				if(s.length()==0)
+					return;
 				// offset one char back to catch an already typed '@' or '#' or ':'
 				int realStart=start;
 				start=Math.max(0, start-1);
@@ -447,7 +449,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 				if(!mentions.contains(m))
 					mentions.add(m);
 			}
-			initialText=TextUtils.join(" ", mentions)+" ";
+			initialText=mentions.isEmpty() ? "" : TextUtils.join(" ", mentions)+" ";
 			if(savedInstanceState==null){
 				mainEditText.setText(initialText);
 				mainEditText.setSelection(mainEditText.length());
@@ -607,17 +609,19 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 					@Override
 					public void onSuccess(Status result){
 						wm.removeView(sendingOverlay);
-						Nav.finish(ComposeFragment.this);
+						sendingOverlay=null;
 						E.post(new StatusCreatedEvent(result));
 						if(replyTo!=null){
 							replyTo.repliesCount++;
 							E.post(new StatusCountersUpdatedEvent(replyTo));
 						}
+						Nav.finish(ComposeFragment.this);
 					}
 
 					@Override
 					public void onError(ErrorResponse error){
 						wm.removeView(sendingOverlay);
+						sendingOverlay=null;
 						sendProgress.setVisibility(View.GONE);
 						sendError.setVisibility(View.VISIBLE);
 						publishButton.setEnabled(true);
@@ -645,6 +649,8 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			confirmDiscardDraftAndFinish();
 			return true;
 		}
+		if(sendingOverlay!=null)
+			return true;
 		return false;
 	}
 
@@ -714,25 +720,27 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			return false;
 		}
 		String type=getActivity().getContentResolver().getType(uri);
-		if(instance.configuration!=null && instance.configuration.mediaAttachments!=null){
+		if(instance!=null && instance.configuration!=null && instance.configuration.mediaAttachments!=null){
 			if(instance.configuration.mediaAttachments.supportedMimeTypes!=null && !instance.configuration.mediaAttachments.supportedMimeTypes.contains(type)){
 				showMediaAttachmentError(getString(R.string.media_attachment_unsupported_type, UiUtils.getFileName(uri)));
 				return false;
 			}
-			int sizeLimit=type.startsWith("image/") ? instance.configuration.mediaAttachments.imageSizeLimit : instance.configuration.mediaAttachments.videoSizeLimit;
-			int size;
-			try(Cursor cursor=MastodonApp.context.getContentResolver().query(uri, new String[]{OpenableColumns.SIZE}, null, null, null)){
-				cursor.moveToFirst();
-				size=cursor.getInt(0);
-			}catch(Exception x){
-				Log.w("ComposeFragment", x);
-				return false;
-			}
-			if(size>sizeLimit){
-				float mb=sizeLimit/(float)(1024*1024);
-				String sMb=String.format(Locale.getDefault(), mb%1f==0f ? "%f" : "%.2f", mb);
-				showMediaAttachmentError(getString(R.string.media_attachment_too_big, UiUtils.getFileName(uri), sMb));
-				return false;
+			if(!type.startsWith("image/")){
+				int sizeLimit=instance.configuration.mediaAttachments.videoSizeLimit;
+				int size;
+				try(Cursor cursor=MastodonApp.context.getContentResolver().query(uri, new String[]{OpenableColumns.SIZE}, null, null, null)){
+					cursor.moveToFirst();
+					size=cursor.getInt(0);
+				}catch(Exception x){
+					Log.w("ComposeFragment", x);
+					return false;
+				}
+				if(size>sizeLimit){
+					float mb=sizeLimit/(float) (1024*1024);
+					String sMb=String.format(Locale.getDefault(), mb%1f==0f ? "%f" : "%.2f", mb);
+					showMediaAttachmentError(getString(R.string.media_attachment_too_big, UiUtils.getFileName(uri), sMb));
+					return false;
+				}
 			}
 		}
 		pollBtn.setEnabled(false);
@@ -1025,7 +1033,8 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		UiUtils.enablePopupMenuIcons(getActivity(), menu);
 		m.setGroupCheckable(0, true, true);
 		m.findItem(switch(statusVisibility){
-			case PUBLIC, UNLISTED -> R.id.vis_public;
+			case PUBLIC -> R.id.vis_public;
+			case UNLISTED -> R.id.vis_unlisted;
 			case PRIVATE -> R.id.vis_followers;
 			case DIRECT -> R.id.vis_private;
 		}).setChecked(true);
@@ -1035,6 +1044,8 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 				int id=item.getItemId();
 				if(id==R.id.vis_public){
 					statusVisibility=StatusPrivacy.PUBLIC;
+				}else if(id==R.id.vis_unlisted){
+					statusVisibility=StatusPrivacy.UNLISTED;
 				}else if(id==R.id.vis_followers){
 					statusVisibility=StatusPrivacy.PRIVATE;
 				}else if(id==R.id.vis_private){
@@ -1062,7 +1073,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 
 	@Override
 	public void onSelectionChanged(int start, int end){
-		if(start==end){
+		if(start==end && mainEditText.length()>0){
 			ComposeAutocompleteSpan[] spans=mainEditText.getText().getSpans(start, end, ComposeAutocompleteSpan.class);
 			if(spans.length>0){
 				assert spans.length==1;
@@ -1096,7 +1107,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 
 	@Override
 	public String[] onGetAllowedMediaMimeTypes(){
-		if(instance.configuration!=null && instance.configuration.mediaAttachments!=null && instance.configuration.mediaAttachments.supportedMimeTypes!=null)
+		if(instance!=null && instance.configuration!=null && instance.configuration.mediaAttachments!=null && instance.configuration.mediaAttachments.supportedMimeTypes!=null)
 			return instance.configuration.mediaAttachments.supportedMimeTypes.toArray(new String[0]);
 		return new String[]{"image/jpeg", "image/gif", "image/png", "video/mp4"};
 	}

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

@@ -5,6 +5,7 @@ import android.app.NotificationManager;
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.graphics.Outline;
+import android.graphics.drawable.ColorDrawable;
 import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
@@ -17,6 +18,7 @@ import android.view.WindowInsets;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.TextView;
 
 import org.joinmastodon.android.MainActivity;
 import org.joinmastodon.android.MastodonApp;
@@ -28,6 +30,7 @@ import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.discover.DiscoverFragment;
 import org.joinmastodon.android.fragments.discover.SearchFragment;
 import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.ui.AccountSwitcherSheet;
 import org.joinmastodon.android.ui.M3AlertDialogBuilder;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.ui.views.TabBar;
@@ -46,6 +49,7 @@ import me.grishka.appkit.fragments.OnBackPressedListener;
 import me.grishka.appkit.imageloader.ViewImageLoader;
 import me.grishka.appkit.imageloader.requests.UrlImageLoaderRequest;
 import me.grishka.appkit.utils.V;
+import me.grishka.appkit.views.BottomSheet;
 import me.grishka.appkit.views.FragmentRootLinearLayout;
 
 public class HomeFragment extends AppKitFragment implements OnBackPressedListener{
@@ -238,21 +242,11 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 
 	private boolean onTabLongClick(@IdRes int tab){
 		if(tab==R.id.tab_profile){
-		ArrayList<String> options=new ArrayList<>();
-		for(AccountSession session:AccountSessionManager.getInstance().getLoggedInAccounts()){
-			options.add(session.self.displayName+"\n("+session.self.username+"@"+session.domain+")");
-		}
-		new M3AlertDialogBuilder(getActivity())
-				.setItems(options.toArray(new String[0]), (dialog, which)->{
-					AccountSession session=AccountSessionManager.getInstance().getLoggedInAccounts().get(which);
-					AccountSessionManager.getInstance().setLastActiveAccountID(session.getID());
-					getActivity().finish();
-					getActivity().startActivity(new Intent(getActivity(), MainActivity.class));
-				})
-				.setNegativeButton(R.string.add_account, (dialog, which)->{
-					Nav.go(getActivity(), SplashFragment.class, null);
-				})
-				.show();
+			ArrayList<String> options=new ArrayList<>();
+			for(AccountSession session:AccountSessionManager.getInstance().getLoggedInAccounts()){
+				options.add(session.self.displayName+"\n("+session.self.username+"@"+session.domain+")");
+			}
+			new AccountSwitcherSheet(getActivity()).show();
 			return true;
 		}
 		return false;

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

@@ -1,14 +1,22 @@
 package org.joinmastodon.android.fragments;
 
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.animation.AnimatorSet;
+import android.animation.ObjectAnimator;
 import android.app.Activity;
 import android.content.res.ColorStateList;
 import android.content.res.Configuration;
+import android.os.Build;
 import android.os.Bundle;
 import android.view.Gravity;
 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.FrameLayout;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.Toolbar;
@@ -16,20 +24,38 @@ import android.widget.Toolbar;
 import com.squareup.otto.Subscribe;
 
 import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.timelines.GetHomeTimeline;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.events.StatusCreatedEvent;
-import org.joinmastodon.android.model.PaginatedResponse;
+import org.joinmastodon.android.model.CacheablePaginatedResponse;
+import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.Status;
+import org.joinmastodon.android.ui.displayitems.GapStatusDisplayItem;
+import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
 import org.joinmastodon.android.ui.utils.UiUtils;
+import org.joinmastodon.android.utils.StatusFilterPredicate;
 
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 
+import androidx.annotation.NonNull;
+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.utils.CubicBezierInterpolator;
+import me.grishka.appkit.utils.V;
 
 public class HomeTimelineFragment extends StatusListFragment{
 	private ImageButton fab;
+	private ImageView toolbarLogo;
+	private Button toolbarShowNewPostsBtn;
+	private boolean newPostsBtnShown;
+	private AnimatorSet currentNewPostsAnim;
 
 	private String maxID;
 
@@ -50,11 +76,13 @@ public class HomeTimelineFragment extends StatusListFragment{
 				.getAccount(accountID).getCacheController()
 				.getHomeTimeline(offset>0 ? maxID : null, count, refreshing, new SimpleCallback<>(this){
 					@Override
-					public void onSuccess(PaginatedResponse<List<Status>> result){
+					public void onSuccess(CacheablePaginatedResponse<List<Status>> result){
 						if(getActivity()==null)
 							return;
 						onDataLoaded(result.items, !result.items.isEmpty());
 						maxID=result.maxID;
+						if(result.isFromCache())
+							loadNewPosts();
 					}
 				});
 	}
@@ -65,6 +93,14 @@ public class HomeTimelineFragment extends StatusListFragment{
 		fab=view.findViewById(R.id.fab);
 		fab.setOnClickListener(this::onFabClick);
 		updateToolbarLogo();
+		list.addOnScrollListener(new RecyclerView.OnScrollListener(){
+			@Override
+			public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy){
+				if(newPostsBtnShown && list.getChildAdapterPosition(list.getChildAt(0))<=getMainAdapterOffset()){
+					hideNewPostsButton();
+				}
+			}
+		});
 	}
 
 	@Override
@@ -89,8 +125,13 @@ public class HomeTimelineFragment extends StatusListFragment{
 	@Override
 	protected void onShown(){
 		super.onShown();
-		if(!getArguments().getBoolean("noAutoLoad") && !loaded && !dataLoading)
-			loadData();
+		if(!getArguments().getBoolean("noAutoLoad")){
+			if(!loaded && !dataLoading){
+				loadData();
+			}else if(!dataLoading){
+				loadNewPosts();
+			}
+		}
 	}
 
 	@Subscribe
@@ -104,12 +145,256 @@ public class HomeTimelineFragment extends StatusListFragment{
 		Nav.go(getActivity(), ComposeFragment.class, args);
 	}
 
+	private void loadNewPosts(){
+		dataLoading=true;
+		// The idea here is that we request the timeline such that if there are fewer than `limit` posts,
+		// we'll get the currently topmost post as last in the response. This way we know there's no gap
+		// between the existing and newly loaded parts of the timeline.
+		String sinceID=data.size()>1 ? data.get(1).id : "1";
+		currentRequest=new GetHomeTimeline(null, null, 20, sinceID)
+				.setCallback(new Callback<>(){
+					@Override
+					public void onSuccess(List<Status> result){
+						currentRequest=null;
+						dataLoading=false;
+						if(result.isEmpty() || getActivity()==null)
+							return;
+						Status last=result.get(result.size()-1);
+						List<Status> toAdd;
+						if(!data.isEmpty() && last.id.equals(data.get(0).id)){ // This part intersects with the existing one
+							toAdd=result.subList(0, result.size()-1); // Remove the already known last post
+						}else{
+							result.get(result.size()-1).hasGapAfter=true;
+							toAdd=result;
+						}
+						List<Filter> filters=AccountSessionManager.getInstance().getAccount(accountID).wordFilters.stream().filter(f->f.context.contains(Filter.FilterContext.HOME)).collect(Collectors.toList());
+						if(!filters.isEmpty()){
+							toAdd=toAdd.stream().filter(new StatusFilterPredicate(filters)).collect(Collectors.toList());
+						}
+						if(!toAdd.isEmpty()){
+							prependItems(toAdd, true);
+							showNewPostsButton();
+							AccountSessionManager.getInstance().getAccount(accountID).getCacheController().putHomeTimeline(toAdd, false);
+						}
+					}
+
+					@Override
+					public void onError(ErrorResponse error){
+						currentRequest=null;
+						dataLoading=false;
+					}
+				})
+				.exec(accountID);
+	}
+
+	@Override
+	public void onGapClick(GapStatusDisplayItem.Holder item){
+		if(dataLoading)
+			return;
+		item.getItem().loading=true;
+		V.setVisibilityAnimated(item.progress, View.VISIBLE);
+		V.setVisibilityAnimated(item.text, View.GONE);
+		GapStatusDisplayItem gap=item.getItem();
+		dataLoading=true;
+		currentRequest=new GetHomeTimeline(item.getItemID(), null, 20, null)
+				.setCallback(new Callback<>(){
+					@Override
+					public void onSuccess(List<Status> result){
+						currentRequest=null;
+						dataLoading=false;
+						if(getActivity()==null)
+							return;
+						int gapPos=displayItems.indexOf(gap);
+						if(gapPos==-1)
+							return;
+						if(result.isEmpty()){
+							displayItems.remove(gapPos);
+							adapter.notifyItemRemoved(getMainAdapterOffset()+gapPos);
+							Status gapStatus=getStatusByID(gap.parentID);
+							if(gapStatus!=null){
+								gapStatus.hasGapAfter=false;
+								AccountSessionManager.getInstance().getAccount(accountID).getCacheController().putHomeTimeline(Collections.singletonList(gapStatus), false);
+							}
+						}else{
+							Set<String> idsBelowGap=new HashSet<>();
+							boolean belowGap=false;
+							int gapPostIndex=0;
+							for(Status s:data){
+								if(belowGap){
+									idsBelowGap.add(s.id);
+								}else if(s.id.equals(gap.parentID)){
+									belowGap=true;
+									s.hasGapAfter=false;
+									AccountSessionManager.getInstance().getAccount(accountID).getCacheController().putHomeTimeline(Collections.singletonList(s), false);
+								}else{
+									gapPostIndex++;
+								}
+							}
+							int endIndex=0;
+							for(Status s:result){
+								endIndex++;
+								if(idsBelowGap.contains(s.id))
+									break;
+							}
+							if(endIndex==result.size()){
+								result.get(result.size()-1).hasGapAfter=true;
+							}else{
+								result=result.subList(0, endIndex);
+							}
+							List<StatusDisplayItem> targetList=displayItems.subList(gapPos, gapPos+1);
+							targetList.clear();
+							List<Status> insertedPosts=data.subList(gapPostIndex+1, gapPostIndex+1);
+							List<Filter> filters=AccountSessionManager.getInstance().getAccount(accountID).wordFilters.stream().filter(f->f.context.contains(Filter.FilterContext.HOME)).collect(Collectors.toList());
+							outer:
+							for(Status s:result){
+								if(idsBelowGap.contains(s.id))
+									break;
+								for(Filter filter:filters){
+									if(filter.matches(s.getContentStatus().content)){
+										continue outer;
+									}
+								}
+								targetList.addAll(buildDisplayItems(s));
+								insertedPosts.add(s);
+							}
+							if(targetList.isEmpty()){
+								// oops. We didn't add new posts, but at least we know there are none.
+								adapter.notifyItemRemoved(getMainAdapterOffset()+gapPos);
+							}else{
+								adapter.notifyItemChanged(getMainAdapterOffset()+gapPos);
+								adapter.notifyItemRangeInserted(getMainAdapterOffset()+gapPos+1, targetList.size()-1);
+							}
+							AccountSessionManager.getInstance().getAccount(accountID).getCacheController().putHomeTimeline(insertedPosts, false);
+						}
+					}
+
+					@Override
+					public void onError(ErrorResponse error){
+						currentRequest=null;
+						dataLoading=false;
+						gap.loading=false;
+						Activity a=getActivity();
+						if(a!=null){
+							error.showToast(a);
+							int gapPos=displayItems.indexOf(gap);
+							if(gapPos>=0)
+								adapter.notifyItemChanged(gapPos);
+						}
+					}
+				})
+				.exec(accountID);
+
+	}
+
+	@Override
+	public void onRefresh(){
+		if(currentRequest!=null){
+			currentRequest.cancel();
+			currentRequest=null;
+			dataLoading=false;
+		}
+		super.onRefresh();
+	}
+
 	private void updateToolbarLogo(){
-		ImageView logo=new ImageView(getActivity());
-		logo.setScaleType(ImageView.ScaleType.CENTER);
-		logo.setImageResource(R.drawable.logo);
-		logo.setImageTintList(ColorStateList.valueOf(UiUtils.getThemeColor(getActivity(), android.R.attr.textColorPrimary)));
+		toolbarLogo=new ImageView(getActivity());
+		toolbarLogo.setScaleType(ImageView.ScaleType.CENTER);
+		toolbarLogo.setImageResource(R.drawable.logo);
+		toolbarLogo.setImageTintList(ColorStateList.valueOf(UiUtils.getThemeColor(getActivity(), android.R.attr.textColorPrimary)));
+
+		toolbarShowNewPostsBtn=new Button(getActivity());
+		toolbarShowNewPostsBtn.setTextAppearance(R.style.m3_title_medium);
+		toolbarShowNewPostsBtn.setTextColor(0xffffffff);
+		toolbarShowNewPostsBtn.setStateListAnimator(null);
+		toolbarShowNewPostsBtn.setBackgroundResource(R.drawable.bg_button_new_posts);
+		toolbarShowNewPostsBtn.setText(R.string.see_new_posts);
+		toolbarShowNewPostsBtn.setCompoundDrawablesRelativeWithIntrinsicBounds(R.drawable.ic_fluent_arrow_up_16_filled, 0, 0, 0);
+		toolbarShowNewPostsBtn.setCompoundDrawableTintList(toolbarShowNewPostsBtn.getTextColors());
+		toolbarShowNewPostsBtn.setCompoundDrawablePadding(V.dp(8));
+		if(Build.VERSION.SDK_INT<Build.VERSION_CODES.N)
+			UiUtils.fixCompoundDrawableTintOnAndroid6(toolbarShowNewPostsBtn);
+		toolbarShowNewPostsBtn.setOnClickListener(this::onNewPostsBtnClick);
+
+		if(newPostsBtnShown){
+			toolbarShowNewPostsBtn.setVisibility(View.VISIBLE);
+			toolbarLogo.setVisibility(View.INVISIBLE);
+			toolbarLogo.setAlpha(0f);
+		}else{
+			toolbarShowNewPostsBtn.setVisibility(View.INVISIBLE);
+			toolbarShowNewPostsBtn.setAlpha(0f);
+			toolbarShowNewPostsBtn.setScaleX(.8f);
+			toolbarShowNewPostsBtn.setScaleY(.8f);
+			toolbarLogo.setVisibility(View.VISIBLE);
+		}
+
+		FrameLayout logoWrap=new FrameLayout(getActivity());
+		logoWrap.addView(toolbarLogo, new FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT, Gravity.CENTER));
+		logoWrap.addView(toolbarShowNewPostsBtn, new FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, V.dp(32), Gravity.CENTER));
+
 		Toolbar toolbar=getToolbar();
-		toolbar.addView(logo, new Toolbar.LayoutParams(Gravity.CENTER));
+		toolbar.addView(logoWrap, new Toolbar.LayoutParams(Gravity.CENTER));
+	}
+
+	private void showNewPostsButton(){
+		if(newPostsBtnShown)
+			return;
+		newPostsBtnShown=true;
+		if(currentNewPostsAnim!=null){
+			currentNewPostsAnim.cancel();
+		}
+		toolbarShowNewPostsBtn.setVisibility(View.VISIBLE);
+		AnimatorSet set=new AnimatorSet();
+		set.playTogether(
+				ObjectAnimator.ofFloat(toolbarLogo, View.ALPHA, 0f),
+				ObjectAnimator.ofFloat(toolbarShowNewPostsBtn, View.ALPHA, 1f),
+				ObjectAnimator.ofFloat(toolbarShowNewPostsBtn, View.SCALE_X, 1f),
+				ObjectAnimator.ofFloat(toolbarShowNewPostsBtn, View.SCALE_Y, 1f)
+		);
+		set.setDuration(300);
+		set.setInterpolator(CubicBezierInterpolator.DEFAULT);
+		set.addListener(new AnimatorListenerAdapter(){
+			@Override
+			public void onAnimationEnd(Animator animation){
+				toolbarLogo.setVisibility(View.INVISIBLE);
+				currentNewPostsAnim=null;
+			}
+		});
+		currentNewPostsAnim=set;
+		set.start();
+	}
+
+	private void hideNewPostsButton(){
+		if(!newPostsBtnShown)
+			return;
+		newPostsBtnShown=false;
+		if(currentNewPostsAnim!=null){
+			currentNewPostsAnim.cancel();
+		}
+		toolbarLogo.setVisibility(View.VISIBLE);
+		AnimatorSet set=new AnimatorSet();
+		set.playTogether(
+				ObjectAnimator.ofFloat(toolbarLogo, View.ALPHA, 1f),
+				ObjectAnimator.ofFloat(toolbarShowNewPostsBtn, View.ALPHA, 0f),
+				ObjectAnimator.ofFloat(toolbarShowNewPostsBtn, View.SCALE_X, .8f),
+				ObjectAnimator.ofFloat(toolbarShowNewPostsBtn, View.SCALE_Y, .8f)
+		);
+		set.setDuration(300);
+		set.setInterpolator(CubicBezierInterpolator.DEFAULT);
+		set.addListener(new AnimatorListenerAdapter(){
+			@Override
+			public void onAnimationEnd(Animator animation){
+				toolbarShowNewPostsBtn.setVisibility(View.INVISIBLE);
+				currentNewPostsAnim=null;
+			}
+		});
+		currentNewPostsAnim=set;
+		set.start();
+	}
+
+	private void onNewPostsBtnClick(View v){
+		if(newPostsBtnShown){
+			hideNewPostsButton();
+			scrollToTop();
+		}
 	}
 }

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

@@ -9,11 +9,14 @@ import android.app.Fragment;
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.graphics.Outline;
+import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.text.SpannableStringBuilder;
+import android.text.TextUtils;
+import android.text.style.ImageSpan;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -42,12 +45,17 @@ import org.joinmastodon.android.api.requests.accounts.GetOwnAccount;
 import org.joinmastodon.android.api.requests.accounts.SetAccountFollowed;
 import org.joinmastodon.android.api.requests.accounts.UpdateAccountCredentials;
 import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.fragments.account_list.FollowerListFragment;
+import org.joinmastodon.android.fragments.account_list.FollowingListFragment;
 import org.joinmastodon.android.fragments.report.ReportReasonChoiceFragment;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.AccountField;
+import org.joinmastodon.android.model.Attachment;
 import org.joinmastodon.android.model.Relationship;
 import org.joinmastodon.android.ui.SimpleViewHolder;
+import org.joinmastodon.android.ui.SingleImagePhotoViewerListener;
 import org.joinmastodon.android.ui.drawables.CoverOverlayGradientDrawable;
+import org.joinmastodon.android.ui.photoviewer.PhotoViewer;
 import org.joinmastodon.android.ui.tabs.TabLayout;
 import org.joinmastodon.android.ui.tabs.TabLayoutMediator;
 import org.joinmastodon.android.ui.text.CustomEmojiSpan;
@@ -93,7 +101,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 	private ProgressBarButton actionButton;
 	private ViewPager2 pager;
 	private NestedRecyclerScrollView scrollView;
-	private AccountTimelineFragment postsFragment, postsWithRepliesFragment, mediaFragment;
+	private AccountTimelineFragment postsFragment, postsWithRepliesFragment, pinnedPostsFragment, mediaFragment;
 	private ProfileAboutFragment aboutFragment;
 	private TabLayout tabbar;
 	private SwipeRefreshLayout refreshLayout;
@@ -104,6 +112,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 	private ProgressBar actionProgress;
 	private FrameLayout[] tabViews;
 	private TabLayoutMediator tabLayoutMediator;
+	private TextView followsYouView;
 
 	private Account account;
 	private String accountID;
@@ -118,6 +127,8 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 	private boolean refreshing;
 	private View fab;
 	private WindowInsets childInsets;
+	private PhotoViewer currentPhotoViewer;
+	private boolean editModeLoading;
 
 	public ProfileFragment(){
 		super(R.layout.loader_fragment_overlay_toolbar);
@@ -178,6 +189,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		bioEdit=content.findViewById(R.id.bio_edit);
 		actionProgress=content.findViewById(R.id.action_progress);
 		fab=content.findViewById(R.id.fab);
+		followsYouView=content.findViewById(R.id.follows_you);
 
 		avatar.setOutlineProvider(new ViewOutlineProvider(){
 			@Override
@@ -197,14 +209,15 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			}
 		};
 
-		tabViews=new FrameLayout[4];
+		tabViews=new FrameLayout[5];
 		for(int i=0;i<tabViews.length;i++){
 			FrameLayout tabView=new FrameLayout(getActivity());
 			tabView.setId(switch(i){
 				case 0 -> R.id.profile_posts;
 				case 1 -> R.id.profile_posts_with_replies;
-				case 2 -> R.id.profile_media;
-				case 3 -> R.id.profile_about;
+				case 2 -> R.id.profile_pinned_posts;
+				case 3 -> R.id.profile_media;
+				case 4 -> R.id.profile_about;
 				default -> throw new IllegalStateException("Unexpected value: "+i);
 			});
 			tabView.setVisibility(View.GONE);
@@ -212,7 +225,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			tabViews[i]=tabView;
 		}
 
-		pager.setOffscreenPageLimit(4);
+		pager.setOffscreenPageLimit(5);
 		pager.setAdapter(new ProfilePagerAdapter());
 		pager.getLayoutParams().height=getResources().getDisplayMetrics().heightPixels;
 
@@ -228,8 +241,9 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 				tab.setText(switch(position){
 					case 0 -> R.string.posts;
 					case 1 -> R.string.posts_and_replies;
-					case 2 -> R.string.media;
-					case 3 -> R.string.profile_about;
+					case 2 -> R.string.pinned_posts;
+					case 3 -> R.string.media;
+					case 4 -> R.string.profile_about;
 					default -> throw new IllegalStateException();
 				});
 			}
@@ -257,6 +271,9 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			fab.setVisibility(View.GONE);
 		}
 
+		followersBtn.setOnClickListener(this::onFollowersOrFollowingClick);
+		followingBtn.setOnClickListener(this::onFollowersOrFollowingClick);
+
 		return sizeWrapper;
 	}
 
@@ -283,6 +300,8 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 								postsFragment.onRefresh();
 							if(postsWithRepliesFragment.loaded)
 								postsWithRepliesFragment.onRefresh();
+							if(pinnedPostsFragment.loaded)
+								pinnedPostsFragment.onRefresh();
 							if(mediaFragment.loaded)
 								mediaFragment.onRefresh();
 						}
@@ -307,6 +326,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		if(postsFragment==null){
 			postsFragment=AccountTimelineFragment.newInstance(accountID, account, GetAccountStatuses.Filter.DEFAULT, true);
 			postsWithRepliesFragment=AccountTimelineFragment.newInstance(accountID, account, GetAccountStatuses.Filter.INCLUDE_REPLIES, false);
+			pinnedPostsFragment =AccountTimelineFragment.newInstance(accountID, account, GetAccountStatuses.Filter.PINNED, false);
 			mediaFragment=AccountTimelineFragment.newInstance(accountID, account, GetAccountStatuses.Filter.MEDIA, false);
 			aboutFragment=new ProfileAboutFragment();
 			aboutFragment.setFields(fields);
@@ -387,6 +407,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		if(postsFragment!=null && postsFragment.isAdded() && childInsets!=null){
 			postsFragment.onApplyWindowInsets(childInsets);
 			postsWithRepliesFragment.onApplyWindowInsets(childInsets);
+			pinnedPostsFragment.onApplyWindowInsets(childInsets);
 			mediaFragment.onApplyWindowInsets(childInsets);
 		}
 	}
@@ -400,8 +421,25 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		HtmlParser.parseCustomEmoji(ssb, account.emojis);
 		name.setText(ssb);
 		setTitle(ssb);
-		username.setText('@'+account.acct);
-		bio.setText(HtmlParser.parse(account.note, account.emojis, Collections.emptyList(), Collections.emptyList(), accountID));
+		if(account.locked){
+			ssb=new SpannableStringBuilder("@");
+			ssb.append(account.acct);
+			ssb.append(" ");
+			Drawable lock=username.getResources().getDrawable(R.drawable.ic_fluent_lock_closed_20_filled, getActivity().getTheme()).mutate();
+			lock.setBounds(0, 0, lock.getIntrinsicWidth(), lock.getIntrinsicHeight());
+			lock.setTint(username.getCurrentTextColor());
+			ssb.append(getString(R.string.manually_approves_followers), new ImageSpan(lock, ImageSpan.ALIGN_BOTTOM), 0);
+			username.setText(ssb);
+		}else{
+			username.setText('@'+account.acct);
+		}
+		CharSequence parsedBio=HtmlParser.parse(account.note, account.emojis, Collections.emptyList(), Collections.emptyList(), accountID);
+		if(TextUtils.isEmpty(parsedBio)){
+			bio.setVisibility(View.GONE);
+		}else{
+			bio.setVisibility(View.VISIBLE);
+			bio.setText(parsedBio);
+		}
 		followersCount.setText(UiUtils.abbreviateNumber(account.followersCount));
 		followingCount.setText(UiUtils.abbreviateNumber(account.followingCount));
 		postsCount.setText(UiUtils.abbreviateNumber(account.statusesCount));
@@ -477,10 +515,17 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
 			return;
 		}
-		if(relationship==null)
+		if(relationship==null && !isOwnProfile)
 			return;
 		inflater.inflate(R.menu.profile, menu);
 		menu.findItem(R.id.share).setTitle(getString(R.string.share_user, account.getDisplayUsername()));
+		if(isOwnProfile){
+			for(int i=0;i<menu.size();i++){
+				MenuItem item=menu.getItem(i);
+				item.setVisible(item.getItemId()==R.id.share);
+			}
+			return;
+		}
 		menu.findItem(R.id.mute).setTitle(getString(relationship.muting ? R.string.unmute_user : R.string.mute_user, account.getDisplayUsername()));
 		menu.findItem(R.id.block).setTitle(getString(relationship.blocking ? R.string.unblock_user : R.string.block_user, account.getDisplayUsername()));
 		menu.findItem(R.id.report).setTitle(getString(R.string.report_user, account.getDisplayUsername()));
@@ -565,16 +610,16 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		invalidateOptionsMenu();
 		actionButton.setVisibility(View.VISIBLE);
 		UiUtils.setRelationshipToActionButton(relationship, actionButton);
+		actionProgress.setIndeterminateTintList(actionButton.getTextColors());
+		followsYouView.setVisibility(relationship.followedBy ? View.VISIBLE : View.GONE);
 	}
 
 	private void onScrollChanged(View v, int scrollX, int scrollY, int oldScrollX, int oldScrollY){
 		int topBarsH=getToolbar().getHeight()+statusBarHeight;
-		if(scrollY>avatar.getTop()-topBarsH){
-			float avaAlpha=Math.max(1f-((scrollY-(avatar.getTop()-topBarsH))/(float)V.dp(38)), 0f);
-			avatar.setAlpha(avaAlpha);
+		if(scrollY>avatarBorder.getTop()-topBarsH){
+			float avaAlpha=Math.max(1f-((scrollY-(avatarBorder.getTop()-topBarsH))/(float)V.dp(38)), 0f);
 			avatarBorder.setAlpha(avaAlpha);
 		}else{
-			avatar.setAlpha(1f);
 			avatarBorder.setAlpha(1f);
 		}
 		if(scrollY>cover.getHeight()-topBarsH){
@@ -596,14 +641,18 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			toolbarTitleView.setTranslationY(titleTransY);
 			toolbarSubtitleView.setTranslationY(titleTransY);
 		}
+		if(currentPhotoViewer!=null){
+			currentPhotoViewer.offsetView(0, oldScrollY-scrollY);
+		}
 	}
 
 	private Fragment getFragmentForPage(int page){
 		return switch(page){
 			case 0 -> postsFragment;
 			case 1 -> postsWithRepliesFragment;
-			case 2 -> mediaFragment;
-			case 3 -> aboutFragment;
+			case 2 -> pinnedPostsFragment;
+			case 3 -> mediaFragment;
+			case 4 -> aboutFragment;
 			default -> throw new IllegalStateException();
 		};
 	}
@@ -630,17 +679,26 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 	}
 
 	private void loadAccountInfoAndEnterEditMode(){
+		if(editModeLoading)
+			return;
+		editModeLoading=true;
 		setActionProgressVisible(true);
 		new GetOwnAccount()
 				.setCallback(new Callback<>(){
 					@Override
 					public void onSuccess(Account result){
+						editModeLoading=false;
+						if(getActivity()==null)
+							return;
 						enterEditMode(result);
 						setActionProgressVisible(false);
 					}
 
 					@Override
 					public void onError(ErrorResponse error){
+						editModeLoading=false;
+						if(getActivity()==null)
+							return;
 						error.showToast(getActivity());
 						setActionProgressVisible(false);
 					}
@@ -655,9 +713,9 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		invalidateOptionsMenu();
 		pager.setUserInputEnabled(false);
 		actionButton.setText(R.string.done);
-		pager.setCurrentItem(3);
+		pager.setCurrentItem(4);
 		ArrayList<Animator> animators=new ArrayList<>();
-		for(int i=0;i<3;i++){
+		for(int i=0;i<tabViews.length-1;i++){
 			animators.add(ObjectAnimator.ofFloat(tabbar.getTabAt(i).view, View.ALPHA, .3f));
 			tabbar.getTabAt(i).view.setEnabled(false);
 		}
@@ -698,7 +756,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		invalidateOptionsMenu();
 		ArrayList<Animator> animators=new ArrayList<>();
 		actionButton.setText(R.string.edit_profile);
-		for(int i=0;i<3;i++){
+		for(int i=0;i<tabViews.length-1;i++){
 			animators.add(ObjectAnimator.ofFloat(tabbar.getTabAt(i).view, View.ALPHA, 1f));
 		}
 		animators.add(ObjectAnimator.ofInt(avatar.getForeground(), "alpha", 0));
@@ -716,7 +774,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		set.addListener(new AnimatorListenerAdapter(){
 			@Override
 			public void onAnimationEnd(Animator animation){
-				for(int i=0;i<3;i++){
+				for(int i=0;i<tabViews.length-1;i++){
 					tabbar.getTabAt(i).view.setEnabled(true);
 				}
 				pager.setUserInputEnabled(true);
@@ -778,15 +836,38 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		return false;
 	}
 
+	private List<Attachment> createFakeAttachments(String url, Drawable drawable){
+		Attachment att=new Attachment();
+		att.type=Attachment.Type.IMAGE;
+		att.url=url;
+		att.meta=new Attachment.Metadata();
+		att.meta.width=drawable.getIntrinsicWidth();
+		att.meta.height=drawable.getIntrinsicHeight();
+		return Collections.singletonList(att);
+	}
+
 	private void onAvatarClick(View v){
 		if(isInEditMode){
 			startImagePicker(AVATAR_RESULT);
+		}else{
+			Drawable ava=avatar.getDrawable();
+			if(ava==null)
+				return;
+			int radius=V.dp(25);
+			currentPhotoViewer=new PhotoViewer(getActivity(), createFakeAttachments(account.avatar, ava), 0,
+					new SingleImagePhotoViewerListener(avatar, avatarBorder, new int[]{radius, radius, radius, radius}, this, ()->currentPhotoViewer=null, ()->ava, null, null));
 		}
 	}
 
 	private void onCoverClick(View v){
 		if(isInEditMode){
 			startImagePicker(COVER_RESULT);
+		}else{
+			Drawable drawable=cover.getDrawable();
+			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)));
 		}
 	}
 
@@ -825,6 +906,20 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		scrollView.smoothScrollTo(0, 0);
 	}
 
+	private void onFollowersOrFollowingClick(View v){
+		Bundle args=new Bundle();
+		args.putString("account", accountID);
+		args.putParcelable("targetAccount", Parcels.wrap(account));
+		Class<? extends Fragment> cls;
+		if(v.getId()==R.id.followers_btn)
+			cls=FollowerListFragment.class;
+		else if(v.getId()==R.id.following_btn)
+			cls=FollowingListFragment.class;
+		else
+			return;
+		Nav.go(getActivity(), cls, args);
+	}
+
 	private class ProfilePagerAdapter extends RecyclerView.Adapter<SimpleViewHolder>{
 		@NonNull
 		@Override
@@ -856,7 +951,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 
 		@Override
 		public int getItemCount(){
-			return loaded ? 4 : 0;
+			return loaded ? tabViews.length : 0;
 		}
 
 		@Override

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

@@ -13,6 +13,8 @@ public interface ScrollableToTop{
 	 * @param list
 	 */
 	default void smoothScrollRecyclerViewToTop(RecyclerView list){
+		if(list==null) // TODO find out why this happens because it should not be possible
+			return;
 		if(list.getChildCount()>0 && list.getChildAdapterPosition(list.getChildAt(0))>10){
 			list.scrollToPosition(0);
 			list.getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener(){

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

@@ -9,9 +9,10 @@ import org.joinmastodon.android.events.PollUpdatedEvent;
 import org.joinmastodon.android.events.StatusCountersUpdatedEvent;
 import org.joinmastodon.android.events.StatusCreatedEvent;
 import org.joinmastodon.android.events.StatusDeletedEvent;
+import org.joinmastodon.android.events.StatusUnpinnedEvent;
 import org.joinmastodon.android.model.Status;
+import org.joinmastodon.android.ui.displayitems.ExtendedFooterStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.FooterStatusDisplayItem;
-import org.joinmastodon.android.ui.displayitems.HeaderStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
 import org.parceler.Parcels;
 
@@ -60,6 +61,8 @@ public abstract class StatusListFragment extends BaseStatusListFragment<Status>{
 
 	protected void onStatusCreated(StatusCreatedEvent ev){}
 
+	protected void onStatusUnpinned(StatusUnpinnedEvent ev){}
+
 	protected Status getContentStatusByID(String id){
 		Status s=getStatusByID(id);
 		return s==null ? null : s.getContentStatus();
@@ -90,16 +93,15 @@ public abstract class StatusListFragment extends BaseStatusListFragment<Status>{
 						RecyclerView.ViewHolder holder=list.getChildViewHolder(list.getChildAt(i));
 						if(holder instanceof FooterStatusDisplayItem.Holder footer && footer.getItem().status==s.getContentStatus()){
 							footer.rebind();
-							return;
+						}else if(holder instanceof ExtendedFooterStatusDisplayItem.Holder footer && footer.getItem().status==s.getContentStatus()){
+							footer.rebind();
 						}
 					}
-					return;
 				}
 			}
 			for(Status s:preloadedData){
 				if(s.id.equals(ev.id)){
 					s.update(ev);
-					return;
 				}
 			}
 		}
@@ -113,10 +115,15 @@ public abstract class StatusListFragment extends BaseStatusListFragment<Status>{
 				return;
 			data.remove(status);
 			preloadedData.remove(status);
-			HeaderStatusDisplayItem item=findItemOfType(ev.id, HeaderStatusDisplayItem.class);
-			if(item==null)
+			int index=-1;
+			for(int i=0;i<displayItems.size();i++){
+				if(ev.id.equals(displayItems.get(i).parentID)){
+					index=i;
+					break;
+				}
+			}
+			if(index==-1)
 				return;
-			int index=displayItems.indexOf(item);
 			int lastIndex;
 			for(lastIndex=index;lastIndex<displayItems.size();lastIndex++){
 				if(!displayItems.get(lastIndex).parentID.equals(ev.id))
@@ -131,6 +138,11 @@ public abstract class StatusListFragment extends BaseStatusListFragment<Status>{
 			StatusListFragment.this.onStatusCreated(ev);
 		}
 
+		@Subscribe
+		public void onStatusUnpinned(StatusUnpinnedEvent ev){
+			StatusListFragment.this.onStatusUnpinned(ev);
+		}
+
 		@Subscribe
 		public void onPollUpdated(PollUpdatedEvent ev){
 			if(!ev.accountID.equals(accountID))

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

@@ -11,6 +11,8 @@ import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.model.StatusContext;
+import org.joinmastodon.android.ui.displayitems.ExtendedFooterStatusDisplayItem;
+import org.joinmastodon.android.ui.displayitems.FooterStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.TextStatusDisplayItem;
 import org.joinmastodon.android.ui.text.HtmlParser;
@@ -45,7 +47,10 @@ public class ThreadFragment extends StatusListFragment{
 			for(StatusDisplayItem item:items){
 				if(item instanceof TextStatusDisplayItem text)
 					text.textSelectable=true;
+				else if(item instanceof FooterStatusDisplayItem footer)
+					footer.hideCounts=true;
 			}
+			items.add(new ExtendedFooterStatusDisplayItem(s.id, this, s.getContentStatus()));
 		}
 		return items;
 	}

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

@@ -0,0 +1,17 @@
+package org.joinmastodon.android.fragments.account_list;
+
+import android.os.Bundle;
+
+import org.joinmastodon.android.model.Account;
+import org.parceler.Parcels;
+
+public abstract class AccountRelatedAccountListFragment extends PaginatedAccountListFragment{
+	protected Account account;
+
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		account=Parcels.unwrap(getArguments().getParcelable("targetAccount"));
+		setTitle("@"+account.acct);
+	}
+}

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

@@ -0,0 +1,394 @@
+package org.joinmastodon.android.fragments.account_list;
+
+import android.app.ProgressDialog;
+import android.content.Intent;
+import android.content.res.Configuration;
+import android.graphics.drawable.Animatable;
+import android.graphics.drawable.Drawable;
+import android.os.Build;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowInsets;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.PopupMenu;
+import android.widget.TextView;
+import android.widget.Toolbar;
+
+import org.joinmastodon.android.GlobalUserPreferences;
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.accounts.GetAccountRelationships;
+import org.joinmastodon.android.api.requests.accounts.SetAccountFollowed;
+import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.fragments.ProfileFragment;
+import org.joinmastodon.android.fragments.report.ReportReasonChoiceFragment;
+import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.model.Relationship;
+import org.joinmastodon.android.ui.DividerItemDecoration;
+import org.joinmastodon.android.ui.OutlineProviders;
+import org.joinmastodon.android.ui.text.HtmlParser;
+import org.joinmastodon.android.ui.utils.CustomEmojiHelper;
+import org.joinmastodon.android.ui.utils.UiUtils;
+import org.parceler.Parcels;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import androidx.annotation.CallSuper;
+import androidx.annotation.NonNull;
+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.fragments.BaseRecyclerFragment;
+import me.grishka.appkit.imageloader.ImageLoaderRecyclerAdapter;
+import me.grishka.appkit.imageloader.ImageLoaderViewHolder;
+import me.grishka.appkit.imageloader.requests.ImageLoaderRequest;
+import me.grishka.appkit.imageloader.requests.UrlImageLoaderRequest;
+import me.grishka.appkit.utils.BindableViewHolder;
+import me.grishka.appkit.utils.V;
+import me.grishka.appkit.views.UsableRecyclerView;
+
+public abstract class BaseAccountListFragment extends BaseRecyclerFragment<BaseAccountListFragment.AccountItem>{
+	protected HashMap<String, Relationship> relationships=new HashMap<>();
+	protected String accountID;
+	protected ArrayList<APIRequest<?>> relationshipsRequests=new ArrayList<>();
+
+	public BaseAccountListFragment(){
+		super(40);
+	}
+
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		accountID=getArguments().getString("account");
+	}
+
+	@Override
+	protected void onDataLoaded(List<AccountItem> d, boolean more){
+		if(refreshing){
+			relationships.clear();
+		}
+		loadRelationships(d);
+		super.onDataLoaded(d, more);
+	}
+
+	@Override
+	public void onRefresh(){
+		for(APIRequest<?> req:relationshipsRequests){
+			req.cancel();
+		}
+		relationshipsRequests.clear();
+		super.onRefresh();
+	}
+
+	protected void loadRelationships(List<AccountItem> accounts){
+		Set<String> ids=accounts.stream().map(ai->ai.account.id).collect(Collectors.toSet());
+		GetAccountRelationships req=new GetAccountRelationships(ids);
+		relationshipsRequests.add(req);
+		req.setCallback(new Callback<>(){
+					@Override
+					public void onSuccess(List<Relationship> result){
+						relationshipsRequests.remove(req);
+						for(Relationship rel:result){
+							relationships.put(rel.id, rel);
+						}
+						if(list==null)
+							return;
+						for(int i=0;i<list.getChildCount();i++){
+							if(list.getChildViewHolder(list.getChildAt(i)) instanceof AccountViewHolder avh){
+								avh.bindRelationship();
+							}
+						}
+					}
+
+					@Override
+					public void onError(ErrorResponse error){
+						relationshipsRequests.remove(req);
+					}
+				})
+				.exec(accountID);
+	}
+
+	@Override
+	protected RecyclerView.Adapter getAdapter(){
+		return new AccountsAdapter();
+	}
+
+	@Override
+	public void onViewCreated(View view, Bundle savedInstanceState){
+		super.onViewCreated(view, savedInstanceState);
+//		list.setPadding(0, V.dp(16), 0, V.dp(16));
+		list.setClipToPadding(false);
+		list.addItemDecoration(new DividerItemDecoration(getActivity(), R.attr.colorPollVoted, 1, 72, 16));
+		updateToolbar();
+	}
+
+	@Override
+	public void onConfigurationChanged(Configuration newConfig){
+		super.onConfigurationChanged(newConfig);
+		updateToolbar();
+	}
+
+	@CallSuper
+	protected void updateToolbar(){
+		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);
+			}
+		}
+	}
+
+	protected boolean hasSubtitle(){
+		return true;
+	}
+
+	@Override
+	public void onApplyWindowInsets(WindowInsets insets){
+		if(Build.VERSION.SDK_INT>=29 && insets.getTappableElementInsets().bottom==0){
+			list.setPadding(0, V.dp(16), 0, V.dp(16)+insets.getSystemWindowInsetBottom());
+			insets=insets.inset(0, 0, 0, insets.getSystemWindowInsetBottom());
+		}else{
+			list.setPadding(0, V.dp(16), 0, V.dp(16));
+		}
+		super.onApplyWindowInsets(insets);
+	}
+
+	protected class AccountsAdapter extends UsableRecyclerView.Adapter<AccountViewHolder> implements ImageLoaderRecyclerAdapter{
+		public AccountsAdapter(){
+			super(imgLoader);
+		}
+
+		@NonNull
+		@Override
+		public AccountViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType){
+			return new AccountViewHolder();
+		}
+
+		@Override
+		public void onBindViewHolder(AccountViewHolder holder, int position){
+			holder.bind(data.get(position));
+			super.onBindViewHolder(holder, position);
+		}
+
+		@Override
+		public int getItemCount(){
+			return data.size();
+		}
+
+		@Override
+		public int getImageCountForItem(int position){
+			return data.get(position).emojiHelper.getImageCount()+1;
+		}
+
+		@Override
+		public ImageLoaderRequest getImageRequest(int position, int image){
+			AccountItem item=data.get(position);
+			return image==0 ? item.avaRequest : item.emojiHelper.getImageRequest(image-1);
+		}
+	}
+
+	protected class AccountViewHolder extends BindableViewHolder<AccountItem> implements ImageLoaderViewHolder, UsableRecyclerView.Clickable, UsableRecyclerView.LongClickable{
+		private final TextView name, username;
+		private final ImageView avatar;
+		private final Button button;
+		private final PopupMenu contextMenu;
+		private final View menuAnchor;
+
+		public AccountViewHolder(){
+			super(getActivity(), R.layout.item_account_list, list);
+			name=findViewById(R.id.name);
+			username=findViewById(R.id.username);
+			avatar=findViewById(R.id.avatar);
+			button=findViewById(R.id.button);
+			menuAnchor=findViewById(R.id.menu_anchor);
+
+			avatar.setOutlineProvider(OutlineProviders.roundedRect(12));
+			avatar.setClipToOutline(true);
+
+			button.setOnClickListener(this::onButtonClick);
+
+			contextMenu=new PopupMenu(getActivity(), menuAnchor);
+			contextMenu.inflate(R.menu.profile);
+			contextMenu.setOnMenuItemClickListener(this::onContextMenuItemSelected);
+		}
+
+		@Override
+		public void onBind(AccountItem item){
+			name.setText(item.parsedName);
+			username.setText("@"+item.account.acct);
+			bindRelationship();
+		}
+
+		public void bindRelationship(){
+			Relationship rel=relationships.get(item.account.id);
+			if(rel==null || AccountSessionManager.getInstance().isSelf(accountID, item.account)){
+				button.setVisibility(View.GONE);
+			}else{
+				button.setVisibility(View.VISIBLE);
+				UiUtils.setRelationshipToActionButton(rel, button);
+			}
+		}
+
+		@Override
+		public void setImage(int index, Drawable image){
+			if(index==0){
+				avatar.setImageDrawable(image);
+			}else{
+				item.emojiHelper.setImageDrawable(index-1, image);
+				name.invalidate();
+			}
+
+			if(image instanceof Animatable a && !a.isRunning())
+				a.start();
+		}
+
+		@Override
+		public void clearImage(int index){
+			setImage(index, null);
+		}
+
+		@Override
+		public void onClick(){
+			Bundle args=new Bundle();
+			args.putString("account", accountID);
+			args.putParcelable("profileAccount", Parcels.wrap(item.account));
+			Nav.go(getActivity(), ProfileFragment.class, args);
+		}
+
+		@Override
+		public boolean onLongClick(){
+			return false;
+		}
+
+		@Override
+		public boolean onLongClick(float x, float y){
+			Relationship relationship=relationships.get(item.account.id);
+			if(relationship==null)
+				return false;
+			Menu menu=contextMenu.getMenu();
+			Account account=item.account;
+
+			menu.findItem(R.id.share).setTitle(getString(R.string.share_user, account.getDisplayUsername()));
+			menu.findItem(R.id.mute).setTitle(getString(relationship.muting ? R.string.unmute_user : R.string.mute_user, account.getDisplayUsername()));
+			menu.findItem(R.id.block).setTitle(getString(relationship.blocking ? R.string.unblock_user : R.string.block_user, account.getDisplayUsername()));
+			menu.findItem(R.id.report).setTitle(getString(R.string.report_user, account.getDisplayUsername()));
+			MenuItem hideBoosts=menu.findItem(R.id.hide_boosts);
+			if(relationship.following){
+				hideBoosts.setTitle(getString(relationship.showingReblogs ? R.string.hide_boosts_from_user : R.string.show_boosts_from_user, account.getDisplayUsername()));
+				hideBoosts.setVisible(true);
+			}else{
+				hideBoosts.setVisible(false);
+			}
+			MenuItem blockDomain=menu.findItem(R.id.block_domain);
+			if(!account.isLocal()){
+				blockDomain.setTitle(getString(relationship.domainBlocking ? R.string.unblock_domain : R.string.block_domain, account.getDomain()));
+				blockDomain.setVisible(true);
+			}else{
+				blockDomain.setVisible(false);
+			}
+
+			menuAnchor.setTranslationX(x);
+			menuAnchor.setTranslationY(y);
+			contextMenu.show();
+
+			return true;
+		}
+
+		private void onButtonClick(View v){
+			ProgressDialog progress=new ProgressDialog(getActivity());
+			progress.setMessage(getString(R.string.loading));
+			progress.setCancelable(false);
+			UiUtils.performAccountAction(getActivity(), item.account, accountID, relationships.get(item.account.id), button, progressShown->{
+				itemView.setHasTransientState(progressShown);
+				if(progressShown)
+					progress.show();
+				else
+					progress.dismiss();
+			}, result->{
+				relationships.put(item.account.id, result);
+				bindRelationship();
+			});
+		}
+
+		private boolean onContextMenuItemSelected(MenuItem item){
+			Relationship relationship=relationships.get(this.item.account.id);
+			if(relationship==null)
+				return false;
+			Account account=this.item.account;
+
+			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()));
+			}else if(id==R.id.mute){
+				UiUtils.confirmToggleMuteUser(getActivity(), accountID, account, relationship.muting, this::updateRelationship);
+			}else if(id==R.id.block){
+				UiUtils.confirmToggleBlockUser(getActivity(), accountID, account, relationship.blocking, this::updateRelationship);
+			}else if(id==R.id.report){
+				Bundle args=new Bundle();
+				args.putString("account", accountID);
+				args.putParcelable("reportAccount", Parcels.wrap(account));
+				Nav.go(getActivity(), ReportReasonChoiceFragment.class, args);
+			}else if(id==R.id.open_in_browser){
+				UiUtils.launchWebBrowser(getActivity(), account.url);
+			}else if(id==R.id.block_domain){
+				UiUtils.confirmToggleBlockDomain(getActivity(), accountID, account.getDomain(), relationship.domainBlocking, ()->{
+					relationship.domainBlocking=!relationship.domainBlocking;
+					bindRelationship();
+				});
+			}else if(id==R.id.hide_boosts){
+				new SetAccountFollowed(account.id, true, !relationship.showingReblogs)
+						.setCallback(new Callback<>(){
+							@Override
+							public void onSuccess(Relationship result){
+								relationships.put(AccountViewHolder.this.item.account.id, result);
+								bindRelationship();
+							}
+
+							@Override
+							public void onError(ErrorResponse error){
+								error.showToast(getActivity());
+							}
+						})
+						.wrapProgress(getActivity(), R.string.loading, false)
+						.exec(accountID);
+			}
+			return true;
+		}
+
+		private void updateRelationship(Relationship r){
+			relationships.put(item.account.id, r);
+			bindRelationship();
+		}
+	}
+
+	protected static class AccountItem{
+		public final Account account;
+		public final ImageLoaderRequest avaRequest;
+		public final CustomEmojiHelper emojiHelper;
+		public final CharSequence parsedName;
+
+		public AccountItem(Account account){
+			this.account=account;
+			avaRequest=new UrlImageLoaderRequest(GlobalUserPreferences.playGifs ? account.avatar : account.avatarStatic, V.dp(50), V.dp(50));
+			emojiHelper=new CustomEmojiHelper();
+			emojiHelper.setText(parsedName=HtmlParser.parseCustomEmoji(account.displayName, account.emojis));
+		}
+	}
+}

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

@@ -0,0 +1,22 @@
+package org.joinmastodon.android.fragments.account_list;
+
+import android.os.Bundle;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.HeaderPaginationRequest;
+import org.joinmastodon.android.api.requests.accounts.GetAccountFollowers;
+import org.joinmastodon.android.model.Account;
+
+public class FollowerListFragment extends AccountRelatedAccountListFragment{
+
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		setSubtitle(getResources().getQuantityString(R.plurals.x_followers, account.followersCount, account.followersCount));
+	}
+
+	@Override
+	public HeaderPaginationRequest<Account> onCreateRequest(String maxID, int count){
+		return new GetAccountFollowers(account.id, maxID, count);
+	}
+}

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

@@ -0,0 +1,22 @@
+package org.joinmastodon.android.fragments.account_list;
+
+import android.os.Bundle;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.HeaderPaginationRequest;
+import org.joinmastodon.android.api.requests.accounts.GetAccountFollowing;
+import org.joinmastodon.android.model.Account;
+
+public class FollowingListFragment extends AccountRelatedAccountListFragment{
+
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		setSubtitle(getResources().getQuantityString(R.plurals.x_following, account.followingCount, account.followingCount));
+	}
+
+	@Override
+	public HeaderPaginationRequest<Account> onCreateRequest(String maxID, int count){
+		return new GetAccountFollowing(account.id, maxID, count);
+	}
+}

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

@@ -0,0 +1,38 @@
+package org.joinmastodon.android.fragments.account_list;
+
+import org.joinmastodon.android.api.requests.HeaderPaginationRequest;
+import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.model.HeaderPaginationList;
+
+import java.util.stream.Collectors;
+
+import me.grishka.appkit.api.SimpleCallback;
+
+public abstract class PaginatedAccountListFragment extends BaseAccountListFragment{
+	private String nextMaxID;
+
+	public abstract HeaderPaginationRequest<Account> onCreateRequest(String maxID, int count);
+
+	@Override
+	protected void doLoadData(int offset, int count){
+		currentRequest=onCreateRequest(offset==0 ? null : nextMaxID, count)
+				.setCallback(new SimpleCallback<>(this){
+					@Override
+					public void onSuccess(HeaderPaginationList<Account> result){
+						if(result.nextPageUri!=null)
+							nextMaxID=result.nextPageUri.getQueryParameter("max_id");
+						else
+							nextMaxID=null;
+						onDataLoaded(result.stream().map(AccountItem::new).collect(Collectors.toList()), nextMaxID!=null);
+					}
+				})
+				.exec(accountID);
+	}
+
+	@Override
+	public void onResume(){
+		super.onResume();
+		if(!loaded && !dataLoading)
+			loadData();
+	}
+}

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

@@ -0,0 +1,21 @@
+package org.joinmastodon.android.fragments.account_list;
+
+import android.os.Bundle;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.HeaderPaginationRequest;
+import org.joinmastodon.android.api.requests.statuses.GetStatusFavorites;
+import org.joinmastodon.android.model.Account;
+
+public class StatusFavoritesListFragment extends StatusRelatedAccountListFragment{
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		setTitle(getResources().getQuantityString(R.plurals.x_favorites, status.favouritesCount, status.favouritesCount));
+	}
+
+	@Override
+	public HeaderPaginationRequest<Account> onCreateRequest(String maxID, int count){
+		return new GetStatusFavorites(status.id, maxID, count);
+	}
+}

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

@@ -0,0 +1,21 @@
+package org.joinmastodon.android.fragments.account_list;
+
+import android.os.Bundle;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.HeaderPaginationRequest;
+import org.joinmastodon.android.api.requests.statuses.GetStatusReblogs;
+import org.joinmastodon.android.model.Account;
+
+public class StatusReblogsListFragment extends StatusRelatedAccountListFragment{
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		setTitle(getResources().getQuantityString(R.plurals.x_reblogs, status.reblogsCount, status.reblogsCount));
+	}
+
+	@Override
+	public HeaderPaginationRequest<Account> onCreateRequest(String maxID, int count){
+		return new GetStatusReblogs(status.id, maxID, count);
+	}
+}

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

@@ -0,0 +1,21 @@
+package org.joinmastodon.android.fragments.account_list;
+
+import android.os.Bundle;
+
+import org.joinmastodon.android.model.Status;
+import org.parceler.Parcels;
+
+public abstract class StatusRelatedAccountListFragment extends PaginatedAccountListFragment{
+	protected Status status;
+
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		status=Parcels.unwrap(getArguments().getParcelable("status"));
+	}
+
+	@Override
+	protected boolean hasSubtitle(){
+		return false;
+	}
+}

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

@@ -51,6 +51,7 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 	private DiscoverAccountsFragment accountsFragment;
 	private SearchFragment searchFragment;
 	private LocalTimelineFragment localTimelineFragment;
+	private FederatedTimelineFragment federatedTimelineFragment;
 
 	private String accountID;
 	private Runnable searchDebouncer=this::onSearchChangedDebounced;
@@ -72,15 +73,16 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 		tabLayout=view.findViewById(R.id.tabbar);
 		pager=view.findViewById(R.id.pager);
 
-		tabViews=new FrameLayout[5];
+		tabViews=new FrameLayout[6];
 		for(int i=0;i<tabViews.length;i++){
 			FrameLayout tabView=new FrameLayout(getActivity());
 			tabView.setId(switch(i){
-				case 0 -> R.id.discover_posts;
-				case 1 -> R.id.discover_hashtags;
-				case 2 -> R.id.discover_news;
-				case 3 -> R.id.discover_local_timeline;
-				case 4 -> R.id.discover_users;
+				case 0 -> R.id.discover_local_timeline;
+				case 1 -> R.id.discover_federated_timeline;
+				case 2 -> R.id.discover_hashtags;
+				case 3 -> R.id.discover_posts;
+				case 4 -> R.id.discover_news;
+				case 5 -> R.id.discover_users;
 				default -> throw new IllegalStateException("Unexpected value: "+i);
 			});
 			tabView.setVisibility(View.GONE);
@@ -106,7 +108,7 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 			}
 		});
 
-		if(postsFragment==null){
+		if(localTimelineFragment==null){
 			Bundle args=new Bundle();
 			args.putString("account", accountID);
 			args.putBoolean("__is_tab", true);
@@ -126,9 +128,13 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 			localTimelineFragment=new LocalTimelineFragment();
 			localTimelineFragment.setArguments(args);
 
+			federatedTimelineFragment=new FederatedTimelineFragment();
+			federatedTimelineFragment.setArguments(args);
+
 			getChildFragmentManager().beginTransaction()
 					.add(R.id.discover_posts, postsFragment)
 					.add(R.id.discover_local_timeline, localTimelineFragment)
+					.add(R.id.discover_federated_timeline, federatedTimelineFragment)
 					.add(R.id.discover_hashtags, hashtagsFragment)
 					.add(R.id.discover_news, newsFragment)
 					.add(R.id.discover_users, accountsFragment)
@@ -139,17 +145,30 @@ 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.posts;
-					case 1 -> R.string.hashtags;
-					case 2 -> R.string.news;
-					case 3 -> R.string.local_timeline;
-					case 4 -> R.string.for_you;
+					case 0 -> R.string.local_timeline;
+					case 1 -> R.string.federated_timeline;
+					case 2 -> R.string.hashtags;
+					case 3 -> R.string.posts;
+					case 4 -> R.string.news;
+					case 5 -> R.string.for_you;
 					default -> throw new IllegalStateException("Unexpected value: "+position);
 				});
 				tab.view.textView.setAllCaps(true);
 			}
 		});
 		tabLayoutMediator.attach();
+		tabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener(){
+			@Override
+			public void onTabSelected(TabLayout.Tab tab){}
+
+			@Override
+			public void onTabUnselected(TabLayout.Tab tab){}
+
+			@Override
+			public void onTabReselected(TabLayout.Tab tab){
+				scrollToTop();
+			}
+		});
 
 		searchEdit=view.findViewById(R.id.search_edit);
 		searchEdit.setOnFocusChangeListener(this::onSearchEditFocusChanged);
@@ -217,8 +236,8 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 	}
 
 	public void loadData(){
-		if(postsFragment!=null && !postsFragment.loaded && !postsFragment.dataLoading)
-			postsFragment.loadData();
+		if(localTimelineFragment!=null && !localTimelineFragment.loaded && !localTimelineFragment.dataLoading)
+			localTimelineFragment.loadData();
 	}
 
 	private void onSearchEditFocusChanged(View v, boolean hasFocus){
@@ -254,11 +273,12 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 
 	private Fragment getFragmentForPage(int page){
 		return switch(page){
-			case 0 -> postsFragment;
-			case 1 -> hashtagsFragment;
-			case 2 -> newsFragment;
-			case 3 -> localTimelineFragment;
-			case 4 -> accountsFragment;
+			case 0 -> localTimelineFragment;
+			case 1 -> federatedTimelineFragment;
+			case 2 -> hashtagsFragment;
+			case 3 -> postsFragment;
+			case 4 -> newsFragment;
+			case 5 -> accountsFragment;
 			default -> throw new IllegalStateException("Unexpected value: "+page);
 		};
 	}

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

@@ -0,0 +1,41 @@
+package org.joinmastodon.android.fragments.discover;
+
+import android.os.Bundle;
+import android.view.View;
+
+import org.joinmastodon.android.api.requests.timelines.GetPublicTimeline;
+import org.joinmastodon.android.fragments.StatusListFragment;
+import org.joinmastodon.android.model.Filter;
+import org.joinmastodon.android.model.Status;
+import org.joinmastodon.android.ui.utils.DiscoverInfoBannerHelper;
+import org.joinmastodon.android.utils.StatusFilterPredicate;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+import me.grishka.appkit.api.SimpleCallback;
+
+public class FederatedTimelineFragment extends StatusListFragment{
+	private DiscoverInfoBannerHelper bannerHelper=new DiscoverInfoBannerHelper(DiscoverInfoBannerHelper.BannerType.FEDERATED_TIMELINE);
+	private String maxID;
+
+	@Override
+	protected void doLoadData(int offset, int count){
+		currentRequest=new GetPublicTimeline(false, false, refreshing ? null : maxID, count)
+				.setCallback(new SimpleCallback<>(this){
+					@Override
+					public void onSuccess(List<Status> result){
+						if(!result.isEmpty())
+							maxID=result.get(result.size()-1).id;
+						onDataLoaded(result.stream().filter(new StatusFilterPredicate(accountID, Filter.FilterContext.PUBLIC)).collect(Collectors.toList()), !result.isEmpty());
+					}
+				})
+				.exec(accountID);
+	}
+
+	@Override
+	public void onViewCreated(View view, Bundle savedInstanceState){
+		super.onViewCreated(view, savedInstanceState);
+		bannerHelper.maybeAddBanner(contentWrap);
+	}
+}

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

@@ -5,23 +5,29 @@ import android.view.View;
 
 import org.joinmastodon.android.api.requests.timelines.GetPublicTimeline;
 import org.joinmastodon.android.fragments.StatusListFragment;
+import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.utils.DiscoverInfoBannerHelper;
+import org.joinmastodon.android.utils.StatusFilterPredicate;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 import me.grishka.appkit.api.SimpleCallback;
 
 public class LocalTimelineFragment extends StatusListFragment{
 	private DiscoverInfoBannerHelper bannerHelper=new DiscoverInfoBannerHelper(DiscoverInfoBannerHelper.BannerType.LOCAL_TIMELINE);
+	private String maxID;
 
 	@Override
 	protected void doLoadData(int offset, int count){
-		currentRequest=new GetPublicTimeline(true, false, refreshing ? null : getMaxID(), count)
+		currentRequest=new GetPublicTimeline(true, false, refreshing ? null : maxID, count)
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(List<Status> result){
-						onDataLoaded(result, !result.isEmpty());
+						if(!result.isEmpty())
+							maxID=result.get(result.size()-1).id;
+						onDataLoaded(result.stream().filter(new StatusFilterPredicate(accountID, Filter.FilterContext.PUBLIC)).collect(Collectors.toList()), !result.isEmpty());
 					}
 				})
 				.exec(accountID);

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

@@ -117,6 +117,8 @@ public class SearchFragment extends BaseStatusListFragment<SearchResult>{
 	protected void doLoadData(int offset, int count){
 		if(isInRecentMode()){
 			AccountSessionManager.getInstance().getAccount(accountID).getCacheController().getRecentSearches(sr->{
+				if(getActivity()==null)
+					return;
 				unfilteredResults=sr;
 				prevDisplayItems=new ArrayList<>(displayItems);
 				onDataLoaded(sr, false);
@@ -203,7 +205,7 @@ public class SearchFragment extends BaseStatusListFragment<SearchResult>{
 
 			@Override
 			public void onTabReselected(TabLayout.Tab tab){
-
+				scrollToTop();
 			}
 		});
 	}

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

@@ -14,6 +14,7 @@ import android.view.WindowInsets;
 import android.widget.Button;
 import android.widget.Toast;
 
+import org.joinmastodon.android.MainActivity;
 import org.joinmastodon.android.MastodonApp;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.accounts.GetOwnAccount;
@@ -136,6 +137,13 @@ public class AccountActivationFragment extends AppKitFragment{
 	}
 
 	private void tryGetAccount(){
+		if(AccountSessionManager.getInstance().tryGetAccount(accountID)==null){
+			uiHandler.removeCallbacks(pollRunnable);
+			getActivity().finish();
+			Intent intent=new Intent(getActivity(), MainActivity.class);
+			startActivity(intent);
+			return;
+		}
 		currentRequest=new GetOwnAccount()
 				.setCallback(new Callback<>(){
 					@Override

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

@@ -2,6 +2,7 @@ package org.joinmastodon.android.fragments.onboarding;
 
 import android.app.ProgressDialog;
 import android.content.Context;
+import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.LocaleList;
@@ -349,7 +350,7 @@ public class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInstanc
 		currentSearchQuery=searchEdit.getText().toString().toLowerCase();
 		updateFilteredList();
 		searchEdit.removeCallbacks(searchDebouncer);
-		Instance instance=instancesCache.get(currentSearchQuery);
+		Instance instance=instancesCache.get(normalizeInstanceDomain(currentSearchQuery));
 		if(instance==null){
 			showProgressDialog();
 			loadInstanceInfo(currentSearchQuery);
@@ -412,15 +413,27 @@ public class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInstanc
 		instanceProgressDialog.show();
 	}
 
-	private void loadInstanceInfo(String _domain){
+	private String normalizeInstanceDomain(String _domain){
 		if(TextUtils.isEmpty(_domain))
-			return;
+			return null;
+		if(_domain.contains(":")){
+			try{
+				_domain=Uri.parse(_domain).getAuthority();
+			}catch(Exception ignore){}
+			if(TextUtils.isEmpty(_domain))
+				return null;
+		}
 		String domain;
 		try{
 			domain=IDN.toASCII(_domain);
 		}catch(IllegalArgumentException x){
-			return;
+			return null;
 		}
+		return domain;
+	}
+
+	private void loadInstanceInfo(String _domain){
+		String domain=normalizeInstanceDomain(_domain);
 		Instance cachedInstance=instancesCache.get(domain);
 		if(cachedInstance!=null){
 			for(CatalogInstance ci:filteredData){

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

@@ -15,6 +15,7 @@ import android.widget.TextView;
 
 import com.squareup.otto.Subscribe;
 
+import org.joinmastodon.android.E;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.accounts.GetAccountStatuses;
 import org.joinmastodon.android.events.FinishReportFragmentsEvent;
@@ -60,6 +61,13 @@ public class ReportAddPostsChoiceFragment extends StatusListFragment{
 		setRetainInstance(true);
 		setListLayoutId(R.layout.fragment_content_report_posts);
 		setLayout(R.layout.fragment_report_posts);
+		E.register(this);
+	}
+
+	@Override
+	public void onDestroy(){
+		E.unregister(this);
+		super.onDestroy();
 	}
 
 	@Override

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

@@ -5,7 +5,9 @@ import android.os.Bundle;
 import com.squareup.otto.Subscribe;
 
 import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.events.FinishReportFragmentsEvent;
+import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.model.ReportReason;
 import org.parceler.Parcels;
 
@@ -21,7 +23,10 @@ public class ReportReasonChoiceFragment extends BaseReportChoiceFragment{
 	protected void populateItems(){
 		items.add(new Item(getString(R.string.report_reason_personal), getString(R.string.report_reason_personal_subtitle), ReportReason.PERSONAL.name()));
 		items.add(new Item(getString(R.string.report_reason_spam), getString(R.string.report_reason_spam_subtitle), ReportReason.SPAM.name()));
-		items.add(new Item(getString(R.string.report_reason_violation), getString(R.string.report_reason_violation_subtitle), ReportReason.VIOLATION.name()));
+		Instance inst=AccountSessionManager.getInstance().getInstanceInfo(AccountSessionManager.getInstance().getAccount(accountID).domain);
+		if(inst!=null && inst.rules!=null && !inst.rules.isEmpty()){
+			items.add(new Item(getString(R.string.report_reason_violation), getString(R.string.report_reason_violation_subtitle), ReportReason.VIOLATION.name()));
+		}
 		items.add(new Item(getString(R.string.report_reason_other), getString(R.string.report_reason_other_subtitle), ReportReason.OTHER.name()));
 	}
 

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

@@ -0,0 +1,14 @@
+package org.joinmastodon.android.model;
+
+public class CacheablePaginatedResponse<T> extends PaginatedResponse<T>{
+	private final boolean fromCache;
+
+	public CacheablePaginatedResponse(T items, String maxID, boolean fromCache){
+		super(items, maxID);
+		this.fromCache=fromCache;
+	}
+
+	public boolean isFromCache(){
+		return fromCache;
+	}
+}

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

@@ -0,0 +1,24 @@
+package org.joinmastodon.android.model;
+
+import android.net.Uri;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import androidx.annotation.NonNull;
+
+public class HeaderPaginationList<T> extends ArrayList<T>{
+	public Uri nextPageUri, prevPageUri;
+
+	public HeaderPaginationList(int initialCapacity){
+		super(initialCapacity);
+	}
+
+	public HeaderPaginationList(){
+		super();
+	}
+
+	public HeaderPaginationList(@NonNull Collection<? extends T> c){
+		super(c);
+	}
+}

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

@@ -54,6 +54,7 @@ public class Status extends BaseModel implements DisplayItemsParent{
 	public boolean pinned;
 
 	public transient boolean spoilerRevealed;
+	public transient boolean hasGapAfter;
 
 	@Override
 	public void postprocess() throws ObjectValidationException{
@@ -125,6 +126,7 @@ public class Status extends BaseModel implements DisplayItemsParent{
 		repliesCount=ev.replies;
 		favourited=ev.favorited;
 		reblogged=ev.reblogged;
+		pinned=ev.pinned;
 	}
 
 	public Status getContentStatus(){

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

@@ -0,0 +1,249 @@
+package org.joinmastodon.android.ui;
+
+import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.ColorStateList;
+import android.graphics.drawable.Animatable;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+import android.os.Build;
+import android.os.Bundle;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowInsets;
+import android.widget.FrameLayout;
+import android.widget.ImageButton;
+import android.widget.ImageView;
+import android.widget.PopupMenu;
+import android.widget.TextView;
+
+import org.joinmastodon.android.GlobalUserPreferences;
+import org.joinmastodon.android.MainActivity;
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.oauth.RevokeOauthToken;
+import org.joinmastodon.android.api.session.AccountSession;
+import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.fragments.SplashFragment;
+import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.ui.utils.UiUtils;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import me.grishka.appkit.Nav;
+import me.grishka.appkit.api.Callback;
+import me.grishka.appkit.api.ErrorResponse;
+import me.grishka.appkit.imageloader.ImageLoaderRecyclerAdapter;
+import me.grishka.appkit.imageloader.ImageLoaderViewHolder;
+import me.grishka.appkit.imageloader.ListImageLoaderWrapper;
+import me.grishka.appkit.imageloader.RecyclerViewDelegate;
+import me.grishka.appkit.imageloader.requests.ImageLoaderRequest;
+import me.grishka.appkit.imageloader.requests.UrlImageLoaderRequest;
+import me.grishka.appkit.utils.BindableViewHolder;
+import me.grishka.appkit.utils.MergeRecyclerAdapter;
+import me.grishka.appkit.utils.SingleViewRecyclerAdapter;
+import me.grishka.appkit.utils.V;
+import me.grishka.appkit.views.BottomSheet;
+import me.grishka.appkit.views.UsableRecyclerView;
+
+public class AccountSwitcherSheet extends BottomSheet{
+	private final Activity activity;
+	private UsableRecyclerView list;
+	private List<WrappedAccount> accounts;
+	private ListImageLoaderWrapper imgLoader;
+
+	public AccountSwitcherSheet(@NonNull Activity activity){
+		super(activity);
+		this.activity=activity;
+
+		accounts=AccountSessionManager.getInstance().getLoggedInAccounts().stream().map(WrappedAccount::new).collect(Collectors.toList());
+
+		list=new UsableRecyclerView(activity);
+		imgLoader=new ListImageLoaderWrapper(activity, list, new RecyclerViewDelegate(list), null);
+		list.setClipToPadding(false);
+		list.setLayoutManager(new LinearLayoutManager(activity));
+
+		MergeRecyclerAdapter adapter=new MergeRecyclerAdapter();
+		View handle=new View(activity);
+		handle.setBackgroundResource(R.drawable.bg_bottom_sheet_handle);
+		adapter.addAdapter(new SingleViewRecyclerAdapter(handle));
+		adapter.addAdapter(new AccountsAdapter());
+		AccountViewHolder holder=new AccountViewHolder();
+		holder.more.setVisibility(View.GONE);
+		holder.currentIcon.setVisibility(View.GONE);
+		holder.name.setText(R.string.add_account);
+		holder.avatar.setScaleType(ImageView.ScaleType.CENTER);
+		holder.avatar.setImageResource(R.drawable.ic_fluent_add_circle_24_filled);
+		holder.avatar.setImageTintList(ColorStateList.valueOf(UiUtils.getThemeColor(activity, android.R.attr.textColorPrimary)));
+		adapter.addAdapter(new ClickableSingleViewRecyclerAdapter(holder.itemView, ()->{
+			Nav.go(activity, SplashFragment.class, null);
+			dismiss();
+		}));
+
+		list.setAdapter(adapter);
+		DividerItemDecoration divider=new DividerItemDecoration(activity, R.attr.colorPollVoted, .5f, 72, 16, DividerItemDecoration.NOT_FIRST);
+		divider.setDrawBelowLastItem(true);
+		list.addItemDecoration(divider);
+
+		FrameLayout content=new FrameLayout(activity);
+		content.setBackgroundResource(R.drawable.bg_bottom_sheet);
+		content.addView(list);
+		setContentView(content);
+		setNavigationBarBackground(new ColorDrawable(UiUtils.getThemeColor(activity, R.attr.colorWindowBackground)), !UiUtils.isDarkTheme());
+	}
+
+	private void confirmLogOut(String accountID){
+		new M3AlertDialogBuilder(activity)
+				.setTitle(R.string.log_out)
+				.setMessage(R.string.confirm_log_out)
+				.setPositiveButton(R.string.log_out, (dialog, which) -> logOut(accountID))
+				.setNegativeButton(R.string.cancel, null)
+				.show();
+	}
+
+	private void logOut(String accountID){
+		AccountSession session=AccountSessionManager.getInstance().getAccount(accountID);
+		new RevokeOauthToken(session.app.clientId, session.app.clientSecret, session.token.accessToken)
+				.setCallback(new Callback<>(){
+					@Override
+					public void onSuccess(Object result){
+						onLoggedOut(accountID);
+					}
+
+					@Override
+					public void onError(ErrorResponse error){
+						onLoggedOut(accountID);
+					}
+				})
+				.wrapProgress(activity, R.string.loading, false)
+				.exec(accountID);
+	}
+
+	private void onLoggedOut(String accountID){
+		AccountSessionManager.getInstance().removeAccount(accountID);
+		dismiss();
+	}
+
+	@Override
+	protected void onWindowInsetsUpdated(WindowInsets insets){
+		if(Build.VERSION.SDK_INT>=29){
+			int tappableBottom=insets.getTappableElementInsets().bottom;
+			int insetBottom=insets.getSystemWindowInsetBottom();
+			if(tappableBottom==0 && insetBottom>0){
+				list.setPadding(0, 0, 0, V.dp(48)-insetBottom);
+			}else{
+				list.setPadding(0, 0, 0, V.dp(24));
+			}
+		}else{
+			list.setPadding(0, 0, 0, V.dp(24));
+		}
+	}
+
+	private class AccountsAdapter extends UsableRecyclerView.Adapter<AccountViewHolder> implements ImageLoaderRecyclerAdapter{
+		public AccountsAdapter(){
+			super(imgLoader);
+		}
+
+		@NonNull
+		@Override
+		public AccountViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType){
+			return new AccountViewHolder();
+		}
+
+		@Override
+		public int getItemCount(){
+			return accounts.size();
+		}
+
+		@Override
+		public void onBindViewHolder(AccountViewHolder holder, int position){
+			holder.bind(accounts.get(position).session);
+			super.onBindViewHolder(holder, position);
+		}
+
+		@Override
+		public int getImageCountForItem(int position){
+			return 1;
+		}
+
+		@Override
+		public ImageLoaderRequest getImageRequest(int position, int image){
+			return accounts.get(position).req;
+		}
+	}
+
+	private class AccountViewHolder extends BindableViewHolder<AccountSession> implements ImageLoaderViewHolder, UsableRecyclerView.Clickable{
+		private final TextView name;
+		private final ImageView avatar;
+		private final ImageButton more;
+		private final View currentIcon;
+		private final PopupMenu menu;
+
+		public AccountViewHolder(){
+			super(activity, R.layout.item_account_switcher, list);
+			name=findViewById(R.id.name);
+			avatar=findViewById(R.id.avatar);
+			more=findViewById(R.id.more);
+			currentIcon=findViewById(R.id.current);
+
+			avatar.setOutlineProvider(OutlineProviders.roundedRect(12));
+			avatar.setClipToOutline(true);
+
+			menu=new PopupMenu(activity, more);
+			menu.inflate(R.menu.account_switcher);
+			menu.setOnMenuItemClickListener(item1 -> {
+				confirmLogOut(item.getID());
+				return true;
+			});
+			more.setOnClickListener(v->menu.show());
+		}
+
+		@SuppressLint("SetTextI18n")
+		@Override
+		public void onBind(AccountSession item){
+			name.setText("@"+item.self.username+"@"+item.domain);
+			if(AccountSessionManager.getInstance().getLastActiveAccountID().equals(item.getID())){
+				more.setVisibility(View.GONE);
+				currentIcon.setVisibility(View.VISIBLE);
+			}else{
+				more.setVisibility(View.VISIBLE);
+				currentIcon.setVisibility(View.GONE);
+			}
+			menu.getMenu().findItem(R.id.log_out).setTitle(activity.getString(R.string.log_out_account, "@"+item.self.username));
+			UiUtils.enablePopupMenuIcons(activity, menu);
+		}
+
+		@Override
+		public void setImage(int index, Drawable image){
+			avatar.setImageDrawable(image);
+			if(image instanceof Animatable a)
+				a.start();
+		}
+
+		@Override
+		public void clearImage(int index){
+			setImage(index, null);
+		}
+
+		@Override
+		public void onClick(){
+			AccountSessionManager.getInstance().setLastActiveAccountID(item.getID());
+			activity.finish();
+			activity.startActivity(new Intent(activity, MainActivity.class));
+		}
+	}
+
+	private static class WrappedAccount{
+		public final AccountSession session;
+		public final ImageLoaderRequest req;
+
+		public WrappedAccount(AccountSession session){
+			this.session=session;
+			req=new UrlImageLoaderRequest(GlobalUserPreferences.playGifs ? session.self.avatar : session.self.avatarStatic, V.dp(50), V.dp(50));
+		}
+	}
+}

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

@@ -0,0 +1,34 @@
+package org.joinmastodon.android.ui;
+
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import me.grishka.appkit.utils.SingleViewRecyclerAdapter;
+import me.grishka.appkit.views.UsableRecyclerView;
+
+public class ClickableSingleViewRecyclerAdapter extends SingleViewRecyclerAdapter{
+	private final Runnable onClick;
+
+	public ClickableSingleViewRecyclerAdapter(View view, Runnable onClick){
+		super(view);
+		this.onClick=onClick;
+	}
+
+	@NonNull
+	@Override
+	public ViewViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType){
+		return new ClickableViewViewHolder(view);
+	}
+
+	public class ClickableViewViewHolder extends ViewViewHolder implements UsableRecyclerView.Clickable{
+		public ClickableViewViewHolder(@NonNull View itemView){
+			super(itemView);
+		}
+
+		@Override
+		public void onClick(){
+			onClick.run();
+		}
+	}
+}

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

@@ -162,6 +162,7 @@ public class ComposeAutocompleteViewController{
 					.map(WrappedEmoji::new)
 					.collect(Collectors.toList());
 			UiUtils.updateList(oldList, emojis, list, emojisAdapter, (e1, e2)->e1.emoji.shortcode.equals(e2.emoji.shortcode));
+			imgLoader.updateImages();
 		}
 	}
 
@@ -186,6 +187,7 @@ public class ComposeAutocompleteViewController{
 						List<WrappedAccount> oldList=users;
 						users=result.accounts.stream().map(WrappedAccount::new).collect(Collectors.toList());
 						UiUtils.updateList(oldList, users, list, usersAdapter, (a1, a2)->a1.account.id.equals(a2.account.id));
+						imgLoader.updateImages();
 						if(listIsHidden){
 							listIsHidden=false;
 							V.setVisibilityAnimated(list, View.VISIBLE);
@@ -210,6 +212,7 @@ public class ComposeAutocompleteViewController{
 						List<Hashtag> oldList=hashtags;
 						hashtags=result.hashtags;
 						UiUtils.updateList(oldList, hashtags, list, hashtagsAdapter, (t1, t2)->t1.name.equals(t2.name));
+						imgLoader.updateImages();
 						if(listIsHidden){
 							listIsHidden=false;
 							V.setVisibilityAnimated(list, View.VISIBLE);

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

@@ -18,6 +18,7 @@ public class DividerItemDecoration extends RecyclerView.ItemDecoration{
 	private Paint paint=new Paint();
 	private int paddingStart, paddingEnd;
 	private Predicate<RecyclerView.ViewHolder> drawDividerPredicate;
+	private boolean drawBelowLastItem;
 
 	public static final Predicate<RecyclerView.ViewHolder> NOT_FIRST=vh->vh.getAbsoluteAdapterPosition()>0;
 
@@ -34,6 +35,10 @@ public class DividerItemDecoration extends RecyclerView.ItemDecoration{
 		this.drawDividerPredicate=drawDividerPredicate;
 	}
 
+	public void setDrawBelowLastItem(boolean drawBelowLastItem){
+		this.drawBelowLastItem=drawBelowLastItem;
+	}
+
 	@Override
 	public void onDraw(@NonNull Canvas c, @NonNull RecyclerView parent, @NonNull RecyclerView.State state){
 		boolean isRTL=parent.getLayoutDirection()==View.LAYOUT_DIRECTION_RTL;
@@ -43,7 +48,7 @@ public class DividerItemDecoration extends RecyclerView.ItemDecoration{
 		for(int i=0;i<parent.getChildCount();i++){
 			View child=parent.getChildAt(i);
 			int pos=parent.getChildAdapterPosition(child);
-			if(pos<totalItems-1 && (drawDividerPredicate==null || drawDividerPredicate.test(parent.getChildViewHolder(child)))){
+			if((drawBelowLastItem || pos<totalItems-1) && (drawDividerPredicate==null || drawDividerPredicate.test(parent.getChildViewHolder(child)))){
 				float y=Math.round(child.getY()+child.getHeight());
 				y-=(y-paint.getStrokeWidth()/2f)%1f; // Make sure the line aligns with the pixel grid
 				paint.setAlpha(Math.round(255f*child.getAlpha()));

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

@@ -0,0 +1,87 @@
+package org.joinmastodon.android.ui;
+
+import android.app.Activity;
+import android.graphics.Typeface;
+import android.graphics.drawable.ColorDrawable;
+import android.os.Build;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowInsets;
+import android.widget.FrameLayout;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.LinearLayoutManager;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.model.Attachment;
+import org.joinmastodon.android.ui.utils.UiUtils;
+
+import me.grishka.appkit.utils.SingleViewRecyclerAdapter;
+import me.grishka.appkit.utils.V;
+import me.grishka.appkit.views.BottomSheet;
+import me.grishka.appkit.views.UsableRecyclerView;
+
+public class ImageDescriptionSheet extends BottomSheet{
+	private UsableRecyclerView list;
+
+	public ImageDescriptionSheet(@NonNull Activity activity, Attachment attachment){
+		super(activity);
+
+		View handleView=new View(activity);
+		handleView.setBackgroundResource(R.drawable.bg_bottom_sheet_handle);
+		ViewGroup handle=new FrameLayout(activity);
+		handle.addView(handleView);
+		handle.setLayoutParams(new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, V.dp(24)));
+
+		TextView textView = new TextView(activity);
+		if (attachment.description == null || attachment.description.isEmpty()) {
+			textView.setText(R.string.media_no_description);
+			textView.setTypeface(null, Typeface.ITALIC);
+		} else {
+			textView.setText(attachment.description);
+			textView.setTextIsSelectable(true);
+		}
+
+		TextView heading=new TextView(activity);
+		heading.setText(R.string.image_description);
+		heading.setAllCaps(true);
+		heading.setTypeface(null, Typeface.BOLD);
+		heading.setPadding(0, V.dp(24), 0, V.dp(8));
+
+		LinearLayout linearLayout = new LinearLayout(activity);
+		linearLayout.setOrientation(LinearLayout.VERTICAL);
+		linearLayout.setPadding(V.dp(24), 0, V.dp(24), 0);
+		linearLayout.addView(heading);
+		linearLayout.addView(textView);
+
+		FrameLayout layout=new FrameLayout(activity);
+		layout.addView(handle);
+		layout.addView(linearLayout);
+
+		list=new UsableRecyclerView(activity);
+		list.setLayoutManager(new LinearLayoutManager(activity));
+		list.setBackgroundResource(R.drawable.bg_bottom_sheet);
+		list.setAdapter(new SingleViewRecyclerAdapter(layout));
+		list.setClipToPadding(false);
+
+		setContentView(list);
+		setNavigationBarBackground(new ColorDrawable(UiUtils.getThemeColor(activity, R.attr.colorWindowBackground)), !UiUtils.isDarkTheme());
+	}
+
+	@Override
+	protected void onWindowInsetsUpdated(WindowInsets insets){
+		if(Build.VERSION.SDK_INT>=29){
+			int tappableBottom=insets.getTappableElementInsets().bottom;
+			int insetBottom=insets.getSystemWindowInsetBottom();
+			if(tappableBottom==0 && insetBottom>0){
+				list.setPadding(0, 0, 0, V.dp(48)-insetBottom);
+			}else{
+				list.setPadding(0, 0, 0, V.dp(24));
+			}
+		}else{
+			list.setPadding(0, 0, 0, V.dp(24));
+		}
+	}
+}

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

@@ -0,0 +1,87 @@
+package org.joinmastodon.android.ui;
+
+import android.app.Fragment;
+import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
+import android.view.View;
+
+import org.joinmastodon.android.ui.photoviewer.PhotoViewer;
+
+import java.util.function.Supplier;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+public class SingleImagePhotoViewerListener implements PhotoViewer.Listener{
+	private final View sourceView, transformView;
+	private final int[] cornerRadius;
+	private final Runnable onDismissed;
+	private final Fragment parentFragment;
+	private final Supplier<Drawable> currentDrawableSupplier;
+	private final Runnable onStart, onEnd;
+
+	private float origAlpha;
+
+	public SingleImagePhotoViewerListener(View sourceView, View transformView, int[] cornerRadius, Fragment parentFragment, Runnable onDismissed, Supplier<Drawable> currentDrawableSupplier, Runnable onStart, Runnable onEnd){
+		this.sourceView=sourceView;
+		this.transformView=transformView;
+		this.cornerRadius=cornerRadius;
+		this.onDismissed=onDismissed;
+		this.parentFragment=parentFragment;
+		this.currentDrawableSupplier=currentDrawableSupplier;
+		this.onStart=onStart;
+		this.onEnd=onEnd;
+		if(cornerRadius!=null && cornerRadius.length!=4)
+			throw new IllegalArgumentException("Corner radius must be null or have length of 4");
+	}
+
+	@Override
+	public void setPhotoViewVisibility(int index, boolean visible){
+		transformView.setVisibility(visible ? View.VISIBLE : View.INVISIBLE);
+	}
+
+	@Override
+	public boolean startPhotoViewTransition(int index, @NonNull Rect outRect, @NonNull int[] outCornerRadius){
+		int[] loc={0, 0};
+		sourceView.getLocationOnScreen(loc);
+		outRect.set(loc[0], loc[1], loc[0]+sourceView.getWidth(), loc[1]+sourceView.getHeight());
+		if(cornerRadius!=null)
+			System.arraycopy(cornerRadius, 0, outCornerRadius, 0, 4);
+		transformView.setTranslationZ(1);
+		if(onStart!=null)
+			onStart.run();
+		return true;
+	}
+
+	@Override
+	public void setTransitioningViewTransform(float translateX, float translateY, float scale){
+		transformView.setTranslationX(translateX);
+		transformView.setTranslationY(translateY);
+		transformView.setScaleX(scale);
+		transformView.setScaleY(scale);
+	}
+
+	@Override
+	public void endPhotoViewTransition(){
+		setTransitioningViewTransform(0f, 0f, 1f);
+		transformView.setTranslationZ(0);
+		if(onEnd!=null)
+			onEnd.run();
+	}
+
+	@Nullable
+	@Override
+	public Drawable getPhotoViewCurrentDrawable(int index){
+		return currentDrawableSupplier.get();
+	}
+
+	@Override
+	public void photoViewerDismissed(){
+		onDismissed.run();
+	}
+
+	@Override
+	public void onRequestPermissions(String[] permissions){
+		parentFragment.requestPermissions(permissions, PhotoViewer.PERMISSION_REQUEST);
+	}
+}

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

@@ -92,7 +92,9 @@ public class AudioStatusDisplayItem extends StatusDisplayItem{
 		public void onBind(AudioStatusDisplayItem item){
 			int seconds=(int)item.attachment.getDuration();
 			String duration=formatDuration(seconds);
-			time.getLayoutParams().width=(int)Math.ceil(time.getPaint().measureText("-"+duration));
+			// Some fonts (not Roboto) have different-width digits. 0 is supposedly the widest.
+			time.getLayoutParams().width=(int)Math.ceil(Math.max(time.getPaint().measureText("-"+duration),
+					time.getPaint().measureText("-"+duration.replaceAll("\\d", "0"))));
 			time.setText(duration);
 			AudioPlayerService service=AudioPlayerService.getInstance();
 			if(service!=null && service.getAttachmentID().equals(item.attachment.id)){

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

@@ -0,0 +1,112 @@
+package org.joinmastodon.android.ui.displayitems;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.text.SpannableStringBuilder;
+import android.text.TextUtils;
+import android.text.style.ForegroundColorSpan;
+import android.text.style.TypefaceSpan;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.fragments.BaseStatusListFragment;
+import org.joinmastodon.android.fragments.account_list.StatusFavoritesListFragment;
+import org.joinmastodon.android.fragments.account_list.StatusReblogsListFragment;
+import org.joinmastodon.android.fragments.account_list.StatusRelatedAccountListFragment;
+import org.joinmastodon.android.model.Status;
+import org.joinmastodon.android.ui.utils.UiUtils;
+import org.parceler.Parcels;
+
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.time.format.FormatStyle;
+import java.util.Locale;
+
+import androidx.annotation.PluralsRes;
+import me.grishka.appkit.Nav;
+
+public class ExtendedFooterStatusDisplayItem extends StatusDisplayItem{
+	public final Status status;
+
+	private static final DateTimeFormatter TIME_FORMATTER=DateTimeFormatter.ofLocalizedDateTime(FormatStyle.LONG, FormatStyle.SHORT);
+
+	public ExtendedFooterStatusDisplayItem(String parentID, BaseStatusListFragment parentFragment, Status status){
+		super(parentID, parentFragment);
+		this.status=status;
+	}
+
+	@Override
+	public Type getType(){
+		return Type.EXTENDED_FOOTER;
+	}
+
+	public static class Holder extends StatusDisplayItem.Holder<ExtendedFooterStatusDisplayItem>{
+		private final TextView reblogs, favorites, time;
+		private final View buttonsView;
+
+		public Holder(Context context, ViewGroup parent){
+			super(context, R.layout.display_item_extended_footer, parent);
+			reblogs=findViewById(R.id.reblogs);
+			favorites=findViewById(R.id.favorites);
+			time=findViewById(R.id.timestamp);
+			buttonsView=findViewById(R.id.button_bar);
+
+			reblogs.setOnClickListener(v->startAccountListFragment(StatusReblogsListFragment.class));
+			favorites.setOnClickListener(v->startAccountListFragment(StatusFavoritesListFragment.class));
+		}
+
+		@Override
+		public void onBind(ExtendedFooterStatusDisplayItem item){
+			Status s=item.status;
+			if(s.favouritesCount>0){
+				favorites.setVisibility(View.VISIBLE);
+				favorites.setText(getFormattedPlural(R.plurals.x_favorites, s.favouritesCount));
+			}else{
+				favorites.setVisibility(View.GONE);
+			}
+			if(s.reblogsCount>0){
+				reblogs.setVisibility(View.VISIBLE);
+				reblogs.setText(getFormattedPlural(R.plurals.x_reblogs, s.reblogsCount));
+			}else{
+				reblogs.setVisibility(View.GONE);
+			}
+			if(s.favouritesCount==0 && s.reblogsCount==0){
+				buttonsView.setVisibility(View.GONE);
+			}else{
+				buttonsView.setVisibility(View.VISIBLE);
+			}
+			String timeStr=TIME_FORMATTER.format(item.status.createdAt.atZone(ZoneId.systemDefault()));
+			if(item.status.application!=null && !TextUtils.isEmpty(item.status.application.name)){
+				time.setText(item.parentFragment.getString(R.string.timestamp_via_app, timeStr, item.status.application.name));
+			}else{
+				time.setText(timeStr);
+			}
+		}
+
+		@Override
+		public boolean isEnabled(){
+			return false;
+		}
+
+		private SpannableStringBuilder getFormattedPlural(@PluralsRes int res, int quantity){
+			String str=item.parentFragment.getResources().getQuantityString(res, quantity, quantity);
+			String formattedNumber=String.format(Locale.getDefault(), "%,d", quantity);
+			int index=str.indexOf(formattedNumber);
+			SpannableStringBuilder ssb=new SpannableStringBuilder(str);
+			if(index>=0){
+				ssb.setSpan(new TypefaceSpan("sans-serif-medium"), index, index+formattedNumber.length(), 0);
+				ssb.setSpan(new ForegroundColorSpan(UiUtils.getThemeColor(item.parentFragment.getActivity(), android.R.attr.textColorPrimary)), index, index+formattedNumber.length(), 0);
+			}
+			return ssb;
+		}
+
+		private void startAccountListFragment(Class<? extends StatusRelatedAccountListFragment> cls){
+			Bundle args=new Bundle();
+			args.putString("account", item.parentFragment.getAccountID());
+			args.putParcelable("status", Parcels.wrap(item.status));
+			Nav.go(item.parentFragment.getActivity(), cls, args);
+		}
+	}
+}

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

@@ -29,6 +29,7 @@ import me.grishka.appkit.utils.V;
 public class FooterStatusDisplayItem extends StatusDisplayItem{
 	public final Status status;
 	private final String accountID;
+	public boolean hideCounts;
 
 	public FooterStatusDisplayItem(String parentID, BaseStatusListFragment parentFragment, Status status, String accountID){
 		super(parentID, parentFragment);
@@ -91,7 +92,7 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 		}
 
 		private void bindButton(TextView btn, int count){
-			if(count>0){
+			if(count>0 && !item.hideCounts){
 				btn.setText(DecimalFormat.getIntegerInstance().format(count));
 				btn.setCompoundDrawablePadding(V.dp(8));
 			}else{

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

@@ -0,0 +1,48 @@
+package org.joinmastodon.android.ui.displayitems;
+
+import android.content.Context;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.fragments.BaseStatusListFragment;
+import org.joinmastodon.android.ui.drawables.SawtoothTearDrawable;
+
+// Mind the gap!
+public class GapStatusDisplayItem extends StatusDisplayItem{
+	public boolean loading;
+
+	public GapStatusDisplayItem(String parentID, BaseStatusListFragment parentFragment){
+		super(parentID, parentFragment);
+	}
+
+	@Override
+	public Type getType(){
+		return Type.GAP;
+	}
+
+	public static class Holder extends StatusDisplayItem.Holder<GapStatusDisplayItem>{
+		public final ProgressBar progress;
+		public final TextView text;
+
+		public Holder(Context context, ViewGroup parent){
+			super(context, R.layout.display_item_gap, parent);
+			progress=findViewById(R.id.progress);
+			text=findViewById(R.id.text);
+			itemView.setForeground(new SawtoothTearDrawable(context));
+		}
+
+		@Override
+		public void onBind(GapStatusDisplayItem item){
+			text.setVisibility(item.loading ? View.GONE : View.VISIBLE);
+			progress.setVisibility(item.loading ? View.VISIBLE : View.GONE);
+		}
+
+		@Override
+		public void onClick(){
+			item.parentFragment.onGapClick(this);
+		}
+	}
+}

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

@@ -137,6 +137,8 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 				int id=menuItem.getItemId();
 				if(id==R.id.delete){
 					UiUtils.confirmDeletePost(item.parentFragment.getActivity(), item.parentFragment.getAccountID(), item.status, s->{});
+				}else if(id==R.id.pin || id==R.id.unpin){
+					UiUtils.confirmPinPost(item.parentFragment.getActivity(), item.parentFragment.getAccountID(), item.status, !item.status.pinned, s->{});
 				}else if(id==R.id.mute){
 					UiUtils.confirmToggleMuteUser(item.parentFragment.getActivity(), item.parentFragment.getAccountID(), account, relationship!=null && relationship.muting, r->{});
 				}else if(id==R.id.block){
@@ -250,6 +252,8 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 			Menu menu=optionsMenu.getMenu();
 			boolean isOwnPost=AccountSessionManager.getInstance().isSelf(item.parentFragment.getAccountID(), account);
 			menu.findItem(R.id.delete).setVisible(item.status!=null && isOwnPost);
+			menu.findItem(R.id.pin).setVisible(item.status!=null && isOwnPost && !item.status.pinned);
+			menu.findItem(R.id.unpin).setVisible(item.status!=null && isOwnPost && item.status.pinned);
 			menu.findItem(R.id.open_in_browser).setVisible(item.status!=null);
 			MenuItem blockDomain=menu.findItem(R.id.block_domain);
 			MenuItem mute=menu.findItem(R.id.mute);

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

@@ -63,6 +63,8 @@ public abstract class StatusDisplayItem{
 			case ACCOUNT_CARD -> new AccountCardStatusDisplayItem.Holder(activity, parent);
 			case ACCOUNT -> new AccountStatusDisplayItem.Holder(activity, parent);
 			case HASHTAG -> new HashtagStatusDisplayItem.Holder(activity, parent);
+			case GAP -> new GapStatusDisplayItem.Holder(activity, parent);
+			case EXTENDED_FOOTER -> new ExtendedFooterStatusDisplayItem.Holder(activity, parent);
 		};
 	}
 
@@ -112,6 +114,8 @@ public abstract class StatusDisplayItem{
 		}
 		if(addFooter){
 			items.add(new FooterStatusDisplayItem(parentID, fragment, statusForContent, accountID));
+			if(status.hasGapAfter)
+				items.add(new GapStatusDisplayItem(parentID, fragment));
 		}
 		int i=1;
 		for(StatusDisplayItem item:items){
@@ -142,7 +146,9 @@ public abstract class StatusDisplayItem{
 		FOOTER,
 		ACCOUNT_CARD,
 		ACCOUNT,
-		HASHTAG
+		HASHTAG,
+		GAP,
+		EXTENDED_FOOTER
 	}
 
 	public static abstract class Holder<T extends StatusDisplayItem> extends BindableViewHolder<T> implements UsableRecyclerView.DisableableClickable{

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

@@ -11,6 +11,7 @@ import android.widget.TextView;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.fragments.BaseStatusListFragment;
 import org.joinmastodon.android.model.Status;
+import org.joinmastodon.android.ui.text.HtmlParser;
 import org.joinmastodon.android.ui.utils.CustomEmojiHelper;
 import org.joinmastodon.android.ui.views.LinkedTextView;
 
@@ -20,7 +21,8 @@ import me.grishka.appkit.imageloader.requests.ImageLoaderRequest;
 
 public class TextStatusDisplayItem extends StatusDisplayItem{
 	private CharSequence text;
-	private CustomEmojiHelper emojiHelper=new CustomEmojiHelper();
+	private CustomEmojiHelper emojiHelper=new CustomEmojiHelper(), spoilerEmojiHelper;
+	private CharSequence parsedSpoilerText;
 	public boolean textSelectable;
 	public final Status status;
 
@@ -29,6 +31,11 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 		this.text=text;
 		this.status=status;
 		emojiHelper.setText(text);
+		if(!TextUtils.isEmpty(status.spoilerText)){
+			parsedSpoilerText=HtmlParser.parseCustomEmoji(status.spoilerText, status.emojis);
+			spoilerEmojiHelper=new CustomEmojiHelper();
+			spoilerEmojiHelper.setText(parsedSpoilerText);
+		}
 	}
 
 	@Override
@@ -38,11 +45,15 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 
 	@Override
 	public int getImageCount(){
+		if(spoilerEmojiHelper!=null && !status.spoilerRevealed)
+			return spoilerEmojiHelper.getImageCount();
 		return emojiHelper.getImageCount();
 	}
 
 	@Override
 	public ImageLoaderRequest getImageRequest(int index){
+		if(spoilerEmojiHelper!=null && !status.spoilerRevealed)
+			return spoilerEmojiHelper.getImageRequest(index);
 		return emojiHelper.getImageRequest(index);
 	}
 
@@ -65,7 +76,7 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 			text.setTextIsSelectable(item.textSelectable);
 			text.setInvalidateOnEveryFrame(false);
 			if(!TextUtils.isEmpty(item.status.spoilerText)){
-				spoilerTitle.setText(item.status.spoilerText);
+				spoilerTitle.setText(item.parsedSpoilerText);
 				if(item.status.spoilerRevealed){
 					spoilerOverlay.setVisibility(View.GONE);
 					text.setVisibility(View.VISIBLE);
@@ -84,8 +95,9 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 
 		@Override
 		public void setImage(int index, Drawable image){
-			item.emojiHelper.setImageDrawable(index, image);
+			getEmojiHelper().setImageDrawable(index, image);
 			text.invalidate();
+			spoilerTitle.invalidate();
 			if(image instanceof Animatable){
 				((Animatable) image).start();
 				if(image instanceof MovieDrawable)
@@ -95,8 +107,12 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 
 		@Override
 		public void clearImage(int index){
-			item.emojiHelper.setImageDrawable(index, null);
+			getEmojiHelper().setImageDrawable(index, null);
 			text.invalidate();
 		}
+
+		private CustomEmojiHelper getEmojiHelper(){
+			return item.spoilerEmojiHelper!=null && !item.status.spoilerRevealed ? item.spoilerEmojiHelper : item.emojiHelper;
+		}
 	}
 }

mastodon/src/main/java/org/joinmastodon/android/ui/drawables/SawtoothTearDrawable.java

@@ -0,0 +1,107 @@
+package org.joinmastodon.android.ui.drawables;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapShader;
+import android.graphics.Canvas;
+import android.graphics.ColorFilter;
+import android.graphics.Matrix;
+import android.graphics.Paint;
+import android.graphics.Path;
+import android.graphics.PixelFormat;
+import android.graphics.Rect;
+import android.graphics.Shader;
+import android.graphics.drawable.Drawable;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.ui.utils.UiUtils;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import me.grishka.appkit.utils.V;
+
+public class SawtoothTearDrawable extends Drawable{
+	private final Paint topPaint, bottomPaint;
+
+	private static final int TOP_SAWTOOTH_HEIGHT=5;
+	private static final int BOTTOM_SAWTOOTH_HEIGHT=3;
+	private static final int STROKE_WIDTH=2;
+	private static final int SAWTOOTH_PERIOD=14;
+
+	public SawtoothTearDrawable(Context context){
+		topPaint=makeShaderPaint(makeSawtoothTexture(context, TOP_SAWTOOTH_HEIGHT, SAWTOOTH_PERIOD, false, STROKE_WIDTH));
+		bottomPaint=makeShaderPaint(makeSawtoothTexture(context, BOTTOM_SAWTOOTH_HEIGHT, SAWTOOTH_PERIOD, true, STROKE_WIDTH));
+		Matrix matrix=new Matrix();
+		//noinspection IntegerDivisionInFloatingPointContext
+		matrix.setTranslate(V.dp(SAWTOOTH_PERIOD/2), 0);
+		bottomPaint.getShader().setLocalMatrix(matrix);
+	}
+
+	private Bitmap makeSawtoothTexture(Context context, int height, int period, boolean fillBottom, int strokeWidth){
+		int actualStrokeWidth=V.dp(strokeWidth);
+		int actualPeriod=V.dp(period);
+		int actualHeight=V.dp(height);
+		Bitmap bitmap=Bitmap.createBitmap(actualPeriod, actualHeight+actualStrokeWidth*2, Bitmap.Config.ARGB_8888);
+		Canvas c=new Canvas(bitmap);
+		Path path=new Path();
+		//noinspection SuspiciousNameCombination
+		path.moveTo(-actualPeriod/2f, actualStrokeWidth);
+		path.lineTo(0, actualHeight+actualStrokeWidth);
+		//noinspection SuspiciousNameCombination
+		path.lineTo(actualPeriod/2f, actualStrokeWidth);
+		path.lineTo(actualPeriod, actualHeight+actualStrokeWidth);
+		//noinspection SuspiciousNameCombination
+		path.lineTo(actualPeriod*1.5f, actualStrokeWidth);
+		if(fillBottom){
+			path.lineTo(actualPeriod*1.5f, actualHeight*20);
+			path.lineTo(-actualPeriod/2f, actualHeight*20);
+		}else{
+			path.lineTo(actualPeriod*1.5f, -actualHeight);
+			path.lineTo(-actualPeriod/2f, -actualHeight);
+		}
+		path.close();
+		Paint paint=new Paint(Paint.ANTI_ALIAS_FLAG);
+		paint.setColor(UiUtils.getThemeColor(context, R.attr.colorWindowBackground));
+		c.drawPath(path, paint);
+		paint.setColor(UiUtils.getThemeColor(context, R.attr.colorPollVoted));
+		paint.setStrokeWidth(actualStrokeWidth);
+		paint.setStyle(Paint.Style.STROKE);
+		c.drawPath(path, paint);
+		return bitmap;
+	}
+
+	private Paint makeShaderPaint(Bitmap bitmap){
+		BitmapShader shader=new BitmapShader(bitmap, Shader.TileMode.REPEAT, Shader.TileMode.CLAMP);
+		Paint paint=new Paint();
+		paint.setShader(shader);
+		return paint;
+	}
+
+	@Override
+	public void draw(@NonNull Canvas canvas){
+		int strokeWidth=V.dp(STROKE_WIDTH);
+		Rect bounds=getBounds();
+		canvas.save();
+		canvas.translate(bounds.left, bounds.top);
+		canvas.drawRect(0, 0, bounds.width(), V.dp(TOP_SAWTOOTH_HEIGHT)+strokeWidth*2, topPaint);
+		int bottomHeight=V.dp(BOTTOM_SAWTOOTH_HEIGHT)+strokeWidth*2;
+		canvas.translate(0, bounds.height()-bottomHeight);
+		canvas.drawRect(0, 0, bounds.width(), bottomHeight, bottomPaint);
+		canvas.restore();
+	}
+
+	@Override
+	public void setAlpha(int alpha){
+
+	}
+
+	@Override
+	public void setColorFilter(@Nullable ColorFilter colorFilter){
+
+	}
+
+	@Override
+	public int getOpacity(){
+		return PixelFormat.TRANSLUCENT;
+	}
+}

mastodon/src/main/java/org/joinmastodon/android/ui/photoviewer/PhotoViewer.java

@@ -19,6 +19,7 @@ import android.media.AudioManager;
 import android.media.MediaPlayer;
 import android.media.MediaScannerConnection;
 import android.net.Uri;
+import android.opengl.Visibility;
 import android.os.Build;
 import android.os.Environment;
 import android.os.SystemClock;
@@ -48,6 +49,7 @@ import android.widget.Toolbar;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.MastodonAPIController;
 import org.joinmastodon.android.model.Attachment;
+import org.joinmastodon.android.ui.ImageDescriptionSheet;
 import org.joinmastodon.android.ui.M3AlertDialogBuilder;
 
 import java.io.File;
@@ -97,6 +99,7 @@ public class PhotoViewer implements ZoomPanView.Listener{
 	private TextView videoTimeView;
 	private ImageButton videoPlayPauseButton;
 	private View videoControls;
+	private MenuItem imageDescriptionButton;
 	private boolean uiVisible=true;
 	private AudioManager.OnAudioFocusChangeListener audioFocusListener=this::onAudioFocusChanged;
 	private Runnable uiAutoHider=()->{
@@ -133,18 +136,18 @@ public class PhotoViewer implements ZoomPanView.Listener{
 			public WindowInsets dispatchApplyWindowInsets(WindowInsets insets){
 				if(Build.VERSION.SDK_INT>=29){
 					DisplayCutout cutout=insets.getDisplayCutout();
+					Insets tappable=insets.getTappableElementInsets();
 					if(cutout!=null){
 						// Make controls extend beneath the cutout, and replace insets to avoid cutout insets being filled with "navigation bar color"
-						Insets tappable=insets.getTappableElementInsets();
 						int leftInset=Math.max(0, cutout.getSafeInsetLeft()-tappable.left);
 						int rightInset=Math.max(0, cutout.getSafeInsetRight()-tappable.right);
-						insets=insets.replaceSystemWindowInsets(tappable.left, tappable.top, tappable.right, tappable.bottom);
 						toolbarWrap.setPadding(leftInset, 0, rightInset, 0);
 						videoControls.setPadding(leftInset, 0, rightInset, 0);
 					}else{
 						toolbarWrap.setPadding(0, 0, 0, 0);
 						videoControls.setPadding(0, 0, 0, 0);
 					}
+					insets=insets.replaceSystemWindowInsets(tappable.left, tappable.top, tappable.right, tappable.bottom);
 				}
 				uiOverlay.dispatchApplyWindowInsets(insets);
 				int bottomInset=insets.getSystemWindowInsetBottom();
@@ -174,11 +177,24 @@ public class PhotoViewer implements ZoomPanView.Listener{
 		toolbarWrap=uiOverlay.findViewById(R.id.toolbar_wrap);
 		toolbar=uiOverlay.findViewById(R.id.toolbar);
 		toolbar.setNavigationOnClickListener(v->onStartSwipeToDismissTransition(0));
-		toolbar.getMenu().add(R.string.download).setIcon(R.drawable.ic_fluent_arrow_download_24_regular).setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
-		toolbar.setOnMenuItemClickListener(item->{
-			saveCurrentFile();
-			return true;
-		});
+		imageDescriptionButton = toolbar.getMenu()
+				.add(R.string.image_description)
+				.setIcon(R.drawable.ic_fluent_image_alt_text_24_regular)
+				.setVisible(attachments.get(pager.getCurrentItem()).description != null
+						&& !attachments.get(pager.getCurrentItem()).description.isEmpty())
+				.setOnMenuItemClickListener(item -> {
+					new ImageDescriptionSheet(activity,attachments.get(pager.getCurrentItem())).show();
+					return true;
+				});
+		imageDescriptionButton.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
+		toolbar.getMenu()
+				.add(R.string.download)
+				.setIcon(R.drawable.ic_fluent_arrow_download_24_regular)
+				.setOnMenuItemClickListener(item -> {
+					saveCurrentFile();
+					return true;
+				})
+				.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
 		uiOverlay.setAlpha(0f);
 		videoControls=uiOverlay.findViewById(R.id.video_player_controls);
 		videoSeekBar=uiOverlay.findViewById(R.id.seekbar);
@@ -374,6 +390,8 @@ public class PhotoViewer implements ZoomPanView.Listener{
 	private void onPageChanged(int index){
 		currentIndex=index;
 		Attachment att=attachments.get(index);
+		imageDescriptionButton.setVisible(att.description != null && !att.description.isEmpty());
+		toolbar.invalidate();
 		V.setVisibilityAnimated(videoControls, att.type==Attachment.Type.VIDEO ? View.VISIBLE : View.GONE);
 		if(att.type==Attachment.Type.VIDEO){
 			videoSeekBar.setSecondaryProgress(0);

mastodon/src/main/java/org/joinmastodon/android/ui/photoviewer/ZoomPanView.java

@@ -4,6 +4,7 @@ import android.annotation.SuppressLint;
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Matrix;
+import android.graphics.Path;
 import android.graphics.Rect;
 import android.graphics.RectF;
 import android.util.AttributeSet;
@@ -54,6 +55,9 @@ public class ZoomPanView extends FrameLayout implements ScaleGestureDetector.OnS
 	private float lastFlingVelocityY;
 	private float backgroundAlphaForTransition=1f;
 	private boolean forceUpdateLayout;
+	private int[] transitionCornerRadius;
+	private Path transitionClipPath=new Path();
+	private float[] tmpFloatArray=new float[8];
 
 	private static final String TAG="ZoomPanView";
 
@@ -148,10 +152,25 @@ public class ZoomPanView extends FrameLayout implements ScaleGestureDetector.OnS
 			child.getMatrix().mapRect(tmpRect2);
 			tmpRect2.offset(child.getLeft(), child.getTop());
 			canvas.save();
-			canvas.clipRect(interpolate(tmpRect2.left, tmpRect.left, cropAnimationValue),
-					interpolate(tmpRect2.top, tmpRect.top, cropAnimationValue),
-					interpolate(tmpRect2.right, tmpRect.right, cropAnimationValue),
-					interpolate(tmpRect2.bottom, tmpRect.bottom, cropAnimationValue));
+			if(transitionCornerRadius!=null){
+				float radiusScale=child.getScaleX();
+				tmpFloatArray[0]=tmpFloatArray[1]=(float)transitionCornerRadius[0]*radiusScale*(1f-cropAnimationValue);
+				tmpFloatArray[2]=tmpFloatArray[3]=(float)transitionCornerRadius[1]*radiusScale*(1f-cropAnimationValue);
+				tmpFloatArray[4]=tmpFloatArray[5]=(float)transitionCornerRadius[2]*radiusScale*(1f-cropAnimationValue);
+				tmpFloatArray[6]=tmpFloatArray[7]=(float)transitionCornerRadius[3]*radiusScale*(1f-cropAnimationValue);
+				transitionClipPath.rewind();
+				transitionClipPath.addRoundRect(interpolate(tmpRect2.left, tmpRect.left, cropAnimationValue),
+						interpolate(tmpRect2.top, tmpRect.top, cropAnimationValue),
+						interpolate(tmpRect2.right, tmpRect.right, cropAnimationValue),
+						interpolate(tmpRect2.bottom, tmpRect.bottom, cropAnimationValue),
+						tmpFloatArray, Path.Direction.CW);
+				canvas.clipPath(transitionClipPath);
+			}else{
+				canvas.clipRect(interpolate(tmpRect2.left, tmpRect.left, cropAnimationValue),
+						interpolate(tmpRect2.top, tmpRect.top, cropAnimationValue),
+						interpolate(tmpRect2.right, tmpRect.right, cropAnimationValue),
+						interpolate(tmpRect2.bottom, tmpRect.bottom, cropAnimationValue));
+			}
 			boolean res=super.drawChild(canvas, child, drawingTime);
 			canvas.restore();
 			return res;
@@ -189,6 +208,18 @@ public class ZoomPanView extends FrameLayout implements ScaleGestureDetector.OnS
 		return initialScale;
 	}
 
+	private void validateAndSetCornerRadius(int[] cornerRadius){
+		transitionCornerRadius=null;
+		if(cornerRadius!=null && cornerRadius.length==4){
+			for(int corner:cornerRadius){
+				if(corner>0){
+					transitionCornerRadius=cornerRadius;
+					break;
+				}
+			}
+		}
+	}
+
 	public void animateIn(Rect rect, int[] cornerRadius){
 		int[] loc={0, 0};
 		getLocationOnScreen(loc);
@@ -204,6 +235,7 @@ public class ZoomPanView extends FrameLayout implements ScaleGestureDetector.OnS
 		animatingTransition=true;
 
 		matrix.getValues(matrixValues);
+		validateAndSetCornerRadius(cornerRadius);
 
 		child.setAlpha(0f);
 		setupAndStartTransitionAnim(new SpringAnimation(this, CROP_AND_FADE, 1f).setMinimumVisibleChange(DynamicAnimation.MIN_VISIBLE_CHANGE_SCALE));
@@ -233,6 +265,7 @@ public class ZoomPanView extends FrameLayout implements ScaleGestureDetector.OnS
 		animatingTransition=true;
 		dismissAfterTransition=true;
 		rawCropAndFadeValue=1f;
+		validateAndSetCornerRadius(cornerRadius);
 
 		setupAndStartTransitionAnim(new SpringAnimation(this, CROP_AND_FADE, 0f).setMinimumVisibleChange(DynamicAnimation.MIN_VISIBLE_CHANGE_SCALE));
 		setupAndStartTransitionAnim(new SpringAnimation(child, DynamicAnimation.SCALE_X, initialScale));

mastodon/src/main/java/org/joinmastodon/android/ui/text/DeleteWhenCopiedSpan.java

@@ -0,0 +1,8 @@
+package org.joinmastodon.android.ui.text;
+
+/**
+ * A span to mark character ranges that should be deleted when copied to the clipboard.
+ * Works with {@link org.joinmastodon.android.ui.views.LinkedTextView}.
+ */
+public class DeleteWhenCopiedSpan{
+}

mastodon/src/main/java/org/joinmastodon/android/ui/text/HtmlParser.java

@@ -67,10 +67,9 @@ public class HtmlParser{
 
 			@Override
 			public void head(@NonNull Node node, int depth){
-				if(node instanceof TextNode){
-					ssb.append(((TextNode) node).text());
-				}else if(node instanceof Element){
-					Element el=(Element)node;
+				if(node instanceof TextNode textNode){
+					ssb.append(textNode.text());
+				}else if(node instanceof Element el){
 					switch(el.nodeName()){
 						case "a" -> {
 							String href=el.attr("href");
@@ -108,10 +107,9 @@ public class HtmlParser{
 
 			@Override
 			public void tail(@NonNull Node node, int depth){
-				if(node instanceof Element){
-					Element el=(Element)node;
+				if(node instanceof Element el){
 					if("span".equals(el.nodeName()) && el.hasClass("ellipsis")){
-						ssb.append('…');
+						ssb.append("…", new DeleteWhenCopiedSpan(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
 					}else if("p".equals(el.nodeName())){
 						if(node.nextSibling()!=null)
 							ssb.append("\n\n");

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

@@ -36,6 +36,7 @@ public class DiscoverInfoBannerHelper{
 				case TRENDING_HASHTAGS -> R.string.trending_hashtags_info_banner;
 				case TRENDING_LINKS -> R.string.trending_links_info_banner;
 				case LOCAL_TIMELINE -> R.string.local_timeline_info_banner;
+				case FEDERATED_TIMELINE -> R.string.federated_timeline_info_banner;
 			});
 		}
 	}
@@ -59,6 +60,7 @@ public class DiscoverInfoBannerHelper{
 		TRENDING_HASHTAGS,
 		TRENDING_LINKS,
 		LOCAL_TIMELINE,
+		FEDERATED_TIMELINE,
 //		ACCOUNTS
 	}
 }

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

@@ -2,6 +2,7 @@ package org.joinmastodon.android.ui.utils;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
+import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.ColorStateList;
@@ -28,6 +29,7 @@ import android.webkit.MimeTypeMap;
 import android.widget.Button;
 import android.widget.PopupMenu;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import org.joinmastodon.android.E;
 import org.joinmastodon.android.GlobalUserPreferences;
@@ -39,8 +41,11 @@ import org.joinmastodon.android.api.requests.accounts.SetAccountMuted;
 import org.joinmastodon.android.api.requests.accounts.SetDomainBlocked;
 import org.joinmastodon.android.api.requests.statuses.DeleteStatus;
 import org.joinmastodon.android.api.requests.statuses.GetStatusByID;
+import org.joinmastodon.android.api.requests.statuses.SetStatusPinned;
 import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.events.StatusCountersUpdatedEvent;
 import org.joinmastodon.android.events.StatusDeletedEvent;
+import org.joinmastodon.android.events.StatusUnpinnedEvent;
 import org.joinmastodon.android.fragments.HashtagTimelineFragment;
 import org.joinmastodon.android.fragments.ProfileFragment;
 import org.joinmastodon.android.fragments.ThreadFragment;
@@ -86,13 +91,17 @@ public class UiUtils{
 	private UiUtils(){}
 
 	public static void launchWebBrowser(Context context, String url){
-		if(GlobalUserPreferences.useCustomTabs){
-			new CustomTabsIntent.Builder()
-					.setShowTitle(true)
-					.build()
-					.launchUrl(context, Uri.parse(url));
-		}else{
-			context.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url)));
+		try{
+			if(GlobalUserPreferences.useCustomTabs){
+				new CustomTabsIntent.Builder()
+						.setShowTitle(true)
+						.build()
+						.launchUrl(context, Uri.parse(url));
+			}else{
+				context.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url)));
+			}
+		}catch(ActivityNotFoundException x){
+			Toast.makeText(context, R.string.no_app_to_handle_action, Toast.LENGTH_SHORT).show();
 		}
 	}
 
@@ -100,7 +109,9 @@ public class UiUtils{
 		long t=instant.toEpochMilli();
 		long now=System.currentTimeMillis();
 		long diff=now-t;
-		if(diff<60_000L){
+		if(diff<1000L){
+			return context.getString(R.string.time_now);
+		}else if(diff<60_000L){
 			return context.getString(R.string.time_seconds, diff/1000L);
 		}else if(diff<3600_000L){
 			return context.getString(R.string.time_minutes, diff/60_000L);
@@ -141,12 +152,15 @@ public class UiUtils{
 
 	@SuppressLint("DefaultLocale")
 	public static String abbreviateNumber(int n){
-		if(n<1000)
+		if(n<1000){
 			return String.format("%,d", n);
-		else if(n<1_000_000)
-			return String.format("%,.1fK", n/1000f);
-		else
-			return String.format("%,.1fM", n/1_000_000f);
+		}else if(n<1_000_000){
+			float a=n/1000f;
+			return a>99f ? String.format("%,dK", (int)Math.floor(a)) : String.format("%,.1fK", a);
+		}else{
+			float a=n/1_000_000f;
+			return a>99f ? String.format("%,dM", (int)Math.floor(a)) : String.format("%,.1fM", n/1_000_000f);
+		}
 	}
 
 	/**
@@ -182,7 +196,7 @@ public class UiUtils{
 				String name=cursor.getString(0);
 				if(name!=null)
 					return name;
-			}
+			}catch(Throwable ignore){}
 		}
 		return uri.getLastPathSegment();
 	}
@@ -326,6 +340,7 @@ public class UiUtils{
 						@Override
 						public void onSuccess(Status result){
 							resultCallback.accept(result);
+							AccountSessionManager.getInstance().getAccount(accountID).getCacheController().deleteStatus(status.id);
 							E.post(new StatusDeletedEvent(status.id, accountID));
 						}
 
@@ -339,14 +354,65 @@ public class UiUtils{
 		});
 	}
 
+	public static void confirmPinPost(Activity activity, String accountID, Status status, boolean pinned, Consumer<Status> resultCallback){
+		showConfirmationAlert(activity,
+				pinned ? R.string.confirm_pin_post_title : R.string.confirm_unpin_post_title,
+				pinned ? R.string.confirm_pin_post : R.string.confirm_unpin_post,
+				pinned ? R.string.pin_post : R.string.unpin_post,
+				()->{
+					new SetStatusPinned(status.id, pinned)
+							.setCallback(new Callback<>() {
+								@Override
+								public void onSuccess(Status result) {
+									resultCallback.accept(result);
+									E.post(new StatusCountersUpdatedEvent(result));
+									if (!result.pinned)
+										E.post(new StatusUnpinnedEvent(status.id, accountID));
+								}
+
+								@Override
+								public void onError(ErrorResponse error) {
+									error.showToast(activity);
+								}
+							})
+							.wrapProgress(activity, pinned ? R.string.pinning : R.string.unpinning, false)
+							.exec(accountID);
+				});
+	}
+
 	public static void setRelationshipToActionButton(Relationship relationship, Button button){
+		boolean secondaryStyle;
 		if(relationship.blocking){
 			button.setText(R.string.button_blocked);
-		}else if(relationship.muting){
-			button.setText(R.string.button_muted);
+			secondaryStyle=true;
+		}else if(relationship.blockedBy){
+			button.setText(R.string.button_follow);
+			secondaryStyle=false;
+		}else if(relationship.requested){
+			button.setText(R.string.button_follow_pending);
+			secondaryStyle=true;
+		}else if(!relationship.following){
+			button.setText(relationship.followedBy ? R.string.follow_back : R.string.button_follow);
+			secondaryStyle=false;
 		}else{
-			button.setText(relationship.following ? R.string.button_following : R.string.button_follow);
+			button.setText(R.string.button_following);
+			secondaryStyle=true;
 		}
+
+		button.setEnabled(!relationship.blockedBy);
+		int attr=secondaryStyle ? R.attr.secondaryButtonStyle : android.R.attr.buttonStyle;
+		TypedArray ta=button.getContext().obtainStyledAttributes(new int[]{attr});
+		int styleRes=ta.getResourceId(0, 0);
+		ta.recycle();
+		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});
+		if(relationship.blocking)
+			button.setTextColor(button.getResources().getColorStateList(R.color.error_600));
+		else
+			button.setTextColor(ta.getColorStateList(0));
+		ta.recycle();
 	}
 
 	public static void performAccountAction(Activity activity, Account account, String accountID, Relationship relationship, Button button, Consumer<Boolean> progressCallback, Consumer<Relationship> resultCallback){
@@ -356,7 +422,7 @@ public class UiUtils{
 			confirmToggleMuteUser(activity, accountID, account, true, resultCallback);
 		}else{
 			progressCallback.accept(true);
-			new SetAccountFollowed(account.id, !relationship.following, true)
+			new SetAccountFollowed(account.id, !relationship.following && !relationship.requested, true)
 					.setCallback(new Callback<>(){
 						@Override
 						public void onSuccess(Relationship result){

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

@@ -0,0 +1,37 @@
+package org.joinmastodon.android.ui.views;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.LinearLayout;
+
+public class AutoOrientationLinearLayout extends LinearLayout{
+	public AutoOrientationLinearLayout(Context context){
+		this(context, null);
+	}
+
+	public AutoOrientationLinearLayout(Context context, AttributeSet attrs){
+		this(context, attrs, 0);
+	}
+
+	public AutoOrientationLinearLayout(Context context, AttributeSet attrs, int defStyle){
+		super(context, attrs, defStyle);
+	}
+
+	@Override
+	protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec){
+		int hPadding=getPaddingLeft()+getPaddingRight();
+		int childrenTotalWidth=0;
+		for(int i=0;i<getChildCount();i++){
+			View child=getChildAt(i);
+			measureChildWithMargins(child, widthMeasureSpec, 0, heightMeasureSpec, 0);
+			childrenTotalWidth+=child.getMeasuredWidth();
+		}
+		if(childrenTotalWidth>MeasureSpec.getSize(widthMeasureSpec)-hPadding){
+			setOrientation(VERTICAL);
+		}else{
+			setOrientation(HORIZONTAL);
+		}
+		super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+	}
+}

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

@@ -36,7 +36,7 @@ public class ImageAttachmentFrameLayout extends FrameLayout{
 			super.onMeasure(widthMeasureSpec, heightMeasureSpec);
 			return;
 		}
-		int w=Math.min(((View)getParent()).getMeasuredWidth()-horizontalInset, V.dp(MAX_WIDTH));
+		int w=Math.min(((View)getParent()).getMeasuredWidth(), V.dp(MAX_WIDTH))-horizontalInset;
 		int actualHeight=Math.round(tile.height/1000f*w)+V.dp(1)*(tile.rowSpan-1);
 		int actualWidth=Math.round(tile.width/1000f*w);
 		if(tile.startCol+tile.colSpan<tileLayout.columnSizes.length)

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

@@ -1,38 +1,68 @@
 package org.joinmastodon.android.ui.views;
 
+import android.content.ClipData;
+import android.content.ClipboardManager;
 import android.content.Context;
 import android.graphics.Canvas;
+import android.text.SpannableStringBuilder;
+import android.text.Spanned;
 import android.util.AttributeSet;
+import android.util.Log;
+import android.view.ActionMode;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.widget.TextView;
 
 import org.joinmastodon.android.ui.text.ClickableLinksDelegate;
+import org.joinmastodon.android.ui.text.DeleteWhenCopiedSpan;
 
-public class LinkedTextView extends TextView {
+public class LinkedTextView extends TextView{
 
 	private ClickableLinksDelegate delegate=new ClickableLinksDelegate(this);
 	private boolean needInvalidate;
-	
-	public LinkedTextView(Context context) {
-		super(context);
-		// TODO Auto-generated constructor stub
+	private ActionMode currentActionMode;
+
+	public LinkedTextView(Context context){
+		this(context, null);
 	}
 
-	public LinkedTextView(Context context, AttributeSet attrs) {
-		super(context, attrs);
-		// TODO Auto-generated constructor stub
+	public LinkedTextView(Context context, AttributeSet attrs){
+		this(context, attrs, 0);
 	}
 
-	public LinkedTextView(Context context, AttributeSet attrs, int defStyle) {
+	public LinkedTextView(Context context, AttributeSet attrs, int defStyle){
 		super(context, attrs, defStyle);
-		// TODO Auto-generated constructor stub
+		setCustomSelectionActionModeCallback(new ActionMode.Callback(){
+			@Override
+			public boolean onCreateActionMode(ActionMode mode, Menu menu){
+				currentActionMode=mode;
+				return true;
+			}
+
+			@Override
+			public boolean onPrepareActionMode(ActionMode mode, Menu menu){
+				return true;
+			}
+
+			@Override
+			public boolean onActionItemClicked(ActionMode mode, MenuItem item){
+				onTextContextMenuItem(item.getItemId());
+				return true;
+			}
+
+			@Override
+			public void onDestroyActionMode(ActionMode mode){
+				currentActionMode=null;
+			}
+		});
 	}
-	
+
 	public boolean onTouchEvent(MotionEvent ev){
 		if(delegate.onTouch(ev)) return true;
-        return super.onTouchEvent(ev);
+		return super.onTouchEvent(ev);
 	}
-	
+
 	public void onDraw(Canvas c){
 		super.onDraw(c);
 		delegate.onDraw(c);
@@ -47,4 +77,43 @@ public class LinkedTextView extends TextView {
 			invalidate();
 	}
 
+	@Override
+	public boolean onTextContextMenuItem(int id){
+		if(id==android.R.id.copy){
+			final int selStart=getSelectionStart();
+			final int selEnd=getSelectionEnd();
+			int min=Math.max(0, Math.min(selStart, selEnd));
+			int max=Math.max(0, Math.max(selStart, selEnd));
+			final ClipData copyData=ClipData.newPlainText(null, deleteTextWithinDeleteSpans(getText().subSequence(min, max)));
+			ClipboardManager clipboard=getContext().getSystemService(ClipboardManager.class);
+			try {
+				clipboard.setPrimaryClip(copyData);
+			} catch (Throwable t) {
+				Log.w("LinkedTextView", t);
+			}
+			if(currentActionMode!=null){
+				currentActionMode.finish();
+			}
+			return true;
+		}
+		return super.onTextContextMenuItem(id);
+	}
+
+	private CharSequence deleteTextWithinDeleteSpans(CharSequence text){
+		if(text instanceof Spanned spanned){
+			DeleteWhenCopiedSpan[] delSpans=spanned.getSpans(0, text.length(), DeleteWhenCopiedSpan.class);
+			if(delSpans.length>0){
+				SpannableStringBuilder ssb=new SpannableStringBuilder(spanned);
+				for(DeleteWhenCopiedSpan span:delSpans){
+					int start=ssb.getSpanStart(span);
+					int end=ssb.getSpanStart(span);
+					if(start==-1)
+						continue;
+					ssb.delete(start, end+1);
+				}
+				return ssb;
+			}
+		}
+		return text;
+	}
 }