bump version, again

see https://github.com/mastodon/mastodon-android/issues/283

README.md

@@ -1,10 +1,36 @@
-# Mastodon for Android
+![Pink version of the Mastodon for Android launcher icon](mastodon/src/main/res/mipmap-xhdpi/ic_launcher_round.png)
 
-<a href="https://play.google.com/store/apps/details?id=org.joinmastodon.android"><img src="img/google-play-badge.png" height="50"></a>
+# Mastodos
 
-This is the repository for the official Android app for Mastodon.
+> A fork of the [official Mastodon Android app](https://github.com/mastodon/mastodon-android) adding important features that are missing in the official app and possibly won’t ever be implemented, such as the federated timeline, unlisted posting, bookmarks and an image description viewer.
 
-Learn more about this app in the [blog post](https://blog.joinmastodon.org/2022/02/official-mastodon-for-android-app-is-coming-soon/).
+## Changes
+
+### Features
+
+* [Add “Unlisted” as a post visibility option](https://github.com/sk22/mastodon-android-fork/tree/feature/enable-unlisted)
+  ([Pull request](https://github.com/mastodon/mastodon-android/pull/103))
+* [Add “Federation” tab and change Discover tab order](https://github.com/sk22/mastodon-android-fork/tree/feature/add-federated-timeline) ([Fixes issue](https://github.com/mastodon/mastodon-android/issues/8))
+* [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))
+* [Implement a bookmark button and list](https://github.com/sk22/mastodon-android-fork/tree/feature/bookmarks) ([Fixes issue](https://github.com/mastodon/mastodon-android/issues/22))
+
+### Behavior
+
+* [Set “Unlisted” as default posting visibility](https://github.com/sk22/mastodon-android-fork/tree/feature/enable-unlisted-as-default)
+* [Make back button return to the home tab before exiting the app](https://github.com/sk22/mastodon-android-fork/tree/feature/back-returns-home) ([Fixes issue](https://github.com/mastodon/mastodon-android/issues/118))
+* [Always preserve content warnings when replying](https://github.com/sk22/mastodon-android-fork/tree/feature/always-preserve-cw) ([Fixes issue](https://github.com/mastodon/mastodon-android/issues/113))
+* [Display full image when adding image description](https://github.com/sk22/mastodon-android-fork/tree/feature/compose-image-description-full-image) ([Pull request](https://github.com/mastodon/mastodon-android/pull/182))
+* [Implement deleting and re-drafting](https://github.com/sk22/mastodon-android-fork/tree/feature/delete-redraft) ([Fixes issue](https://github.com/mastodon/mastodon-android/issues/21))
+
+### Branding
+
+* App name “Mastodos”
+* Pink primary color
+* Custom icon: Modulate upstream icon using ImageMagick
+  ```bash
+  mogrify -modulate 90,100,140 mastodon/src/main/res/mipmap-*/ic_launcher*.png
+  ```
 
 ## Building
 
@@ -16,4 +42,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/cs-CZ/full_description.txt

@@ -0,0 +1,16 @@
+Mastodon je největší decentralizovanou sociální sítí na internetu. Místo jednné webové stránky je to síť pro miliony uživatelů v nezávislých komunitách, kteří mohou všichni vzájemně a bezproblémově komunikovat. Bez ohledu na to, co vás baví, můžete se setkat s vášnivými lidmi, kteří o tom vysílají na Mastodon!
+
+Připojte se ke komunitě a vytvořte svůj profil. Najděte a sledujte fascinující lidi a přečtěte si jejich příspěvky v bezreklamní a chronologické časové linii. Vyjádřete se pomocí vlastních emojí, obrázků, GIFů, videí a zvuku v 500-znakových příspěvcích. Odpovězte na vlákna a reblogujte příspěvky od kohokoliv, abyste mohli sdílet skvělé věci. Najděte nové účty pro sledování a populární hashtagy pro rozšíření vaší sítě.
+
+Mastodon je postaven se zaměřením na soukromí a bezpečnost. Rozhodněte, zda jsou vaše příspěvky sdíleny se svými sledujícími, jen s lidmi, které zmiňujete, nebo s celým světem. Upozornění na obsah vám umožní skrýt příspěvky obsahující citlivý nebo spouštěcí materiál, dokud se s nimi nezačnete zabývat. Každá komunita má vlastní pokyny a moderátory, aby udržela své členy v bezpečí, a robustní blokování a hlášení nástrojů pomáhá předcházet zneužití.
+
+Další funkce:
+
+• Tmavý režim: Čtěte příspěvky ve světlém, tmavém nebo zcela černém režimu
+• Ankety: Požádejte sledující o jejich názor a spojte se s jejich hlasováním
+• Průzkum: Trendové hashtagy a účty jsou pryč na jedno klepnutí
+• Upozornění: Dostávejte upozornění na nové sledování, odpovědi a reblogy
+• Sdílení: Odesílání přímo do Mastodonu z libovolného seznamu sdílení v jakékoliv aplikaci
+• Roztomilost: Naším maskotem je roztomilý slon, kterého čas od času uvidíte
+
+Mastodon je registrovaný neziskový projekt a vývojový program je podporován přímo vašimi dary. Neexistuje žádná reklama, žádná monetizace a žádný rizikový kapitál a my máme v plánu to udržet.

fastlane/metadata/android/cs-CZ/short_description.txt

@@ -0,0 +1 @@
+Decentralizovaná sociální síť

fastlane/metadata/android/cs-CZ/title.txt

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

fastlane/metadata/android/de-DE/full_description.txt

@@ -1,16 +1,16 @@
 Mastodon ist das größte dezentralisierte soziale Netzwerk im Internet. Statt einer einzigen Website ist es ein Netzwerk von Millionen von Benutzer*innen in unabhängigen Gemeinschaften, die alle miteinander interagieren können. Egal was dich interessiert, auf Mastodon kannst du interessierte Leute treffen, die darüber schreiben!
 
-Trete einer Gemeinschaft bei und erstelle dein Profil. Finde und verfolge faszinierende Leute und lese ihre Beiträge in einer werbefreien, chronologischen Zeitachse. Drücke dich mit benutzerdefinierten Emojis, Bilderns, GIFs, Videos und Audio in 500-Zeichen Beiträgen aus. Antworte auf Threads und teile Beiträge von anderen um großartige Sachen zu verbreiten. Finde neue Accounts zum Folgen und angesagte Hashtags, um dein Netzwerk zu erweitern.
+Tritt einer Gemeinschaft bei und erstelle dein Profil. Finde und folge faszinierenden Leuten, und lies ihre Beiträge in einer werbefreien, chronologischen Zeitachse. Drücke dich mit benutzerdefinierten Emojis, Bildern, GIFs, Videos und Audio in 500-Zeichen-Beiträgen aus. Antworte auf Threads und teile Beiträge von anderen, um großartige Sachen zu verbreiten. Finde neue Accounts zum Folgen und angesagte Hashtags, um dein Netzwerk zu erweitern.
 
-Mastodon wurde mit einem Schwerpunkt auf Privatsphäre und Sicherheit gebaut. Entscheide, ob du deine Beiträge mit deinen Followern, nur mit den Menschen, die du erwähnst, oder mit der ganzen Welt teilen möchtest. Mit Inhaltswarnungen kannst du Beiträge mit sensiblem oder triggerndem Inhalt ausblenden, bis du bereit bist, dich damit auseinanderzusetzen. Jede Gemeinschaft hat ihre eigenen Regeln und Moderator*innen, um die Sicherheit ihrer Mitglieder zu gewährleisten, sowie robuste Sperr- und Meldewerkzeuge um Missbrauch vorzubeugen.
+Mastodon wurde mit einem Schwerpunkt auf Privatsphäre und Sicherheit gebaut. Entscheide, ob du deine Beiträge mit deinen Followern, nur mit den Menschen, die du erwähnst, oder mit der ganzen Welt teilen möchtest. Mit Inhaltswarnungen kannst du Beiträge mit sensiblem oder triggerndem Inhalt ausblenden, bis du bereit bist, dich damit auseinanderzusetzen. Jede Gemeinschaft hat ihre eigenen Regeln und Moderator*innen, um die Sicherheit ihrer Mitglieder zu gewährleisten, sowie robuste Sperr- und Meldewerkzeuge, um Missbrauch vorzubeugen.
 
 Weitere Funktionen:
 
 • Dunkler Modus: Beiträge im hellen, dunklen oder schwarzen Modus lesen
 • Umfragen: Frage deine Follower nach ihrer Meinung und zähle die Stimmen
-• Entdecken: Trending Hashtags und Accounts sind nur einen Fingertipp entfernt
+• Entdecken: trendende Hashtags und Profile sind nur einen Fingertipp entfernt
 • Benachrichtigungen: Erhalte Benachrichtigungen über neue Follower, Antworten und geteilte Beiträge
 • Teilen: Veröffentliche auf Mastodon aus jeder beliebigen anderen App
-• Niedlichkeit: Unser Maskottchen ist ein entzückender Elefant und du wirst ihn von Zeit zu Zeit auftauchen sehen
+• Niedlichkeit: Unser Maskottchen ist ein entzückender Elefant, und du wirst ihn von Zeit zu Zeit auftauchen sehen
 
-Mastodon ist eine eingetragene gemeinnützige Organisation und die Entwicklung wird direkt durch deine Spenden unterstützt. Es gibt keine Werbung, keine Monetisierung und kein Venture-Capital, und wir planen es so zu erhalten.
+Mastodon ist eine eingetragene gemeinnützige Organisation, und die Entwicklung wird direkt durch deine Spenden unterstützt. Es gibt keine Werbung, keine Monetisierung und kein Venture-Capital, und wir planen, das auch so beizubehalten.

fastlane/metadata/android/es-ES/full_description.txt

@@ -1,6 +1,6 @@
 Mastodon es la red social descentralizada más grande de internet. En lugar de ser una sola web, es una red de millones de usuarios en comunidades independientes que pueden interactuar entre ellas de forma transparente. No importa qué es lo que hagas, podrás encontrar gente apasionada escribiendo sobre ello en Mastodon!
 
-Únete a una comunidad y crea tu perfil. Encuentra y sigue a gente fascinante y lee sus publicaciones sin anuncios y de forma cronológica. Exprésate con emoticonos personalizados, imágenes, GIFs, vídeos y audio en publicaciónes de 500 caracteres. Responde a hilos e impulsa publicaciones de cualquiera para compartir contenido genial. Encuentra nuevas cuentas para seguir y los hashtags de actualidad para expandir tu red.
+Únete a una comunidad y crea tu perfil. Encuentra y sigue a gente fascinante y lee sus publicaciones sin anuncios y de forma cronológica. Exprésate con emoticonos personalizados, imágenes, GIFs, vídeos y audio en publicaciónes de 500 caracteres. Responde a hilos e rebloguea publicaciones de cualquiera para compartir contenido genial. Encuentra nuevas cuentas para seguir y los hashtags de actualidad para expandir tu red.
 
 Mastodon está construída con un enfoque en la privacidad y la seguridad. Decide si tus publicaciones se comparten con tus seguidores, solo a la gente que menciones, o a todo el mundo. Las advertencias de contenido te permiten esconder publicaciones con contenido sensible o limitarlas de tu visión hasta que estés listo para interactuar con ellas. Cada comunidad tiene sus propias reglas y moderadores para mantener a salvo a sus miembros, además de herramientas robustas para bloquear y reportar contenido para prevenir el abuso.
 
@@ -9,7 +9,7 @@ Más características:
 • Modo oscuro: Lee las publicaciones en modo claro, oscuro o negro real
 • Encuestas: Pide opinión a tus seguidores y cuenta los votos
 • Explora: Hashtags y cuentas en tendencia a un solo toque
-• Notificaciones: Recibe notificaciones sobre nuevos seguidores, respuestas e impulsos
+• Notificaciones: Recibe notificaciones sobre nuevos seguidores, respuestas y reblogueos
 • Compartir: Publica directamente a Mastodon desde cualquier hoja de acción en cualquier aplicación
 • Preciosidad: Nuestra mascota es un elefante adorable, y verás que aparece de vez en cuando
 

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

@@ -0,0 +1,16 @@
+Mastodon on internetin suurin hajautettu sosiaalinen verkosto. Yhden verkkopalvelun sijaan, se on miljoonien itsenäisissä yhteisöissä olevien käyttäjien verkosto, jotka voivat olla vuorovaikutuksessa toistensa kanssa saumattomasti. Riippumatta siitä, mistä olet kiinnostunut, voit tavata intohimoisia ihmisiä, jotka julkaisevat aiheesta Mastodonissa!
+
+Liity yhteisöön ja luo itsellesi tili. Löydä ja seuraa kiehtovia ihmisiä ja lue heidän julkaisunsa ilman mainoksia, kronologisella aikajanalla. Ilmaise itseäsi mukautetuilla emojeilla, kuvilla, videoilla ja audiolla 500 merkin pituisissa julkaisuissa. Vastaa viestiketjuihin ja edelleen jaa julkaisuja keneltä tahansa, jakaaksesi hienoja juttuja. Löydä uusia tilejä seurattavaksi ja trendaavia hashtageja laajentaaksesi verkostoasi.
+
+Mastodon on rakennettu keskittyen yksityisyyteen ja turvallisuuteen. Päätä, jaetaanko julkaisusi seuraajille, vain mainitsemillesi ihmisille vai koko maailmalle. Sisältövaroitusten avulla, voit piilottaa julkaisut, jotka sisältävät arkaluontoista tai laukaisevaa materiaalia, kunnes olet valmis käsittelemään niitä. Jokaisella yhteisöllä on omat ohjeistonsa ja valvojansa, jotka pitävät jäsenensä turvassa, ja tehokkaat esto- ja ilmiantotyökalut auttavat torjumaan väärinkäytöksiä.
+
+Lisää ominaisuuksia:
+
+• Tumma tila: Lue julkaisut vaaleassa, tummassa tai mustan tummassa tilassa
+• Kyselyt: Kysy seuraajilta heidän mielipidettään ja laske äänet
+• Tutustu: Trendaavat hashtagit ja tilit ovat vain napsautuksen päässä
+• Ilmoitukset: Saat ilmoituksen uusista seuraajista, vastauksista ja edelleen jaoista
+• Jakaminen: Julkaise suoraan Mastodoniin minkä tahansa sovelluksen jakovalikon kautta
+• Suloisuus: Maskottimme on ihastuttava mastodontti ja näet sen ajoittain
+
+Mastodon on rekisteröity voittoa tavoittelematon organisaatio ja kehitystä tuetaan suoraan lahjoituksillasi. Ei mainontaa, kaupallistamista eikä riskipääomaa, ja aiomme pitää sen sellaisena.

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

@@ -0,0 +1 @@
+Hajautettu sosiaalinen verkosto

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

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

fastlane/metadata/android/fr-FR/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 est le plus grand réseau social décentralisé sur Internet. Au lieu d’un site Web unique, c’est un réseau de millions d’utilisateurs dans des communautés indépendantes qui peuvent tous interagir les uns avec les autres, de manière transparente. Peu importe ce que vous êtes, vous pouvez rencontrer des gens passionnés qui publient à ce sujet sur 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.
+Rejoignez une communauté et créez votre profil. Trouvez et suivez des gens fascinants et lisez leurs messages dans une chronologie chronologique sans publicité. Exprimez-vous avec des émojis personnalisés, des images, des GIFs, des vidéos et de l’audio dans des messages de 500 caractères. Répondez aux sujets de discussions et aux reblogues de n’importe qui pour partager des choses géniales. Trouvez de nouveaux comptes à suivre et des hashtags tendance pour étendre votre réseau.
 
-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 est construit en mettant l’accent sur la vie privée et la sécurité. Décidez si vos messages sont partagés avec vos abonnés, les personnes que vous mentionnez, ou le monde entier. Les avertissements de contenu vous permettent de masquer les messages au contenu sensible jusqu’à ce que vous soyez prêt à vous engager avec eux. Chaque communauté a ses propres directives et modérateurs pour assurer la sécurité de ses membres, et de solides outils de blocage et de signalement aident à prévenir les abus.
 
-More features:
+Plus de fonctionnalités :
 
-• 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
+• Mode Sombre : Lisez les messages en mode clair, sombre ou vrai noir
+• Sondages : Demandez l’opinion à vos abonnés et comptez les votes
+• Explorer : Les hashtags et les comptes tendance sont à portée de main
+• Notifications : Soyez informé des nouveaux abonnements, réponses et reblogs
+• Partage : Publiez directement sur Mastodon à partir de n’importe quelle feuille de partage dans n’importe quelle application
+• Cuteness : Notre mascotte est un adorable éléphant, et vous la verrez apparaître de temps en temps
 
-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 est un organisme sans but lucratif enregistré et le développement est soutenu directement par vos dons. Il n’y a pas de publicité, pas de monétisation, pas de capital-risque, et nous prévoyons de continuer ainsi.

fastlane/metadata/android/fr-FR/short_description.txt

@@ -1 +1 @@
-Decentralized social network
+Réseau social décentralisé

fastlane/metadata/android/gl-ES/full_description.txt

@@ -1,16 +1,16 @@
 Mastodon é a rede social descentralizada máis grande de internet. Non é unha soa web, é unha rede de millóns de persoas en comunidades independentes que poden interactuar entre elas, sen problema. Sexan cales fosen os teus intereses, podes atopar persoas comentando ese tema en Mastodon!
 
-Únete a unha comunidade e crea un perfil. Atopa e segue a persoas interesantes e lé o que publican, nunha cronoloxía limpa de publicidade e ordenada. Exprésate usando emojis personalizados, imaxes, GIFs, vídeos e audio con publicacións de 500 caracteres. Responde aos fíos e promove publicacións doutras persoas que creas relevantes. Atopa novas contas e segue os cancelos en voga para facer medrar a túa rede.
+Únete a unha comunidade e crea un perfil. Atopa e segue a persoas interesantes e le o que publican, nunha cronoloxía limpa de publicidade e ordenada. Exprésate usando emojis personalizados, imaxes, GIFs, vídeos e audio con publicacións de 500 caracteres. Responde aos fíos e promove publicacións doutras persoas que creas relevantes. Atopa novas contas e segue os cancelos en voga para facer medrar a túa rede.
 
 Mastodon está creado pensando na privacidade e seguridade. Decide con quen compartes as túas publicacións, só coas seguidoras ou persoas que mencionas, ou con todo o mundo. Os avisos sobre o contido permiten agochar contido sensible ou material que podería crear ansiedade ata que estás preparada para velo. Cada comunidade ten as súas normas e a moderación coida da seguridade das persoas da instancia, con ferramentas para denunciar e bloquear e así evitar abusos.
 
 Máis características:
 
-• Modo Escuro: ler publicacións en modo claro, escuro ou negro total
+• Modo Escuro: ler publicacións en modo claro, escuro ou negro verdadeiro
 • Enquisas: pregúntalle ás seguidoras a súa opinión e recolle os votos
-• Explorar: Cancelos e contas en voga fácilmente accesibles
+• Explorar: Cancelos e contas en voga facilmente accesibles
 • Notificacións: recibe notificacións sobre seguimentos, respostas e promocións
 • Compartir: publica directamente en Mastodon desde o menú de calquera app
-• Fermosiña: A nosa mascota é un elefante moi feitiño, que verás a miúdo por aquí
+• Fermosura: a nosa mascota é un elefante moi feitiño, que verás a miúdo por aquí
 
 Mastodon é unha organización rexistrada sen ánimo de lucro cuxo desenvolvemento está financiado por doazóns. Non hai publicidade, nen monetización, sen inversións de capital risco, e pretendemos seguir así.

fastlane/metadata/android/hr-HR/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 je najveća decentralizirana društvena mreža na internetu. Umjesto jedne web stranice, to je mreža milijuna korisnika u neovisnim zajednicama koje sve mogu međusobno komunicirati. Bez obzira na to što te zanima, možeš upoznati strastvene ljude koji o tome objavljuju na Mastodonu!
 
-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.
+Pridruži se zajednici i kreiraj svoj profil. Pronađi i prati fascinantne ljude i čitaj njihove postove u kronološkoj vremenskoj liniji bez oglasa. Izrazi se prilagođenim emojijima, slikama, GIF-ovima, videozapisima i zvukom u objavama od 500 znakova. Odgovori na teme i reblogaj postove od bilo koga da podijeliš sjajne stvari. Pronađi nove račune koje ćeš pratiti i popularne hashtagove kako bi proširio/la svoju mrežu.
 
-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 je izgrađen s fokusom na privatnost i sigurnost. Odluči hoće li se tvoje objave dijeliti s tvojim sljedbenicima, samo s osobama koje spominjete ili s cijelim svijetom. Upozorenja o sadržaju omogućuju ti da sakriješ postove koji sadrže osjetljivi ili izazovni materijal dok ne budeš spreman za interakciju s njima. Svaka zajednica ima vlastite smjernice i moderatore kako bi zaštitili svoje članove, a robusni alati za blokiranje i prijavljivanje pomažu u sprječavanju zlouporabe.
 
-More features:
+Više značajki:
 
-• 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
+• Tamni način rada: čitaj postove u svijetlom, tamnom ili stvarno crnom načinu
+• Ankete: Pitaj sljedbenike za mišljenje i zbroji glasove
+• Istraži: popularni hashtagovi i računi udaljeni su samo jedan dodir
+• Obavijesti: primaj obavijesti o novim pratiteljima, odgovorima i reblogovima
+• Dijeljenje: objavi izravno na Mastodonu s bilo kojeg lista za dijeljenje u bilo kojoj aplikaciji
+• Slatkoća: Naša maskota je ljupki slon i vidjet ćeš ih kako iskaču s vremena na vrijeme
 
-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 je registrirana neprofitna organizacija i razvoj je podržan izravno vašim donacijama. Nema oglašavanja, nema monetizacije i rizičnog kapitala, a planiramo takvi i ostati.

fastlane/metadata/android/hr-HR/short_description.txt

@@ -1 +1 @@
-Decentralized social network
+Decentralizirana društvena mreža

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

@@ -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!
+마스토돈은 인터넷에서 가장 큰 분산 소셜 네트워크입니다. 단 하나의 통일된 웹사이트 대신, 수백만 명의 사용자들이, 서로 경계 없이 소통할 수 있는 독립적인 커뮤니티의 네트워크입니다. 당신이 어디에 속하든간에, 마스토돈에 열정적으로 게시물을 남기는 사람들을 만날 수 있습니다!
 
-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.
+마스토돈은 개인정보 보호와 안전에 중점을 두고 만들어졌습니다. 당신의 게시물을 팔로워들에게만 공개할지, 언급한 사람들에게만 공유할지, 아니면 전세계에 공유할 지 선택하세요. 열람주의는 민감하거나 남들에게 껄끄러울 수 있는 게시물을 마음의 준비가 된 사람들만 열람하도록 숨길 수 있도록 해줍니다. 각각의 커뮤니티는 구성원들을 안전하게 지키기 위한 각자의 규정과 중재자들을 가지고 있으며, 남용을 방지하기 위한 강력한 차단 도구와 신고 도구를 가지고 있습니다.
 
-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/ko-KR/short_description.txt

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

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

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

fastlane/metadata/android/pl-PL/full_description.txt

@@ -1,16 +1,16 @@
 Mastodon to największa zdecentralizowana sieć społecznościowa w Internecie. Zamiast jednej strony internetowej, jest to sieć milionów użytkowników w niezależnych społecznościach, które mogą ze sobą wchodzić w interakcje. Niezależnie od swoich zainteresowań, momżesz poznać interesujących ludzi piszących o nich na Mastodonie!
 
-Dołącz do społeczności i utwórz swój profil. Poznaj i obserwuj fascynujących ludzi i czytaj ich wpisy w chronologicznym osi czasu. Wyrażaj siebie za pomocą niestandardowych emoji, obrazów, GIFów, filmów i audio w 500-znakowych wpisach. Reply to threads and reblog posts from anyone to share great stuff. Find new accounts to follow and trending hashtags to expand your network.
+Dołącz do społeczności i utwórz swój profil. Poznaj i obserwuj fascynujących ludzi i czytaj ich wpisy w chronologicznym osi czasu. Wyrażaj siebie za pomocą niestandardowych emoji, obrazów, GIFów, filmów i audio w 500-znakowych wpisach. Odpowiadaj na wątki i podawaj dalej posty od każdego, aby dzielić się wspaniałymi rzeczami. Odnajduj nowe konta do śledzenia i zyskujące popularność hashtagi, by poszerzać swoją sieć.
 
-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 został zaprojektowany z myślą o prywatności i bezpieczeństwie. Decyduj, czy Twoje wpisy są udostępniane osobom śledzącym Cię, tylko wzmiankowanym, czy całemu światu. Ostrzeżenia dotyczące zawartości pozwalają ukrywać posty zawierające wrażliwe lub wyzywające materiały, dopóki nie będziesz gotów się z nimi pogodzić. Każda społeczność ma własne wytyczne i moderatorów, aby zapewniać swoim członkom bezpieczeństwo, a także solidne narzędzia blokowania i raportowania pomagające zapobiegać nadużyciom.
 
 Więcej funkcji:
 
 • Tryb ciemny: Czytaj wpisy w jasnym, ciemnym lub czarnym trybie
 • Ankiety: Poproś obserwujących o ich opinię i poznaj ich głosy
-• Explore: Trending hashtags and accounts are a tap away
+• Odkrywaj: Najpopularniejsze hashtagi i konta są dostępne za jednym dotknięciem
 • Powiadomienia: Otrzymuj powiadomienia o nowych obserwacjach, odpowiedziach i udostępnieniach
-• 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
+• Udostępnianie: Publikuj bezpośrednio na Mastodonie z menu udostępniania w dowolnej aplikacji
+• Słodycz: Nasza maskotka to uroczy słoń i zobaczysz go pojawiającego się od czasu do czasu
 
-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 to zarejestrowana organizacja non-profit i rozwój jest wspierany bezpośrednio przez darowizny. Nie ma reklam, monetyzacji, ani kapitału inwestycyjnego i planujemy, by tak pozostało.

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

@@ -1,8 +1,8 @@
-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. Independemente dos teus gostos, consegues encontrar pessoas que os partilhem no 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.
+Junta-te a uma comunidade e cria o teu perfil. Encontra, segue gente fascinante e lê as suas publicações numa cronologia sem anúncios. Expressa-te com emojis personalizados imagens, GIFs, vídeos e áudio em publicações com até 500 caracteres. Responde a tópicos e promove publicações de qualquer pessoa para partilhares ótimas coisas. Encontra novas contas e tendências a seguir para expandires a tua rede.
 
-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.
+O Mastodon é construído com foco na privacidade e segurança. Decide se as tuas publicações são partilhadas com os teus seguidores, apenas com as pessoas mencionadas, ou com o mundo inteiro. Avisos de conteúdo permitem-te esconder publicações que contenham material sensível ou provocatório até estares pronto(a) para o veres. Each community has its own guidelines and moderators to keep its members safe, and robust blocking and reporting tools help prevent abuse.
 
 More features:
 

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/sv-SE/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 är det största decentraliserade sociala nätverket på internet. I stället för en enda webbplats är det ett nätverk av miljontals användare på oberoende servrar som alla kan interagera med varandra, sömlöst. Oavsett vad du är intresserad av kan du träffa passionerade personer som diskuterar ämnet på 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.
+Gå med på en server och skapa din profil. Hitta och följ fascinerande människor och läsa deras inlägg i en annonsfri, kronologisk tidslinje. Uttryck dig med anpassade emoji, bilder, GIF:ar, videor och ljud i 500-teckensinlägg. Svara på trådar och ompostningar från vem som helst för att dela bra saker. Hitta nya konton att följa och trendande hashtaggar för att utöka ditt nätverk.
 
-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 är byggt med fokus på integritet och trygghet. Bestäm om dina inlägg delas med dina följare, bara personer du omnämner, eller hela världen. Innehållsvarningar låter dig dölja inlägg som innehåller känsligt eller triggande material tills du är redo att interagera med dem. Varje server har sina egna riktlinjer och moderatorer för att hålla sina medlemmar trygga, och robusta blockerings- och rapporteringsverktyg för att förhindra missbruk.
 
-More features:
+Fler funktioner:
 
-• 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
+• Mörkt läge: Läs inlägg i ljust, mörkt eller helsvart läge
+• Omröstningar: Fråga följare om deras åsikt och sammanställ deras röster
+• Utforska: Trendande hashtaggar och konton är ett tryck bort
+• Notiser: Bli meddelad om nya följare, svar och ompostningar
+• Delning: Posta direkt till Mastodon från delningsbladet i alla appar
+• Gullighet: Vår maskot är en bedårande elefant, och du kommer att se dem dyka upp då och då
 
-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 är en registrerad ideell förening och utvecklingen stöds direkt av dina donationer. Det finns ingen reklam, ingen monetarisering, och inget riskkapital, och vi planerar att behålla det på det sättet.

fastlane/metadata/android/sv-SE/short_description.txt

@@ -1 +1 @@
-Decentralized social network
+Decentraliserat socialt nätverk

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

@@ -0,0 +1,16 @@
+Mastodon เป็นเครือข่ายสังคมแบบกระจายศูนย์ที่ใหญ่ที่สุดบนอินเทอร์เน็ต ซึ่งไม่ได้เป็นเว็บไซต์เดียว แต่เป็นเครือข่ายของผู้ใช้หลายล้านคนในชุมชนอิสระที่ทุกคนสามารถโต้ตอบซึ่งกันและกันได้แบบไร้รอยต่อ ไม่ว่าคุณจะชอบอะไร คุณก็พบคนที่ชื่นชอบเหมือนกันโพสต์เกี่ยวกับสิ่งที่คุณชอบได้บน Mastodon!
+
+เข้าร่วมชุมชนและสร้างโปรไฟล์ ค้นหาและติดตามผู้คนที่น่าสนใจและอ่านโพสต์ของเขาในไทม์ไลน์ที่ไร้โฆษณาและเรียงตามลำดับเวลาล้วน ๆ แสดงความรู้สึกของตัวคุณเองด้วยอีโมจิที่กำหนดเอง รูปภาพ GIF วิดีโอ และเสียงในโพสต์ 500 ตัวอักษร ตอบกลับและดันโพสต์จากคนอื่น ๆ เพื่อแชร์สิ่งดี ๆ และค้นหาบัญชีใหม่ ๆ ที่จะติดตามและแฮชแท็กที่เป็นที่นิยมเพื่อขยายเครือข่ายของคุณ
+
+Mastodon สร้างขึ้นโดยเน้นความเป็นส่วนตัวและความปลอดภัยเป็นสำคัญ คุณสามารถตัดสินใจได้ว่าโพสต์ของคุณจะถูกแชร์กับผู้ติดตามของคุณ คนที่คุณกล่าวถึง หรือคนทั้งโลกก็ได้ ฟังก์ชั่นคำเตือนเนื้อหาช่วยให้คุณซ่อนโพสต์ที่มีเนื้อหาที่ละเอียดอ่อนจนกว่าคุณจะพร้อมเห็นเนื้อหานั้น แต่ละชุมชนจะมีหลักเกณฑ์และผู้ควบคุมเป็นของตนเองเพื่อรักษาความปลอดภัยของสมาชิก รวมถึงเครื่องมือการปิดกั้นและรายงานที่มีประสิทธิภาพเพื่อช่วยป้องกันการกระทำผิด
+
+คุณสมบัติอื่น ๆ:
+
+• โหมดมืด: อ่านโพสต์ในโหมดสว่าง มืด หรือโหมดมืดดำสนิท
+• การสำรวจความคิดเห็น: สำรวจความคิดเห็นของผู้ติดตามและนับจำนวนการลงคะแนน
+• สำรวจ: แตะปุ่มเดียวเพื่อดูแฮชแท็กและบัญชีที่เป็นที่นิยม
+• การแจ้งเตือน: รับการแจ้งเตือนเกี่ยวกับผู้ติดตามใหม่ การตอบกลับ และการดันโพสต์
+• การแชร์: โพสต์ลง Mastodon ได้โดยตรงจากแอปอื่น ๆ ที่อยู่ในเครื่อง
+• ความน่ารัก: มาสคอตของเราเป็นช้างน่ารัก และคุณจะเห็นมันโผล่ออกมาเป็นระยะ ๆ
+
+Mastodon เป็นองค์กรไม่แสวงหาผลกำไรที่จดทะเบียนแล้ว และการพัฒนาได้รับการสนับสนุนจากเงินบริจาคของคุณโดยตรง ดังนั้นจึงไม่มีโฆษณา ไม่มีการทำกำไร และไม่มีการร่วมลงทุน และเรามีแผนจะทำให้เป็นอย่างนี้ต่อไป

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/tr-TR/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, internetteki merkezi olmayan en büyük sosyal ağdır. Tek bir web siteye bağlı kalmaksızın, milyonlarca kullanıcının bağımsız olarak birbiri ile kolayca etkileşebileceği bir ağdır. Hangi konuyla ilgili olduğun önemli değil, Mastodon'da onunla ilgili gönderi paylaşan tutkulu insanlarla tanışabilirsin!
 
-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.
+Bir topluluğa katıl ve profilini oluştur. Olağanüstü kişileri bul ve takip et, gönderilerini kronolojik ve reklamsız sunan bir akışta oku. Gönderilerinde 500 karakter sınırlamasıyla kendini emojiler, görseller, GIFler, videolar ve sesler ile ifade et. Harika içerikler paylaşmak için başlıklara yanıt yaz, insanların gönderilerini yeniden paylaş. Ağınızı genişletmek için takip edilecek yeni hesaplar ve hashtagler bul.
 
-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 gizlilik ve güvenlik odaklı yapılmıştır. Her postunuz için takipçilerinizle mi, bahsettiğiniz kişilerle mi ya da tüm dünyayla mı paylaşılacağına karar verin. Gönderi uyarıları, hassas ve tetikleyici olabilecek içerikleri kişi görmeyi hazır olana kadar gizler. Her topluluk, üyelerini güvende tutmak için kendi kurallarına ve moderatörlerine; istismarı önlemek için de güçlü engelleme ve bildirme araçlarına sahiptir.
 
-More features:
+Diğer özellikler:
 
-• 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
+• Koyu Mod: Gönderileri aydınlık, karanlık ya da gerçek karanlık modunda okuyabilirsin
+• Anketler: Takipçilerine görüşlerini sor ve oylarını gör
+• Keşfet: Trend hashtagler ve hesaplar bir tık uzağında
+• Bildirimler: Yeni takipçilerden, yanıtlardan ve yeniden paylaşımlardan haberin olsun
+• Paylaşım: Doğrudan Mastodon'a herhangi bir tipte gönderi paylaş
+• Sevimlilik: Maskotumuz şirin bir fil ve onu uygulamada zaman zaman göreceksin
 
-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 kar amacı gütmeyen bir kuruluştur ve geliştirilmesi doğrudan bağışlarınızla sağlanmaktadır. Reklam, para kazanma amacı, risk sermayesi yoktur ve bunu böyle tutmayı planlıyoruz.

fastlane/metadata/android/tr-TR/short_description.txt

@@ -1 +1 @@
-Decentralized social network
+Merkezsizleştirilmiş sosyal ağ

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

@@ -1,14 +1,14 @@
-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 nổi bật để 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:
 
 • Chế độ Tối: Đọc tút ở chế độ sáng, tối hoặc đen
 • Bình chọn: Hỏi cộng đồng về ý kiến của họ và đếm lượt bình chọn
-• Khám phá: Xem hashtag xu hướng và tài khoản chỉ bằng một nhấn
+• Khám phá: Xem hashtag nổi bật và tài khoản chỉ bằng một nhấn
 • Thông báo: Nhận thông báo về người theo dõi, lượt trả lời và đăng lại mới
 • Chia sẻ: Đăng trực tiếp lên Mastodon từ bất kỳ ứng dụng nào
 • Đáng yêu: Linh vật của chúng tôi là một chú voi ma mút và bạn sẽ thấy anh ấy thỉnh thoảng xuất hiện

fastlane/metadata/android/zh-CN/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.
+加入一个社区节点并创建你的账户。 寻找并关注感兴趣的同好，无广告地浏览他们的时间线。 用自定义表情、图像、GIF、视频和音频在 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
+• 暗色模式：以浅色、深色、纯黑模式下进行阅读
+• 投票：询问关注者的意见并统计他们的投票
+• 探索：热门的话题以及账号
+• 通知：获得新关注、回复和转发的通知
+• 分享：从其他应用中的分享菜单中直接发布到 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-CN/short_description.txt

@@ -1 +1 @@
-Decentralized social network
+分布式社交网络

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

@@ -4,13 +4,13 @@ plugins {
 }
 
 android {
-	compileSdk 31
+	compileSdk 33
 	defaultConfig {
-		applicationId "org.joinmastodon.android"
+		applicationId "org.joinmastodon.android.sk"
 		minSdk 23
-		targetSdk 31
-		versionCode 30
-		versionName "1.0.1"
+		targetSdk 33
+		versionCode 27
+		versionName "1.1.4+fork.27"
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 	}
 
@@ -33,6 +33,9 @@ android {
 			initWith release
 			versionNameSuffix "-beta"
 		}
+		githubRelease{
+			initWith release
+		}
 	}
 	compileOptions {
 		sourceCompatibility JavaVersion.VERSION_17
@@ -46,6 +49,16 @@ android {
 		appcenterPublicBeta{
 			setRoot "src/appcenter"
 		}
+		githubRelease{
+			setRoot "src/github"
+		}
+		debug {
+			setRoot "src/github"
+		}
+	}
+	lintOptions{
+		checkReleaseBuilds false
+		abortOnError false
 	}
 }
 
@@ -58,7 +71,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/proguard-rules.pro

@@ -46,4 +46,9 @@
 
 -keep class org.joinmastodon.android.AppCenterWrapper { *; }
 
--keepattributes LineNumberTable
+-keepattributes LineNumberTable
+
+# Parceler library
+-keep interface org.parceler.Parcel
+-keep @org.parceler.Parcel class * { *; }
+-keep class **$$Parcelable { *; }

mastodon/src/github/AndroidManifest.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+	package="org.joinmastodon.android">
+
+	<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
+
+	<application>
+		<!--		<receiver android:name=".updater.GithubSelfUpdaterImpl$InstallerStatusReceiver" android:exported="false"/>-->
+		<!--		<receiver android:name=".updater.GithubSelfUpdaterImpl$AfterUpdateRestartReceiver" android:exported="true" android:enabled="false">-->
+		<!--			<intent-filter>-->
+		<!--				<action android:name="android.intent.action.MY_PACKAGE_REPLACED"/>-->
+		<!--			</intent-filter>-->
+		<!--		</receiver>-->
+		<provider
+			android:authorities="${applicationId}.self_update_provider"
+			android:name=".updater.SelfUpdateContentProvider"
+			android:grantUriPermissions="true"
+			android:exported="false"/>
+	</application>
+
+</manifest>

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

@@ -0,0 +1,348 @@
+package org.joinmastodon.android.updater;
+
+import android.app.Activity;
+import android.app.DownloadManager;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.SharedPreferences;
+import android.content.pm.PackageInstaller;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Build;
+import android.util.Log;
+import android.widget.Toast;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+
+import org.joinmastodon.android.BuildConfig;
+import org.joinmastodon.android.E;
+import org.joinmastodon.android.MastodonApp;
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.MastodonAPIController;
+import org.joinmastodon.android.events.SelfUpdateStateChangedEvent;
+
+import java.io.File;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import androidx.annotation.Keep;
+import okhttp3.Call;
+import okhttp3.Request;
+import okhttp3.Response;
+
+@Keep
+public class GithubSelfUpdaterImpl extends GithubSelfUpdater{
+	private static final long CHECK_PERIOD=24*3600*1000L;
+	private static final String TAG="GithubSelfUpdater";
+
+	private UpdateState state=UpdateState.NO_UPDATE;
+	private UpdateInfo info;
+	private long downloadID;
+	private BroadcastReceiver downloadCompletionReceiver=new BroadcastReceiver(){
+		@Override
+		public void onReceive(Context context, Intent intent){
+			if(downloadID!=0 && intent.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, 0)==downloadID){
+				MastodonApp.context.unregisterReceiver(this);
+				setState(UpdateState.DOWNLOADED);
+			}
+		}
+	};
+
+	public GithubSelfUpdaterImpl(){
+		SharedPreferences prefs=getPrefs();
+		int checkedByBuild=prefs.getInt("checkedByBuild", 0);
+		if(prefs.contains("version") && checkedByBuild==BuildConfig.VERSION_CODE){
+			info=new UpdateInfo();
+			info.version=prefs.getString("version", null);
+			info.size=prefs.getLong("apkSize", 0);
+			downloadID=prefs.getLong("downloadID", 0);
+			if(downloadID==0 || !getUpdateApkFile().exists()){
+				state=UpdateState.UPDATE_AVAILABLE;
+			}else{
+				DownloadManager dm=MastodonApp.context.getSystemService(DownloadManager.class);
+				state=dm.getUriForDownloadedFile(downloadID)==null ? UpdateState.DOWNLOADING : UpdateState.DOWNLOADED;
+				if(state==UpdateState.DOWNLOADING){
+					MastodonApp.context.registerReceiver(downloadCompletionReceiver, new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE));
+				}
+			}
+		}else if(checkedByBuild!=BuildConfig.VERSION_CODE && checkedByBuild>0){
+			// We are in a new version, running for the first time after update. Gotta clean things up.
+			long id=getPrefs().getLong("downloadID", 0);
+			if(id!=0){
+				MastodonApp.context.getSystemService(DownloadManager.class).remove(id);
+			}
+			getUpdateApkFile().delete();
+			getPrefs().edit()
+					.remove("apkSize")
+					.remove("version")
+					.remove("apkURL")
+					.remove("checkedByBuild")
+					.remove("downloadID")
+					.apply();
+		}
+	}
+
+	private SharedPreferences getPrefs(){
+		return MastodonApp.context.getSharedPreferences("githubUpdater", Context.MODE_PRIVATE);
+	}
+
+	@Override
+	public void maybeCheckForUpdates(){
+		if(state!=UpdateState.NO_UPDATE && state!=UpdateState.UPDATE_AVAILABLE)
+			return;
+		long timeSinceLastCheck=System.currentTimeMillis()-getPrefs().getLong("lastCheck", CHECK_PERIOD);
+		if(timeSinceLastCheck>=CHECK_PERIOD){
+			setState(UpdateState.CHECKING);
+			MastodonAPIController.runInBackground(this::actuallyCheckForUpdates);
+		}
+	}
+
+	private void actuallyCheckForUpdates(){
+		Request req=new Request.Builder()
+				.url("https://api.github.com/repos/sk22/mastodon-android-fork/releases/latest")
+				.build();
+		Call call=MastodonAPIController.getHttpClient().newCall(req);
+		try(Response resp=call.execute()){
+			JsonObject obj=JsonParser.parseReader(resp.body().charStream()).getAsJsonObject();
+			String tag=obj.get("tag_name").getAsString();
+			Pattern pattern=Pattern.compile("v?(\\d+)\\.(\\d+)\\.(\\d+)\\+fork\\.(\\d+)");
+			Matcher matcher=pattern.matcher(tag);
+			if(!matcher.find()){
+				Log.w(TAG, "actuallyCheckForUpdates: release tag has wrong format: "+tag);
+				return;
+			}
+			int newMajor=Integer.parseInt(matcher.group(1)),
+				newMinor=Integer.parseInt(matcher.group(2)),
+				newRevision=Integer.parseInt(matcher.group(3)),
+				newForkNumber=Integer.parseInt(matcher.group(4));
+			matcher=pattern.matcher(BuildConfig.VERSION_NAME);
+			String[] currentParts=BuildConfig.VERSION_NAME.split("[.+]");
+			if(!matcher.find()){
+				Log.w(TAG, "actuallyCheckForUpdates: current version has wrong format: "+BuildConfig.VERSION_NAME);
+				return;
+			}
+			int curMajor=Integer.parseInt(matcher.group(1)),
+				curMinor=Integer.parseInt(matcher.group(2)),
+				curRevision=Integer.parseInt(matcher.group(3)),
+				curForkNumber=Integer.parseInt(matcher.group(4));
+			long newVersion=((long)newMajor << 32) | ((long)newMinor << 16) | newRevision;
+			long curVersion=((long)curMajor << 32) | ((long)curMinor << 16) | curRevision;
+			if(newVersion>curVersion || newForkNumber>curForkNumber || BuildConfig.DEBUG){
+				String version=newMajor+"."+newMinor+"."+newRevision+"+fork."+newForkNumber;
+				Log.d(TAG, "actuallyCheckForUpdates: new version: "+version);
+				for(JsonElement el:obj.getAsJsonArray("assets")){
+					JsonObject asset=el.getAsJsonObject();
+					if("application/vnd.android.package-archive".equals(asset.get("content_type").getAsString()) && "uploaded".equals(asset.get("state").getAsString())){
+						long size=asset.get("size").getAsLong();
+						String url=asset.get("browser_download_url").getAsString();
+
+						UpdateInfo info=new UpdateInfo();
+						info.size=size;
+						info.version=version;
+						this.info=info;
+
+						getPrefs().edit()
+								.putLong("apkSize", size)
+								.putString("version", version)
+								.putString("apkURL", url)
+								.putInt("checkedByBuild", BuildConfig.VERSION_CODE)
+								.remove("downloadID")
+								.apply();
+
+						break;
+					}
+				}
+			}
+			getPrefs().edit().putLong("lastCheck", System.currentTimeMillis()).apply();
+		}catch(Exception x){
+			Log.w(TAG, "actuallyCheckForUpdates", x);
+		}finally{
+			setState(info==null ? UpdateState.NO_UPDATE : UpdateState.UPDATE_AVAILABLE);
+		}
+	}
+
+	private void setState(UpdateState state){
+		this.state=state;
+		E.post(new SelfUpdateStateChangedEvent(state));
+	}
+
+	@Override
+	public UpdateState getState(){
+		return state;
+	}
+
+	@Override
+	public UpdateInfo getUpdateInfo(){
+		return info;
+	}
+
+	public File getUpdateApkFile(){
+		return new File(MastodonApp.context.getExternalCacheDir(), "update.apk");
+	}
+
+	@Override
+	public void downloadUpdate(){
+		if(state==UpdateState.DOWNLOADING)
+			throw new IllegalStateException();
+		DownloadManager dm=MastodonApp.context.getSystemService(DownloadManager.class);
+		MastodonApp.context.registerReceiver(downloadCompletionReceiver, new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE));
+		downloadID=dm.enqueue(
+				new DownloadManager.Request(Uri.parse(getPrefs().getString("apkURL", null)))
+						.setDestinationUri(Uri.fromFile(getUpdateApkFile()))
+		);
+		getPrefs().edit().putLong("downloadID", downloadID).apply();
+		setState(UpdateState.DOWNLOADING);
+	}
+
+	@Override
+	public void installUpdate(Activity activity){
+		if(state!=UpdateState.DOWNLOADED)
+			throw new IllegalStateException();
+		Uri uri;
+		Intent intent=new Intent(Intent.ACTION_INSTALL_PACKAGE);
+		if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.N){
+			uri=new Uri.Builder().scheme("content").authority(activity.getPackageName()+".self_update_provider").path("update.apk").build();
+			intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+		}else{
+			uri=Uri.fromFile(getUpdateApkFile());
+		}
+		intent.setDataAndType(uri, "application/vnd.android.package-archive");
+		activity.startActivity(intent);
+
+		// TODO figure out how to restart the app when updating via this new API
+		/*
+		PackageInstaller installer=activity.getPackageManager().getPackageInstaller();
+		try{
+			final int sid=installer.createSession(new PackageInstaller.SessionParams(PackageInstaller.SessionParams.MODE_FULL_INSTALL));
+			installer.registerSessionCallback(new PackageInstaller.SessionCallback(){
+				@Override
+				public void onCreated(int i){
+
+				}
+
+				@Override
+				public void onBadgingChanged(int i){
+
+				}
+
+				@Override
+				public void onActiveChanged(int i, boolean b){
+
+				}
+
+				@Override
+				public void onProgressChanged(int id, float progress){
+
+				}
+
+				@Override
+				public void onFinished(int id, boolean success){
+					activity.getPackageManager().setComponentEnabledSetting(new ComponentName(activity, AfterUpdateRestartReceiver.class), PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP);
+				}
+			});
+			activity.getPackageManager().setComponentEnabledSetting(new ComponentName(activity, AfterUpdateRestartReceiver.class), PackageManager.COMPONENT_ENABLED_STATE_ENABLED, PackageManager.DONT_KILL_APP);
+			PackageInstaller.Session session=installer.openSession(sid);
+			try(OutputStream out=session.openWrite("mastodon.apk", 0, info.size); InputStream in=new FileInputStream(getUpdateApkFile())){
+				byte[] buffer=new byte[16384];
+				int read;
+				while((read=in.read(buffer))>0){
+					out.write(buffer, 0, read);
+				}
+			}
+//			PendingIntent intent=PendingIntent.getBroadcast(activity, 1, new Intent(activity, InstallerStatusReceiver.class), PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_MUTABLE);
+			PendingIntent intent=PendingIntent.getActivity(activity, 1, new Intent(activity, MainActivity.class), PendingIntent.FLAG_UPDATE_CURRENT);
+			session.commit(intent.getIntentSender());
+		}catch(IOException x){
+			Log.w(TAG, "installUpdate", x);
+			Toast.makeText(activity, x.getMessage(), Toast.LENGTH_SHORT).show();
+		}
+		 */
+	}
+
+	@Override
+	public float getDownloadProgress(){
+		if(state!=UpdateState.DOWNLOADING)
+			throw new IllegalStateException();
+		DownloadManager dm=MastodonApp.context.getSystemService(DownloadManager.class);
+		try(Cursor cursor=dm.query(new DownloadManager.Query().setFilterById(downloadID))){
+			if(cursor.moveToFirst()){
+				long loaded=cursor.getLong(cursor.getColumnIndexOrThrow(DownloadManager.COLUMN_BYTES_DOWNLOADED_SO_FAR));
+				long total=cursor.getLong(cursor.getColumnIndexOrThrow(DownloadManager.COLUMN_TOTAL_SIZE_BYTES));
+//				Log.d(TAG, "getDownloadProgress: "+loaded+" of "+total);
+				return total>0 ? (float)loaded/total : 0f;
+			}
+		}
+		return 0;
+	}
+
+	@Override
+	public void cancelDownload(){
+		if(state!=UpdateState.DOWNLOADING)
+			throw new IllegalStateException();
+		DownloadManager dm=MastodonApp.context.getSystemService(DownloadManager.class);
+		dm.remove(downloadID);
+		downloadID=0;
+		getPrefs().edit().remove("downloadID").apply();
+		setState(UpdateState.UPDATE_AVAILABLE);
+	}
+
+	@Override
+	public void handleIntentFromInstaller(Intent intent, Activity activity){
+		int status=intent.getIntExtra(PackageInstaller.EXTRA_STATUS, 0);
+		if(status==PackageInstaller.STATUS_PENDING_USER_ACTION){
+			Intent confirmIntent=intent.getParcelableExtra(Intent.EXTRA_INTENT);
+			activity.startActivity(confirmIntent);
+		}else if(status!=PackageInstaller.STATUS_SUCCESS){
+			String msg=intent.getStringExtra(PackageInstaller.EXTRA_STATUS_MESSAGE);
+			Toast.makeText(activity, activity.getString(R.string.error)+":\n"+msg, Toast.LENGTH_LONG).show();
+		}
+	}
+
+	/*public static class InstallerStatusReceiver extends BroadcastReceiver{
+
+		@Override
+		public void onReceive(Context context, Intent intent){
+			int status=intent.getIntExtra(PackageInstaller.EXTRA_STATUS, 0);
+			if(status==PackageInstaller.STATUS_PENDING_USER_ACTION){
+				Intent confirmIntent=intent.getParcelableExtra(Intent.EXTRA_INTENT);
+				context.startActivity(confirmIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
+			}else if(status!=PackageInstaller.STATUS_SUCCESS){
+				String msg=intent.getStringExtra(PackageInstaller.EXTRA_STATUS_MESSAGE);
+				Toast.makeText(context, context.getString(R.string.error)+":\n"+msg, Toast.LENGTH_LONG).show();
+			}
+		}
+	}
+
+	public static class AfterUpdateRestartReceiver extends BroadcastReceiver{
+
+		@Override
+		public void onReceive(Context context, Intent intent){
+			if(Intent.ACTION_MY_PACKAGE_REPLACED.equals(intent.getAction())){
+				context.getPackageManager().setComponentEnabledSetting(new ComponentName(context, AfterUpdateRestartReceiver.class), PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP);
+				Toast.makeText(context, R.string.update_installed, Toast.LENGTH_SHORT).show();
+				Intent restartIntent=new Intent(context, MainActivity.class)
+						.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+						.setPackage(context.getPackageName());
+				if(Build.VERSION.SDK_INT<Build.VERSION_CODES.P){
+					context.startActivity(restartIntent);
+				}else{
+					// Bypass activity starting restrictions by starting it from a notification
+					NotificationManager nm=context.getSystemService(NotificationManager.class);
+					NotificationChannel chan=new NotificationChannel("selfUpdateRestart", context.getString(R.string.update_installed), NotificationManager.IMPORTANCE_HIGH);
+					nm.createNotificationChannel(chan);
+					Notification n=new Notification.Builder(context, "selfUpdateRestart")
+							.setContentTitle(context.getString(R.string.update_installed))
+							.setContentIntent(PendingIntent.getActivity(context, 1, restartIntent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE))
+							.setFullScreenIntent(PendingIntent.getActivity(context, 1, restartIntent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE), true)
+							.setSmallIcon(R.drawable.ic_ntf_logo)
+							.build();
+					nm.notify(1, n);
+				}
+			}
+		}
+	}*/
+}

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

@@ -0,0 +1,62 @@
+package org.joinmastodon.android.updater;
+
+import android.content.ContentProvider;
+import android.content.ContentValues;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.ParcelFileDescriptor;
+
+import java.io.FileNotFoundException;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+public class SelfUpdateContentProvider extends ContentProvider{
+	@Override
+	public boolean onCreate(){
+		return true;
+	}
+
+	@Nullable
+	@Override
+	public Cursor query(@NonNull Uri uri, @Nullable String[] projection, @Nullable String selection, @Nullable String[] selectionArgs, @Nullable String sortOrder){
+		return null;
+	}
+
+	@Nullable
+	@Override
+	public String getType(@NonNull Uri uri){
+		if(isCorrectUri(uri))
+			return "application/vnd.android.package-archive";
+		return null;
+	}
+
+	@Nullable
+	@Override
+	public Uri insert(@NonNull Uri uri, @Nullable ContentValues values){
+		return null;
+	}
+
+	@Override
+	public int delete(@NonNull Uri uri, @Nullable String selection, @Nullable String[] selectionArgs){
+		return 0;
+	}
+
+	@Override
+	public int update(@NonNull Uri uri, @Nullable ContentValues values, @Nullable String selection, @Nullable String[] selectionArgs){
+		return 0;
+	}
+
+	@Nullable
+	@Override
+	public ParcelFileDescriptor openFile(@NonNull Uri uri, @NonNull String mode) throws FileNotFoundException{
+		if(isCorrectUri(uri)){
+			return ParcelFileDescriptor.open(((GithubSelfUpdaterImpl)GithubSelfUpdater.getInstance()).getUpdateApkFile(), ParcelFileDescriptor.MODE_READ_ONLY);
+		}
+		throw new FileNotFoundException();
+	}
+
+	private boolean isCorrectUri(Uri uri){
+		return "/update.apk".equals(uri.getPath());
+	}
+}

mastodon/src/main/AndroidManifest.xml

@@ -7,6 +7,7 @@
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="28"/>
 	<uses-permission android:name="${applicationId}.permission.C2D_MESSAGE"/>
 	<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/>
+	<uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
 
 	<permission android:name="${applicationId}.permission.C2D_MESSAGE" android:protectionLevel="signature"/>
 

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

@@ -1,14 +1,19 @@
 package org.joinmastodon.android;
 
+import android.Manifest;
 import android.app.Application;
 import android.app.Fragment;
 import android.content.Intent;
+import android.content.pm.PackageInstaller;
+import android.content.pm.PackageManager;
+import android.os.Build;
 import android.os.Bundle;
 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;
@@ -16,6 +21,7 @@ import org.joinmastodon.android.fragments.ThreadFragment;
 import org.joinmastodon.android.fragments.onboarding.AccountActivationFragment;
 import org.joinmastodon.android.model.Notification;
 import org.joinmastodon.android.ui.utils.UiUtils;
+import org.joinmastodon.android.updater.GithubSelfUpdater;
 import org.parceler.Parcels;
 
 import java.lang.reflect.InvocationTargetException;
@@ -56,6 +62,10 @@ 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();
+				}else{
+					maybeRequestNotificationsPermission();
 				}
 			}
 		}
@@ -65,6 +75,8 @@ public class MainActivity extends FragmentStackActivity{
 			try{
 				Class.forName("org.joinmastodon.android.AppCenterWrapper").getMethod("init", Application.class).invoke(null, getApplication());
 			}catch(ClassNotFoundException|NoSuchMethodException|IllegalAccessException|InvocationTargetException ignore){}
+		}else if(GithubSelfUpdater.needSelfUpdating()){
+			GithubSelfUpdater.getInstance().maybeCheckForUpdates();
 		}
 	}
 
@@ -91,7 +103,11 @@ public class MainActivity extends FragmentStackActivity{
 				fragment.setArguments(args);
 				showFragmentClearingBackStack(fragment);
 			}
-		}
+		}else if(intent.getBooleanExtra("compose", false)){
+			showCompose();
+		}/*else if(intent.hasExtra(PackageInstaller.EXTRA_STATUS) && GithubSelfUpdater.needSelfUpdating()){
+			GithubSelfUpdater.getInstance().handleIntentFromInstaller(intent, this);
+		}*/
 	}
 
 	private void showFragmentForNotification(Notification notification, String accountID){
@@ -115,4 +131,21 @@ 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);
+	}
+
+	private void maybeRequestNotificationsPermission(){
+		if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.TIRAMISU && checkSelfPermission(Manifest.permission.POST_NOTIFICATIONS)!=PackageManager.PERMISSION_GRANTED){
+			requestPermissions(new String[]{Manifest.permission.POST_NOTIFICATIONS}, 100);
+		}
+	}
 }

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/AvatarResizedImageRequestBody.java

