Fix #842

Display more user-friendly error messages

.github/workflows/build_and_deploy.yml

@@ -0,0 +1,79 @@
+name: Build and deploy
+ 
+on:
+  push:
+    branches:
+      - 'ci_setup'
+  workflow_dispatch:
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up JDK
+        uses: actions/setup-java@v2
+        with:
+          java-version: 21
+          distribution: temurin
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.3.0
+          bundler-cache: true
+
+      - name: Set up Android SDK
+        uses: android-actions/setup-android@v3
+
+      - name: Decode keystore
+        uses: timheuer/base64-to-file@v1
+        id: android_keystore
+        with:
+          fileName: "release.jks"
+          encodedString: ${{ secrets.KEYSTORE_FILE }}
+
+      - name: Prepare Gradle environment
+        run: |
+          echo "apply from: 'ci_signing.gradle'" >> mastodon/build.gradle
+          echo "sdk.dir=$ANDROID_SDK_ROOT" > local.properties
+
+      - name: Build and deploy to Google Play
+        run: bundle exec fastlane deploy
+        env:
+          KEYSTORE_FILE: ${{ steps.android_keystore.outputs.filePath }}
+          KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
+          SUPPLY_JSON_KEY_DATA: ${{ secrets.GOOGLE_SERVICE_ACCOUNT_KEY }}
+          SUPPLY_SKIP_UPLOAD_METADATA: true
+          SUPPLY_SKIP_UPLOAD_CHANGELOGS: true
+
+      - name: Build release apk
+        run: ./gradlew assembleRelease
+        env:
+          KEYSTORE_FILE: ${{ steps.android_keystore.outputs.filePath }}
+          KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
+
+      - name: Upload release apk
+        uses: actions/upload-artifact@v4
+        with:
+          name: mastodon-release.apk
+          path: mastodon/build/outputs/apk/release/mastodon-release.apk
+
+      - name: Build githubRelease apk
+        run: ./gradlew assembleGithubRelease
+        env:
+          KEYSTORE_FILE: ${{ steps.android_keystore.outputs.filePath }}
+          KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
+
+      - name: Upload githubRelease apk
+        uses: actions/upload-artifact@v4
+        with:
+          name: mastodon-githubRelease.apk
+          path: mastodon/build/outputs/apk/githubRelease/mastodon-githubRelease.apk
+
+      - name: Upload mappings
+        uses: actions/upload-artifact@v4
+        with:
+          name: mappings
+          path: mastodon/build/outputs/mapping/*/mapping.txt

.gitignore

@@ -9,3 +9,4 @@
 .cxx
 local.properties
 *.jks
+/fastlane/report.xml

Gemfile

@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gem "fastlane"

Gemfile.lock

@@ -0,0 +1,218 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    CFPropertyList (3.0.7)
+      base64
+      nkf
+      rexml
+    addressable (2.8.6)
+      public_suffix (>= 2.0.2, < 6.0)
+    artifactory (3.0.17)
+    atomos (0.1.3)
+    aws-eventstream (1.3.0)
+    aws-partitions (1.913.0)
+    aws-sdk-core (3.191.6)
+      aws-eventstream (~> 1, >= 1.3.0)
+      aws-partitions (~> 1, >= 1.651.0)
+      aws-sigv4 (~> 1.8)
+      jmespath (~> 1, >= 1.6.1)
+    aws-sdk-kms (1.78.0)
+      aws-sdk-core (~> 3, >= 3.191.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-s3 (1.146.1)
+      aws-sdk-core (~> 3, >= 3.191.0)
+      aws-sdk-kms (~> 1)
+      aws-sigv4 (~> 1.8)
+    aws-sigv4 (1.8.0)
+      aws-eventstream (~> 1, >= 1.0.2)
+    babosa (1.0.4)
+    base64 (0.2.0)
+    claide (1.1.0)
+    colored (1.2)
+    colored2 (3.1.2)
+    commander (4.6.0)
+      highline (~> 2.0.0)
+    declarative (0.0.20)
+    digest-crc (0.6.5)
+      rake (>= 12.0.0, < 14.0.0)
+    domain_name (0.6.20240107)
+    dotenv (2.8.1)
+    emoji_regex (3.2.3)
+    excon (0.110.0)
+    faraday (1.10.3)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.0)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-cookie_jar (0.0.7)
+      faraday (>= 0.8.0)
+      http-cookie (~> 1.0.0)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
+    faraday_middleware (1.2.0)
+      faraday (~> 1.0)
+    fastimage (2.3.1)
+    fastlane (2.220.0)
+      CFPropertyList (>= 2.3, < 4.0.0)
+      addressable (>= 2.8, < 3.0.0)
+      artifactory (~> 3.0)
+      aws-sdk-s3 (~> 1.0)
+      babosa (>= 1.0.3, < 2.0.0)
+      bundler (>= 1.12.0, < 3.0.0)
+      colored (~> 1.2)
+      commander (~> 4.6)
+      dotenv (>= 2.1.1, < 3.0.0)
+      emoji_regex (>= 0.1, < 4.0)
+      excon (>= 0.71.0, < 1.0.0)
+      faraday (~> 1.0)
+      faraday-cookie_jar (~> 0.0.6)
+      faraday_middleware (~> 1.0)
+      fastimage (>= 2.1.0, < 3.0.0)
+      gh_inspector (>= 1.1.2, < 2.0.0)
+      google-apis-androidpublisher_v3 (~> 0.3)
+      google-apis-playcustomapp_v1 (~> 0.1)
+      google-cloud-env (>= 1.6.0, < 2.0.0)
+      google-cloud-storage (~> 1.31)
+      highline (~> 2.0)
+      http-cookie (~> 1.0.5)
+      json (< 3.0.0)
+      jwt (>= 2.1.0, < 3)
+      mini_magick (>= 4.9.4, < 5.0.0)
+      multipart-post (>= 2.0.0, < 3.0.0)
+      naturally (~> 2.2)
+      optparse (>= 0.1.1, < 1.0.0)
+      plist (>= 3.1.0, < 4.0.0)
+      rubyzip (>= 2.0.0, < 3.0.0)
+      security (= 0.1.5)
+      simctl (~> 1.6.3)
+      terminal-notifier (>= 2.0.0, < 3.0.0)
+      terminal-table (~> 3)
+      tty-screen (>= 0.6.3, < 1.0.0)
+      tty-spinner (>= 0.8.0, < 1.0.0)
+      word_wrap (~> 1.0.0)
+      xcodeproj (>= 1.13.0, < 2.0.0)
+      xcpretty (~> 0.3.0)
+      xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
+    gh_inspector (1.1.3)
+    google-apis-androidpublisher_v3 (0.54.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-core (0.11.3)
+      addressable (~> 2.5, >= 2.5.1)
+      googleauth (>= 0.16.2, < 2.a)
+      httpclient (>= 2.8.1, < 3.a)
+      mini_mime (~> 1.0)
+      representable (~> 3.0)
+      retriable (>= 2.0, < 4.a)
+      rexml
+    google-apis-iamcredentials_v1 (0.17.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-playcustomapp_v1 (0.13.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-storage_v1 (0.31.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-cloud-core (1.7.0)
+      google-cloud-env (>= 1.0, < 3.a)
+      google-cloud-errors (~> 1.0)
+    google-cloud-env (1.6.0)
+      faraday (>= 0.17.3, < 3.0)
+    google-cloud-errors (1.4.0)
+    google-cloud-storage (1.47.0)
+      addressable (~> 2.8)
+      digest-crc (~> 0.4)
+      google-apis-iamcredentials_v1 (~> 0.1)
+      google-apis-storage_v1 (~> 0.31.0)
+      google-cloud-core (~> 1.6)
+      googleauth (>= 0.16.2, < 2.a)
+      mini_mime (~> 1.0)
+    googleauth (1.8.1)
+      faraday (>= 0.17.3, < 3.a)
+      jwt (>= 1.4, < 3.0)
+      multi_json (~> 1.11)
+      os (>= 0.9, < 2.0)
+      signet (>= 0.16, < 2.a)
+    highline (2.0.3)
+    http-cookie (1.0.5)
+      domain_name (~> 0.5)
+    httpclient (2.8.3)
+    jmespath (1.6.2)
+    json (2.7.2)
+    jwt (2.8.1)
+      base64
+    mini_magick (4.12.0)
+    mini_mime (1.1.5)
+    multi_json (1.15.0)
+    multipart-post (2.4.0)
+    nanaimo (0.3.0)
+    naturally (2.2.1)
+    nkf (0.2.0)
+    optparse (0.4.0)
+    os (1.1.4)
+    plist (3.7.1)
+    public_suffix (5.0.5)
+    rake (13.2.1)
+    representable (3.2.0)
+      declarative (< 0.1.0)
+      trailblazer-option (>= 0.1.1, < 0.2.0)
+      uber (< 0.2.0)
+    retriable (3.1.2)
+    rexml (3.2.6)
+    rouge (2.0.7)
+    ruby2_keywords (0.0.5)
+    rubyzip (2.3.2)
+    security (0.1.5)
+    signet (0.19.0)
+      addressable (~> 2.8)
+      faraday (>= 0.17.5, < 3.a)
+      jwt (>= 1.5, < 3.0)
+      multi_json (~> 1.10)
+    simctl (1.6.10)
+      CFPropertyList
+      naturally
+    terminal-notifier (2.0.0)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
+    trailblazer-option (0.1.2)
+    tty-cursor (0.7.1)
+    tty-screen (0.8.2)
+    tty-spinner (0.9.3)
+      tty-cursor (~> 0.7)
+    uber (0.1.0)
+    unicode-display_width (2.5.0)
+    word_wrap (1.0.0)
+    xcodeproj (1.24.0)
+      CFPropertyList (>= 2.3.3, < 4.0)
+      atomos (~> 0.1.3)
+      claide (>= 1.0.2, < 2.0)
+      colored2 (~> 3.1)
+      nanaimo (~> 0.3.0)
+      rexml (~> 3.2.4)
+    xcpretty (0.3.0)
+      rouge (~> 2.0.7)
+    xcpretty-travis-formatter (1.0.1)
+      xcpretty (~> 0.2, >= 0.0.7)
+
+PLATFORMS
+  arm64-darwin-22
+  ruby
+
+DEPENDENCIES
+  fastlane
+
+BUNDLED WITH
+   2.5.4

build.gradle

@@ -5,7 +5,7 @@ buildscript {
 		mavenCentral()
 	}
 	dependencies {
-		classpath "com.android.tools.build:gradle:7.4.2"
+		classpath "com.android.tools.build:gradle:8.2.2"
 		classpath "com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:2.0.1"
 		// NOTE: Do not place your application dependencies here; they belong
 		// in the individual module build.gradle files

fastlane/Appfile

@@ -0,0 +1,2 @@
+json_key_file("") # Path to the json secret file - Follow https://docs.fastlane.tools/actions/supply/#setup to get one
+package_name("org.joinmastodon.android") # e.g. com.krausefx.app

fastlane/Fastfile

@@ -0,0 +1,36 @@
+# This file contains the fastlane.tools configuration
+# You can find the documentation at https://docs.fastlane.tools
+#
+# For a list of all available actions, check out
+#
+#     https://docs.fastlane.tools/actions
+#
+# For a list of all available plugins, check out
+#
+#     https://docs.fastlane.tools/plugins/available-plugins
+#
+
+# Uncomment the line if you want fastlane to automatically update itself
+# update_fastlane
+
+default_platform(:android)
+
+platform :android do
+  desc "Runs all the tests"
+  lane :test do
+    gradle(task: "test")
+  end
+
+  desc "Deploy a new version to the Google Play"
+  lane :deploy do
+    gradle(
+      task: "bundle",
+      build_type: "release",
+    )
+    upload_to_play_store(
+      changes_not_sent_for_review: true,
+      skip_upload_images: true,
+      skip_upload_screenshots: true
+    )
+  end
+end

fastlane/README.md

@@ -0,0 +1,40 @@
+fastlane documentation
+----
+
+# Installation
+
+Make sure you have the latest version of the Xcode command line tools installed:
+
+```sh
+xcode-select --install
+```
+
+For _fastlane_ installation instructions, see [Installing _fastlane_](https://docs.fastlane.tools/#installing-fastlane)
+
+# Available Actions
+
+## Android
+
+### android test
+
+```sh
+[bundle exec] fastlane android test
+```
+
+Runs all the tests
+
+### android deploy
+
+```sh
+[bundle exec] fastlane android deploy
+```
+
+Deploy a new version to the Google Play
+
+----
+
+This README.md is auto-generated and will be re-generated every time [_fastlane_](https://fastlane.tools) is run.
+
+More information about _fastlane_ can be found on [fastlane.tools](https://fastlane.tools).
+
+The documentation of _fastlane_ can be found on [docs.fastlane.tools](https://docs.fastlane.tools).

fastlane/metadata/android/en-US/changelogs/86.txt

@@ -0,0 +1,3 @@
+- You can now easily share and scan QR codes to quickly find each other
+- We've updated the look of the tab bar to better match current platform guidelines
+- Various minor usability improvements

fastlane/metadata/android/en-US/changelogs/88.txt

@@ -0,0 +1,3 @@
+- QR code scanner can now be accessed from the explore page
+- You can now pin posts to your profile
+- Fixed featured hashtags on profiles not showing the profile's own posts exclusively

fastlane/metadata/android/en-US/changelogs/93.txt

@@ -0,0 +1,8 @@
+- Adjust filters in the Notifications tab to silence unwanted alerts*
+- Opt into push notifications when a user posts by tapping the bell 🔔 in the top corner of a user's profile.
+- Mute overly active conversation notifications via the More button ⋮ on your posts
+- When writing a post, choose Quiet public 🌙 visibility to avoid appearing in feeds or searches
+- Improved post legibility with adjusted line height
+- Bug fixes
+
+*Your server must support filtered notifications to see this option.

fastlane/metadata/android/hi-IN/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 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.
+कोई ग्रुप जॉइन करें और अपना प्रोफाइल बनाएं। दिलचस्प लोगों को ढूंढ़ें और फॉलो करें और उनके पोस्ट पढ़ें बिना किसी ऐड के। 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/hi-IN/short_description.txt

@@ -1 +1 @@
-Decentralized social network
+डिसेंट्रलाइज़्ड सोशल नेटवर्क

fastlane/metadata/android/hu-HU/short_description.txt

@@ -1 +1 @@
-Decentralizált szociális hálózat
+Decentralizált közösségi hálózat

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

@@ -4,12 +4,12 @@
 
 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. Զգայուն կամ հրահրող թեմաներով գրառումները կարելի է թաքցնել նախազգուշացումներով։ Each community has its own guidelines and moderators to keep its members safe, and robust blocking and reporting tools help prevent abuse.
 
-Ավելին՝
+Ավելին.
 
-• Մուգ տարբերակ՝ կարդացեք գրառումներ մուգ, բաց կամ իսկական սև տարբերակներում
-• Հարցումներ՝ իմացեք ձեր հետևորդների կարծիքը և հաշվեք ձայները
+• Մուգ տարբերակ. կարդացեք գրառումներ մուգ, բաց կամ իսկական սև տարբերակներում
+• Հարցումներ. իմացեք ձեր հետևորդների կարծիքը և հաշվեք ձայները
 • 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
 

fastlane/metadata/android/id-ID/full_description.txt

@@ -1,6 +1,6 @@
 Mastodon dalah jaringan sosial terdesentralisasi terbesar di internet. Bukan hanya satu situs web, ini adalah jaringan dari jutaan pengguna dalam komunitas tersendiri yang dapat saling interaksi antar sesama, tanpa batasan. Apapun yang kamu minati, kamu dapat bertemu orang-orang baru yang mengirimkan apa yang mereka minati di Mastodon!
 
-Bergabunglah dalam sebuah komunitas dan buat profil kalian. Temukan dan ikuti orang-orang yang menarik dan baca postingan mereka dalam linimasa yang kronologis serta bebas iklan. Ekspresikan diri Anda dengan emoji kustom, gambar, GIF, video, dan audio dalam kiriman dengan batasan 500 karakter. Balas ke utasan dan bagikan kiriman dari siapa pun ke pengikut Anda untuk membagikan hal-hal yang keren. Temukan akun baru untuk diikuti dan tagar yang sedang tren untuk memperluas jejaring Anda.
+Bergabunglah dalam sebuah komunitas dan buat profil kalian. Temukan dan ikuti orang-orang yang menarik dan baca postingan mereka dalam lini masa yang kronologis serta bebas iklan. Ekspresikan diri Anda dengan emoji kustom, gambar, GIF, video, dan audio dalam kiriman dengan batasan 500 karakter. Balas ke utasan dan bagikan kiriman dari siapa pun ke pengikut Anda untuk membagikan hal-hal yang keren. Temukan akun baru untuk diikuti dan tagar yang sedang tren untuk memperluas jejaring Anda.
 
 Mastodon dibuat dengan fokus pada privasi dan keamanan. Tentukan apakah kiriman Anda dibagikan kepada pengikut, hanya orang yang disebut, atau seluruh dunia. Peringatan konten memungkinkan Anda untuk menyembunyikan kiriman yang berisi material sensitif atau memicu sampai Anda siap untuk terlibat dengan mereka. Setiap komunitas memiliki pedoman dan moderator sendiri-sendiri untuk menjaga anggotanya aman, dan alat pemblokiran dan pelaporan yang kokoh membantu mencegah pelecehan.
 

fastlane/metadata/android/ka-GE/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 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/ka-GE/short_description.txt

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

fastlane/metadata/android/ka-GE/title.txt

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

fastlane/metadata/android/lt-LT/full_description.txt

@@ -0,0 +1,16 @@
+Mastodon – didžiausias decentralizuotas socialinis tinklas internete. Vietoj vienos svetainės tai yra milijonų naudotojų, priklausančių nepriklausomoms bendruomenėms, kurios gali sklandžiai bendrauti tarpusavyje, tinklas. Nesvarbu, kuo domiesi, Mastodon gali sutikti aistringų žmonių, skelbiančių apie tai!
+
+Prisijunk prie bendruomenės ir susikurk savo profilį. Rask ir sek žavius žmones bei skaityk jų įrašus chronologinėje laiko skalėje be reklamų. Išreikšk save su pasirinktais jaustukais, vaizdais, GIF, vaizdo ir garso įrašais 500 simbolių įrašuose. Atsakyk į gijas ir perrašyk bet kurio asmens įrašus, kad galėtum dalytis puikiais dalykais. Ieškok naujų paskyrų sekti ir tendencingų saitažodžių, kad praplėstum savo tinklą.
+
+Mastodon sukurtas daugiausia dėmesio skiriant privatumui ir saugumui. Nuspręsk, ar tavo įrašai bus bendrinami tavo sekėjams, tik tavo paminėtiems žmonėms, ar visam pasauliui. Turinio įspėjimai leidžia paslėpti įrašus, kuriuose yra jautrios ar dirginančios medžiagos, kol būsi pasiruošęs (-usi) su jais bendrauti. Kiekviena bendruomenė turi savo gaires ir prižiūrėtojus, kad jos nariai būtų saugūs, o patikimi blokavimo ir pranešimo įrankiai padeda užkirsti kelią piktnaudžiavimui.
+
+Daugiau funkcijų:
+
+• Tamsusis režimas: skaityk įrašus šviesiu, tamsiu arba tikru juodu režimu.
+• Apklausos: paklausk sekėjų nuomonės ir suskaičiuok balsus.
+• Naršyti: tendencingos saitažodžiai ir paskyros – vos nuo vieno prisilietimo.
+• Pranešimai: gauk pranešimus apie naujus sekėjus, atsakymus ir perrašymus.
+• Bendrinti: skelbk tiesiogiai į Mastodon iš bet kurio bendrinimo lapo bet kurioje programėlėje.
+• Mielumas: mūsų talismanas – žavus drambliukas, kurį retkarčiais pamatysi.
+
+Mastodon – registruota ne pelno siekianti organizacija, kurios plėtra yra tiesiogiai paremta aukomis. Nėra jokios reklamos, jokių monetizacijos ir rizikos kapitalo, ir mes planuojame, kad taip ir liks.

fastlane/metadata/android/lt-LT/short_description.txt

@@ -0,0 +1 @@
+Decentralizuotas socialinis tinklas

fastlane/metadata/android/lt-LT/title.txt

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

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

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

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

@@ -1,4 +1,4 @@
-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ğunuz önemli değil, Mastodon'da onunla ilgili gönderi paylaşan tutkulu insanlarla tanışabilirsiniz!
+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 birbirleriyle kolayca etkileşebileceği bir ağdır. Hangi konuyla ilgili olduğunuz önemli değil, Mastodon'da onunla ilgili gönderi paylaşan tutkulu insanlarla tanışabilirsiniz!
 
 Bir topluluğa katılın ve profilinizi oluşturun. Olağanüstü kişileri bulun ve takip edin; gönderilerini reklamsız ve kronolojik bir zaman çizelgesinde okuyun. Gönderilerinizde şimdilik 500 karakter sınırlamasıyla kendinizi emojiler, görseller, GIFler, videolar ve sesler ile ifade edin. Harika içerikler paylaşmak için başlıklara yanıt yazın, insanların gönderilerini yineleyin. Ağınızı genişletmek için takip edilecek yeni hesaplar ve hashtagler bulun.
 
@@ -13,4 +13,4 @@ Diğer özellikler:
 • Paylaşım: Doğrudan Mastodon'a herhangi bir türde gönderi paylaş
 • Sevimlilik: Maskotumuz şirin bir fil ve onu uygulamada zaman zaman göreceksiniz
 
-Mastodon kar amacı gütmeyen bir kuruluştur ve geliştirilmesi doğrudan bağışlarınızla sağlanmaktadır. Reklam yok, para kazanma güdüsü yok, risk sermayesi yok ve bu şekilde devam etmeyi planlıyoruz.
+Mastodon kâr amacı gütmeyen bir kuruluştur ve geliştirilmesi doğrudan bağışlarınızla sağlanmaktadır. Reklam yok, para kazanma güdüsü yok, risk sermayesi yok ve bu şekilde devam etmeyi planlıyoruz.

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

@@ -1,8 +1,8 @@
-Mastodon 是網際網路上最大的去中心化社群網路。 它是一個由能無縫互動的獨立社群中，數百萬使用者組成的網路，而非單一網站。 無論您對什麼事情感興趣，您都能在 Mastodon 上遇到充滿熱情的人們討論該話題。
+Mastodon 是網際網路上最大的去中心化社群網路。 它是一個由能無縫互動的獨立社群中，數百萬使用者組成的網路，而非單一網站。 無論您對什麼事情感興趣，您都能於 Mastodon 上遇到充滿熱情的人們討論該話題。
 
-加入社群並建立您的個人檔案。 尋找並跟隨迷人的朋友們，並在無廣告、按時間順序排列的時間軸上閱讀他們的嘟文。 在 500 個字元的嘟文中使用自訂表情符號、GIF、視訊與音訊來表達您自己。 回覆任何人的話題與轉發貼文以分享精彩內容。 尋找要跟隨的新帳號與熱門主題標籤來拓展您的網路。
+加入社群並建立您的個人檔案。 尋找並跟隨迷人的朋友們，並於無廣告、按時間順序排列的時間軸上閱讀他們的嘟文。 於 500 個字元的嘟文中使用自訂表情符號、GIF、視訊與音訊表達您自己。 回覆任何人的話題與轉發貼文以分享精彩內容。 尋找要跟隨的新帳號與熱門主題標籤以拓展您的網路。
 
-Mastodon 以隱私與安全為要。 決定您的嘟文要與您的跟隨者分享、只與您提及的人們分享，又或是與全世界分享。 內容警告可讓您隱藏包含敏感或可能觸發強烈情緒反應的嘟文，直到您準備好與它們進行互動。 每個社群都有它們自己的指導方針與管理原來確保其成員安全，強大的封鎖與回報工具有助於防止濫用。
+Mastodon 以隱私與安全為要。 決定您的嘟文要與您的跟隨者分享、只與您提及的人們分享，又或是與全世界分享。 內容警告可讓您隱藏包含敏感或可能觸發強烈情緒反應的嘟文，直到您準備好與它們進行互動。 每個社群都有它們自己的指導方針與管理員以確保其成員安全，強大的封鎖與回報工具有助於防止濫用。
 
 更多功能：
 
@@ -10,7 +10,7 @@ Mastodon 以隱私與安全為要。 決定您的嘟文要與您的跟隨者分
 • 投票：詢問跟隨者們的意見並計票
 • 探索：僅需輕點一下，即可看到熱門主題標籤與帳號
 • 通知：取得關於新跟隨者們、回覆與轉發的通知
-• 分享：從任何應用程式中的分享表中直接發表嘟文到 Mastodon 中
+• 分享：自任何應用程式中的分享表中直接發表嘟文到 Mastodon 中
 • 可愛：我們的吉祥物是一隻可愛的大象，您會不時看到牠出現
 
 Mastodon 是一家註冊的非營利組織，您的捐款會直接支援開發工作。 沒有廣告、沒有貨幣化、沒有風險投資，我們計畫維持這種狀態。 沒有廣告、沒有貨幣化、沒有風險投資，我們計畫維持這種狀態。

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Sat Jun 03 23:40:27 MSK 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

mastodon/build.gradle

@@ -4,15 +4,18 @@ plugins {
 }
 
 android {
+	androidResources {
+		generateLocaleConfig = true
+	}
+
 	compileSdk 33
 	defaultConfig {
 		applicationId "org.joinmastodon.android"
 		minSdk 23
 		targetSdk 33
-		versionCode 75
-		versionName "2.2.0"
+		versionCode 97
+		versionName "2.5.0"
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-		resConfigs "ar-rSA", "be-rBY", "bn-rBD", "bs-rBA", "ca-rES", "cs-rCZ", "da-rDK", "de-rDE", "el-rGR", "es-rES", "eu-rES", "fa-rIR", "fi-rFI", "fil-rPH", "fr-rFR", "ga-rIE", "gd-rGB", "gl-rES", "hi-rIN", "hr-rHR", "hu-rHU", "hy-rAM", "ig-rNG", "in-rID", "is-rIS", "it-rIT", "iw-rIL", "ja-rJP", "kab", "ko-rKR", "my-rMM", "nl-rNL", "no-rNO", "oc-rFR", "pl-rPL", "pt-rBR", "pt-rPT", "ro-rRO", "ru-rRU", "si-rLK", "sl-rSI", "sv-rSE", "th-rTH", "tr-rTR", "uk-rUA", "ur-rIN", "vi-rVN", "zh-rCN", "zh-rTW"
 	}
 
 	buildTypes {
@@ -64,6 +67,17 @@ android {
 		checkReleaseBuilds false
 		abortOnError false
 	}
+	buildFeatures{
+		aidl true
+		buildConfig true
+	}
+	dependenciesInfo{
+		// Disables dependency metadata when building APKs.
+		includeInApk false
+		// Disables dependency metadata when building Android App Bundles.
+		includeInBundle false
+	}
+	namespace 'org.joinmastodon.android'
 }
 
 dependencies {
@@ -76,11 +90,13 @@ dependencies {
 	implementation 'me.grishka.litex:viewpager:1.0.0'
 	implementation 'me.grishka.litex:viewpager2:1.0.0'
 	implementation 'me.grishka.litex:palette:1.0.0'
-	implementation 'me.grishka.appkit:appkit:1.2.15'
+	implementation 'me.grishka.appkit:appkit:1.2.17'
 	implementation 'com.google.code.gson:gson:2.8.9'
 	implementation 'org.jsoup:jsoup:1.14.3'
 	implementation 'com.squareup:otto:1.3.8'
 	implementation 'de.psdev:async-otto:1.0.3'
+	implementation 'com.google.zxing:core:3.5.3'
+	implementation 'org.microg:safe-parcel:1.5.0'
 	implementation 'org.parceler:parceler-api:1.1.12'
 	annotationProcessor 'org.parceler:parceler:1.1.12'
 	coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'

mastodon/ci_signing.gradle

@@ -0,0 +1,20 @@
+// Included into build.gradle when running in a CI pipeline
+
+android{
+	signingConfigs{
+		release{
+			keyAlias "key0"
+			keyPassword System.getenv("KEYSTORE_PASSWORD")
+			storeFile file(System.getenv("KEYSTORE_FILE"))
+			storePassword System.getenv("KEYSTORE_PASSWORD")
+		}
+	}
+	buildTypes{
+		release{
+			signingConfig signingConfigs.release
+		}
+		githubRelease{
+			signingConfig signingConfigs.release
+		}
+	}
+}

mastodon/proguard-rules.pro

@@ -22,7 +22,7 @@
 
 # Keep all model classes as they're used with gson and their names are shown in errors
 -keep public class org.joinmastodon.android.model.**{
-	<fields>;
+	*;
 }
 
 # Inner classes in api requests are used with gson
@@ -50,4 +50,8 @@
 
 -keep class org.joinmastodon.android.AppCenterWrapper { *; }
 
--keepattributes LineNumberTable
+-keepattributes LineNumberTable
+-keepattributes Signature
+-keep class com.google.gson.reflect.TypeToken { *; }
+-keep class * extends com.google.gson.reflect.TypeToken
+-keep public class * implements java.lang.reflect.Type

mastodon/src/main/AndroidManifest.xml

@@ -4,6 +4,7 @@
 
 	<uses-permission android:name="android.permission.INTERNET"/>
 	<uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+	<uses-permission android:name="android.permission.VIBRATE" />
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="28"/>
 	<uses-permission android:name="${applicationId}.permission.C2D_MESSAGE"/>
 	<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/>
@@ -19,6 +20,10 @@
 		<intent>
 			<action android:name="android.intent.action.TRANSLATE" />
 		</intent>
+		<intent>
+			<action android:name="android.intent.action.VIEW"/>
+			<data android:scheme="http"/>
+		</intent>
 	</queries>
 
 	<application
@@ -26,11 +31,14 @@
 		android:allowBackup="true"
 		android:label="@string/app_name"
 		android:supportsRtl="true"
-		android:localeConfig="@xml/locales_config"
 		android:icon="@mipmap/ic_launcher"
 		android:theme="@style/Theme.Mastodon.AutoLightDark"
 		android:largeHeap="true">
 
+		<meta-data
+			android:name="com.google.mlkit.vision.DEPENDENCIES"
+			android:value="barcode_ui"/>
+
 		<activity android:name=".MainActivity" android:exported="true" android:configChanges="orientation|screenSize" android:windowSoftInputMode="adjustResize" android:launchMode="singleTask">
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN"/>
@@ -84,6 +92,14 @@
 			</intent-filter>
 		</receiver>
 
+		<provider
+			android:authorities="${applicationId}.fileprovider"
+			android:name=".TweakedFileProvider"
+			android:grantUriPermissions="true"
+			android:exported="false">
+			<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/fileprovider_paths"/>
+		</provider>
+
 	</application>
 
 </manifest>

mastodon/src/main/aidl/com/google/android/gms/common/api/Status.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.common.api;
+
+parcelable Status;

mastodon/src/main/aidl/com/google/android/gms/common/api/internal/IStatusCallback.aidl

@@ -0,0 +1,7 @@
+package com.google.android.gms.common.api.internal;
+
+import com.google.android.gms.common.api.Status;
+
+interface IStatusCallback {
+    void onResult(in Status status);
+}

mastodon/src/main/aidl/com/google/android/gms/common/internal/ConnectionInfo.aidl

@@ -0,0 +1,7 @@
+/*
+ * SPDX-FileCopyrightText: 2020, microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.android.gms.common.internal;
+parcelable ConnectionInfo;

mastodon/src/main/aidl/com/google/android/gms/common/internal/GetServiceRequest.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.common.internal;
+
+parcelable GetServiceRequest;

mastodon/src/main/aidl/com/google/android/gms/common/internal/IGmsCallbacks.aidl

@@ -0,0 +1,15 @@
+/*
+ * SPDX-FileCopyrightText: 2020, microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.android.gms.common.internal;
+
+import android.os.Bundle;
+import com.google.android.gms.common.internal.ConnectionInfo;
+
+interface IGmsCallbacks {
+    void onPostInitComplete(int statusCode, IBinder binder, in Bundle params);
+    void onAccountValidationComplete(int statusCode, in Bundle params);
+    void onPostInitCompleteWithConnectionInfo(int statusCode, IBinder binder, in ConnectionInfo info);
+}

mastodon/src/main/aidl/com/google/android/gms/common/internal/IGmsServiceBroker.aidl

@@ -0,0 +1,10 @@
+package com.google.android.gms.common.internal;
+
+import android.os.Bundle;
+
+import com.google.android.gms.common.internal.IGmsCallbacks;
+import com.google.android.gms.common.internal.GetServiceRequest;
+
+interface IGmsServiceBroker {
+	void getService(IGmsCallbacks callback, in GetServiceRequest request) = 45;
+}

mastodon/src/main/aidl/com/google/android/gms/common/moduleinstall/ModuleAvailabilityResponse.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.common.moduleinstall;
+
+parcelable ModuleAvailabilityResponse;

mastodon/src/main/aidl/com/google/android/gms/common/moduleinstall/ModuleInstallIntentResponse.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.common.moduleinstall;
+
+parcelable ModuleInstallIntentResponse;

mastodon/src/main/aidl/com/google/android/gms/common/moduleinstall/ModuleInstallResponse.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.common.moduleinstall;
+
+parcelable ModuleInstallResponse;

mastodon/src/main/aidl/com/google/android/gms/common/moduleinstall/ModuleInstallStatusUpdate.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.common.moduleinstall;
+
+parcelable ModuleInstallStatusUpdate;

mastodon/src/main/aidl/com/google/android/gms/common/moduleinstall/internal/ApiFeatureRequest.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.common.moduleinstall.internal;
+
+parcelable ApiFeatureRequest;

mastodon/src/main/aidl/com/google/android/gms/common/moduleinstall/internal/IModuleInstallCallbacks.aidl

@@ -0,0 +1,13 @@
+package com.google.android.gms.common.moduleinstall.internal;
+
+import com.google.android.gms.common.api.Status;
+import com.google.android.gms.common.moduleinstall.ModuleAvailabilityResponse;
+import com.google.android.gms.common.moduleinstall.ModuleInstallIntentResponse;
+import com.google.android.gms.common.moduleinstall.ModuleInstallResponse;
+
+interface IModuleInstallCallbacks {
+    void onModuleAvailabilityResponse(in Status status, in ModuleAvailabilityResponse response) = 0;
+    void onModuleInstallResponse(in Status status, in ModuleInstallResponse response) = 1;
+    void onModuleInstallIntentResponse(in Status status, in ModuleInstallIntentResponse response) = 2;
+    void onStatus(in Status status) = 3;
+}

mastodon/src/main/aidl/com/google/android/gms/common/moduleinstall/internal/IModuleInstallService.aidl

@@ -0,0 +1,14 @@
+package com.google.android.gms.common.moduleinstall.internal;
+
+import com.google.android.gms.common.api.internal.IStatusCallback;
+import com.google.android.gms.common.moduleinstall.internal.ApiFeatureRequest;
+import com.google.android.gms.common.moduleinstall.internal.IModuleInstallCallbacks;
+import com.google.android.gms.common.moduleinstall.internal.IModuleInstallStatusListener;
+
+interface IModuleInstallService {
+    void areModulesAvailable(IModuleInstallCallbacks callbacks, in ApiFeatureRequest request) = 0;
+    void installModules(IModuleInstallCallbacks callbacks, in ApiFeatureRequest request, IModuleInstallStatusListener listener) = 1;
+    void getInstallModulesIntent(IModuleInstallCallbacks callbacks, in ApiFeatureRequest request) = 2;
+    void releaseModules(IStatusCallback callback, in ApiFeatureRequest request) = 3;
+    void unregisterListener(IStatusCallback callback, IModuleInstallStatusListener listener) = 5;
+}

mastodon/src/main/aidl/com/google/android/gms/common/moduleinstall/internal/IModuleInstallStatusListener.aidl

@@ -0,0 +1,7 @@
+package com.google.android.gms.common.moduleinstall.internal;
+
+import com.google.android.gms.common.moduleinstall.ModuleInstallStatusUpdate;
+
+interface IModuleInstallStatusListener {
+    void onModuleInstallStatusUpdate(in ModuleInstallStatusUpdate statusUpdate) = 0;
+}

mastodon/src/main/java/com/google/android/gms/common/Feature.java

@@ -0,0 +1,15 @@
+package com.google.android.gms.common;
+
+import org.microg.safeparcel.AutoSafeParcelable;
+import org.microg.safeparcel.SafeParceled;
+
+public class Feature extends AutoSafeParcelable{
+	@SafeParceled(1)
+	public String name;
+	@SafeParceled(2)
+	public int oldVersion;
+	@SafeParceled(3)
+	public long version=-1;
+
+	public static final Creator<Feature> CREATOR=new AutoCreator<>(Feature.class);
+}

mastodon/src/main/java/com/google/android/gms/common/api/Scope.java

@@ -0,0 +1,13 @@
+package com.google.android.gms.common.api;
+
+import org.microg.safeparcel.AutoSafeParcelable;
+import org.microg.safeparcel.SafeParceled;
+
+public class Scope extends AutoSafeParcelable{
+	@SafeParceled(1)
+	public int versionCode=1;
+	@SafeParceled(2)
+	public String scopeUri;
+
+	public static final Creator<Scope> CREATOR=new AutoCreator<>(Scope.class);
+}

mastodon/src/main/java/com/google/android/gms/common/api/Status.java

@@ -0,0 +1,33 @@
+package com.google.android.gms.common.api;
+
+import android.app.PendingIntent;
+
+import org.joinmastodon.android.googleservices.ConnectionResult;
+import org.microg.safeparcel.AutoSafeParcelable;
+import org.microg.safeparcel.SafeParceled;
+
+public class Status extends AutoSafeParcelable{
+	@SafeParceled(1000)
+	public int versionCode;
+	@SafeParceled(1)
+	public int statusCode;
+	@SafeParceled(2)
+	public String statusMessage;
+	@SafeParceled(3)
+	public PendingIntent pendingIntent;
+	@SafeParceled(4)
+	public ConnectionResult connectionResult;
+
+	public static final Creator<Status> CREATOR=new AutoCreator<>(Status.class);
+
+	@Override
+	public String toString(){
+		return "Status{"+
+				"versionCode="+versionCode+
+				", statusCode="+statusCode+
+				", statusMessage='"+statusMessage+'\''+
+				", pendingIntent="+pendingIntent+
+				", connectionResult="+connectionResult+
+				'}';
+	}
+}

mastodon/src/main/java/com/google/android/gms/common/internal/ConnectionInfo.java

@@ -0,0 +1,19 @@
+package com.google.android.gms.common.internal;
+
+import android.os.Bundle;
+
+import com.google.android.gms.common.Feature;
+
+import org.microg.safeparcel.AutoSafeParcelable;
+import org.microg.safeparcel.SafeParceled;
+
+public class ConnectionInfo extends AutoSafeParcelable{
+	@SafeParceled(1)
+	public Bundle params;
+	@SafeParceled(2)
+	public Feature[] features;
+	@SafeParceled(3)
+	public int unknown3;
+
+	public static final Creator<ConnectionInfo> CREATOR=new AutoCreator<>(ConnectionInfo.class);
+}

mastodon/src/main/java/com/google/android/gms/common/internal/GetServiceRequest.java

@@ -0,0 +1,47 @@
+package com.google.android.gms.common.internal;
+
+import android.os.Bundle;
+import android.os.IBinder;
+import android.accounts.Account;
+
+import com.google.android.gms.common.Feature;
+import com.google.android.gms.common.api.Scope;
+
+import org.microg.safeparcel.AutoSafeParcelable;
+import org.microg.safeparcel.SafeParceled;
+
+public class GetServiceRequest extends AutoSafeParcelable{
+	@SafeParceled(1)
+	int versionCode=6;
+	@SafeParceled(2)
+	public int serviceId;
+	@SafeParceled(3)
+	public int gmsVersion;
+	@SafeParceled(4)
+	public String packageName;
+	@SafeParceled(5)
+	public IBinder accountAccessor;
+	@SafeParceled(6)
+	public Scope[] scopes;
+	@SafeParceled(7)
+	public Bundle extras;
+	@SafeParceled(8)
+	public Account account;
+	@SafeParceled(9)
+	@Deprecated
+	long field9;
+	@SafeParceled(10)
+	public Feature[] defaultFeatures;
+	@SafeParceled(11)
+	public Feature[] apiFeatures;
+	@SafeParceled(12)
+	boolean supportsConnectionInfo;
+	@SafeParceled(13)
+	int field13;
+	@SafeParceled(14)
+	boolean field14;
+	@SafeParceled(15)
+	String attributionTag;
+
+	public static final Creator<GetServiceRequest> CREATOR=new AutoCreator<>(GetServiceRequest.class);
+}

mastodon/src/main/java/com/google/android/gms/common/moduleinstall/ModuleAvailabilityResponse.java

@@ -0,0 +1,13 @@
+package com.google.android.gms.common.moduleinstall;
+
+import org.microg.safeparcel.AutoSafeParcelable;
+import org.microg.safeparcel.SafeParceled;
+
+public class ModuleAvailabilityResponse extends AutoSafeParcelable{
+	@SafeParceled(1)
+	public boolean modulesAvailable;
+	@SafeParceled(2)
+	public int availabilityStatus;
+
+	public static final Creator<ModuleAvailabilityResponse> CREATOR=new AutoCreator<>(ModuleAvailabilityResponse.class);
+}

mastodon/src/main/java/com/google/android/gms/common/moduleinstall/ModuleInstallIntentResponse.java

@@ -0,0 +1,13 @@
+package com.google.android.gms.common.moduleinstall;
+
+import android.app.PendingIntent;
+
+import org.microg.safeparcel.AutoSafeParcelable;
+import org.microg.safeparcel.SafeParceled;
+
+public class ModuleInstallIntentResponse extends AutoSafeParcelable{
+	@SafeParceled(1)
+	public PendingIntent pendingIntent;
+
+	public static final Creator<ModuleInstallIntentResponse> CREATOR=new AutoCreator<>(ModuleInstallIntentResponse.class);
+}

mastodon/src/main/java/com/google/android/gms/common/moduleinstall/ModuleInstallResponse.java

@@ -0,0 +1,21 @@
+package com.google.android.gms.common.moduleinstall;
+
+import org.microg.safeparcel.AutoSafeParcelable;
+import org.microg.safeparcel.SafeParceled;
+
+public class ModuleInstallResponse extends AutoSafeParcelable{
+	@SafeParceled(1)
+	public int sessionID;
+	@SafeParceled(2)
+	public boolean shouldUnregisterListener;
+
+	public static final Creator<ModuleInstallResponse> CREATOR=new AutoCreator<>(ModuleInstallResponse.class);
+
+	@Override
+	public String toString(){
+		return "ModuleInstallResponse{"+
+				"sessionID="+sessionID+
+				", shouldUnregisterListener="+shouldUnregisterListener+
+				'}';
+	}
+}

mastodon/src/main/java/com/google/android/gms/common/moduleinstall/ModuleInstallStatusUpdate.java

@@ -0,0 +1,63 @@
+package com.google.android.gms.common.moduleinstall;
+
+import org.microg.safeparcel.AutoSafeParcelable;
+import org.microg.safeparcel.SafeParceled;
+
+public class ModuleInstallStatusUpdate extends AutoSafeParcelable{
+	public static final int STATE_UNKNOWN = 0;
+	/**
+	 * The request is pending and will be processed soon.
+	 */
+	public static final int STATE_PENDING = 1;
+	/**
+	 * The optional module download is in progress.
+	 */
+	public static final int STATE_DOWNLOADING = 2;
+	/**
+	 * The optional module download has been canceled.
+	 */
+	public static final int STATE_CANCELED = 3;
+	/**
+	 * Installation is completed; the optional modules are available to the client app.
+	 */
+	public static final int STATE_COMPLETED = 4;
+	/**
+	 * The optional module download or installation has failed.
+	 */
+	public static final int STATE_FAILED = 5;
+	/**
+	 * The optional modules have been downloaded and the installation is in progress.
+	 */
+	public static final int STATE_INSTALLING = 6;
+	/**
+	 * The optional module download has been paused.
+	 * <p>
+	 * This usually happens when connectivity requirements can't be met during download. Once the connectivity requirements
+	 * are met, the download will be resumed automatically.
+	 */
+	public static final int STATE_DOWNLOAD_PAUSED = 7;
+
+	@SafeParceled(1)
+	public int sessionID;
+	@SafeParceled(2)
+	public int installState;
+	@SafeParceled(3)
+	public Long bytesDownloaded;
+	@SafeParceled(4)
+	public Long totalBytesToDownload;
+	@SafeParceled(5)
+	public int errorCode;
+
+	@Override
+	public String toString(){
+		return "ModuleInstallStatusUpdate{"+
+				"sessionID="+sessionID+
+				", installState="+installState+
+				", bytesDownloaded="+bytesDownloaded+
+				", totalBytesToDownload="+totalBytesToDownload+
+				", errorCode="+errorCode+
+				'}';
+	}
+
+	public static final Creator<ModuleInstallStatusUpdate> CREATOR=new AutoCreator<>(ModuleInstallStatusUpdate.class);
+}