@@ -0,0 +1,39 @@
+package org.joinmastodon.android.api;
+
+import android.graphics.Rect;
+import android.net.Uri;
+
+import java.io.IOException;
+
+public class AvatarResizedImageRequestBody extends ResizedImageRequestBody{
+	public AvatarResizedImageRequestBody(Uri uri, ProgressListener progressListener) throws IOException{
+		super(uri, 0, progressListener);
+	}
+
+	@Override
+	protected int[] getTargetSize(int srcWidth, int srcHeight){
+		float factor=400f/Math.min(srcWidth, srcHeight);
+		return new int[]{Math.round(srcWidth*factor), Math.round(srcHeight*factor)};
+	}
+
+	@Override
+	protected boolean needResize(int srcWidth, int srcHeight){
+		return srcHeight>400 || srcWidth!=srcHeight;
+	}
+
+	@Override
+	protected boolean needCrop(int srcWidth, int srcHeight){
+		return srcWidth!=srcHeight;
+	}
+
+	@Override
+	protected Rect getCropBounds(int srcWidth, int srcHeight){
+		Rect rect=new Rect();
+		if(srcWidth>srcHeight){
+			rect.set(srcWidth/2-srcHeight/2, 0, srcWidth/2-srcHeight/2+srcHeight, srcHeight);
+		}else{
+			rect.set(0, srcHeight/2-srcWidth/2, srcWidth, srcHeight/2-srcWidth/2+srcWidth);
+		}
+		return rect;
+	}
+}

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);
 							}
 
@@ -103,21 +102,25 @@ public class CacheController{
 						.exec(accountID);
 			}catch(SQLiteException x){
 				Log.w(TAG, x);
-				uiHandler.post(()->callback.onError(new MastodonErrorResponse(x.getLocalizedMessage(), 500)));
+				uiHandler.post(()->callback.onError(new MastodonErrorResponse(x.getLocalizedMessage(), 500, x)));
 			}finally{
 				closeDelayed();
 			}
 		}, 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);
 			}
 		});
@@ -181,7 +184,7 @@ public class CacheController{
 						.exec(accountID);
 			}catch(SQLiteException x){
 				Log.w(TAG, x);
-				uiHandler.post(()->callback.onError(new MastodonErrorResponse(x.getLocalizedMessage(), 500)));
+				uiHandler.post(()->callback.onError(new MastodonErrorResponse(x.getLocalizedMessage(), 500, x)));
 			}finally{
 				closeDelayed();
 			}
@@ -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;
@@ -102,11 +96,11 @@ public class MastodonAPIController{
 						if(call.isCanceled())
 							return;
 						if(BuildConfig.DEBUG)
-							Log.w(TAG, "["+(session==null ? "no-auth" : session.getID())+"] "+hreq+" failed: "+e);
+							Log.w(TAG, "["+(session==null ? "no-auth" : session.getID())+"] "+hreq+" failed", e);
 						synchronized(req){
 							req.okhttpCall=null;
 						}
-						req.onError(e.getLocalizedMessage(), 0);
+						req.onError(e.getLocalizedMessage(), 0, e);
 					}
 
 					@Override