mastodon/src/main/java/com/google/android/gms/common/moduleinstall/internal/ApiFeatureRequest.java

@@ -0,0 +1,21 @@
+package com.google.android.gms.common.moduleinstall.internal;
+
+import com.google.android.gms.common.Feature;
+
+import org.microg.safeparcel.AutoSafeParcelable;
+import org.microg.safeparcel.SafeParceled;
+
+import java.util.List;
+
+public class ApiFeatureRequest extends AutoSafeParcelable{
+	@SafeParceled(value=1, subClass=Feature.class)
+	public List<Feature> features;
+	@SafeParceled(2)
+	public boolean urgent;
+	@SafeParceled(3)
+	public String sessionId;
+	@SafeParceled(4)
+	public String callingPackage;
+
+	public static final Creator<ApiFeatureRequest> CREATOR=new AutoCreator<>(ApiFeatureRequest.class);
+}

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

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

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

@@ -3,6 +3,9 @@ package org.joinmastodon.android;
 import android.content.Context;
 import android.content.SharedPreferences;
 
+import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.model.Account;
+
 public class GlobalUserPreferences{
 	public static boolean playGifs;
 	public static boolean useCustomTabs;
@@ -13,6 +16,10 @@ public class GlobalUserPreferences{
 		return MastodonApp.context.getSharedPreferences("global", Context.MODE_PRIVATE);
 	}
 
+	private static SharedPreferences getPreReplyPrefs(){
+		return MastodonApp.context.getSharedPreferences("pre_reply_sheets", Context.MODE_PRIVATE);
+	}
+
 	public static void load(){
 		SharedPreferences prefs=getPrefs();
 		playGifs=prefs.getBoolean("playGifs", true);
@@ -36,9 +43,42 @@ public class GlobalUserPreferences{
 				.apply();
 	}
 
+	public static boolean isOptedOutOfPreReplySheet(PreReplySheetType type, Account account, String accountID){
+		if(getPreReplyPrefs().getBoolean("opt_out_"+type, false))
+			return true;
+		if(account==null)
+			return false;
+		String accountKey=account.acct;
+		if(!accountKey.contains("@"))
+			accountKey+="@"+AccountSessionManager.get(accountID).domain;
+		return getPreReplyPrefs().getBoolean("opt_out_"+type+"_"+accountKey.toLowerCase(), false);
+	}
+
+	public static void optOutOfPreReplySheet(PreReplySheetType type, Account account, String accountID){
+		String key;
+		if(account==null){
+			key="opt_out_"+type;
+		}else{
+			String accountKey=account.acct;
+			if(!accountKey.contains("@"))
+				accountKey+="@"+AccountSessionManager.get(accountID).domain;
+			key="opt_out_"+type+"_"+accountKey.toLowerCase();
+		}
+		getPreReplyPrefs().edit().putBoolean(key, true).apply();
+	}
+
+	public static void resetPreReplySheets(){
+		getPreReplyPrefs().edit().clear().apply();
+	}
+
 	public enum ThemePreference{
 		AUTO,
 		LIGHT,
 		DARK
 	}
+
+	public enum PreReplySheetType{
+		OLD_POST,
+		NON_MUTUAL
+	}
 }

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

@@ -6,6 +6,7 @@ import android.app.Fragment;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.net.Uri;
+import android.os.BadParcelableException;
 import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
@@ -36,6 +37,8 @@ import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
 
 public class MainActivity extends FragmentStackActivity{
+	private static final String TAG="MainActivity";
+
 	@Override
 	protected void onCreate(@Nullable Bundle savedInstanceState){
 		UiUtils.setUserPreferredTheme(this);
@@ -99,11 +102,11 @@ public class MainActivity extends FragmentStackActivity{
 			session=AccountSessionManager.get(accountID);
 		if(session==null || !session.activated)
 			return;
-		openSearchQuery(uri.toString(), session.getID(), R.string.opening_link, false);
+		openSearchQuery(uri.toString(), session.getID(), R.string.opening_link, false, null);
 	}
 
-	public void openSearchQuery(String q, String accountID, int progressText, boolean fromSearch){
-		new GetSearchResults(q, null, true, null, 0, 0)
+	public void openSearchQuery(String q, String accountID, int progressText, boolean fromSearch, GetSearchResults.Type type){
+		new GetSearchResults(q, type, true, null, 0, 0)
 				.setCallback(new Callback<>(){
 					@Override
 					public void onSuccess(SearchResults result){
@@ -149,6 +152,11 @@ public class MainActivity extends FragmentStackActivity{
 		}
 		fragment.setArguments(args);
 		showFragment(fragment);
+		Intent intent=getIntent();
+		intent.removeExtra("fromNotification");
+		intent.removeExtra("notification");
+		intent.removeExtra("accountID");
+		setIntent(intent);
 	}
 
 	private void showCompose(){
@@ -193,8 +201,14 @@ public class MainActivity extends FragmentStackActivity{
 			fragment.setArguments(args);
 			showFragmentClearingBackStack(fragment);
 			if(intent.getBooleanExtra("fromNotification", false) && intent.hasExtra("notification")){
-				Notification notification=Parcels.unwrap(intent.getParcelableExtra("notification"));
-				showFragmentForNotification(notification, session.getID());
+				// Parcelables might not be compatible across app versions so this protects against possible crashes
+				// when a notification was received, then the app was updated, and then the user opened the notification
+				try{
+					Notification notification=Parcels.unwrap(intent.getParcelableExtra("notification"));
+					showFragmentForNotification(notification, session.getID());
+				}catch(BadParcelableException x){
+					Log.w(TAG, x);
+				}
 			}else if(intent.getBooleanExtra("compose", false)){
 				showCompose();
 			}else if(Intent.ACTION_VIEW.equals(intent.getAction())){

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

@@ -75,7 +75,7 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 						}
 						String accountID=account.getID();
 						PushNotification pn=AccountSessionManager.getInstance().getAccount(accountID).getPushSubscriptionManager().decryptNotification(k, p, s);
-						new GetNotificationByID(pn.notificationId+"")
+						new GetNotificationByID(pn.notificationId)
 								.setCallback(new Callback<>(){
 									@Override
 									public void onSuccess(org.joinmastodon.android.model.Notification result){

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

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

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

@@ -45,7 +45,11 @@ public class MastodonAPIController{
 			.registerTypeAdapter(LocalDate.class, new IsoLocalDateTypeAdapter())
 			.create();
 	private static WorkerThread thread=new WorkerThread("MastodonAPIController");
-	private static OkHttpClient httpClient=new OkHttpClient.Builder().build();
+	private static OkHttpClient httpClient=new OkHttpClient.Builder()
+			.connectTimeout(60, TimeUnit.SECONDS)
+			.writeTimeout(60, TimeUnit.SECONDS)
+			.readTimeout(60, TimeUnit.SECONDS)
+			.build();
 
 	private AccountSession session;
 
@@ -109,8 +113,10 @@ public class MastodonAPIController{
 
 					@Override
 					public void onResponse(@NonNull Call call, @NonNull Response response) throws IOException{
-						if(req.canceled)
+						if(req.canceled){
+							response.close();
 							return;
+						}
 						if(BuildConfig.DEBUG)
 							Log.d(TAG, logTag(session)+hreq+" received response: "+response);
 						synchronized(req){

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

@@ -5,31 +5,62 @@ import android.view.View;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.google.gson.JsonIOException;
+import com.google.gson.JsonSyntaxException;
+
 import org.joinmastodon.android.R;
 
+import java.net.SocketTimeoutException;
+import java.net.UnknownHostException;
+
 import me.grishka.appkit.api.ErrorResponse;
 
 public class MastodonErrorResponse extends ErrorResponse{
 	public final String error;
 	public final int httpStatus;
 	public final Throwable underlyingException;
+	public final int messageResource;
 
 	public MastodonErrorResponse(String error, int httpStatus, Throwable exception){
 		this.error=error;
 		this.httpStatus=httpStatus;
 		this.underlyingException=exception;
+
+		if(exception instanceof UnknownHostException){
+			this.messageResource=R.string.could_not_reach_server;
+		}else if(exception instanceof SocketTimeoutException){
+			this.messageResource=R.string.connection_timed_out;
+		}else if(exception instanceof JsonSyntaxException || exception instanceof JsonIOException || httpStatus>=500){
+			this.messageResource=R.string.server_error;
+		}else if(httpStatus==404){
+			this.messageResource=R.string.not_found;
+		}else{
+			this.messageResource=0;
+		}
 	}
 
 	@Override
 	public void bindErrorView(View view){
 		TextView text=view.findViewById(R.id.error_text);
-		text.setText(error);
+		String message;
+		if(messageResource>0){
+			message=view.getContext().getString(messageResource, error);
+		}else{
+			message=error;
+		}
+		text.setText(message);
 	}
 
 	@Override
 	public void showToast(Context context){
 		if(context==null)
 			return;
-		Toast.makeText(context, error, Toast.LENGTH_SHORT).show();
+		String message;
+		if(messageResource>0){
+			message=context.getString(messageResource, error);
+		}else{
+			message=error;
+		}
+		Toast.makeText(context, message, Toast.LENGTH_SHORT).show();
 	}
 }

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

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

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

@@ -1,5 +1,7 @@
 package org.joinmastodon.android.api.requests.accounts;
 
+import android.text.TextUtils;
+
 import com.google.gson.reflect.TypeToken;
 
 import org.joinmastodon.android.api.MastodonAPIRequest;
@@ -10,7 +12,7 @@ import java.util.List;
 import androidx.annotation.NonNull;
 
 public class GetAccountStatuses extends MastodonAPIRequest<List<Status>>{
-	public GetAccountStatuses(String id, String maxID, String minID, int limit, @NonNull Filter filter){
+	public GetAccountStatuses(String id, String maxID, String minID, int limit, @NonNull Filter filter, String hashtag){
 		super(HttpMethod.GET, "/accounts/"+id+"/statuses", new TypeToken<>(){});
 		if(maxID!=null)
 			addQueryParameter("max_id", maxID);
@@ -29,6 +31,8 @@ public class GetAccountStatuses extends MastodonAPIRequest<List<Status>>{
 			case OWN_POSTS_AND_REPLIES -> addQueryParameter("exclude_reblogs", "true");
 			case PINNED -> addQueryParameter("pinned", "true");
 		}
+		if(!TextUtils.isEmpty(hashtag))
+			addQueryParameter("tagged", hashtag);
 	}
 
 	public enum Filter{

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

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

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

@@ -4,10 +4,10 @@ import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.Relationship;
 
 public class SetAccountFollowed extends MastodonAPIRequest<Relationship>{
-	public SetAccountFollowed(String id, boolean followed, boolean showReblogs){
+	public SetAccountFollowed(String id, boolean followed, boolean showReblogs, boolean notify){
 		super(HttpMethod.POST, "/accounts/"+id+"/"+(followed ? "follow" : "unfollow"), Relationship.class);
 		if(followed)
-			setRequestBody(new Request(showReblogs, null));
+			setRequestBody(new Request(showReblogs, notify));
 		else
 			setRequestBody(new Object());
 	}

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

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

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

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

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

@@ -1,6 +1,7 @@
 package org.joinmastodon.android.api.requests.notifications;
 
-import com.google.gson.annotations.SerializedName;
+import android.text.TextUtils;
+
 import com.google.gson.reflect.TypeToken;
 
 import org.joinmastodon.android.api.ApiUtils;
@@ -12,6 +13,10 @@ import java.util.List;
 
 public class GetNotifications extends MastodonAPIRequest<List<Notification>>{
 	public GetNotifications(String maxID, int limit, EnumSet<Notification.Type> includeTypes){
+		this(maxID, limit, includeTypes, null);
+	}
+
+	public GetNotifications(String maxID, int limit, EnumSet<Notification.Type> includeTypes, String onlyAccountID){
 		super(HttpMethod.GET, "/notifications", new TypeToken<>(){});
 		if(maxID!=null)
 			addQueryParameter("max_id", maxID);
@@ -25,6 +30,8 @@ public class GetNotifications extends MastodonAPIRequest<List<Notification>>{
 				addQueryParameter("exclude_types[]", type);
 			}
 		}
+		if(!TextUtils.isEmpty(onlyAccountID))
+			addQueryParameter("account_id", onlyAccountID);
 		removeUnsupportedItems=true;
 	}
 }

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

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

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

@@ -0,0 +1,10 @@
+package org.joinmastodon.android.api.requests.notifications;
+
+import org.joinmastodon.android.api.ResultlessMastodonAPIRequest;
+
+public class RespondToNotificationRequest extends ResultlessMastodonAPIRequest{
+	public RespondToNotificationRequest(String id, boolean allow){
+		super(HttpMethod.POST, "/notifications/requests/"+id+(allow ? "/accept" : "/dismiss"));
+		setRequestBody(new Object());
+	}
+}

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

@@ -0,0 +1,11 @@
+package org.joinmastodon.android.api.requests.notifications;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.model.NotificationsPolicy;
+
+public class SetNotificationsPolicy extends MastodonAPIRequest<NotificationsPolicy>{
+	public SetNotificationsPolicy(NotificationsPolicy policy){
+		super(HttpMethod.PUT, "/notifications/policy", NotificationsPolicy.class);
+		setRequestBody(policy);
+	}
+}

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

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

mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/SetStatusConversationMuted.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 SetStatusConversationMuted extends MastodonAPIRequest<Status>{
+	public SetStatusConversationMuted(String id, boolean muted){
+		super(HttpMethod.POST, "/statuses/"+id+(muted ? "/mute" : "/unmute"), 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/session/AccountSessionManager.java

@@ -181,7 +181,11 @@ public class AccountSessionManager{
 		if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.N){
 			MastodonApp.context.deleteSharedPreferences(id);
 		}else{
-			new File(MastodonApp.context.getDir("shared_prefs", Context.MODE_PRIVATE), id+".xml").delete();
+			String dataDir=MastodonApp.context.getApplicationInfo().dataDir;
+			if(dataDir!=null){
+				File prefsDir=new File(dataDir, "shared_prefs");
+				new File(prefsDir, id+".xml").delete();
+			}
 		}
 		sessions.remove(id);
 		if(lastActiveAccountID.equals(id)){

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

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

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

@@ -0,0 +1,181 @@
+package org.joinmastodon.android.fragments;
+
+import android.content.res.ColorStateList;
+import android.graphics.drawable.Drawable;
+import android.os.Build;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.TextView;
+
+import org.joinmastodon.android.E;
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.notifications.GetNotifications;
+import org.joinmastodon.android.api.requests.notifications.RespondToNotificationRequest;
+import org.joinmastodon.android.events.NotificationRequestRespondedEvent;
+import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.model.Notification;
+import org.joinmastodon.android.ui.Snackbar;
+import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
+import org.joinmastodon.android.ui.utils.UiUtils;
+import org.parceler.Parcels;
+
+import java.util.ArrayList;
+import java.util.EnumSet;
+import java.util.List;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+import me.grishka.appkit.api.Callback;
+import me.grishka.appkit.api.ErrorResponse;
+import me.grishka.appkit.api.SimpleCallback;
+import me.grishka.appkit.utils.MergeRecyclerAdapter;
+import me.grishka.appkit.utils.SingleViewRecyclerAdapter;
+
+public class AccountNotificationsListFragment extends BaseNotificationsListFragment{
+	private Account account;
+	private String requestID;
+	private TextView expandedTitle;
+	private boolean choiceMade, allowed;
+
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		account=Parcels.unwrap(getArguments().getParcelable("targetAccount"));
+		requestID=getArguments().getString("requestID");
+		setTitleMarqueeEnabled(false);
+		loadData();
+		setTitle(getString(R.string.notifications_from_user, account.displayName));
+		setHasOptionsMenu(true);
+	}
+
+	@Override
+	protected void doLoadData(int offset, int count){
+		if(!refreshing && endMark!=null)
+			endMark.setVisibility(View.GONE);
+		currentRequest=new GetNotifications(offset==0 ? null : maxID, count, EnumSet.allOf(Notification.Type.class), account.id)
+				.setCallback(new SimpleCallback<>(this){
+					@Override
+					public void onSuccess(List<Notification> result){
+						onDataLoaded(result, !result.isEmpty());
+						maxID=result.isEmpty() ? null : result.get(result.size()-1).id;
+						endMark.setVisibility(result.isEmpty() ? View.VISIBLE : View.GONE);
+					}
+				})
+				.exec(accountID);
+	}
+
+	@Override
+	protected boolean needDividerForExtraItem(View child, View bottomSibling, RecyclerView.ViewHolder holder, RecyclerView.ViewHolder siblingHolder){
+		return super.needDividerForExtraItem(child, bottomSibling, holder, siblingHolder) || (siblingHolder!=null && siblingHolder.getAbsoluteAdapterPosition()>=list.getAdapter().getItemCount());
+	}
+
+	@Override
+	protected RecyclerView.Adapter getAdapter(){
+		MergeRecyclerAdapter mergeAdapter=new MergeRecyclerAdapter();
+
+		expandedTitle=(TextView) LayoutInflater.from(getActivity()).inflate(R.layout.expanded_title_medium, list, false);
+		expandedTitle.setText(getTitle());
+		mergeAdapter.addAdapter(new SingleViewRecyclerAdapter(expandedTitle));
+
+		mergeAdapter.addAdapter(super.getAdapter());
+		return mergeAdapter;
+	}
+
+	@Override
+	public void onViewCreated(View view, Bundle savedInstanceState){
+		super.onViewCreated(view, savedInstanceState);
+		list.addOnScrollListener(new RecyclerView.OnScrollListener(){
+			@Override
+			public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy){
+				if(recyclerView.getChildCount()==0)
+					return;
+				float fraction;
+				View topChild=recyclerView.getChildAt(0);
+				if(recyclerView.getChildAdapterPosition(topChild)>0){
+					fraction=1;
+				}else{
+					fraction=(-topChild.getTop())/(float)(topChild.getHeight()-topChild.getPaddingBottom());
+				}
+				expandedTitle.setAlpha(1f-fraction);
+				toolbarTitleView.setAlpha(fraction);
+			}
+		});
+	}
+
+	@Override
+	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater){
+		inflater.inflate(R.menu.notification_request, menu);
+		MenuItem mute=menu.findItem(R.id.mute);
+		MenuItem allow=menu.findItem(R.id.allow);
+		if(choiceMade && allowed){
+			allow.setIcon(R.drawable.ic_check_wght700_24px);
+			tintMenuIcon(allow, R.attr.colorM3Primary);
+		}else{
+			tintMenuIcon(allow, R.attr.colorM3OnSurfaceVariant);
+		}
+		if(choiceMade && !allowed){
+			mute.setIcon(R.drawable.ic_delete_wght700_24px);
+			tintMenuIcon(mute, R.attr.colorM3Primary);
+		}else{
+			tintMenuIcon(mute, R.attr.colorM3OnSurfaceVariant);
+		}
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item){
+		if(choiceMade)
+			return true;
+		allowed=item.getItemId()==R.id.allow;
+		new RespondToNotificationRequest(requestID, allowed)
+				.setCallback(new Callback<>(){
+					@Override
+					public void onSuccess(Void result){
+						choiceMade=true;
+						invalidateOptionsMenu();
+						E.post(new NotificationRequestRespondedEvent(accountID, requestID));
+						new Snackbar.Builder(getActivity())
+								.setText(getString(allowed ? R.string.notifications_allowed : R.string.notifications_muted, account.displayName))
+								.show();
+					}
+
+					@Override
+					public void onError(ErrorResponse error){
+						error.showToast(getActivity());
+					}
+				})
+				.wrapProgress(getActivity(), R.string.loading, false)
+				.exec(accountID);
+		return true;
+	}
+
+	@Override
+	protected List<StatusDisplayItem> buildDisplayItems(Notification n){
+		if(n.type==Notification.Type.MENTION || n.type==Notification.Type.STATUS){
+			return StatusDisplayItem.buildItems(this, n.status, accountID, n, knownAccounts, StatusDisplayItem.FLAG_MEDIA_FORCE_HIDDEN);
+		}
+		return super.buildDisplayItems(n);
+	}
+
+	@Override
+	protected boolean wantsToolbarMenuIconsTinted(){
+		return false;
+	}
+
+	private void tintMenuIcon(MenuItem item, int color){
+		int tintColor=UiUtils.getThemeColor(getActivity(), color);
+		if(Build.VERSION.SDK_INT<Build.VERSION_CODES.O){
+			Drawable icon=item.getIcon();
+			if(icon!=null && icon.getColorFilter()==null){
+				icon=icon.mutate();
+				icon.setTintList(ColorStateList.valueOf(tintColor));
+				item.setIcon(icon);
+			}
+		}else{
+			item.setIconTintList(ColorStateList.valueOf(tintColor));
+		}
+	}
+}

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

@@ -10,7 +10,6 @@ import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.accounts.GetAccountStatuses;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.events.RemoveAccountPostsEvent;
-import org.joinmastodon.android.events.StatusCreatedEvent;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.FilterContext;
 import org.joinmastodon.android.model.Status;
@@ -58,7 +57,7 @@ public class AccountTimelineFragment extends StatusListFragment{
 
 	@Override
 	protected void doLoadData(int offset, int count){
-		currentRequest=new GetAccountStatuses(user.id, offset>0 ? getMaxID() : null, null, count, filter)
+		currentRequest=new GetAccountStatuses(user.id, offset>0 ? getMaxID() : null, null, count, filter, null)
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(List<Status> result){
@@ -141,11 +140,6 @@ public class AccountTimelineFragment extends StatusListFragment{
 		return mergeAdapter;
 	}
 
-	@Override
-	protected int getMainAdapterOffset(){
-		return super.getMainAdapterOffset()+1;
-	}
-
 	private FilterChipView getViewForFilter(GetAccountStatuses.Filter filter){
 		return switch(filter){
 			case DEFAULT -> defaultFilter;

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

@@ -0,0 +1,120 @@
+package org.joinmastodon.android.fragments;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.model.Notification;
+import org.joinmastodon.android.model.Status;
+import org.joinmastodon.android.ui.displayitems.NotificationHeaderStatusDisplayItem;
+import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
+import org.joinmastodon.android.ui.utils.InsetStatusItemDecoration;
+import org.parceler.Parcels;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import androidx.recyclerview.widget.RecyclerView;
+import me.grishka.appkit.Nav;
+
+public abstract class BaseNotificationsListFragment extends BaseStatusListFragment<Notification>{
+	protected String maxID;
+	protected View endMark;
+
+	@Override
+	protected List<StatusDisplayItem> buildDisplayItems(Notification n){
+		NotificationHeaderStatusDisplayItem titleItem;
+		if(n.type==Notification.Type.MENTION || n.type==Notification.Type.STATUS){
+			titleItem=null;
+		}else{
+			titleItem=new NotificationHeaderStatusDisplayItem(n.id, this, n, accountID);
+			if(n.status!=null){
+				n.status.card=null;
+				n.status.spoilerText=null;
+			}
+		}
+		if(n.status!=null){
+			int flags=titleItem==null ? 0 : (StatusDisplayItem.FLAG_NO_FOOTER | StatusDisplayItem.FLAG_INSET | StatusDisplayItem.FLAG_NO_HEADER);
+			ArrayList<StatusDisplayItem> items=StatusDisplayItem.buildItems(this, n.status, accountID, n, knownAccounts, flags);
+			if(titleItem!=null)
+				items.add(0, titleItem);
+			return items;
+		}else if(titleItem!=null){
+			return Collections.singletonList(titleItem);
+		}else{
+			return Collections.emptyList();
+		}
+	}
+
+	@Override
+	protected void addAccountToKnown(Notification s){
+		if(!knownAccounts.containsKey(s.account.id))
+			knownAccounts.put(s.account.id, s.account);
+		if(s.status!=null && !knownAccounts.containsKey(s.status.account.id))
+			knownAccounts.put(s.status.account.id, s.status.account);
+	}
+
+	@Override
+	public void onItemClick(String id){
+		Notification n=getNotificationByID(id);
+		if(n.status!=null){
+			Status status=n.status;
+			Bundle args=new Bundle();
+			args.putString("account", accountID);
+			args.putParcelable("status", Parcels.wrap(status.clone()));
+			if(status.inReplyToAccountId!=null && knownAccounts.containsKey(status.inReplyToAccountId))
+				args.putParcelable("inReplyToAccount", Parcels.wrap(knownAccounts.get(status.inReplyToAccountId)));
+			Nav.go(getActivity(), ThreadFragment.class, args);
+		}else{
+			Bundle args=new Bundle();
+			args.putString("account", accountID);
+			args.putParcelable("profileAccount", Parcels.wrap(n.account));
+			Nav.go(getActivity(), ProfileFragment.class, args);
+		}
+	}
+
+	private Notification getNotificationByID(String id){
+		for(Notification n : data){
+			if(n.id.equals(id))
+				return n;
+		}
+		return null;
+	}
+
+	protected void removeNotification(Notification n){
+		data.remove(n);
+		preloadedData.remove(n);
+		int index=-1;
+		for(int i=0; i<displayItems.size(); i++){
+			if(n.id.equals(displayItems.get(i).parentID)){
+				index=i;
+				break;
+			}
+		}
+		if(index==-1)
+			return;
+		int lastIndex;
+		for(lastIndex=index; lastIndex<displayItems.size(); lastIndex++){
+			if(!displayItems.get(lastIndex).parentID.equals(n.id))
+				break;
+		}
+		displayItems.subList(index, lastIndex).clear();
+		adapter.notifyItemRangeRemoved(index, lastIndex-index);
+	}
+
+	@Override
+	protected View onCreateFooterView(LayoutInflater inflater){
+		View v=inflater.inflate(R.layout.load_more_with_end_mark, null);
+		endMark=v.findViewById(R.id.end_mark);
+		endMark.setVisibility(View.GONE);
+		return v;
+	}
+
+	@Override
+	public void onViewCreated(View view, Bundle savedInstanceState){
+		super.onViewCreated(view, savedInstanceState);
+		list.addItemDecoration(new InsetStatusItemDecoration(this));
+	}
+}

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

@@ -14,10 +14,12 @@ import android.view.WindowInsets;
 import android.widget.Toolbar;
 
 import org.joinmastodon.android.E;
+import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.accounts.GetAccountRelationships;
 import org.joinmastodon.android.api.requests.polls.SubmitPollVote;
 import org.joinmastodon.android.api.requests.statuses.TranslateStatus;
+import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.events.PollUpdatedEvent;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.DisplayItemsParent;
@@ -27,8 +29,9 @@ import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.model.Translation;
 import org.joinmastodon.android.ui.BetterItemAnimator;
 import org.joinmastodon.android.ui.M3AlertDialogBuilder;
+import org.joinmastodon.android.ui.sheets.NonMutualPreReplySheet;
+import org.joinmastodon.android.ui.sheets.OldPostPreReplySheet;
 import org.joinmastodon.android.ui.displayitems.AccountStatusDisplayItem;
-import org.joinmastodon.android.ui.displayitems.ExtendedFooterStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.GapStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.HashtagStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.MediaGridStatusDisplayItem;
@@ -43,6 +46,8 @@ import org.joinmastodon.android.ui.utils.MediaAttachmentViewController;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.utils.TypedObjectPool;
 
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -106,6 +111,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		for(T s:items){
 			displayItems.addAll(buildDisplayItems(s));
 		}
+		loadRelationships(items.stream().map(DisplayItemsParent::getAccountID).filter(Objects::nonNull).collect(Collectors.toSet()));
 	}
 
 	@Override
@@ -127,6 +133,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		}
 		if(notify)
 			adapter.notifyItemRangeInserted(0, offset);
+		loadRelationships(items.stream().map(DisplayItemsParent::getAccountID).filter(Objects::nonNull).collect(Collectors.toSet()));
 	}
 
 	protected String getMaxID(){
@@ -174,7 +181,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 	@Override
 	public void openPhotoViewer(String parentID, Status _status, int attachmentIndex, MediaGridStatusDisplayItem.Holder gridHolder){
 		final Status status=_status.getContentStatus();
-		currentPhotoViewer=new PhotoViewer(getActivity(), status.mediaAttachments, attachmentIndex, new PhotoViewer.Listener(){
+		currentPhotoViewer=new PhotoViewer(getActivity(), status.mediaAttachments, attachmentIndex, status, accountID, new PhotoViewer.Listener(){
 			private MediaAttachmentViewController transitioningHolder;
 
 			@Override
@@ -240,6 +247,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 			@Override
 			public void photoViewerDismissed(){
 				currentPhotoViewer=null;
+				gridHolder.itemView.setHasTransientState(false);
 			}
 
 			@Override
@@ -251,6 +259,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 				return gridHolder.getViewController(index);
 			}
 		});
+		gridHolder.itemView.setHasTransientState(true);
 	}
 
 	@Override
@@ -316,7 +325,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		toolbar.setNavigationContentDescription(R.string.back);
 	}
 
-	protected int getMainAdapterOffset(){
+	public int getMainAdapterOffset(){
 		if(list.getAdapter() instanceof MergeRecyclerAdapter mergeAdapter){
 			return mergeAdapter.getPositionForAdapter(adapter);
 		}
@@ -357,7 +366,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		List<StatusDisplayItem> pollItems=displayItems.subList(firstOptionIndex, footerIndex+1);
 		int prevSize=pollItems.size();
 		pollItems.clear();
-		StatusDisplayItem.buildPollItems(itemID, this, poll, pollItems);
+		StatusDisplayItem.buildPollItems(itemID, this, poll, status, pollItems);
 		if(prevSize!=pollItems.size()){
 			adapter.notifyItemRangeRemoved(firstOptionIndex, prevSize);
 			adapter.notifyItemRangeInserted(firstOptionIndex, pollItems.size());
@@ -455,6 +464,9 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 	}
 
 	protected void loadRelationships(Set<String> ids){
+		if(ids.isEmpty())
+			return;
+		ids=ids.stream().filter(id->!relationships.containsKey(id)).collect(Collectors.toSet());
 		if(ids.isEmpty())
 			return;
 		// TODO somehow manage these and cancel outstanding requests on refresh
@@ -586,11 +598,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 										return;
 									status.translation=result;
 									status.translationState=Status.TranslationState.SHOWN;
-									TextStatusDisplayItem.Holder text=findHolderOfType(itemID, TextStatusDisplayItem.Holder.class);
-									if(text!=null){
-										text.updateTranslation(true);
-										imgLoader.bindViewHolder((ImageLoaderRecyclerAdapter) list.getAdapter(), text, text.getAbsoluteAdapterPosition());
-									}
+									updateTranslation(itemID);
 								}
 
 								@Override
@@ -598,10 +606,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 									if(getActivity()==null)
 										return;
 									status.translationState=Status.TranslationState.HIDDEN;
-									TextStatusDisplayItem.Holder text=findHolderOfType(itemID, TextStatusDisplayItem.Holder.class);
-									if(text!=null){
-										text.updateTranslation(true);
-									}
+									updateTranslation(itemID);
 									new M3AlertDialogBuilder(getActivity())
 											.setTitle(R.string.error)
 											.setMessage(R.string.translation_failed)
@@ -613,11 +618,31 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 				}
 			}
 		}
+		updateTranslation(itemID);
+	}
+
+	private void updateTranslation(String itemID) {
 		TextStatusDisplayItem.Holder text=findHolderOfType(itemID, TextStatusDisplayItem.Holder.class);
 		if(text!=null){
 			text.updateTranslation(true);
 			imgLoader.bindViewHolder((ImageLoaderRecyclerAdapter) list.getAdapter(), text, text.getAbsoluteAdapterPosition());
 		}
+
+		SpoilerStatusDisplayItem.Holder spoiler=findHolderOfType(itemID, SpoilerStatusDisplayItem.Holder.class);
+		if(spoiler!=null){
+			spoiler.rebind();
+		}
+
+		MediaGridStatusDisplayItem.Holder media=findHolderOfType(itemID, MediaGridStatusDisplayItem.Holder.class);
+		if (media!=null) {
+			media.rebind();
+		}
+
+		for(int i=0;i<list.getChildCount();i++){
+			if(list.getChildViewHolder(list.getChildAt(i)) instanceof PollOptionStatusDisplayItem.Holder item){
+				item.rebind();
+			}
+		}
 	}
 
 	public void rebuildAllDisplayItems(){
@@ -628,6 +653,26 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		adapter.notifyDataSetChanged();
 	}
 
+	public void maybeShowPreReplySheet(Status status, Runnable proceed){
+		Relationship rel=getRelationship(status.account.id);
+		if(!GlobalUserPreferences.isOptedOutOfPreReplySheet(GlobalUserPreferences.PreReplySheetType.NON_MUTUAL, status.account, accountID) &&
+				!status.account.id.equals(AccountSessionManager.get(accountID).self.id) && rel!=null && !rel.followedBy && status.account.followingCount>=1){
+			new NonMutualPreReplySheet(getActivity(), notAgain->{
+				GlobalUserPreferences.optOutOfPreReplySheet(GlobalUserPreferences.PreReplySheetType.NON_MUTUAL, notAgain ? null : status.account, accountID);
+				proceed.run();
+			}, status.account, accountID).show();
+		}else if(!GlobalUserPreferences.isOptedOutOfPreReplySheet(GlobalUserPreferences.PreReplySheetType.OLD_POST, null, null) &&
+				status.createdAt.isBefore(Instant.now().minus(90, ChronoUnit.DAYS))){
+			new OldPostPreReplySheet(getActivity(), notAgain->{
+				if(notAgain)
+					GlobalUserPreferences.optOutOfPreReplySheet(GlobalUserPreferences.PreReplySheetType.OLD_POST, null, null);
+				proceed.run();
+			}, status).show();
+		}else{
+			proceed.run();
+		}
+	}
+
 	protected void onModifyItemViewHolder(BindableViewHolder<StatusDisplayItem> holder){}
 
 	protected class DisplayItemsAdapter extends UsableRecyclerView.Adapter<BindableViewHolder<StatusDisplayItem>> implements ImageLoaderRecyclerAdapter{
@@ -700,7 +745,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 				// Do not draw dividers between hashtag and/or account rows
 				if((ih instanceof HashtagStatusDisplayItem.Holder || ih instanceof AccountStatusDisplayItem.Holder) && (sh instanceof HashtagStatusDisplayItem.Holder || sh instanceof AccountStatusDisplayItem.Holder))
 					return false;
-				return (!ih.getItemID().equals(sh.getItemID()) || sh instanceof ExtendedFooterStatusDisplayItem.Holder) && ih.getItem().getType()!=StatusDisplayItem.Type.GAP;
+				return !ih.getItemID().equals(sh.getItemID()) && ih.getItem().getType()!=StatusDisplayItem.Type.GAP;
 			}
 			return false;
 		}

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

@@ -1,7 +1,11 @@
 package org.joinmastodon.android.fragments;
 
+import android.animation.Animator;
+import android.animation.AnimatorSet;
+import android.animation.ObjectAnimator;
 import android.annotation.SuppressLint;
 import android.app.Activity;
+import android.app.AlertDialog;
 import android.content.ClipData;
 import android.content.Intent;
 import android.content.res.Configuration;
@@ -19,6 +23,10 @@ import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.text.style.BackgroundColorSpan;
 import android.text.style.ForegroundColorSpan;
+import android.transition.ChangeBounds;
+import android.transition.Fade;
+import android.transition.TransitionManager;
+import android.transition.TransitionSet;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -28,15 +36,14 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewOutlineProvider;
 import android.view.WindowManager;
+import android.view.accessibility.AccessibilityNodeInfo;
 import android.view.inputmethod.InputConnection;
 import android.view.inputmethod.InputMethodManager;
-import android.widget.Button;
 import android.widget.EditText;
 import android.widget.FrameLayout;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
-import android.widget.PopupMenu;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
@@ -62,7 +69,9 @@ import org.joinmastodon.android.model.Mention;
 import org.joinmastodon.android.model.Preferences;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.model.StatusPrivacy;
+import org.joinmastodon.android.model.viewmodel.ListItem;
 import org.joinmastodon.android.ui.CustomEmojiPopupKeyboard;
+import org.joinmastodon.android.ui.ExtendedPopupMenu;
 import org.joinmastodon.android.ui.M3AlertDialogBuilder;
 import org.joinmastodon.android.ui.OutlineProviders;
 import org.joinmastodon.android.ui.PopupKeyboard;
@@ -83,19 +92,23 @@ import org.parceler.Parcels;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
+import java.util.function.Consumer;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
+import androidx.annotation.NonNull;
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
+import me.grishka.appkit.fragments.CustomTransitionsFragment;
 import me.grishka.appkit.fragments.OnBackPressedListener;
 import me.grishka.appkit.imageloader.ViewImageLoader;
 import me.grishka.appkit.imageloader.requests.UrlImageLoaderRequest;
+import me.grishka.appkit.utils.CubicBezierInterpolator;
 import me.grishka.appkit.utils.V;
 
-public class ComposeFragment extends MastodonToolbarFragment implements OnBackPressedListener, ComposeEditText.SelectionListener{
+public class ComposeFragment extends MastodonToolbarFragment implements OnBackPressedListener, ComposeEditText.SelectionListener, CustomTransitionsFragment{
 
 	private static final int MEDIA_RESULT=717;
 	public static final int IMAGE_DESCRIPTION_RESULT=363;
@@ -125,7 +138,8 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 
 	private ImageButton mediaBtn, pollBtn, emojiBtn, spoilerBtn, languageBtn;
 	private TextView replyText;
-	private Button visibilityBtn;
+	private LinearLayout visibilityBtn;
+	private TextView visibilityText1, visibilityText2, visibilityCurrentText;
 	private LinearLayout bottomBar;
 	private View autocompleteDivider;
 
@@ -265,6 +279,9 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		emojiBtn=view.findViewById(R.id.btn_emoji);
 		spoilerBtn=view.findViewById(R.id.btn_spoiler);
 		visibilityBtn=view.findViewById(R.id.btn_visibility);
+		visibilityText1=view.findViewById(R.id.visibility_text1);
+		visibilityText2=view.findViewById(R.id.visibility_text2);
+		visibilityCurrentText=visibilityText1;
 		languageBtn=view.findViewById(R.id.btn_language);
 		replyText=view.findViewById(R.id.reply_text);
 
@@ -274,9 +291,15 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		spoilerBtn.setOnClickListener(v->toggleSpoiler());
 		languageBtn.setOnClickListener(v->showLanguageAlert());
 		visibilityBtn.setOnClickListener(this::onVisibilityClick);
+		visibilityBtn.setAccessibilityDelegate(new View.AccessibilityDelegate(){
+			@Override
+			public void onInitializeAccessibilityNodeInfo(@NonNull View host, @NonNull AccessibilityNodeInfo info){
+				super.onInitializeAccessibilityNodeInfo(host, info);
+				info.setClassName("android.widget.Spinner");
+			}
+		});
 		Drawable arrow=getResources().getDrawable(R.drawable.ic_baseline_arrow_drop_down_18, getActivity().getTheme()).mutate();
 		arrow.setTint(UiUtils.getThemeColor(getActivity(), R.attr.colorM3OnSurface));
-		visibilityBtn.setCompoundDrawablesRelativeWithIntrinsicBounds(null, null, arrow, null);
 		emojiKeyboard.setOnIconChangedListener(new PopupKeyboard.OnIconChangeListener(){
 			@Override
 			public void onIconChanged(int icon){
@@ -317,7 +340,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		if(editingStatus!=null && editingStatus.visibility!=null) {
 			statusVisibility=editingStatus.visibility;
 		}
-		updateVisibilityIcon();
+		updateVisibilityIcon(false);
 
 		autocompleteViewController=new ComposeAutocompleteViewController(getActivity(), accountID);
 		autocompleteViewController.setCompletionSelectedListener(new ComposeAutocompleteViewController.AutocompleteListener(){
@@ -903,22 +926,20 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 	}
 
 	private void onVisibilityClick(View v){
-		PopupMenu menu=new PopupMenu(getActivity(), v);
-		menu.inflate(R.menu.compose_visibility);
-		menu.setOnMenuItemClickListener(item->{
-			int id=item.getItemId();
-			if(id==R.id.vis_public){
-				statusVisibility=StatusPrivacy.PUBLIC;
-			}else if(id==R.id.vis_followers){
-				statusVisibility=StatusPrivacy.PRIVATE;
-			}else if(id==R.id.vis_private){
-				statusVisibility=StatusPrivacy.DIRECT;
+		ArrayList<ListItem<StatusPrivacy>> items=new ArrayList<>();
+		ExtendedPopupMenu menu=new ExtendedPopupMenu(getActivity(), items);
+		Consumer<ListItem<StatusPrivacy>> onClick=i->{
+			if(statusVisibility!=i.parentObject){
+				statusVisibility=i.parentObject;
+				updateVisibilityIcon(true);
 			}
-			item.setChecked(true);
-			updateVisibilityIcon();
-			return true;
-		});
-		menu.show();
+			menu.dismiss();
+		};
+		items.add(new ListItem<>(R.string.visibility_public, R.string.visibility_subtitle_public, R.drawable.ic_public_24px, StatusPrivacy.PUBLIC, onClick));
+		items.add(new ListItem<>(R.string.visibility_unlisted, R.string.visibility_subtitle_unlisted, R.drawable.ic_clear_night_24px, StatusPrivacy.UNLISTED, onClick));
+		items.add(new ListItem<>(R.string.visibility_followers_only, R.string.visibility_subtitle_followers, R.drawable.ic_lock_24px, StatusPrivacy.PRIVATE, onClick));
+		items.add(new ListItem<>(R.string.visibility_private, R.string.visibility_subtitle_private, R.drawable.ic_alternate_email_24px, StatusPrivacy.DIRECT, onClick));
+		menu.showAsDropDown(v);
 	}
 
 	private void loadDefaultStatusVisibility(Bundle savedInstanceState){
@@ -944,12 +965,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 	private void applyPreferencesForPostVisibility(Preferences prefs, Bundle savedInstanceState){
 		// Only override the reply visibility if our preference is more private
 		if(prefs.postingDefaultVisibility.isLessVisibleThan(statusVisibility)){
-			// Map unlisted from the API onto public, because we don't have unlisted in the UI
-			statusVisibility=switch(prefs.postingDefaultVisibility){
-				case PUBLIC, UNLISTED -> StatusPrivacy.PUBLIC;
-				case PRIVATE -> StatusPrivacy.PRIVATE;
-				case DIRECT -> StatusPrivacy.DIRECT;
-			};
+			statusVisibility=prefs.postingDefaultVisibility;
 		}
 
 		// A saved privacy setting from a previous compose session wins over all
@@ -957,28 +973,45 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			statusVisibility=(StatusPrivacy) savedInstanceState.getSerializable("visibility");
 		}
 
-		updateVisibilityIcon();
+		updateVisibilityIcon(false);
 	}
 
-	private void updateVisibilityIcon(){
+	private void updateVisibilityIcon(boolean animated){
 		if(getActivity()==null)
 			return;
 		if(statusVisibility==null){ // TODO find out why this happens
 			statusVisibility=StatusPrivacy.PUBLIC;
 		}
-		visibilityBtn.setText(switch(statusVisibility){
-			case PUBLIC, UNLISTED -> R.string.visibility_public;
+		TextView visibilityText;
+		if(!animated){
+			visibilityText=visibilityCurrentText;
+		}else{
+			TransitionManager.beginDelayedTransition(visibilityBtn, new TransitionSet()
+					.addTransition(new Fade(Fade.IN | Fade.OUT))
+					.addTransition(new ChangeBounds().excludeTarget(TextView.class, true))
+					.setDuration(250)
+					.setInterpolator(CubicBezierInterpolator.DEFAULT)
+			);
+			visibilityText=visibilityCurrentText==visibilityText1 ? visibilityText2 : visibilityText1;
+			visibilityText.setVisibility(View.VISIBLE);
+			visibilityCurrentText.setVisibility(View.GONE);
+			visibilityCurrentText=visibilityText;
+		}
+		visibilityText.setText(switch(statusVisibility){
+			case PUBLIC -> R.string.visibility_public;
+			case UNLISTED -> R.string.visibility_unlisted;
 			case PRIVATE -> R.string.visibility_followers_only;
 			case DIRECT -> R.string.visibility_private;
 		});
 		Drawable icon=getResources().getDrawable(switch(statusVisibility){
-			case PUBLIC, UNLISTED -> R.drawable.ic_public_20px;
+			case PUBLIC -> R.drawable.ic_public_20px;
+			case UNLISTED -> R.drawable.ic_clear_night_20px;
 			case PRIVATE -> R.drawable.ic_group_20px;
 			case DIRECT -> R.drawable.ic_alternate_email_20px;
 		}, getActivity().getTheme()).mutate();
 		icon.setBounds(0, 0, V.dp(18), V.dp(18));
 		icon.setTint(UiUtils.getThemeColor(getActivity(), R.attr.colorM3Primary));
-		visibilityBtn.setCompoundDrawablesRelative(icon, null, visibilityBtn.getCompoundDrawablesRelative()[2], null);
+		visibilityText.setCompoundDrawablesRelative(icon, null, null, null);
 	}
 
 	@Override
@@ -1012,8 +1045,26 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		return new String[]{"image/jpeg", "image/gif", "image/png", "video/mp4"};
 	}
 
+	private String sanitizeMediaDescription(String description){
+		if(description == null){
+			return null;
+		}
+
+		// The Gboard android keyboard attaches this text whenever the user
+		// pastes something from the keyboard's suggestion bar.
+		// Due to different end user locales, the exact text may vary, but at
+		// least in version 13.4.08, all of the translations contained the
+		// string "Gboard".
+		if (description.contains("Gboard")){
+			return null;
+		}
+
+		return description;
+	}
+
 	@Override
 	public boolean onAddMediaAttachmentFromEditText(Uri uri, String description){
+		description = sanitizeMediaDescription(description);
 		return mediaViewController.addMediaAttachment(uri, description);
 	}
 
@@ -1054,6 +1105,8 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		Editable e=mainEditText.getText();
 		int start=e.getSpanStart(currentAutocompleteSpan);
 		int end=e.getSpanEnd(currentAutocompleteSpan);
+		if(start==-1 || end==-1)
+			return;
 		e.replace(start, end, text+" ");
 		finishAutocomplete();
 		InputConnection conn=mainEditText.getCurrentInputConnection();
@@ -1095,15 +1148,49 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 	private void showLanguageAlert(){
 		Preferences prefs=AccountSessionManager.getInstance().getAccount(accountID).preferences;
 		ComposeLanguageAlertViewController vc=new ComposeLanguageAlertViewController(getActivity(), prefs!=null ? prefs.postingDefaultLanguage : null, postLang, mainEditText.getText().toString());
-		new M3AlertDialogBuilder(getActivity())
+		final AlertDialog dlg=new M3AlertDialogBuilder(getActivity())
 				.setTitle(R.string.language)
 				.setView(vc.getView())
-				.setPositiveButton(R.string.ok, (dialog, which)->setPostLanguage(vc.getSelectedOption()))
-				.setNegativeButton(R.string.cancel, null)
+				.setPositiveButton(R.string.cancel, null)
 				.show();
+		vc.setSelectionListener(opt->{
+			setPostLanguage(opt);
+			dlg.dismiss();
+		});
 	}
 
 	private void setPostLanguage(ComposeLanguageAlertViewController.SelectedOption language){
 		postLang=language;
 	}
+
+	@Override
+	public Animator onCreateEnterTransition(View prev, View container){
+		AnimatorSet anim=new AnimatorSet();
+		if(getArguments().getBoolean("fromThreadFragment")){
+			anim.playTogether(
+					ObjectAnimator.ofFloat(container, View.ALPHA, 0f, 1f),
+					ObjectAnimator.ofFloat(container, View.TRANSLATION_Y, V.dp(200), 0)
+			);
+		}else{
+			anim.playTogether(
+					ObjectAnimator.ofFloat(container, View.ALPHA, 0f, 1f),
+					ObjectAnimator.ofFloat(container, View.TRANSLATION_X, V.dp(100), 0)
+			);
+		}
+		anim.setDuration(300);
+		anim.setInterpolator(CubicBezierInterpolator.DEFAULT);
+		return anim;
+	}
+
+	@Override
+	public Animator onCreateExitTransition(View prev, View container){
+		AnimatorSet anim=new AnimatorSet();
+		anim.playTogether(
+				ObjectAnimator.ofFloat(container, View.TRANSLATION_X, V.dp(100)),
+				ObjectAnimator.ofFloat(container, View.ALPHA, 0)
+		);
+		anim.setDuration(200);
+		anim.setInterpolator(CubicBezierInterpolator.DEFAULT);
+		return anim;
+	}
 }

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

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

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

@@ -10,7 +10,6 @@ import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Hashtag;
 import org.joinmastodon.android.ui.displayitems.HashtagStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
-import org.joinmastodon.android.ui.utils.UiUtils;
 import org.parceler.Parcels;
 
 import java.util.Collections;
@@ -19,6 +18,7 @@ import java.util.Objects;
 import java.util.stream.Collectors;
 
 import androidx.recyclerview.widget.RecyclerView;
+import me.grishka.appkit.Nav;
 
 public class FeaturedHashtagsListFragment extends BaseStatusListFragment<Hashtag>{
 	private Account account;
@@ -45,7 +45,11 @@ public class FeaturedHashtagsListFragment extends BaseStatusListFragment<Hashtag
 
 	@Override
 	public void onItemClick(String id){
-		UiUtils.openHashtagTimeline(getActivity(), accountID, Objects.requireNonNull(findItemOfType(id, HashtagStatusDisplayItem.class)).tag);
+		Bundle args=new Bundle();
+		args.putParcelable("targetAccount", Parcels.wrap(account));
+		args.putParcelable("hashtag", Parcels.wrap(Objects.requireNonNull(findItemOfType(id, HashtagStatusDisplayItem.class)).tag));
+		args.putString("account", accountID);
+		Nav.go(getActivity(), HashtagFeaturedTimelineFragment.class, args);
 	}
 
 	@Override

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

@@ -0,0 +1,47 @@
+package org.joinmastodon.android.fragments;
+
+import android.os.Bundle;
+
+import org.joinmastodon.android.api.requests.accounts.GetAccountStatuses;
+import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.model.FilterContext;
+import org.joinmastodon.android.model.Hashtag;
+import org.joinmastodon.android.model.Status;
+import org.parceler.Parcels;
+
+import java.util.List;
+
+import me.grishka.appkit.api.SimpleCallback;
+
+// The difference between this and HashtagTimelineFragment is that this opens from the featured hashtags
+// and only shows posts by that account.
+public class HashtagFeaturedTimelineFragment extends StatusListFragment{
+	private Account targetAccount;
+	private Hashtag hashtag;
+
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		targetAccount=Parcels.unwrap(getArguments().getParcelable("targetAccount"));
+		hashtag=Parcels.unwrap(getArguments().getParcelable("hashtag"));
+		setTitle("#"+hashtag.name);
+		loadData();
+	}
+
+	@Override
+	protected void doLoadData(int offset, int count){
+		currentRequest=new GetAccountStatuses(targetAccount.id, offset>0 ? getMaxID() : null, null, count, GetAccountStatuses.Filter.DEFAULT, hashtag.name)
+				.setCallback(new SimpleCallback<>(this){
+					@Override
+					public void onSuccess(List<Status> result){
+						if(getActivity()==null)
+							return;
+						boolean empty=result.isEmpty();
+						AccountSessionManager.get(accountID).filterStatuses(result, FilterContext.ACCOUNT);
+						onDataLoaded(result, !empty);
+					}
+				})
+				.exec(accountID);
+	}
+}

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

@@ -34,7 +34,6 @@ 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.MergeRecyclerAdapter;
 import me.grishka.appkit.utils.SingleViewRecyclerAdapter;
 import me.grishka.appkit.utils.V;
@@ -155,7 +154,7 @@ public class HashtagTimelineFragment extends StatusListFragment{
 	}
 
 	@Override
-	protected int getMainAdapterOffset(){
+	public int getMainAdapterOffset(){
 		return 1;
 	}
 

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

@@ -30,7 +30,7 @@ import org.joinmastodon.android.fragments.onboarding.OnboardingFollowSuggestions
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Notification;
 import org.joinmastodon.android.model.PaginatedResponse;
-import org.joinmastodon.android.ui.AccountSwitcherSheet;
+import org.joinmastodon.android.ui.sheets.AccountSwitcherSheet;
 import org.joinmastodon.android.ui.OutlineProviders;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.ui.views.TabBar;
@@ -112,7 +112,7 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 		content.setOrientation(LinearLayout.VERTICAL);
 
 		FrameLayout fragmentContainer=new FrameLayout(getActivity());
-		fragmentContainer.setId(R.id.fragment_wrap);
+		fragmentContainer.setId(me.grishka.appkit.R.id.fragment_wrap);
 		content.addView(fragmentContainer, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 0, 1f));
 
 		inflater.inflate(R.layout.tab_bar, content);
@@ -131,10 +131,10 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 
 		if(savedInstanceState==null){
 			getChildFragmentManager().beginTransaction()
-					.add(R.id.fragment_wrap, homeTimelineFragment)
-					.add(R.id.fragment_wrap, searchFragment).hide(searchFragment)
-					.add(R.id.fragment_wrap, notificationsFragment).hide(notificationsFragment)
-					.add(R.id.fragment_wrap, profileFragment).hide(profileFragment)
+					.add(me.grishka.appkit.R.id.fragment_wrap, homeTimelineFragment)
+					.add(me.grishka.appkit.R.id.fragment_wrap, searchFragment).hide(searchFragment)
+					.add(me.grishka.appkit.R.id.fragment_wrap, notificationsFragment).hide(notificationsFragment)
+					.add(me.grishka.appkit.R.id.fragment_wrap, profileFragment).hide(profileFragment)
 					.commit();
 
 			String defaultTab=getArguments().getString("tab");

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

@@ -43,6 +43,7 @@ import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.model.TimelineMarkers;
 import org.joinmastodon.android.ui.displayitems.GapStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
+import org.joinmastodon.android.ui.utils.DiscoverInfoBannerHelper;
 import org.joinmastodon.android.ui.viewcontrollers.HomeTimelineMenuController;
 import org.joinmastodon.android.ui.viewcontrollers.ToolbarDropdownMenuController;
 import org.joinmastodon.android.ui.views.FixedAspectRatioImageView;
@@ -61,6 +62,7 @@ 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.MergeRecyclerAdapter;
 import me.grishka.appkit.utils.V;
 
 public class HomeTimelineFragment extends StatusListFragment implements ToolbarDropdownMenuController.HostFragment{
@@ -77,6 +79,8 @@ public class HomeTimelineFragment extends StatusListFragment implements ToolbarD
 	private List<FollowList> lists=List.of();
 	private ListMode listMode=ListMode.FOLLOWING;
 	private FollowList currentList;
+	private MergeRecyclerAdapter mergeAdapter;
+	private DiscoverInfoBannerHelper localTimelineBannerHelper;
 
 	private String maxID;
 	private String lastSavedMarkerID;
@@ -85,6 +89,12 @@ public class HomeTimelineFragment extends StatusListFragment implements ToolbarD
 		setListLayoutId(R.layout.fragment_timeline);
 	}
 
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		localTimelineBannerHelper=new DiscoverInfoBannerHelper(DiscoverInfoBannerHelper.BannerType.LOCAL_TIMELINE, accountID);
+	}
+
 	@Override
 	public void onAttach(Activity activity){
 		super.onAttach(activity);
@@ -167,6 +177,8 @@ public class HomeTimelineFragment extends StatusListFragment implements ToolbarD
 							public void onSuccess(List<Status> result){
 								if(refreshing)
 									list.scrollToPosition(0);
+								maxID=result.isEmpty() ? null : result.get(result.size()-1).id;
+								AccountSessionManager.get(accountID).filterStatuses(result, FilterContext.PUBLIC);
 								onDataLoaded(result, !result.isEmpty());
 							}
 						})
@@ -179,6 +191,8 @@ public class HomeTimelineFragment extends StatusListFragment implements ToolbarD
 							public void onSuccess(List<Status> result){
 								if(refreshing)
 									list.scrollToPosition(0);
+								maxID=result.isEmpty() ? null : result.get(result.size()-1).id;
+								AccountSessionManager.get(accountID).filterStatuses(result, FilterContext.HOME);
 								onDataLoaded(result, !result.isEmpty());
 							}
 						})
@@ -619,6 +633,26 @@ public class HomeTimelineFragment extends StatusListFragment implements ToolbarD
 		invalidateOptionsMenu();
 	}
 
+	@Override
+	protected RecyclerView.Adapter getAdapter(){
+		mergeAdapter=new MergeRecyclerAdapter();
+		mergeAdapter.addAdapter(super.getAdapter());
+		return mergeAdapter;
+	}
+
+	@Override
+	protected void onDataLoaded(List<Status> d, boolean more){
+		if(refreshing){
+			if(listMode==ListMode.LOCAL){
+				localTimelineBannerHelper.maybeAddBanner(list, mergeAdapter);
+				localTimelineBannerHelper.onBannerBecameVisible();
+			}else{
+				localTimelineBannerHelper.removeBanner(mergeAdapter);
+			}
+		}
+		super.onDataLoaded(d, more);
+	}
+
 	private String getCurrentListTitle(){
 		return switch(listMode){
 			case FOLLOWING -> getString(R.string.timeline_following);

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

@@ -1,12 +1,17 @@
 package org.joinmastodon.android.fragments;
 
+import android.os.Build;
 import android.os.Bundle;
 import android.view.ActionMode;
+import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.WindowInsets;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.FrameLayout;
 import android.widget.ImageButton;
 
 import com.squareup.otto.Subscribe;
@@ -19,7 +24,7 @@ import org.joinmastodon.android.api.requests.lists.GetListAccounts;
 import org.joinmastodon.android.api.requests.lists.RemoveAccountsFromList;
 import org.joinmastodon.android.events.AccountAddedToListEvent;
 import org.joinmastodon.android.events.AccountRemovedFromListEvent;
-import org.joinmastodon.android.fragments.account_list.AddListMembersFragment;
+import org.joinmastodon.android.fragments.account_list.AddNewListMembersFragment;
 import org.joinmastodon.android.fragments.account_list.PaginatedAccountListFragment;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.FollowList;
@@ -33,24 +38,31 @@ import org.parceler.Parcels;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
 
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
+import me.grishka.appkit.fragments.OnBackPressedListener;
+import me.grishka.appkit.utils.CubicBezierInterpolator;
 import me.grishka.appkit.utils.V;
+import me.grishka.appkit.views.FragmentRootLinearLayout;
 
-public class ListMembersFragment extends PaginatedAccountListFragment{
-	private static final int ADD_MEMBER_RESULT=600;
-
+public class ListMembersFragment extends PaginatedAccountListFragment implements AddNewListMembersFragment.Listener, OnBackPressedListener{
 	private ImageButton fab;
 	private FollowList followList;
 	private boolean inSelectionMode;
 	private Set<String> selectedAccounts=new HashSet<>();
 	private ActionMode actionMode;
 	private MenuItem deleteItem;
+	private FrameLayout searchFragmentContainer;
+	private FrameLayout fragmentContentWrap;
+	private AddNewListMembersFragment searchFragment;
+	private FragmentRootLinearLayout rootView;
+	private WindowInsets lastInsets;
+	private HashSet<String> accountIDsInList=new HashSet<>();
+	private boolean dismissingSearchFragment;
 
 	public ListMembersFragment(){
 		setListLayoutId(R.layout.recycler_fragment_with_fab);
@@ -76,6 +88,26 @@ public class ListMembersFragment extends PaginatedAccountListFragment{
 		return new GetListAccounts(followList.id, maxID, count);
 	}
 
+	@Override
+	protected void onDataLoaded(List<AccountViewModel> d, boolean more){
+		if(refreshing)
+			accountIDsInList.clear();
+		for(AccountViewModel a:d){
+			accountIDsInList.add(a.account.id);
+		}
+		super.onDataLoaded(d, more);
+	}
+
+	@Override
+	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState){
+		View view=super.onCreateView(inflater, container, savedInstanceState);
+		FrameLayout wrapper=new FrameLayout(getActivity());
+		wrapper.addView(view);
+		rootView=(FragmentRootLinearLayout) view;
+		fragmentContentWrap=wrapper;
+		return wrapper;
+	}
+
 	@Override
 	protected void onConfigureViewHolder(AccountViewHolder holder){
 		super.onConfigureViewHolder(holder);
@@ -132,16 +164,19 @@ public class ListMembersFragment extends PaginatedAccountListFragment{
 
 	@Override
 	public void onApplyWindowInsets(WindowInsets insets){
-		super.onApplyWindowInsets(insets);
+		lastInsets=insets;
+		if(searchFragment!=null)
+			searchFragment.onApplyWindowInsets(insets);
 		UiUtils.applyBottomInsetToFAB(fab, insets);
-	}
-
-	@Override
-	public void onFragmentResult(int reqCode, boolean success, Bundle result){
-		if(reqCode==ADD_MEMBER_RESULT && success){
-			Account acc=Objects.requireNonNull(Parcels.unwrap(result.getParcelable("selectedAccount")));
-			addAccounts(List.of(acc));
+		if(Build.VERSION.SDK_INT>=29 && insets.getTappableElementInsets().bottom==0){
+			list.setPadding(0, 0, 0, insets.getSystemWindowInsetBottom());
+			emptyView.setPadding(0, 0, 0, insets.getSystemWindowInsetBottom());
+			progress.setPadding(0, 0, 0, insets.getSystemWindowInsetBottom());
+			insets=insets.inset(0, 0, 0, insets.getSystemWindowInsetBottom());
+		}else{
+			list.setPadding(0, 0, 0, 0);
 		}
+		rootView.onApplyWindowInsets(insets);
 	}
 
 	@Subscribe
@@ -160,9 +195,25 @@ public class ListMembersFragment extends PaginatedAccountListFragment{
 	}
 
 	private void onFabClick(){
+		searchFragmentContainer=new FrameLayout(getActivity());
+		searchFragmentContainer.setId(R.id.search_fragment);
+		fragmentContentWrap.addView(searchFragmentContainer);
+
 		Bundle args=new Bundle();
 		args.putString("account", accountID);
-		Nav.goForResult(getActivity(), AddListMembersFragment.class, args, ADD_MEMBER_RESULT, this);
+		args.putParcelable("list", Parcels.wrap(followList));
+		args.putBoolean("_can_go_back", true);
+		searchFragment=new AddNewListMembersFragment(this);
+		searchFragment.setArguments(args);
+		getChildFragmentManager().beginTransaction().add(R.id.search_fragment, searchFragment).commit();
+		getChildFragmentManager().executePendingTransactions();
+		if(lastInsets!=null)
+			searchFragment.onApplyWindowInsets(lastInsets);
+		searchFragmentContainer.setTranslationX(V.dp(100));
+		searchFragmentContainer.setAlpha(0f);
+		searchFragmentContainer.animate().translationX(0).alpha(1).setDuration(300).withLayer().setInterpolator(CubicBezierInterpolator.DEFAULT).withEndAction(()->{
+			rootView.setVisibility(View.GONE);
+		}).start();
 	}
 
 	private void onItemClick(AccountViewHolder holder){
@@ -198,7 +249,7 @@ public class ListMembersFragment extends PaginatedAccountListFragment{
 		if(id==R.id.remove_from_list){
 			new M3AlertDialogBuilder(getActivity())
 					.setTitle(R.string.confirm_remove_list_member)
-					.setPositiveButton(R.string.remove, (dlg, which)->removeAccounts(Set.of(holder.getItem().account.id)))
+					.setPositiveButton(R.string.remove, (dlg, which)->removeAccounts(Set.of(holder.getItem().account.id), null))
 					.setNegativeButton(R.string.cancel, null)
 					.show();
 		}
@@ -229,7 +280,7 @@ public class ListMembersFragment extends PaginatedAccountListFragment{
 			public boolean onActionItemClicked(ActionMode mode, MenuItem item){
 				new M3AlertDialogBuilder(getActivity())
 						.setTitle(R.string.confirm_remove_list_members)
-						.setPositiveButton(R.string.remove, (dlg, which)->removeAccounts(new HashSet<>(selectedAccounts)))
+						.setPositiveButton(R.string.remove, (dlg, which)->removeAccounts(new HashSet<>(selectedAccounts), null))
 						.setNegativeButton(R.string.cancel, null)
 						.show();
 				return true;
@@ -251,13 +302,16 @@ public class ListMembersFragment extends PaginatedAccountListFragment{
 		actionMode.setTitle(getResources().getQuantityString(R.plurals.x_items_selected, selectedAccounts.size(), selectedAccounts.size()));
 	}
 
-	private void removeAccounts(Set<String> ids){
+	private void removeAccounts(Set<String> ids, Runnable onDone){
 		new RemoveAccountsFromList(followList.id, ids)
 				.setCallback(new Callback<>(){
 					@Override
 					public void onSuccess(Void result){
+						if(onDone!=null)
+							onDone.run();
 						if(inSelectionMode)
 							actionMode.finish();
+						accountIDsInList.removeAll(ids);
 						removeAccountRows(ids);
 					}
 
@@ -270,12 +324,15 @@ public class ListMembersFragment extends PaginatedAccountListFragment{
 				.exec(accountID);
 	}
 
-	private void addAccounts(Collection<Account> accounts){
+	private void addAccounts(Collection<Account> accounts, Runnable onDone){
 		new AddAccountsToList(followList.id, accounts.stream().map(a->a.id).collect(Collectors.toSet()))
 				.setCallback(new Callback<>(){
 					@Override
 					public void onSuccess(Void result){
+						if(onDone!=null)
+							onDone.run();
 						for(Account acc:accounts){
+							accountIDsInList.add(acc.id);
 							data.add(new AccountViewModel(acc, accountID));
 						}
 						list.getAdapter().notifyItemRangeInserted(data.size()-accounts.size(), accounts.size());
@@ -298,4 +355,54 @@ public class ListMembersFragment extends PaginatedAccountListFragment{
 			}
 		}
 	}
+
+	@Override
+	public boolean isAccountInList(AccountViewModel account){
+		return accountIDsInList.contains(account.account.id);
+	}
+
+	@Override
+	public void addAccountToList(AccountViewModel account, Runnable onDone){
+		addAccounts(Set.of(account.account), onDone);
+	}
+
+	@Override
+	public void removeAccountAccountFromList(AccountViewModel account, Runnable onDone){
+		removeAccounts(Set.of(account.account.id), onDone);
+	}
+
+	@Override
+	public boolean onBackPressed(){
+		if(searchFragment!=null){
+			dismissSearchFragment();
+			return true;
+		}
+		return false;
+	}
+
+	private void dismissSearchFragment(){
+		if(searchFragment==null || dismissingSearchFragment)
+			return;
+		dismissingSearchFragment=true;
+		rootView.setVisibility(View.VISIBLE);
+		searchFragmentContainer.animate().translationX(V.dp(100)).alpha(0).setDuration(200).withLayer().setInterpolator(CubicBezierInterpolator.DEFAULT).withEndAction(()->{
+			getChildFragmentManager().beginTransaction().remove(searchFragment).commit();
+			getChildFragmentManager().executePendingTransactions();
+			fragmentContentWrap.removeView(searchFragmentContainer);
+			searchFragmentContainer=null;
+			searchFragment=null;
+			dismissingSearchFragment=false;
+		}).start();
+		getActivity().getSystemService(InputMethodManager.class).hideSoftInputFromWindow(contentView.getWindowToken(), 0);
+	}
+
+	@Override
+	protected void setStatusBarColor(int color){
+		rootView.setStatusBarColor(color);
+	}
+
+	@Override
+	protected void setNavigationBarColor(int color){
+		rootView.setNavigationBarColor(color);
+	}
 }

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

@@ -0,0 +1,250 @@
+package org.joinmastodon.android.fragments;
+
+import android.annotation.SuppressLint;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageButton;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.squareup.otto.Subscribe;
+
+import org.joinmastodon.android.E;
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.notifications.GetNotificationRequests;
+import org.joinmastodon.android.api.requests.notifications.RespondToNotificationRequest;
+import org.joinmastodon.android.events.NotificationRequestRespondedEvent;
+import org.joinmastodon.android.model.HeaderPaginationList;
+import org.joinmastodon.android.model.NotificationRequest;
+import org.joinmastodon.android.model.viewmodel.AccountViewModel;
+import org.joinmastodon.android.ui.BetterItemAnimator;
+import org.joinmastodon.android.ui.DividerItemDecoration;
+import org.joinmastodon.android.ui.OutlineProviders;
+import org.joinmastodon.android.ui.Snackbar;
+import org.parceler.Parcels;
+
+import java.util.HashMap;
+import java.util.Objects;
+
+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.imageloader.ImageLoaderRecyclerAdapter;
+import me.grishka.appkit.imageloader.ImageLoaderViewHolder;
+import me.grishka.appkit.imageloader.requests.ImageLoaderRequest;
+import me.grishka.appkit.utils.BindableViewHolder;
+import me.grishka.appkit.views.UsableRecyclerView;
+
+public class NotificationRequestsFragment extends MastodonRecyclerFragment<NotificationRequest>{
+	private String accountID;
+	private String maxID;
+	private HashMap<String, AccountViewModel> accountViewModels=new HashMap<>();
+	private View endMark;
+	private NotificationRequestsAdapter adapter;
+
+	public NotificationRequestsFragment(){
+		super(50);
+	}
+
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		accountID=getArguments().getString("account");
+		setTitle(R.string.filtered_notifications);
+		loadData();
+		E.register(this);
+	}
+
+	@Override
+	public void onDestroy(){
+		E.unregister(this);
+		super.onDestroy();
+	}
+
+	@Override
+	protected void doLoadData(int offset, int count){
+		if(!refreshing && endMark!=null)
+			endMark.setVisibility(View.GONE);
+		currentRequest=new GetNotificationRequests(offset==0 ? null : maxID)
+				.setCallback(new SimpleCallback<>(this){
+					@Override
+					public void onSuccess(HeaderPaginationList<NotificationRequest> result){
+						if(data.isEmpty() || refreshing)
+							accountViewModels.clear();
+						maxID=result.getNextPageMaxID();
+						for(NotificationRequest req:result){
+							accountViewModels.put(req.account.id, new AccountViewModel(req.account, accountID, false));
+						}
+						onDataLoaded(result, !TextUtils.isEmpty(maxID));
+						endMark.setVisibility(TextUtils.isEmpty(maxID) ? View.VISIBLE : View.GONE);
+					}
+				})
+				.exec(accountID);
+	}
+
+	@Override
+	protected RecyclerView.Adapter<?> getAdapter(){
+		return adapter=new NotificationRequestsAdapter();
+	}
+
+	@Override
+	public void onViewCreated(View view, Bundle savedInstanceState){
+		super.onViewCreated(view, savedInstanceState);
+		list.setItemAnimator(new BetterItemAnimator());
+		list.addItemDecoration(new DividerItemDecoration(getActivity(), R.attr.colorM3OutlineVariant, 1, 0, 0, vh->vh instanceof NotificationRequestViewHolder).setDrawBelowLastItem(true));
+	}
+
+	@Override
+	protected View onCreateFooterView(LayoutInflater inflater){
+		View v=inflater.inflate(R.layout.load_more_with_end_mark, null);
+		endMark=v.findViewById(R.id.end_mark);
+		endMark.setVisibility(View.GONE);
+		return v;
+	}
+
+	@Subscribe
+	public void onNotificationRequestResponded(NotificationRequestRespondedEvent ev){
+		if(adapter==null || !ev.accountID.equals(accountID))
+			return;
+		for(int i=0;i<data.size();i++){
+			if(data.get(i).id.equals(ev.requestID)){
+				data.remove(i);
+				adapter.notifyItemRemoved(i);
+				return;
+			}
+		}
+		for(NotificationRequest nr:preloadedData){
+			if(nr.id.equals(ev.requestID)){
+				preloadedData.remove(nr);
+				break;
+			}
+		}
+	}
+
+	private class NotificationRequestsAdapter extends UsableRecyclerView.Adapter<NotificationRequestViewHolder> implements ImageLoaderRecyclerAdapter{
+
+		public NotificationRequestsAdapter(){
+			super(imgLoader);
+		}
+
+		@NonNull
+		@Override
+		public NotificationRequestViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType){
+			return new NotificationRequestViewHolder();
+		}
+
+		@Override
+		public int getItemCount(){
+			return data.size();
+		}
+
+		@Override
+		public void onBindViewHolder(NotificationRequestViewHolder holder, int position){
+			holder.bind(data.get(position));
+			super.onBindViewHolder(holder, position);
+		}
+
+		@Override
+		public int getImageCountForItem(int position){
+			return Objects.requireNonNull(accountViewModels.get(data.get(position).account.id)).emojiHelper.getImageCount()+1;
+		}
+
+		@Override
+		public ImageLoaderRequest getImageRequest(int position, int image){
+			AccountViewModel model=Objects.requireNonNull(accountViewModels.get(data.get(position).account.id));
+			return switch(image){
+				case 0 -> model.avaRequest;
+				default -> model.emojiHelper.getImageRequest(image-1);
+			};
+		}
+	}
+
+	private class NotificationRequestViewHolder extends BindableViewHolder<NotificationRequest> implements ImageLoaderViewHolder, UsableRecyclerView.Clickable{
+		private final TextView name, username, badge;
+		private final ImageView ava;
+		private final ImageButton allow, mute;
+
+		public NotificationRequestViewHolder(){
+			super(getActivity(), R.layout.item_notification_request, list);
+			name=findViewById(R.id.name);
+			username=findViewById(R.id.username);
+			badge=findViewById(R.id.badge);
+			ava=findViewById(R.id.ava);
+			allow=findViewById(R.id.btn_allow);
+			mute=findViewById(R.id.btn_mute);
+			ava.setOutlineProvider(OutlineProviders.roundedRect(8));
+			ava.setClipToOutline(true);
+			allow.setOnClickListener(this::onAllowClick);
+			mute.setOnClickListener(this::onMuteClick);
+		}
+
+		@SuppressLint("DefaultLocale")
+		@Override
+		public void onBind(NotificationRequest item){
+			AccountViewModel model=Objects.requireNonNull(accountViewModels.get(item.account.id));
+			name.setText(model.parsedName);
+			username.setText(item.account.getDisplayUsername());
+			badge.setText(item.notificationsCount>99 ? String.format("%d+", 99) : String.format("%d", item.notificationsCount));
+		}
+
+		@Override
+		public void setImage(int index, Drawable image){
+			if(index==0){
+				if(image==null)
+					 ava.setImageResource(R.drawable.image_placeholder);
+				else
+					 ava.setImageDrawable(image);
+			}else{
+				AccountViewModel model=Objects.requireNonNull(accountViewModels.get(item.account.id));
+				model.emojiHelper.setImageDrawable(index-1, image);
+				name.invalidate();
+			}
+		}
+
+		@Override
+		public void onClick(){
+			Bundle args=new Bundle();
+			args.putString("account", accountID);
+			args.putParcelable("targetAccount", Parcels.wrap(item.account));
+			args.putString("requestID", item.id);
+			Nav.go(getActivity(), AccountNotificationsListFragment.class, args);
+		}
+
+		private void onAllowClick(View v){
+			acceptOrDecline(true);
+		}
+
+		private void onMuteClick(View v){
+			acceptOrDecline(false);
+		}
+
+		private void acceptOrDecline(boolean accept){
+			new RespondToNotificationRequest(item.id, accept)
+					.setCallback(new Callback<>(){
+						@Override
+						public void onSuccess(Void result){
+							int pos=data.indexOf(item);
+							data.remove(pos);
+							adapter.notifyItemRemoved(pos);
+							new Snackbar.Builder(getActivity())
+									.setText(getString(accept ? R.string.notifications_allowed : R.string.notifications_muted, item.account.displayName))
+									.show();
+						}
+
+						@Override
+						public void onError(ErrorResponse error){
+							error.showToast(getActivity());
+						}
+					})
+					.wrapProgress(getActivity(), R.string.loading, false)
+					.exec(accountID);
+		}
+	}
+}

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

@@ -1,57 +1,70 @@
 package org.joinmastodon.android.fragments;
 
 import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
 import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.Rect;
 import android.os.Bundle;
 import android.text.TextUtils;
-import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
+import android.widget.Button;
 
 import com.squareup.otto.Subscribe;
 
 import org.joinmastodon.android.E;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.markers.SaveMarkers;
+import org.joinmastodon.android.api.requests.notifications.GetNotificationsPolicy;
+import org.joinmastodon.android.api.requests.notifications.SetNotificationsPolicy;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.events.PollUpdatedEvent;
 import org.joinmastodon.android.events.RemoveAccountPostsEvent;
 import org.joinmastodon.android.model.Notification;
+import org.joinmastodon.android.model.NotificationsPolicy;
 import org.joinmastodon.android.model.PaginatedResponse;
 import org.joinmastodon.android.model.Status;
+import org.joinmastodon.android.model.viewmodel.CheckableListItem;
+import org.joinmastodon.android.model.viewmodel.ListItem;
+import org.joinmastodon.android.ui.M3AlertDialogBuilder;
 import org.joinmastodon.android.ui.OutlineProviders;
-import org.joinmastodon.android.ui.displayitems.NotificationHeaderStatusDisplayItem;
+import org.joinmastodon.android.ui.adapters.GenericListItemsAdapter;
 import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
 import org.joinmastodon.android.ui.utils.InsetStatusItemDecoration;
 import org.joinmastodon.android.ui.utils.UiUtils;
+import org.joinmastodon.android.ui.viewcontrollers.GenericListItemsViewController;
 import org.joinmastodon.android.ui.views.NestedRecyclerScrollView;
 import org.joinmastodon.android.utils.ObjectIdComparator;
-import org.parceler.Parcels;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
+import java.util.function.Consumer;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 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.MergeRecyclerAdapter;
 
-public class NotificationsListFragment extends BaseStatusListFragment<Notification>{
+public class NotificationsListFragment extends BaseNotificationsListFragment{
 	private boolean onlyMentions;
-	private String maxID;
 	private View tabBar;
 	private View mentionsTab, allTab;
-	private View endMark;
 	private String unreadMarker, realUnreadMarker;
 	private MenuItem markAllReadItem;
 	private boolean reloadingFromCache;
+	private ListItem<Void> requestsItem=new ListItem<>(R.string.filtered_notifications, 0, R.drawable.ic_inventory_2_24px, i->openNotificationRequests());
+	private ArrayList<ListItem<Void>> requestsItems=new ArrayList<>();
+	private GenericListItemsAdapter<Void> requestsRowAdapter=new GenericListItemsAdapter<>(requestsItems);
+	private NotificationsPolicy lastPolicy;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState){
@@ -74,43 +87,12 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 		setTitle(R.string.notifications);
 	}
 
-	@Override
-	protected List<StatusDisplayItem> buildDisplayItems(Notification n){
-		NotificationHeaderStatusDisplayItem titleItem;
-		if(n.type==Notification.Type.MENTION || n.type==Notification.Type.STATUS){
-			titleItem=null;
-		}else{
-			titleItem=new NotificationHeaderStatusDisplayItem(n.id, this, n, accountID);
-			if(n.status!=null){
-				n.status.card=null;
-				n.status.spoilerText=null;
-			}
-		}
-		if(n.status!=null){
-			int flags=titleItem==null ? 0 : (StatusDisplayItem.FLAG_NO_FOOTER | StatusDisplayItem.FLAG_INSET | StatusDisplayItem.FLAG_NO_HEADER);
-			ArrayList<StatusDisplayItem> items=StatusDisplayItem.buildItems(this, n.status, accountID, n, knownAccounts, flags);
-			if(titleItem!=null)
-				items.add(0, titleItem);
-			return items;
-		}else if(titleItem!=null){
-			return Collections.singletonList(titleItem);
-		}else{
-			return Collections.emptyList();
-		}
-	}
-
-	@Override
-	protected void addAccountToKnown(Notification s){
-		if(!knownAccounts.containsKey(s.account.id))
-			knownAccounts.put(s.account.id, s.account);
-		if(s.status!=null && !knownAccounts.containsKey(s.status.account.id))
-			knownAccounts.put(s.status.account.id, s.status.account);
-	}
-
 	@Override
 	protected void doLoadData(int offset, int count){
 		if(!refreshing && !reloadingFromCache)
 			endMark.setVisibility(View.GONE);
+		if(offset==0)
+			reloadPolicy();
 		AccountSessionManager.getInstance()
 				.getAccount(accountID).getCacheController()
 				.getNotifications(offset>0 ? maxID : null, count, onlyMentions, refreshing && !reloadingFromCache, new SimpleCallback<>(this){
@@ -142,30 +124,10 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 		resetUnreadBackground();
 	}
 
-	@Override
-	public void onItemClick(String id){
-		Notification n=getNotificationByID(id);
-		if(n.status!=null){
-			Status status=n.status;
-			Bundle args=new Bundle();
-			args.putString("account", accountID);
-			args.putParcelable("status", Parcels.wrap(status.clone()));
-			if(status.inReplyToAccountId!=null && knownAccounts.containsKey(status.inReplyToAccountId))
-				args.putParcelable("inReplyToAccount", Parcels.wrap(knownAccounts.get(status.inReplyToAccountId)));
-			Nav.go(getActivity(), ThreadFragment.class, args);
-		}else{
-			Bundle args=new Bundle();
-			args.putString("account", accountID);
-			args.putParcelable("profileAccount", Parcels.wrap(n.account));
-			Nav.go(getActivity(), ProfileFragment.class, args);
-		}
-	}
-
 	@Override
 	public void onViewCreated(View view, Bundle savedInstanceState){
 		tabBar=view.findViewById(R.id.tabbar);
 		super.onViewCreated(view, savedInstanceState);
-		list.addItemDecoration(new InsetStatusItemDecoration(this));
 
 		View tabBarItself=view.findViewById(R.id.tabbar_inner);
 		tabBarItself.setOutlineProvider(OutlineProviders.roundedRect(20));
@@ -215,14 +177,6 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 		return views;
 	}
 
-	private Notification getNotificationByID(String id){
-		for(Notification n:data){
-			if(n.id.equals(id))
-				return n;
-		}
-		return null;
-	}
-
 	@Subscribe
 	public void onPollUpdated(PollUpdatedEvent ev){
 		if(!ev.accountID.equals(accountID))
@@ -249,25 +203,9 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 		}
 	}
 
-	private void removeNotification(Notification n){
-		data.remove(n);
-		preloadedData.remove(n);
-		int index=-1;
-		for(int i=0;i<displayItems.size();i++){
-			if(n.id.equals(displayItems.get(i).parentID)){
-				index=i;
-				break;
-			}
-		}
-		if(index==-1)
-			return;
-		int lastIndex;
-		for(lastIndex=index;lastIndex<displayItems.size();lastIndex++){
-			if(!displayItems.get(lastIndex).parentID.equals(n.id))
-				break;
-		}
-		displayItems.subList(index, lastIndex).clear();
-		adapter.notifyItemRangeRemoved(index, lastIndex-index);
+	@Override
+	protected boolean needDividerForExtraItem(View child, View bottomSibling, RecyclerView.ViewHolder holder, RecyclerView.ViewHolder siblingHolder){
+		return super.needDividerForExtraItem(child, bottomSibling, holder, siblingHolder) || (siblingHolder!=null && siblingHolder.getAbsoluteAdapterPosition()>=adapter.getItemCount()) || holder.getAbsoluteAdapterPosition()<requestsItems.size();
 	}
 
 	private void onTabClick(View v){
@@ -285,35 +223,37 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 		AccountSessionManager.get(accountID).setNotificationsMentionsOnly(onlyMentions);
 	}
 
-	@Override
-	protected View onCreateFooterView(LayoutInflater inflater){
-		View v=inflater.inflate(R.layout.load_more_with_end_mark, null);
-		endMark=v.findViewById(R.id.end_mark);
-		endMark.setVisibility(View.GONE);
-		return v;
-	}
-
-	@Override
-	protected boolean needDividerForExtraItem(View child, View bottomSibling, RecyclerView.ViewHolder holder, RecyclerView.ViewHolder siblingHolder){
-		return super.needDividerForExtraItem(child, bottomSibling, holder, siblingHolder) || (siblingHolder!=null && siblingHolder.getAbsoluteAdapterPosition()>=adapter.getItemCount());
-	}
-
 	@Override
 	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater){
 		inflater.inflate(R.menu.notifications, menu);
 		markAllReadItem=menu.findItem(R.id.mark_all_read);
+		MenuItem filters=menu.findItem(R.id.filters);
+		filters.setVisible(lastPolicy!=null);
 	}
 
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item){
-		if(item.getItemId()==R.id.mark_all_read){
+		int id=item.getItemId();
+		if(id==R.id.mark_all_read){
 			markAsRead();
 			resetUnreadBackground();
+		}else if(id==R.id.filters){
+			showFiltersAlert();
 		}
 		return true;
 	}
 
+	@Override
+	protected RecyclerView.Adapter getAdapter(){
+		MergeRecyclerAdapter mergeAdapter=new MergeRecyclerAdapter();
+		mergeAdapter.addAdapter(requestsRowAdapter);
+		mergeAdapter.addAdapter(super.getAdapter());
+		return mergeAdapter;
+	}
+
 	private void markAsRead(){
+		if(data.isEmpty())
+			return;
 		String id=data.get(0).id;
 		if(ObjectIdComparator.INSTANCE.compare(id, realUnreadMarker)>0){
 			new SaveMarkers(null, id).exec(accountID);
@@ -364,4 +304,93 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 		}
 		return true;
 	}
+
+	private void updatePolicy(NotificationsPolicy policy){
+		int count=policy.summary==null ? 0 : policy.summary.pendingRequestsCount;
+		boolean isShown=!requestsItems.isEmpty();
+		boolean needShow=count>0;
+		if(isShown && !needShow){
+			requestsItems.clear();
+			requestsRowAdapter.notifyItemRemoved(0);
+		}else if(!isShown && needShow){
+			requestsItem.subtitle=getResources().getQuantityString(R.plurals.x_people_you_may_know, count, count);
+			requestsItems.add(requestsItem);
+			requestsRowAdapter.notifyItemInserted(0);
+		}else if(isShown){
+			requestsItem.subtitle=getResources().getQuantityString(R.plurals.x_people_you_may_know, count, count);
+			requestsRowAdapter.notifyItemChanged(0);
+		}
+		lastPolicy=policy;
+		invalidateOptionsMenu();
+	}
+
+	private void reloadPolicy(){
+		new GetNotificationsPolicy()
+				.setCallback(new Callback<>(){
+					@Override
+					public void onSuccess(NotificationsPolicy policy){
+						updatePolicy(policy);
+					}
+
+					@Override
+					public void onError(ErrorResponse errorResponse){
+
+					}
+				})
+				.exec(accountID);
+	}
+
+	private void showFiltersAlert(){
+		GenericListItemsViewController<Void> controller=new GenericListItemsViewController<>(getActivity());
+		Consumer<CheckableListItem<Void>> toggler=item->{
+			item.toggle();
+			controller.rebindItem(item);
+		};
+		CheckableListItem<Void> followingItem, followersItem, newAccountsItem, mentionsItem;
+		List<ListItem<Void>> items=List.of(
+				followingItem=new CheckableListItem<>(R.string.notification_filter_following, R.string.notification_filter_following_explanation, CheckableListItem.Style.CHECKBOX, lastPolicy.filterNotFollowing, toggler, true),
+				followersItem=new CheckableListItem<>(R.string.notification_filter_followers, R.string.notification_filter_followers_explanation, CheckableListItem.Style.CHECKBOX, lastPolicy.filterNotFollowers, toggler, true),
+				newAccountsItem=new CheckableListItem<>(R.string.notification_filter_new_accounts, R.string.notification_filter_new_accounts_explanation, CheckableListItem.Style.CHECKBOX, lastPolicy.filterNewAccounts, toggler, true),
+				mentionsItem=new CheckableListItem<>(R.string.notification_filter_mentions, R.string.notification_filter_mentions_explanation, CheckableListItem.Style.CHECKBOX, lastPolicy.filterPrivateMentions, toggler, true)
+		);
+		controller.setItems(items);
+		AlertDialog dlg=new M3AlertDialogBuilder(getActivity())
+				.setTitle(R.string.filter_notifications)
+				.setView(controller.getView())
+				.setPositiveButton(R.string.save, null)
+				.show();
+		Button btn=dlg.getButton(Dialog.BUTTON_POSITIVE);
+		btn.setOnClickListener(v->{
+			UiUtils.showProgressForAlertButton(btn, true);
+			NotificationsPolicy newPolicy=new NotificationsPolicy();
+			newPolicy.filterNotFollowing=followingItem.checked;
+			newPolicy.filterNotFollowers=followersItem.checked;
+			newPolicy.filterNewAccounts=newAccountsItem.checked;
+			newPolicy.filterPrivateMentions=mentionsItem.checked;
+			new SetNotificationsPolicy(newPolicy)
+					.setCallback(new Callback<>(){
+						@Override
+						public void onSuccess(NotificationsPolicy policy){
+							updatePolicy(policy);
+							dlg.dismiss();
+						}
+
+						@Override
+						public void onError(ErrorResponse errorResponse){
+							Activity activity=getActivity();
+							if(activity==null)
+								return;
+							UiUtils.showProgressForAlertButton(btn, false);
+							errorResponse.showToast(activity);
+						}
+					})
+					.exec(accountID);
+		});
+	}
+
+	private void openNotificationRequests(){
+		Bundle args=new Bundle();
+		args.putString("account", accountID);
+		Nav.go(getActivity(), NotificationRequestsFragment.class, args);
+	}
 }

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

@@ -25,7 +25,7 @@ public class PinnedPostsListFragment extends StatusListFragment{
 
 	@Override
 	protected void doLoadData(int offset, int count){
-		new GetAccountStatuses(account.id, null, null, 100, GetAccountStatuses.Filter.PINNED)
+		new GetAccountStatuses(account.id, null, null, 100, GetAccountStatuses.Filter.PINNED, null)
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(List<Status> result){

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

@@ -310,7 +310,7 @@ public class ProfileAboutFragment extends Fragment implements WindowInsetsAwareF
 		public void onSelectedChanged(@Nullable RecyclerView.ViewHolder viewHolder, int actionState){
 			super.onSelectedChanged(viewHolder, actionState);
 			if(actionState==ItemTouchHelper.ACTION_STATE_DRAG){
-				viewHolder.itemView.setTag(R.id.item_touch_helper_previous_elevation, viewHolder.itemView.getElevation()); // prevents the default behavior of changing elevation in onDraw()
+				viewHolder.itemView.setTag(me.grishka.appkit.R.id.item_touch_helper_previous_elevation, viewHolder.itemView.getElevation()); // prevents the default behavior of changing elevation in onDraw()
 				viewHolder.itemView.animate().translationZ(V.dp(1)).setDuration(200).setInterpolator(CubicBezierInterpolator.DEFAULT).start();
 			}
 		}