@@ -139,16 +133,16 @@ public class MastodonAPIController{
 								}catch(JsonIOException|JsonSyntaxException x){
 									if(BuildConfig.DEBUG)
 										Log.w(TAG, "["+(session==null ? "no-auth" : session.getID())+"] "+response+" error parsing or reading body", x);
-									req.onError(x.getLocalizedMessage(), response.code());
+									req.onError(x.getLocalizedMessage(), response.code(), x);
 									return;
 								}
 
 								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);
-									req.onError(x.getLocalizedMessage(), response.code());
+									req.onError(x.getLocalizedMessage(), response.code(), x);
 									return;
 								}
 
@@ -161,7 +155,7 @@ public class MastodonAPIController{
 									JsonObject error=JsonParser.parseReader(reader).getAsJsonObject();
 									Log.w(TAG, "["+(session==null ? "no-auth" : session.getID())+"] "+response+" received error: "+error);
 									if(error.has("details")){
-										MastodonDetailedErrorResponse err=new MastodonDetailedErrorResponse(error.get("error").getAsString(), response.code());
+										MastodonDetailedErrorResponse err=new MastodonDetailedErrorResponse(error.get("error").getAsString(), response.code(), null);
 										HashMap<String, List<MastodonDetailedErrorResponse.FieldError>> details=new HashMap<>();
 										JsonObject errorDetails=error.getAsJsonObject("details");
 										for(String key:errorDetails.keySet()){
@@ -178,12 +172,12 @@ public class MastodonAPIController{
 										err.detailedErrors=details;
 										req.onError(err);
 									}else{
-										req.onError(error.get("error").getAsString(), response.code());
+										req.onError(error.get("error").getAsString(), response.code(), null);
 									}
 								}catch(JsonIOException|JsonSyntaxException x){
-									req.onError(response.code()+" "+response.message(), response.code());
+									req.onError(response.code()+" "+response.message(), response.code(), x);
 								}catch(Exception x){
-									req.onError("Error parsing an API error", response.code());
+									req.onError("Error parsing an API error", response.code(), x);
 								}
 							}
 						}catch(Exception x){
@@ -195,7 +189,7 @@ public class MastodonAPIController{
 			}catch(Exception x){
 				if(BuildConfig.DEBUG)
 					Log.w(TAG, "["+(session==null ? "no-auth" : session.getID())+"] error creating and sending http request", x);
-				req.onError(x.getLocalizedMessage(), 0);
+				req.onError(x.getLocalizedMessage(), 0, x);
 			}
 		}, 0);
 	}
@@ -203,4 +197,8 @@ public class MastodonAPIController{
 	public static void runInBackground(Runnable action){
 		thread.postRunnable(action, 0);
 	}
+
+	public static OkHttpClient getHttpClient(){
+		return httpClient;
+	}
 }

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, x));
+		}
 		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){
@@ -188,8 +194,8 @@ public abstract class MastodonAPIRequest<T> extends APIRequest<T>{
 		invokeErrorCallback(err);
 	}
 
-	void onError(String msg, int httpStatus){
-		invokeErrorCallback(new MastodonErrorResponse(msg, httpStatus));
+	void onError(String msg, int httpStatus, Throwable exception){
+		invokeErrorCallback(new MastodonErrorResponse(msg, httpStatus, exception));
 	}
 
 	void onSuccess(T resp){

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

@@ -7,8 +7,8 @@ import java.util.Map;
 public class MastodonDetailedErrorResponse extends MastodonErrorResponse{
 	public Map<String, List<FieldError>> detailedErrors;
 
-	public MastodonDetailedErrorResponse(String error, int httpStatus){
-		super(error, httpStatus);
+	public MastodonDetailedErrorResponse(String error, int httpStatus, Throwable exception){
+		super(error, httpStatus, exception);
 	}
 
 	public static class FieldError{

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

@@ -12,10 +12,12 @@ import me.grishka.appkit.api.ErrorResponse;
 public class MastodonErrorResponse extends ErrorResponse{
 	public final String error;
 	public final int httpStatus;
+	public final Throwable underlyingException;
 
-	public MastodonErrorResponse(String error, int httpStatus){
+	public MastodonErrorResponse(String error, int httpStatus, Throwable exception){
 		this.error=error;
 		this.httpStatus=httpStatus;
+		this.underlyingException=exception;
 	}
 
 	@Override
@@ -26,6 +28,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,11 +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);
-				AccountSession session=AccountSessionManager.getInstance().getAccount(accountID);
+				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);
@@ -155,14 +157,16 @@ 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){
 							MastodonAPIController.runInBackground(()->{
 								serverKey=deserializeRawPublicKey(Base64.decode(result.serverKey, Base64.URL_SAFE));
 
-								AccountSession session=AccountSessionManager.getInstance().getAccount(accountID);
+								AccountSession session=AccountSessionManager.getInstance().tryGetAccount(accountID);
+								if(session==null)
+									return;
 								session.pushSubscription=result;
 								AccountSessionManager.getInstance().writeAccountsFile();
 								Log.d(TAG, "Successfully registered "+accountID+" for push notifications");
@@ -183,7 +187,9 @@ public class PushSubscriptionManager{
 				.setCallback(new Callback<>(){
 					@Override
 					public void onSuccess(PushSubscription result){
-						AccountSession session=AccountSessionManager.getInstance().getAccount(accountID);
+						AccountSession session=AccountSessionManager.getInstance().tryGetAccount(accountID);
+						if(session==null)
+							return;
 						if(result.policy!=subscription.policy)
 							result.policy=subscription.policy;
 						session.pushSubscription=result;
@@ -196,7 +202,9 @@ public class PushSubscriptionManager{
 						if(((MastodonErrorResponse)error).httpStatus==404){ // Not registered for push, register now
 							registerAccountForPush(subscription);
 						}else{
-							AccountSession session=AccountSessionManager.getInstance().getAccount(accountID);
+							AccountSession session=AccountSessionManager.getInstance().tryGetAccount(accountID);
+							if(session==null)
+								return;
 							session.needUpdatePushSettings=true;
 							session.pushSubscription=subscription;
 							AccountSessionManager.getInstance().writeAccountsFile();
@@ -359,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/ResizedImageRequestBody.java

@@ -14,6 +14,7 @@ import android.os.Build;
 import android.provider.OpenableColumns;
 
 import org.joinmastodon.android.MastodonApp;
+import org.joinmastodon.android.ui.utils.UiUtils;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -30,62 +31,105 @@ public class ResizedImageRequestBody extends CountingRequestBody{
 	private File tempFile;
 	private Uri uri;
 	private String contentType;
+	private int maxSize;
 
 	public ResizedImageRequestBody(Uri uri, int maxSize, ProgressListener progressListener) throws IOException{
 		super(progressListener);
 		this.uri=uri;
-		contentType=MastodonApp.context.getContentResolver().getType(uri);
+		this.maxSize=maxSize;
 		BitmapFactory.Options opts=new BitmapFactory.Options();
 		opts.inJustDecodeBounds=true;
-		try(InputStream in=MastodonApp.context.getContentResolver().openInputStream(uri)){
-			BitmapFactory.decodeStream(in, null, opts);
+		if("file".equals(uri.getScheme())){
+			BitmapFactory.decodeFile(uri.getPath(), opts);
+			contentType=UiUtils.getFileMediaType(new File(uri.getPath())).type();
+		}else{
+			try(InputStream in=MastodonApp.context.getContentResolver().openInputStream(uri)){
+				BitmapFactory.decodeStream(in, null, opts);
+			}
+			contentType=MastodonApp.context.getContentResolver().getType(uri);
 		}
-		if(opts.outWidth*opts.outHeight>maxSize){
+		if(needResize(opts.outWidth, opts.outHeight) || needCrop(opts.outWidth, opts.outHeight)){
 			Bitmap bitmap;
-			if(Build.VERSION.SDK_INT>=29){
-				bitmap=ImageDecoder.decodeBitmap(ImageDecoder.createSource(MastodonApp.context.getContentResolver(), uri), (decoder, info, source)->{
-					int targetWidth=Math.round((float)Math.sqrt((float)maxSize*((float)info.getSize().getWidth()/info.getSize().getHeight())));
-					int targetHeight=Math.round((float)Math.sqrt((float)maxSize*((float)info.getSize().getHeight()/info.getSize().getWidth())));
+			if(Build.VERSION.SDK_INT>=28){
+				ImageDecoder.Source source;
+				if("file".equals(uri.getScheme())){
+					source=ImageDecoder.createSource(new File(uri.getPath()));
+				}else{
+					source=ImageDecoder.createSource(MastodonApp.context.getContentResolver(), uri);
+				}
+				bitmap=ImageDecoder.decodeBitmap(source, (decoder, info, _source)->{
+					int[] size=getTargetSize(info.getSize().getWidth(), info.getSize().getHeight());
 					decoder.setAllocator(ImageDecoder.ALLOCATOR_SOFTWARE);
-					decoder.setTargetSize(targetWidth, targetHeight);
+					decoder.setTargetSize(size[0], size[1]);
+					// Breaks images in mysterious ways
+//					if(needCrop(size[0], size[1]))
+//						decoder.setCrop(getCropBounds(size[0], size[1]));
 				});
+				if(needCrop(bitmap.getWidth(), bitmap.getHeight())){
+					Rect crop=getCropBounds(bitmap.getWidth(), bitmap.getHeight());
+					bitmap=Bitmap.createBitmap(bitmap, crop.left, crop.top, crop.width(), crop.height());
+				}
 			}else{
-				int targetWidth=Math.round((float)Math.sqrt((float)maxSize*((float)opts.outWidth/opts.outHeight)));
-				int targetHeight=Math.round((float)Math.sqrt((float)maxSize*((float)opts.outHeight/opts.outWidth)));
+				int[] size=getTargetSize(opts.outWidth, opts.outHeight);
+				int targetWidth=size[0];
+				int targetHeight=size[1];
 				float factor=opts.outWidth/(float)targetWidth;
 				opts=new BitmapFactory.Options();
 				opts.inSampleSize=(int)factor;
-				try(InputStream in=MastodonApp.context.getContentResolver().openInputStream(uri)){
-					bitmap=BitmapFactory.decodeStream(in, null, opts);
+				if("file".equals(uri.getScheme())){
+					bitmap=BitmapFactory.decodeFile(uri.getPath(), opts);
+				}else{
+					try(InputStream in=MastodonApp.context.getContentResolver().openInputStream(uri)){
+						bitmap=BitmapFactory.decodeStream(in, null, opts);
+					}
 				}
-				if(factor%1f!=0f){
-					Bitmap scaled=Bitmap.createBitmap(targetWidth, targetHeight, Bitmap.Config.ARGB_8888);
-					new Canvas(scaled).drawBitmap(bitmap, null, new Rect(0, 0, bitmap.getWidth(), bitmap.getHeight()), new Paint(Paint.FILTER_BITMAP_FLAG));
+				boolean needCrop=needCrop(targetWidth, targetHeight);
+				if(factor%1f!=0f || needCrop){
+					Rect srcBounds=null;
+					Rect dstBounds;
+					if(needCrop){
+						Rect crop=getCropBounds(targetWidth, targetHeight);
+						dstBounds=new Rect(0, 0, crop.width(), crop.height());
+						srcBounds=new Rect(
+								Math.round(crop.left/(float)targetWidth*bitmap.getWidth()),
+								Math.round(crop.top/(float)targetHeight*bitmap.getHeight()),
+								Math.round(crop.right/(float)targetWidth*bitmap.getWidth()),
+								Math.round(crop.bottom/(float)targetHeight*bitmap.getHeight())
+						);
+					}else{
+						dstBounds=new Rect(0, 0, targetWidth, targetHeight);
+					}
+					Bitmap scaled=Bitmap.createBitmap(dstBounds.width(), dstBounds.height(), Bitmap.Config.ARGB_8888);
+					new Canvas(scaled).drawBitmap(bitmap, srcBounds, dstBounds, new Paint(Paint.FILTER_BITMAP_FLAG));
 					bitmap=scaled;
 				}
-				if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.N){
-					int rotation;
+				int orientation=0;
+				if("file".equals(uri.getScheme())){
+					ExifInterface exif=new ExifInterface(uri.getPath());
+					orientation=exif.getAttributeInt(ExifInterface.TAG_ORIENTATION, ExifInterface.ORIENTATION_NORMAL);
+				}else if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.N){
 					try(InputStream in=MastodonApp.context.getContentResolver().openInputStream(uri)){
 						ExifInterface exif=new ExifInterface(in);
-						int orientation=exif.getAttributeInt(ExifInterface.TAG_ORIENTATION, ExifInterface.ORIENTATION_NORMAL);
-						rotation=switch(orientation){
-							case ExifInterface.ORIENTATION_ROTATE_90 -> 90;
-							case ExifInterface.ORIENTATION_ROTATE_180 -> 180;
-							case ExifInterface.ORIENTATION_ROTATE_270 -> 270;
-							default -> 0;
-						};
-					}
-					if(rotation!=0){
-						Matrix matrix=new Matrix();
-						matrix.setRotate(rotation);
-						bitmap=Bitmap.createBitmap(bitmap, 0, 0, bitmap.getWidth(), bitmap.getHeight(), matrix, false);
+						orientation=exif.getAttributeInt(ExifInterface.TAG_ORIENTATION, ExifInterface.ORIENTATION_NORMAL);
 					}
 				}
+				int rotation=switch(orientation){
+					case ExifInterface.ORIENTATION_ROTATE_90 -> 90;
+					case ExifInterface.ORIENTATION_ROTATE_180 -> 180;
+					case ExifInterface.ORIENTATION_ROTATE_270 -> 270;
+					default -> 0;
+				};
+				if(rotation!=0){
+					Matrix matrix=new Matrix();
+					matrix.setRotate(rotation);
+					bitmap=Bitmap.createBitmap(bitmap, 0, 0, bitmap.getWidth(), bitmap.getHeight(), matrix, false);
+				}
 			}
 
-			tempFile=new File(MastodonApp.context.getCacheDir(), "tmp_upload_image");
+			boolean isPNG="image/png".equals(contentType);
+			tempFile=File.createTempFile("mastodon_tmp_resized", null);
 			try(FileOutputStream out=new FileOutputStream(tempFile)){
-				if("image/png".equals(contentType)){
+				if(isPNG){
 					bitmap.compress(Bitmap.CompressFormat.PNG, 0, out);
 				}else{
 					bitmap.compress(Bitmap.CompressFormat.JPEG, 97, out);
@@ -94,9 +138,13 @@ public class ResizedImageRequestBody extends CountingRequestBody{
 			}
 			length=tempFile.length();
 		}else{
-			try(Cursor cursor=MastodonApp.context.getContentResolver().query(uri, new String[]{OpenableColumns.SIZE}, null, null, null)){
-				cursor.moveToFirst();
-				length=cursor.getInt(0);
+			if("file".equals(uri.getScheme())){
+				length=new File(uri.getPath()).length();
+			}else{
+				try(Cursor cursor=MastodonApp.context.getContentResolver().query(uri, new String[]{OpenableColumns.SIZE}, null, null, null)){
+					cursor.moveToFirst();
+					length=cursor.getInt(0);
+				}
 			}
 		}
 	}
@@ -125,4 +173,22 @@ public class ResizedImageRequestBody extends CountingRequestBody{
 			}
 		}
 	}
+
+	protected int[] getTargetSize(int srcWidth, int srcHeight){
+		int targetWidth=Math.round((float)Math.sqrt((float)maxSize*((float)srcWidth/srcHeight)));
+		int targetHeight=Math.round((float)Math.sqrt((float)maxSize*((float)srcHeight/srcWidth)));
+		return new int[]{targetWidth, targetHeight};
+	}
+
+	protected boolean needResize(int srcWidth, int srcHeight){
+		return srcWidth*srcHeight>maxSize;
+	}
+
+	protected boolean needCrop(int srcWidth, int srcHeight){
+		return false;
+	}
+
+	protected Rect getCropBounds(int srcWidth, int srcHeight){
+		return null;
+	}
 }

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

@@ -4,6 +4,7 @@ import android.os.Looper;
 
 import org.joinmastodon.android.E;
 import org.joinmastodon.android.MastodonApp;
+import org.joinmastodon.android.api.requests.statuses.SetStatusBookmarked;
 import org.joinmastodon.android.api.requests.statuses.SetStatusFavorited;
 import org.joinmastodon.android.api.requests.statuses.SetStatusReblogged;
 import org.joinmastodon.android.events.StatusCountersUpdatedEvent;
@@ -18,6 +19,7 @@ public class StatusInteractionController{
 	private final String accountID;
 	private final HashMap<String, SetStatusFavorited> runningFavoriteRequests=new HashMap<>();
 	private final HashMap<String, SetStatusReblogged> runningReblogRequests=new HashMap<>();
+	private final HashMap<String, SetStatusBookmarked> runningBookmarkRequests=new HashMap<>();
 
 	public StatusInteractionController(String accountID){
 		this.accountID=accountID;
@@ -58,6 +60,37 @@ public class StatusInteractionController{
 			status.favouritesCount++;
 		else
 			status.favouritesCount--;
+		E.post(new StatusCountersUpdatedEvent(status));
+	}
+
+	public void setBookmarked(Status status, boolean bookmarked){
+		if(!Looper.getMainLooper().isCurrentThread())
+			throw new IllegalStateException("Can only be called from main thread");
+
+		SetStatusBookmarked current=runningBookmarkRequests.remove(status.id);
+		if(current!=null){
+			current.cancel();
+		}
+		SetStatusBookmarked req=(SetStatusBookmarked) new SetStatusBookmarked(status.id, bookmarked)
+				.setCallback(new Callback<>(){
+					@Override
+					public void onSuccess(Status result){
+						runningBookmarkRequests.remove(status.id);
+						E.post(new StatusCountersUpdatedEvent(result));
+					}
+
+					@Override
+					public void onError(ErrorResponse error){
+						runningBookmarkRequests.remove(status.id);
+						error.showToast(MastodonApp.context);
+						status.bookmarked=!bookmarked;
+						E.post(new StatusCountersUpdatedEvent(status));
+					}
+				})
+				.exec(accountID);
+		runningBookmarkRequests.put(status.id, req);
+		status.bookmarked=bookmarked;
+		E.post(new StatusCountersUpdatedEvent(status));
 	}
 
 	public void setReblogged(Status status, boolean reblogged){
@@ -95,5 +128,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,18 +21,22 @@ 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");
 				addQueryParameter("exclude_reblogs", "true");
 			}
+			case OWN_POSTS_AND_REPLIES -> addQueryParameter("exclude_reblogs", "true");
 		}
 	}
 
 	public enum Filter{
 		DEFAULT,
 		INCLUDE_REPLIES,
+		PINNED,
 		MEDIA,
-		NO_REBLOGS
+		NO_REBLOGS,
+		OWN_POSTS_AND_REPLIES
 	}
 }

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

@@ -0,0 +1,52 @@
+package org.joinmastodon.android.api.requests.accounts;
+
+import androidx.annotation.NonNull;
+
+import com.google.gson.reflect.TypeToken;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.model.Status;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+
+import okhttp3.Response;
+
+public class GetBookmarks extends MastodonAPIRequest<List<Status>>{
+	private String maxId;
+
+	public GetBookmarks(String maxID, String minID, int limit){
+		super(HttpMethod.GET, "/bookmarks", new TypeToken<>(){});
+		if(maxID!=null)
+			addQueryParameter("max_id", maxID);
+		if(minID!=null)
+			addQueryParameter("min_id", minID);
+		if(limit>0)
+			addQueryParameter("limit", ""+limit);
+	}
+
+	@Override
+	public void validateAndPostprocessResponse(List<Status> respObj, Response httpResponse) throws IOException {
+		super.validateAndPostprocessResponse(respObj, httpResponse);
+		// <https://mastodon.social/api/v1/bookmarks?max_id=268962>; rel="next",
+		// <https://mastodon.social/api/v1/bookmarks?min_id=268981>; rel="prev"
+		String link=httpResponse.header("link");
+		// parsing link header by hand; using a library would be cleaner
+		// (also, the functionality should be part of the max id logics and implemented in MastodonAPIRequest)
+		if(link==null) return;
+		String maxIdEq="max_id=";
+		for(String s : link.split(",")) {
+			if(s.contains("rel=\"next\"")) {
+				int start=s.indexOf(maxIdEq)+maxIdEq.length();
+				int end=s.indexOf('>');
+				if(start<0 || start>end) return;
+				this.maxId=s.substring(start, end);
+			}
+		}
+	}
+
+	public String getMaxId() {
+		return maxId;
+	}
+}

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

@@ -0,0 +1,10 @@
+package org.joinmastodon.android.api.requests.accounts;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.model.Preferences;
+
+public class GetPreferences extends MastodonAPIRequest<Preferences> {
+    public GetPreferences(){
+        super(HttpMethod.GET, "/preferences", Preferences.class);
+    }
+}

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

@@ -2,13 +2,16 @@ package org.joinmastodon.android.api.requests.accounts;
 
 import android.net.Uri;
 
+import org.joinmastodon.android.api.AvatarResizedImageRequestBody;
 import org.joinmastodon.android.api.ContentUriRequestBody;
 import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.api.ResizedImageRequestBody;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.AccountField;
 import org.joinmastodon.android.ui.utils.UiUtils;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.List;
 
 import okhttp3.MultipartBody;
@@ -39,21 +42,21 @@ public class UpdateAccountCredentials extends MastodonAPIRequest<Account>{
 	}
 
 	@Override
-	public RequestBody getRequestBody(){
+	public RequestBody getRequestBody() throws IOException{
 		MultipartBody.Builder bldr=new MultipartBody.Builder()
 				.setType(MultipartBody.FORM)
 				.addFormDataPart("display_name", displayName)
 				.addFormDataPart("note", bio);
 
 		if(avatar!=null){
-			bldr.addFormDataPart("avatar", UiUtils.getFileName(avatar), new ContentUriRequestBody(avatar, null));
+			bldr.addFormDataPart("avatar", UiUtils.getFileName(avatar), new AvatarResizedImageRequestBody(avatar, null));
 		}else if(avatarFile!=null){
-			bldr.addFormDataPart("avatar", avatarFile.getName(), RequestBody.create(UiUtils.getFileMediaType(avatarFile), avatarFile));
+			bldr.addFormDataPart("avatar", avatarFile.getName(), new AvatarResizedImageRequestBody(Uri.fromFile(avatarFile), null));
 		}
 		if(cover!=null){
-			bldr.addFormDataPart("header", UiUtils.getFileName(cover), new ContentUriRequestBody(cover, null));
+			bldr.addFormDataPart("header", UiUtils.getFileName(cover), new ResizedImageRequestBody(cover, 1500*500, null));
 		}else if(coverFile!=null){
-			bldr.addFormDataPart("header", coverFile.getName(), RequestBody.create(UiUtils.getFileMediaType(coverFile), coverFile));
+			bldr.addFormDataPart("header", coverFile.getName(), new ResizedImageRequestBody(Uri.fromFile(coverFile), 1500*500, null));
 		}
 		if(fields.isEmpty()){
 			bldr.addFormDataPart("fields_attributes[0][name]", "").addFormDataPart("fields_attributes[0][value]", "");

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="Mastodos";
 		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/EditStatus.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 EditStatus extends MastodonAPIRequest<Status>{
+	public EditStatus(CreateStatus.Request req, String id){
+		super(HttpMethod.PUT, "/statuses/"+id, Status.class);
+		setRequestBody(req);
+	}
+}

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

@@ -0,0 +1,21 @@
+package org.joinmastodon.android.api.requests.statuses;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.model.Attachment;
+
+import java.io.IOException;
+
+import okhttp3.Response;
+
+public class GetAttachmentByID extends MastodonAPIRequest<Attachment>{
+	public GetAttachmentByID(String id){
+		super(HttpMethod.GET, "/media/"+id, Attachment.class);
+	}
+
+	@Override
+	public void validateAndPostprocessResponse(Attachment respObj, Response httpResponse) throws IOException{
+		if(httpResponse.code()==206)
+			respObj.url="";
+		super.validateAndPostprocessResponse(respObj, httpResponse);
+	}
+}

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

@@ -0,0 +1,33 @@
+package org.joinmastodon.android.api.requests.statuses;
+
+import com.google.gson.reflect.TypeToken;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.model.Status;
+import org.joinmastodon.android.model.StatusPrivacy;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.List;
+
+import okhttp3.Response;
+
+public class GetStatusEditHistory extends MastodonAPIRequest<List<Status>>{
+	public GetStatusEditHistory(String id){
+		super(HttpMethod.GET, "/statuses/"+id+"/history", new TypeToken<>(){});
+	}
+
+	@Override
+	public void validateAndPostprocessResponse(List<Status> respObj, Response httpResponse) throws IOException{
+		int i=0;
+		for(Status s:respObj){
+			s.uri="";
+			s.id="fakeID"+i;
+			s.visibility=StatusPrivacy.PUBLIC;
+			s.mentions=Collections.emptyList();
+			s.tags=Collections.emptyList();
+			i++;
+		}
+		super.validateAndPostprocessResponse(respObj, httpResponse);
+	}
+}

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/GetStatusSourceText.java

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

mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/SetStatusBookmarked.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 SetStatusBookmarked extends MastodonAPIRequest<Status>{
+	public SetStatusBookmarked(String id, boolean bookmarked){
+		super(HttpMethod.POST, "/statuses/"+id+"/"+(bookmarked ? "bookmark" : "unbookmark"), Status.class);
+		setRequestBody(new Object());
+	}
+}

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/statuses/UploadAttachment.java

@@ -17,6 +17,7 @@ import java.io.IOException;
 
 import okhttp3.MultipartBody;
 import okhttp3.RequestBody;
+import okhttp3.Response;
 
 public class UploadAttachment extends MastodonAPIRequest<Attachment>{
 	private Uri uri;
@@ -40,6 +41,18 @@ public class UploadAttachment extends MastodonAPIRequest<Attachment>{
 		return this;
 	}
 
+	@Override
+	protected String getPathPrefix(){
+		return "/api/v2";
+	}
+
+	@Override
+	public void validateAndPostprocessResponse(Attachment respObj, Response httpResponse) throws IOException{
+		if(respObj.url==null)
+			respObj.url="";
+		super.validateAndPostprocessResponse(respObj, httpResponse);
+	}
+
 	@Override
 	public RequestBody getRequestBody() throws IOException{
 		MultipartBody.Builder builder=new MultipartBody.Builder()

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/requests/timelines/GetPublicTimeline.java

@@ -0,0 +1,24 @@
+package org.joinmastodon.android.api.requests.timelines;
+
+import android.text.TextUtils;
+
+import com.google.gson.reflect.TypeToken;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.model.Status;
+
+import java.util.List;
+
+public class GetPublicTimeline extends MastodonAPIRequest<List<Status>>{
+	public GetPublicTimeline(boolean local, boolean remote, String maxID, int limit){
+		super(HttpMethod.GET, "/timelines/public", new TypeToken<>(){});
+		if(local)
+			addQueryParameter("local", "true");
+		if(remote)
+			addQueryParameter("remote", "true");
+		if(!TextUtils.isEmpty(maxID))
+			addQueryParameter("max_id", maxID);
+		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(){
@@ -133,10 +142,20 @@ public class AccountSessionManager{
 		return session;
 	}
 
+	@Nullable
+	public AccountSession tryGetAccount(String id){
+		return sessions.get(id);
+	}
+
 	@Nullable
 	public AccountSession getLastActiveAccount(){
 		if(sessions.isEmpty() || lastActiveAccountID==null)
 			return null;
+		if(!sessions.containsKey(lastActiveAccountID)){
+			// TODO figure out why this happens. It should not be possible.
+			lastActiveAccountID=getLoggedInAccounts().get(0).getID();
+			writeAccountsFile();
+		}
 		return getAccount(lastActiveAccountID);
 	}
 
@@ -171,6 +190,7 @@ public class AccountSessionManager{
 			NotificationManager nm=MastodonApp.context.getSystemService(NotificationManager.class);
 			nm.deleteNotificationChannelGroup(id);
 		}
+		maybeUpdateShortcuts();
 	}
 
 	@NonNull
@@ -197,6 +217,7 @@ public class AccountSessionManager{
 
 						new CustomTabsIntent.Builder()
 								.setShareState(CustomTabsIntent.SHARE_STATE_OFF)
+								.setShowTitle(true)
 								.build()
 								.launchUrl(activity, uri);
 					}
@@ -347,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);
 			}
 		}
@@ -384,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/SelfUpdateStateChangedEvent.java

@@ -0,0 +1,11 @@
+package org.joinmastodon.android.events;
+
+import org.joinmastodon.android.updater.GithubSelfUpdater;
+
+public class SelfUpdateStateChangedEvent{
+	public final GithubSelfUpdater.UpdateState state;
+
+	public SelfUpdateStateChangedEvent(GithubSelfUpdater.UpdateState state){
+		this.state=state;
+	}
+}

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/events/StatusUpdatedEvent.java

@@ -0,0 +1,11 @@
+package org.joinmastodon.android.events;
+
+import org.joinmastodon.android.model.Status;
+
+public class StatusUpdatedEvent{
+	public Status status;
+
+	public StatusUpdatedEvent(Status status){
+		this.status=status;
+	}
+}

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;
@@ -47,6 +49,8 @@ public class AccountTimelineFragment extends StatusListFragment{
 
 	@Override
 	protected void doLoadData(int offset, int count){
+		if(user==null) // TODO figure out why this happens
+			return;
 		currentRequest=new GetAccountStatuses(user.id, offset>0 ? getMaxID() : null, null, count, filter)
 				.setCallback(new SimpleCallback<>(this){
 					@Override
@@ -74,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))
@@ -84,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;
@@ -243,6 +245,8 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 			}
 
 			private ImageStatusDisplayItem.Holder<?> findPhotoViewHolder(int index){
+				if(list==null)
+					return null;
 				int offset=0;
 				for(StatusDisplayItem item:displayItems){
 					if(item.parentID.equals(parentID)){
@@ -279,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);
@@ -356,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){
@@ -448,13 +457,11 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		status.spoilerRevealed=true;
 		TextStatusDisplayItem.Holder text=findHolderOfType(itemID, TextStatusDisplayItem.Holder.class);
 		if(text!=null)
-			adapter.notifyItemChanged(text.getAbsoluteAdapterPosition()+getMainAdapterOffset());
+			adapter.notifyItemChanged(text.getAbsoluteAdapterPosition()-getMainAdapterOffset());
 		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){
@@ -463,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;
 	}
@@ -557,6 +579,10 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		return true;
 	}
 
+	public ArrayList<StatusDisplayItem> getDisplayItems(){
+		return displayItems;
+	}
+
 	@Override
 	public void onApplyWindowInsets(WindowInsets insets){
 		if(Build.VERSION.SDK_INT>=29 && insets.getTappableElementInsets().bottom==0 && wantsOverlaySystemNavigation()){
@@ -651,8 +677,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/BookmarksListFragment.java

@@ -0,0 +1,53 @@
+package org.joinmastodon.android.fragments;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.accounts.GetBookmarks;
+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.Status;
+
+import java.util.List;
+
+import me.grishka.appkit.api.SimpleCallback;
+
+public class BookmarksListFragment extends StatusListFragment{
+
+    private String accountID;
+    private Account self;
+    private String lastMaxId=null;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState){
+        super.onCreate(savedInstanceState);
+        accountID=getArguments().getString("account");
+        AccountSession session=AccountSessionManager.getInstance().getAccount(accountID);
+        self=session.self;
+        setTitle(R.string.bookmarks);
+    }
+
+    @Override
+    protected void onShown(){
+        super.onShown();
+        if(!getArguments().getBoolean("noAutoLoad") && !loaded && !dataLoading)
+            loadData();
+    }
+
+    @Override
+    protected void doLoadData(int offset, int count) {
+        GetBookmarks b=new GetBookmarks(offset>0 ? lastMaxId : null, null, count);
+        currentRequest=b.setCallback(new SimpleCallback<>(this){
+                    @Override
+                    public void onSuccess(List<Status> result){
+                        onDataLoaded(result, b.getMaxId()!=null);
+                        lastMaxId=b.getMaxId();
+                    }
+                })
+                .exec(accountID);
+    }
+}

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

@@ -2,12 +2,9 @@ package org.joinmastodon.android.fragments;
 
 import android.app.Fragment;
 import android.app.NotificationManager;
-import android.content.Intent;
-import android.content.res.Configuration;
 import android.graphics.Outline;
 import android.os.Build;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -18,17 +15,13 @@ import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 
-import org.joinmastodon.android.MainActivity;
-import org.joinmastodon.android.MastodonApp;
 import org.joinmastodon.android.PushNotificationReceiver;
 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.discover.DiscoverFragment;
-import org.joinmastodon.android.fragments.discover.SearchFragment;
 import org.joinmastodon.android.model.Account;
-import org.joinmastodon.android.ui.M3AlertDialogBuilder;
+import org.joinmastodon.android.ui.AccountSwitcherSheet;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.ui.views.TabBar;
 import org.parceler.Parcels;
@@ -38,8 +31,6 @@ import java.util.ArrayList;
 import androidx.annotation.IdRes;
 import androidx.annotation.Nullable;
 import me.grishka.appkit.FragmentStackActivity;
-import me.grishka.appkit.Nav;
-import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.fragments.AppKitFragment;
 import me.grishka.appkit.fragments.LoaderFragment;
 import me.grishka.appkit.fragments.OnBackPressedListener;
@@ -137,7 +128,6 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 					}
 				});
 			}
-		}else{
 		}
 
 		return content;
@@ -238,21 +228,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;
@@ -261,9 +241,14 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 	@Override
 	public boolean onBackPressed(){
 		if(currentTab==R.id.tab_profile)
-			return profileFragment.onBackPressed();
+			if (profileFragment.onBackPressed()) return true;
 		if(currentTab==R.id.tab_search)
-			return searchFragment.onBackPressed();
+			if (searchFragment.onBackPressed()) return true;
+		if (currentTab!=R.id.tab_home) {
+			tabBar.selectTab(R.id.tab_home);
+			onTabSelected(R.id.tab_home);
+			return true;
+		}
 		return false;
 	}
 

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

@@ -1,35 +1,64 @@
 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;
 
 import com.squareup.otto.Subscribe;
 
+import org.joinmastodon.android.E;
 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.SelfUpdateStateChangedEvent;
 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.updater.GithubSelfUpdater;
+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 +79,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 +96,19 @@ 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();
+				}
+			}
+		});
+
+		if(GithubSelfUpdater.needSelfUpdating()){
+			E.register(this);
+			updateUpdateState(GithubSelfUpdater.getInstance().getState());
+		}
 	}
 
 	@Override
@@ -89,11 +133,15 @@ 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
 	public void onStatusCreated(StatusCreatedEvent ev){
 		prependItems(Collections.singletonList(ev.status), true);
 	}
@@ -104,12 +152,274 @@ 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();
+		}
+	}
+
+	@Override
+	public void onDestroyView(){
+		super.onDestroyView();
+		if(GithubSelfUpdater.needSelfUpdating()){
+			E.unregister(this);
+		}
+	}
+
+	private void updateUpdateState(GithubSelfUpdater.UpdateState state){
+		if(state!=GithubSelfUpdater.UpdateState.NO_UPDATE && state!=GithubSelfUpdater.UpdateState.CHECKING)
+			getToolbar().getMenu().findItem(R.id.settings).setIcon(R.drawable.ic_settings_24_badged);
+	}
+
+	@Subscribe
+	public void onSelfUpdateStateChanged(SelfUpdateStateChangedEvent ev){
+		updateUpdateState(ev.state);
 	}
 }

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

@@ -1,10 +1,6 @@
 package org.joinmastodon.android.fragments;
 
 import android.app.Activity;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.graphics.Rect;
-import android.graphics.RectF;
 import android.os.Bundle;
 import android.view.View;
 
@@ -16,24 +12,21 @@ import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.events.PollUpdatedEvent;
 import org.joinmastodon.android.model.Notification;
 import org.joinmastodon.android.model.PaginatedResponse;
-import org.joinmastodon.android.model.Poll;
 import org.joinmastodon.android.model.Status;
-import org.joinmastodon.android.ui.PhotoLayoutHelper;
 import org.joinmastodon.android.ui.displayitems.AccountCardStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.HeaderStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.ImageStatusDisplayItem;
-import org.joinmastodon.android.ui.displayitems.LinkCardStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
-import org.joinmastodon.android.ui.utils.UiUtils;
+import org.joinmastodon.android.ui.utils.InsetStatusItemDecoration;
 import org.parceler.Parcels;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 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.SimpleCallback;
@@ -84,9 +77,11 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 			if(titleItem!=null)
 				items.add(0, titleItem);
 			return items;
-		}else{
+		}else if(titleItem!=null){
 			AccountCardStatusDisplayItem card=new AccountCardStatusDisplayItem(n.id, this, n.account);
 			return Arrays.asList(titleItem, card);
+		}else{
+			return Collections.emptyList();
 		}
 	}
 
@@ -160,90 +155,7 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 	@Override
 	public void onViewCreated(View view, Bundle savedInstanceState){
 		super.onViewCreated(view, savedInstanceState);
-		list.addItemDecoration(new RecyclerView.ItemDecoration(){
-			private Paint paint=new Paint(Paint.ANTI_ALIAS_FLAG);
-			private int bgColor=UiUtils.getThemeColor(getActivity(), android.R.attr.colorBackground);
-			private int borderColor=UiUtils.getThemeColor(getActivity(), R.attr.colorPollVoted);
-			private RectF rect=new RectF();
-
-			@Override
-			public void onDraw(@NonNull Canvas c, @NonNull RecyclerView parent, @NonNull RecyclerView.State state){
-				int pos=0;
-				for(int i=0;i<parent.getChildCount();i++){
-					View child=parent.getChildAt(i);
-					RecyclerView.ViewHolder holder=parent.getChildViewHolder(child);
-					pos=holder.getAbsoluteAdapterPosition();
-					boolean inset=(holder instanceof StatusDisplayItem.Holder<?> sdi) && sdi.getItem().inset;
-					if(inset){
-						if(rect.isEmpty()){
-							rect.set(child.getX(), i==0 && pos>0 && displayItems.get(pos-1).inset ? V.dp(-10) : child.getY(), child.getX()+child.getWidth(), child.getY()+child.getHeight());
-						}else{
-							rect.bottom=Math.max(rect.bottom, child.getY()+child.getHeight());
-							rect.right=Math.max(rect.right, child.getX()+child.getHeight());
-						}
-					}else if(!rect.isEmpty()){
-						drawInsetBackground(c);
-						rect.setEmpty();
-					}
-				}
-				if(!rect.isEmpty()){
-					if(pos<displayItems.size()-1 && displayItems.get(pos+1).inset){
-						rect.bottom=parent.getHeight()+V.dp(10);
-					}
-					drawInsetBackground(c);
-					rect.setEmpty();
-				}
-			}
-
-			private void drawInsetBackground(Canvas c){
-				paint.setStyle(Paint.Style.FILL);
-				paint.setColor(bgColor);
-				rect.inset(V.dp(4), V.dp(4));
-				c.drawRoundRect(rect, V.dp(4), V.dp(4), paint);
-				paint.setStyle(Paint.Style.STROKE);
-				paint.setStrokeWidth(V.dp(1));
-				paint.setColor(borderColor);
-				rect.inset(paint.getStrokeWidth()/2f, paint.getStrokeWidth()/2f);
-				c.drawRoundRect(rect, V.dp(4), V.dp(4), paint);
-			}
-
-			@Override
-			public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state){
-				RecyclerView.ViewHolder holder=parent.getChildViewHolder(view);
-				if(holder instanceof StatusDisplayItem.Holder<?> sdi){
-					boolean inset=sdi.getItem().inset;
-					int pos=holder.getAbsoluteAdapterPosition();
-					if(inset){
-						boolean topSiblingInset=pos>0 && displayItems.get(pos-1).inset;
-						boolean bottomSiblingInset=pos<displayItems.size()-1 && displayItems.get(pos+1).inset;
-						int pad;
-						if(holder instanceof ImageStatusDisplayItem.Holder || holder instanceof LinkCardStatusDisplayItem.Holder)
-							pad=V.dp(16);
-						else
-							pad=V.dp(12);
-						boolean insetLeft=true, insetRight=true;
-						if(holder instanceof ImageStatusDisplayItem.Holder<?> img){
-							PhotoLayoutHelper.TiledLayoutResult layout=img.getItem().tiledLayout;
-							PhotoLayoutHelper.TiledLayoutResult.Tile tile=img.getItem().thisTile;
-							// only inset those items that are on the edges of the layout
-							insetLeft=tile.startCol==0;
-							insetRight=tile.startCol+tile.colSpan==layout.columnSizes.length;
-							// inset all items in the bottom row
-							if(tile.startRow+tile.rowSpan==layout.rowSizes.length)
-								bottomSiblingInset=false;
-						}
-						if(insetLeft)
-							outRect.left=pad;
-						if(insetRight)
-							outRect.right=pad;
-						if(!topSiblingInset)
-							outRect.top=pad;
-						if(!bottomSiblingInset)
-							outRect.bottom=pad;
-					}
-				}
-			}
-		});
+		list.addItemDecoration(new InsetStatusItemDecoration(this));
 	}
 
 	private Notification getNotificationByID(String id){
@@ -267,4 +179,5 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 			}
 		}
 	}
+
 }

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,33 @@ 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));
+
+		boolean isSelf=AccountSessionManager.getInstance().isSelf(accountID, account);
+
+		if(account.locked){
+			ssb=new SpannableStringBuilder("@");
+			ssb.append(account.acct);
+			if(isSelf){
+				ssb.append('@');
+				ssb.append(AccountSessionManager.getInstance().getAccount(accountID).domain);
+			}
+			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{
+			// noinspection SetTextI18n
+			username.setText('@'+account.acct+(isSelf ? ('@'+AccountSessionManager.getInstance().getAccount(accountID).domain) : ""));
+		}
+		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 +523,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 || item.getItemId()==R.id.bookmarks);
+			}
+			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()));
@@ -497,11 +550,16 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item){
 		int id=item.getItemId();
-		if(id==R.id.share){
-			Intent intent=new Intent(Intent.ACTION_SEND);
+		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.bookmarks) {
+			Bundle args=new Bundle();
+			args.putString("account", accountID);
+			args.putParcelable("profileAccount", Parcels.wrap(account));
+			Nav.go(getActivity(), BookmarksListFragment.class, args);
 		}else if(id==R.id.mute){
 			confirmToggleMuted();
 		}else if(id==R.id.block){
@@ -565,16 +623,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 +654,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 +692,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 +726,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 +769,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 +787,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 +849,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 +919,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 +964,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/SettingsFragment.java

@@ -1,5 +1,6 @@
 package org.joinmastodon.android.fragments;
 
+import android.animation.ObjectAnimator;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Intent;
@@ -14,15 +15,21 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowInsets;
 import android.view.WindowManager;
+import android.view.animation.LinearInterpolator;
 import android.widget.Button;
+import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.PopupMenu;
+import android.widget.ProgressBar;
 import android.widget.RadioButton;
 import android.widget.Switch;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.squareup.otto.Subscribe;
+
 import org.joinmastodon.android.BuildConfig;
+import org.joinmastodon.android.E;
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.MainActivity;
 import org.joinmastodon.android.MastodonApp;
@@ -31,11 +38,13 @@ import org.joinmastodon.android.api.MastodonAPIController;
 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.events.SelfUpdateStateChangedEvent;
 import org.joinmastodon.android.model.PushNotification;
 import org.joinmastodon.android.model.PushSubscription;
 import org.joinmastodon.android.ui.M3AlertDialogBuilder;
 import org.joinmastodon.android.ui.OutlineProviders;
 import org.joinmastodon.android.ui.utils.UiUtils;
+import org.joinmastodon.android.updater.GithubSelfUpdater;
 
 import java.util.ArrayList;
 import java.util.function.Consumer;
@@ -47,7 +56,6 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
-import me.grishka.appkit.fragments.ToolbarFragment;
 import me.grishka.appkit.imageloader.ImageCache;
 import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.utils.V;
@@ -73,6 +81,14 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		accountID=getArguments().getString("account");
 		AccountSession session=AccountSessionManager.getInstance().getAccount(accountID);
 
+		if(GithubSelfUpdater.needSelfUpdating()){
+			GithubSelfUpdater updater=GithubSelfUpdater.getInstance();
+			GithubSelfUpdater.UpdateState state=updater.getState();
+			if(state!=GithubSelfUpdater.UpdateState.NO_UPDATE && state!=GithubSelfUpdater.UpdateState.CHECKING){
+				items.add(new UpdateItem());
+			}
+		}
+
 		items.add(new HeaderItem(R.string.settings_theme));
 		items.add(themeItem=new ThemeItem());
 		items.add(new SwitchItem(R.string.theme_true_black, R.drawable.ic_fluent_dark_theme_24_regular, GlobalUserPreferences.trueBlackTheme, this::onTrueBlackThemeChanged));
@@ -131,7 +147,7 @@ public class SettingsFragment extends MastodonToolbarFragment{
 			public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state){
 				// Add 32dp gaps between sections
 				RecyclerView.ViewHolder holder=parent.getChildViewHolder(view);
-				if((holder instanceof HeaderViewHolder || holder instanceof FooterViewHolder) && holder.getAbsoluteAdapterPosition()>0)
+				if((holder instanceof HeaderViewHolder || holder instanceof FooterViewHolder) && holder.getAbsoluteAdapterPosition()>1)
 					outRect.top=V.dp(32);
 			}
 		});
@@ -155,6 +171,20 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		}
 	}
 
+	@Override
+	public void onViewCreated(View view, Bundle savedInstanceState){
+		super.onViewCreated(view, savedInstanceState);
+		if(GithubSelfUpdater.needSelfUpdating())
+			E.register(this);
+	}
+
+	@Override
+	public void onDestroyView(){
+		super.onDestroyView();
+		if(GithubSelfUpdater.needSelfUpdating())
+			E.unregister(this);
+	}
+
 	private void onThemePreferenceClick(GlobalUserPreferences.ThemePreference theme){
 		GlobalUserPreferences.theme=theme;
 		GlobalUserPreferences.save();
@@ -294,6 +324,16 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		});
 	}
 
+	@Subscribe
+	public void onSelfUpdateStateChanged(SelfUpdateStateChangedEvent ev){
+		if(items.get(0) instanceof UpdateItem item){
+			RecyclerView.ViewHolder holder=list.findViewHolderForAdapterPosition(0);
+			if(holder instanceof UpdateViewHolder uvh){
+				uvh.bind(item);
+			}
+		}
+	}
+
 	private static abstract class Item{
 		public abstract int getViewType();
 	}
@@ -395,6 +435,14 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		}
 	}
 
+	private class UpdateItem extends Item{
+
+		@Override
+		public int getViewType(){
+			return 7;
+		}
+	}
+
 	private class SettingsAdapter extends RecyclerView.Adapter<BindableViewHolder<Item>>{
 		@NonNull
 		@Override
@@ -408,6 +456,7 @@ public class SettingsFragment extends MastodonToolbarFragment{
 				case 4 -> new TextViewHolder();
 				case 5 -> new HeaderViewHolder(true);
 				case 6 -> new FooterViewHolder();
+				case 7 -> new UpdateViewHolder();
 				default -> throw new IllegalStateException("Unexpected value: "+viewType);
 			};
 		}
@@ -609,4 +658,74 @@ public class SettingsFragment extends MastodonToolbarFragment{
 			text.setText(item.text);
 		}
 	}
+
+	private class UpdateViewHolder extends BindableViewHolder<UpdateItem>{
+
+		private final TextView text;
+		private final Button button;
+		private final ImageButton cancelBtn;
+		private final ProgressBar progress;
+
+		private ObjectAnimator rotationAnimator;
+		private Runnable progressUpdater=this::updateProgress;
+
+		public UpdateViewHolder(){
+			super(getActivity(), R.layout.item_settings_update, list);
+			text=findViewById(R.id.text);
+			button=findViewById(R.id.button);
+			cancelBtn=findViewById(R.id.cancel_btn);
+			progress=findViewById(R.id.progress);
+			button.setOnClickListener(v->{
+				GithubSelfUpdater updater=GithubSelfUpdater.getInstance();
+				switch(updater.getState()){
+					case UPDATE_AVAILABLE -> updater.downloadUpdate();
+					case DOWNLOADED -> updater.installUpdate(getActivity());
+				}
+			});
+			cancelBtn.setOnClickListener(v->GithubSelfUpdater.getInstance().cancelDownload());
+			rotationAnimator=ObjectAnimator.ofFloat(progress, View.ROTATION, 0f, 360f);
+			rotationAnimator.setInterpolator(new LinearInterpolator());
+			rotationAnimator.setDuration(1500);
+			rotationAnimator.setRepeatCount(ObjectAnimator.INFINITE);
+		}
+
+		@Override
+		public void onBind(UpdateItem item){
+			GithubSelfUpdater updater=GithubSelfUpdater.getInstance();
+			GithubSelfUpdater.UpdateInfo info=updater.getUpdateInfo();
+			GithubSelfUpdater.UpdateState state=updater.getState();
+			if(state!=GithubSelfUpdater.UpdateState.DOWNLOADED){
+				text.setText(getString(R.string.update_available, info.version));
+				button.setText(getString(R.string.download_update, UiUtils.formatFileSize(getActivity(), info.size, false)));
+			}else{
+				text.setText(getString(R.string.update_ready, info.version));
+				button.setText(R.string.install_update);
+			}
+			if(state==GithubSelfUpdater.UpdateState.DOWNLOADING){
+				rotationAnimator.start();
+				button.setVisibility(View.INVISIBLE);
+				cancelBtn.setVisibility(View.VISIBLE);
+				progress.setVisibility(View.VISIBLE);
+				updateProgress();
+			}else{
+				rotationAnimator.cancel();
+				button.setVisibility(View.VISIBLE);
+				cancelBtn.setVisibility(View.GONE);
+				progress.setVisibility(View.GONE);
+				progress.removeCallbacks(progressUpdater);
+			}
+		}
+
+		private void updateProgress(){
+			GithubSelfUpdater updater=GithubSelfUpdater.getInstance();
+			if(updater.getState()!=GithubSelfUpdater.UpdateState.DOWNLOADING)
+				return;
+			int value=Math.round(progress.getMax()*updater.getDownloadProgress());
+			if(Build.VERSION.SDK_INT>=24)
+				progress.setProgress(value, true);
+			else
+				progress.setProgress(value);
+			progress.postDelayed(progressUpdater, 1000);
+		}
+	}
 }

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

@@ -0,0 +1,157 @@
+package org.joinmastodon.android.fragments;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.View;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.statuses.GetStatusEditHistory;
+import org.joinmastodon.android.model.Status;
+import org.joinmastodon.android.ui.displayitems.ReblogOrReplyLineStatusDisplayItem;
+import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
+import org.joinmastodon.android.ui.utils.InsetStatusItemDecoration;
+import org.joinmastodon.android.ui.utils.UiUtils;
+
+import java.time.ZoneId;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+import me.grishka.appkit.api.SimpleCallback;
+
+public class StatusEditHistoryFragment extends StatusListFragment{
+	private String id;
+
+
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		id=getArguments().getString("id");
+		loadData();
+	}
+
+	@Override
+	public void onAttach(Activity activity){
+		super.onAttach(activity);
+		setTitle(R.string.edit_history);
+	}
+
+	@Override
+	protected void doLoadData(int offset, int count){
+		new GetStatusEditHistory(id)
+				.setCallback(new SimpleCallback<>(this){
+					@Override
+					public void onSuccess(List<Status> result){
+						Collections.sort(result, Comparator.comparing((Status s)->s.createdAt).reversed());
+						onDataLoaded(result, false);
+					}
+				})
+				.exec(accountID);
+	}
+
+	@Override
+	protected List<StatusDisplayItem> buildDisplayItems(Status s){
+		List<StatusDisplayItem> items=StatusDisplayItem.buildItems(this, s, accountID, s, knownAccounts, true, false);
+		int idx=data.indexOf(s);
+		if(idx>=0){
+			String date=UiUtils.DATE_TIME_FORMATTER.format(s.createdAt.atZone(ZoneId.systemDefault()));
+			String action="";
+			if(idx==data.size()-1){
+				action=getString(R.string.edit_original_post);
+			}else{
+				enum StatusEditChangeType{
+					TEXT_CHANGED,
+					SPOILER_ADDED,
+					SPOILER_REMOVED,
+					SPOILER_CHANGED,
+					POLL_ADDED,
+					POLL_REMOVED,
+					POLL_CHANGED,
+					MEDIA_ADDED,
+					MEDIA_REMOVED,
+					MEDIA_REORDERED,
+					MARKED_SENSITIVE,
+					MARKED_NOT_SENSITIVE
+				}
+				EnumSet<StatusEditChangeType> changes=EnumSet.noneOf(StatusEditChangeType.class);
+				Status prev=data.get(idx+1);
+
+				if(!Objects.equals(s.content, prev.content)){
+					changes.add(StatusEditChangeType.TEXT_CHANGED);
+				}
+				if(!Objects.equals(s.spoilerText, prev.spoilerText)){
+					if(s.spoilerText==null){
+						changes.add(StatusEditChangeType.SPOILER_REMOVED);
+					}else if(prev.spoilerText==null){
+						changes.add(StatusEditChangeType.SPOILER_ADDED);
+					}else{
+						changes.add(StatusEditChangeType.SPOILER_CHANGED);
+					}
+				}
+				if(s.poll!=null || prev.poll!=null){
+					if(s.poll==null){
+						changes.add(StatusEditChangeType.POLL_REMOVED);
+					}else if(prev.poll==null){
+						changes.add(StatusEditChangeType.POLL_ADDED);
+					}else if(!s.poll.id.equals(prev.poll.id)){
+						changes.add(StatusEditChangeType.POLL_CHANGED);
+					}
+				}
+				List<String> newAttachmentIDs=s.mediaAttachments.stream().map(att->att.id).collect(Collectors.toList());
+				List<String> prevAttachmentIDs=s.mediaAttachments.stream().map(att->att.id).collect(Collectors.toList());
+				boolean addedOrRemoved=false;
+				if(!newAttachmentIDs.containsAll(prevAttachmentIDs)){
+					changes.add(StatusEditChangeType.MEDIA_REMOVED);
+					addedOrRemoved=true;
+				}
+				if(!prevAttachmentIDs.containsAll(newAttachmentIDs)){
+					changes.add(StatusEditChangeType.MEDIA_ADDED);
+					addedOrRemoved=true;
+				}
+				if(!addedOrRemoved && !newAttachmentIDs.equals(prevAttachmentIDs)){
+					changes.add(StatusEditChangeType.MEDIA_REORDERED);
+				}
+				if(s.sensitive && !prev.sensitive){
+					changes.add(StatusEditChangeType.MARKED_SENSITIVE);
+				}else if(prev.sensitive && !s.sensitive){
+					changes.add(StatusEditChangeType.MARKED_NOT_SENSITIVE);
+				}
+
+				if(changes.size()==1){
+					action=getString(switch(changes.iterator().next()){
+						case TEXT_CHANGED -> R.string.edit_text_edited;
+						case SPOILER_ADDED -> R.string.edit_spoiler_added;
+						case SPOILER_REMOVED -> R.string.edit_spoiler_removed;
+						case SPOILER_CHANGED -> R.string.edit_spoiler_edited;
+						case POLL_ADDED -> R.string.edit_poll_added;
+						case POLL_REMOVED -> R.string.edit_poll_removed;
+						case POLL_CHANGED -> R.string.edit_poll_edited;
+						case MEDIA_ADDED -> R.string.edit_media_added;
+						case MEDIA_REMOVED -> R.string.edit_media_removed;
+						case MEDIA_REORDERED -> R.string.edit_media_reordered;
+						case MARKED_SENSITIVE -> R.string.edit_marked_sensitive;
+						case MARKED_NOT_SENSITIVE -> R.string.edit_marked_not_sensitive;
+					});
+				}else{
+					action=getString(R.string.edit_multiple_changed);
+				}
+			}
+			items.add(0, new ReblogOrReplyLineStatusDisplayItem(s.id, this, action+" · "+date, Collections.emptyList(), 0));
+		}
+		return items;
+	}
+
+	@Override
+	public void onViewCreated(View view, Bundle savedInstanceState){
+		super.onViewCreated(view, savedInstanceState);
+		list.addItemDecoration(new InsetStatusItemDecoration(this));
+	}
+
+	@Override
+	public boolean isItemEnabled(String id){
+		return false;
+	}
+}

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

@@ -9,12 +9,14 @@ 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.StatusUpdatedEvent;
 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;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import androidx.recyclerview.widget.RecyclerView;
@@ -60,6 +62,59 @@ public abstract class StatusListFragment extends BaseStatusListFragment<Status>{
 
 	protected void onStatusCreated(StatusCreatedEvent ev){}
 
+	protected void onStatusUpdated(StatusUpdatedEvent ev){
+		ArrayList<Status> statusesForDisplayItems=new ArrayList<>();
+		for(int i=0;i<data.size();i++){
+			Status s=data.get(i);
+			if(s.reblog!=null && s.reblog.id.equals(ev.status.id)){
+				s.reblog=ev.status;
+				statusesForDisplayItems.add(s);
+			}else if(s.id.equals(ev.status.id)){
+				data.set(i, ev.status);
+				statusesForDisplayItems.add(ev.status);
+			}
+		}
+		for(int i=0;i<preloadedData.size();i++){
+			Status s=preloadedData.get(i);
+			if(s.reblog!=null && s.reblog.id.equals(ev.status.id)){
+				s.reblog=ev.status;
+			}else if(s.id.equals(ev.status.id)){
+				preloadedData.set(i, ev.status);
+			}
+		}
+
+		if(statusesForDisplayItems.isEmpty())
+			return;
+
+		for(Status s:statusesForDisplayItems){
+			int i=0;
+			for(StatusDisplayItem item:displayItems){
+				if(item.parentID.equals(s.id)){
+					int start=i;
+					for(;i<displayItems.size();i++){
+						if(!displayItems.get(i).parentID.equals(s.id))
+							break;
+					}
+					List<StatusDisplayItem> postItems=displayItems.subList(start, i);
+					postItems.clear();
+					postItems.addAll(buildDisplayItems(s));
+					int oldSize=i-start, newSize=postItems.size();
+					if(oldSize==newSize){
+						adapter.notifyItemRangeChanged(start, newSize);
+					}else if(oldSize<newSize){
+						adapter.notifyItemRangeChanged(start, oldSize);
+						adapter.notifyItemRangeInserted(start+oldSize, newSize-oldSize);
+					}else{
+						adapter.notifyItemRangeChanged(start, newSize);
+						adapter.notifyItemRangeRemoved(start+newSize, oldSize-newSize);
+					}
+					break;
+				}
+				i++;
+			}
+		}
+	}
+
 	protected Status getContentStatusByID(String id){
 		Status s=getStatusByID(id);
 		return s==null ? null : s.getContentStatus();
@@ -90,16 +145,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 +167,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 +190,11 @@ public abstract class StatusListFragment extends BaseStatusListFragment<Status>{
 			StatusListFragment.this.onStatusCreated(ev);
 		}
 
+		@Subscribe
+		public void onStatusUpdated(StatusUpdatedEvent ev){
+			StatusListFragment.this.onStatusUpdated(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;
@@ -41,11 +43,14 @@ public class ThreadFragment extends StatusListFragment{
 	@Override
 	protected List<StatusDisplayItem> buildDisplayItems(Status s){
 		List<StatusDisplayItem> items=super.buildDisplayItems(s);
-		if(s==mainStatus){
+		if(s.id.equals(mainStatus.id)){
 			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;
 	}
@@ -56,6 +61,8 @@ public class ThreadFragment extends StatusListFragment{
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(StatusContext result){
+						if(getActivity()==null)
+							return;
 						if(refreshing){
 							data.clear();
 							displayItems.clear();
@@ -64,7 +71,8 @@ public class ThreadFragment extends StatusListFragment{
 						}
 						result.descendants=filterStatuses(result.descendants);
 						result.ancestors=filterStatuses(result.ancestors);
-						footerProgress.setVisibility(View.GONE);
+						if(footerProgress!=null)
+							footerProgress.setVisibility(View.GONE);
 						data.addAll(result.descendants);
 						int prevCount=displayItems.size();
 						onAppendItems(result.descendants);