refactor: move mastodon/session/session to mastodon/session package

refactor: move mastodon api calls to own package
This should help organization for implementing the misskey side of the api
2023-05-14 14:43:57 -03:00 · 2023-05-14 11:24:18 -03:00 · 2023-05-14 11:24:18 -03:00 · 2023-05-14 11:24:18 -03:00 · 2023-05-14 11:23:39 -03:00 · 2023-05-14 09:24:49 -03:00
332 changed files with 3119 additions and 1786 deletions
--- a/.github/workflows/nightly-builds.yml
+++ b/.github/workflows/nightly-builds.yml
@@ -15,7 +15,7 @@ jobs:
      uses: actions/setup-java@v3
      with:
        java-version: '17'
-        distribution: 'temurin'
+        distribution: 'corretto'
        cache: gradle
    
    - name: Get current date
--- a/.github/workflows/validate-gradle-wrapper.yml
+++ b/.github/workflows/validate-gradle-wrapper.yml
@@ -0,0 +1,11 @@
+name: Validate Gradle Wrapper
+
+on: [pull_request, push]
+
+jobs:
+  validation:
+    name: Validation
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: gradle/wrapper-validation-action@v1
--- a/FAQ.md
+++ b/FAQ.md
@@ -0,0 +1,5 @@
+## F.A.Q
+
+Q: What are the main differences between Moshidon and Megalodon?
+
+A: There are many, but the most outstanding differences are: the ability to have other server's local timeline inside the app. It can be acessed in the "Add community" option in the top right corner of the Edit timelines screen. Other outstanding features that Moshidon has are some quality of life improvements, such as notification actions and allowing for unlisted replies by default.  Most other features are pretty minor, such as profile notes directly available in the person's profile. Other features are quite minor usability and visibility improvements. All of which can be found in the settings page. 
--- a/README.md
+++ b/README.md
@@ -7,38 +7,38 @@

 [![Download latest release](https://img.shields.io/badge/dynamic/json?color=282C37&label=Download%20APK&query=%24.tag_name&url=https%3A%2F%2Fapi.github.com%2Frepos%2FLucasGGamerM%2Fmoshidon%2Freleases%2Flatest&style=for-the-badge)](https://github.com/LucasGGamerM/moshidon/releases/latest/download/moshidon.apk)

-[![Download nightly release](https://img.shields.io/badge/dynamic/json?color=282C37&label=Download%20Nightly%20APK&query=%24.tag_name&url=https%3A%2F%2Fapi.github.com%2Frepos%2FLucasGGamerM%2Fmoshidon%2Freleases%2Flatest&style=for-the-badge)](https://nightly.link/LucasGGamerM/moshidon/workflows/nightly-builds/master/moshidon-nightly.apk.zip)
+[![Download nightly release](https://img.shields.io/badge/dynamic/json?color=282C37&label=Download%20Nightly%20APK&query=%24.tag_name&url=https%3A%2F%2Fapi.github.com%2Frepos%2FLucasGGamerM%2Fmoshidon%2Freleases%2Flatest&style=for-the-badge)](https://github.com/LucasGGamerM/moshidon-nightly/releases/latest/download/moshidon-nightly.apk)


 [![Translation status](https://translate.codeberg.org/widgets/moshidon/-/svg-badge.svg)](https://translate.codeberg.org/engage/moshidon/)
 &nbsp;
-[![Nightly build](https://github.com/LucasGGamerM/moshidon/actions/workflows/nightly-builds.yml/badge.svg)](https://github.com/LucasGGamerM/moshidon/actions/workflows/android.yml)
+[![Nightly build](https://github.com/LucasGGamerM/moshidon/actions/workflows/nightly-builds.yml/badge.svg)](https://github.com/LucasGGamerM/moshidon/actions/workflows/nightly-builds.yml)

 <a href="https://play.google.com/store/apps/details?id=org.joinmastodon.android.moshinda"><img height="50" alt="Get it on Google Play" src="img/google-play-badge.png"></a>
 &nbsp;
 <a href="https://apt.izzysoft.de/fdroid/index/apk/org.joinmastodon.android.moshinda"><img height="50" alt="Get it on IzzyOnDroid" src="img/izzy-badge.png"></a>

+## Help out the project by donating at: https://github.com/sponsors/LucasGGamerM!
+
 --- 

-## F.A.Q
-
-### Q: What are the main differences between Moshidon and Megalodon?
-
-### A: There are many, but the most outstanding differences are: the ability to have other server's local timeline inside the app. It can be acessed in the "Add community" option in the top right corner of the Edit timelines screen. Other outstanding features that Moshidon has are some quality of life improvements, such as notification actions and allowing for unlisted replies by default.  Most other features are pretty minor, such as profile notes directly available in the person's profile. Other features are quite minor usability and visibility improvements. All of which can be found in the settings page. 
-
---
-
 ## Key features

-### **The ability to add new custom local timelines!**
+### **The ability to add other server's local timeline to your timelines**

-#### It can be accessed in the "Edit timelines" menu, where you can add a new "Community" to see other server's local posts!
+It can be accessed in the "Edit timelines" menu, where you can add a new "Community" to see other server's local posts!

-### **Material you theme support on Android 12+ devices!**
+### **View remote profiles**

-### **Show posts filtered with a warning!**
+You can now see all of a profile follows and followers, by directly loading them from the profile's home instance. In case of a failed lookup, the app will automatically fall back to the older method.

-**Allows you to have filtered posts collapsed with a warning! As shown in the screenshots:**
+### **Translate posts easily**
+
+Allows you to easily translate posts in another language with a translate button! Your instance must support translation, otherwise it will not work.
+
+### **Show posts filtered with a warning**
+
+Allows you to have filtered posts collapsed with a warning! As shown in the screenshots:

 Before             |  After
 :-------------------------:|:-------------------------:
@@ -47,7 +47,7 @@ Before             |  After

 ### **Color themes**

-**Allows you to change theme within the app. Supports Purple, pink, green, blue, red, orange, yellow and Nord!**
+Allows you to change theme within the app. Supports Material You, purple, pink, green, blue, red, orange, yellow and Nord!

 ### **Unlisted posting**

@@ -71,6 +71,10 @@ That’s one of the reasons why choosing a small, **well-moderated instance is i

 This is important to **ensure the content you’re sharing is as accessible as possible** to people who can’t see the images and rely on software to read back the provided content descriptions. Thankfully, it’s quite common for people on the Fediverse to provide such alt texts, and hopefully things stay this way!

+### **Reminder to add alt text to attached media**
+
+By default, Moshidon will show a warning to add alt text if your post has any attachments without any alt text. This is for better accessibility, and it can easily be bypassed and disabled in settings.
+
 ### **Pinning posts**

 **This lets you can highlight important posts on your profile. A dedicated “Pinned” tab in people’s profiles shows all the posts they pinned.**
@@ -95,12 +99,22 @@ Moshidon is also available in [IzzyOnDroid repo](https://apt.izzysoft.de/fdroid/

 ## Release variants

-All downloads can be found on the [Releases](https://github.com/LucasGGamerM/moshidon/releases) page.
+### Stable variant
+
+All stable version downloads can be found on the [Releases](https://github.com/LucasGGamerM/moshidon/releases) page.

 **`moshidon.apk`**

 Variant with an integrated updater. If you download Moshidon from here (and not from an app store), just download the regular `moshidon.apk`.

+### Nightly variant
+
+All nightly builds can be downloaded at [Nightly Releases](https://github.com/LucasGGamerM/moshidon-nightly/releases) page.
+
+**`moshidon-nightly.apk`**
+
+Unstable variant with an integrated updater. It's for development and testing purposes. If you find any bugs with it, please file a bug report at our [issues](https://github.com/LucasGGamerM/moshidon/issues) page.
+
 ---


@@ -108,16 +122,18 @@ Variant with an integrated updater. If you download Moshidon from here (and not

 ### Features

+* [Adding the ability to view other server's local timelines](https://github.com/LucasGGamerM/moshidon/tree/feature/local-timelines)
+* [Adding the ability to load followers and following from remote instance](https://github.com/LucasGGamerM/moshidon/tree/feature/remote-followers)
 * [Adding the ability to have filtered posts show with a warning](https://github.com/LucasGGamerM/moshidon/tree/feature/filters_again)
 * [Add “Unlisted” as a post visibility option](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/enable-unlisted)
  ([Pull request](https://github.com/mastodon/mastodon-android/pull/103))
-* Adding a useful private profile note box!*
-* Auto hiding the compose button on scroll!*
-* Adding the ability to remind yourself to add alt text to images!*
-* An indicator for if an image has alt text or not*
-* Adding the ability to have drafts!*
-* Also adding the ability to view announcements from your instance!*
-* Adding the ability to post for local timeline only (Only on instances that support it!)*
+* Adding a useful private profile note box
+* Auto hiding the compose button on scroll
+* Adding the ability to remind yourself to add alt text to images
+* An indicator for if an image has alt text or not
+* Adding the ability to have drafts
+* Also adding the ability to view announcements from your instance
+* Adding the ability to post for local timeline only (Only on instances that support it!)
 * [Add image description button and viewer](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/display-alt-text) ([Pull request](https://github.com/mastodon/mastodon-android/pull/129))
 * [Implement pinning posts and displaying pinned posts](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/pin-posts) ([Pull request](https://github.com/mastodon/mastodon-android/pull/140))
 * [Implement deleting and re-drafting](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/delete-redraft) ([Closes issue](https://github.com/mastodon/mastodon-android/issues/21))
@@ -139,6 +155,7 @@ Variant with an integrated updater. If you download Moshidon from here (and not

 ### Behavior

+* Allow for confirmation before reblogging
 * Adding a bottom option for the publish button, allowing for easier use on larger screens!
 * [Make back button return to the home tab before exiting the app](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/back-returns-home) ([Closes issue](https://github.com/mastodon/mastodon-android/issues/118))
 * [Always preserve content warnings when replying](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/always-preserve-cw) ([Closes issue](https://github.com/mastodon/mastodon-android/issues/113))
@@ -170,6 +187,10 @@ This project is released under the [GPL-3 License](./LICENSE).

 ## Links

-[Official matrix chatroom:](https://matrix.to/#/#moshidon:matrix.org) https://matrix.to/#/#moshidon:matrix.org
+[F.A.Q](FAQ.md)
+
+[Official matrix chatroom:](https://matrix.to/#/#moshidon:floss.social) https://matrix.to/#/#moshidon:floss.social

 <a rel="me" href="https://floss.social/@moshidon">@moshidon<wbr>@floss.social</a>
+
+---
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
 		mavenCentral()
 	}
 	dependencies {
-		classpath 'com.android.tools.build:gradle:7.3.1'
+		classpath 'com.android.tools.build:gradle:8.0.0'
 		// NOTE: Do not place your application dependencies here; they belong
 		// in the individual module build.gradle files
 	}
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,4 +16,7 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=false
+android.enableJetifier=false
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=true
+android.nonFinalResIds=false
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
-#Thu Jan 13 11:33:43 MSK 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionSha256Sum=e111cb9948407e26351227dabce49822fb88c37ee72f1d1582a69c68af2e702f
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
--- a/288
+++ b/288
@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh

 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,67 +17,98 @@
 #

 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################

 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null

-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum

 warn () {
    echo "$*"
-}
+} >&2

 die () {
    echo
    echo "$*"
    echo
    exit 1
-}
+} >&2

 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac

 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +118,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
    else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
    fi
    if [ ! -x "$JAVACMD" ] ; then
        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,7 +129,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
    fi
 else
-    JAVACMD="java"
+    JAVACMD=java
    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.

 Please set the JAVA_HOME variable in your environment to match the
@@ -106,80 +137,109 @@ location of your Java installation."
 fi

 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=`expr $i + 1`
-    done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
    esac
 fi

-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.

-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'

 exec "$JAVACMD" "$@"
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -14,7 +14,7 @@
@rem limitations under the License.
@rem

-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal

 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%

@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome

 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute

 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar

 :end
@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd

 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%

 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
--- a/mastodon/build.gradle
+++ b/mastodon/build.gradle
@@ -2,6 +2,12 @@ plugins {
 	id 'com.android.application'
 }

+java {
+	toolchain {
+		languageVersion = JavaLanguageVersion.of(17)
+	}
+}
+
 android {
 	compileSdk 33
 	defaultConfig {
@@ -10,11 +16,11 @@ android {
 		applicationId "org.joinmastodon.android.moshinda"
 		minSdk 23
 		targetSdk 33
-		versionCode 99
-		versionName "1.2.0+fork.99.moshinda"
+		versionCode 100
+		versionName "1.3.0+fork.100.moshinda"
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-		resConfigs "ar-rSA", "be-rBY", "bn-rBD", "bs-rBA", "ca-rES", "cs-rCZ", "de-rDE", "el-rGR", "es-rES", "eu-rES", "fi-rFI", "fil-rPH", "fr-rFR", "ga-rIE", "gd-rGB", "gl-rES", "hi-rIN", "hr-rHR", "hu-rHU", "hy-rAM", "in-rID", "is-rIS", "it-rIT", "iw-rIL", "ja-rJP", "kab", "ko-rKR", "nl-rNL", "oc-rFR", "pl-rPL", "pt-rBR", "pt-rPT", "ro-rRO", "ru-rRU", "si-rLK", "sl-rSI", "sv-rSE", "th-rTH", "tr-rTR", "uk-rUA", "vi-rVN", "zh-rCN", "zh-rTW"
-	}
+        resourceConfigurations += ['ar-rSA', 'ar-rDZ', 'be-rBY', 'bn-rBD', 'bs-rBA', 'ca-rES', 'cs-rCZ', 'da-rDK', 'de-rDE', 'el-rGR', 'es-rES', 'eu-rES', 'fa-rIR', 'fi-rFI', 'fil-rPH', 'fr-rFR', 'ga-rIE', 'gd-rGB', 'gl-rES', 'hi-rIN', 'hr-rHR', 'hu-rHU', 'hy-rAM', 'ig-rNG', 'in-rID', 'is-rIS', 'it-rIT', 'iw-rIL', 'ja-rJP', 'kab', 'ko-rKR', 'my-rMM', 'nl-rNL', 'no-rNO', 'oc-rFR', 'pl-rPL', 'pt-rBR', 'pt-rPT', 'ro-rRO', 'ru-rRU', 'si-rLK', 'sl-rSI', 'sv-rSE', 'th-rTH', 'tr-rTR', 'uk-rUA', 'ur-rIN', 'vi-rVN', 'zh-rCN', 'zh-rTW']
+   	}

 	signingConfigs {
 		nightly{
@@ -42,8 +48,8 @@ android {

 	buildTypes {
 		release {
-//			minifyEnabled true
-//			shrinkResources true
+			minifyEnabled true
+			shrinkResources true
 			proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
 		}
 		debug{
@@ -85,17 +91,22 @@ android {
 			setRoot "src/github"
 		}
 		debug {
-			setRoot "src/github"
+			setRoot "src/debug"
 		}
 	}
-	lintOptions{
-		checkReleaseBuilds false
+	namespace 'org.joinmastodon.android'
+	lint {
 		abortOnError false
+		checkReleaseBuilds false
+	}
+
+	buildFeatures {
+		buildConfig true
 	}
 }

 dependencies {
-	api 'androidx.annotation:annotation:1.3.0'
+	api 'androidx.annotation:annotation:1.6.0'
 	implementation 'com.squareup.okhttp3:okhttp:3.14.9'
 	implementation 'me.grishka.litex:recyclerview:1.2.1.1'
 	implementation 'me.grishka.litex:swiperefreshlayout:1.1.0.1'
@@ -104,7 +115,7 @@ dependencies {
 	implementation 'me.grishka.litex:viewpager:1.0.0'
 	implementation 'me.grishka.litex:viewpager2:1.0.0'
 	implementation 'me.grishka.appkit:appkit:1.2.7'
-	implementation 'com.google.code.gson:gson:2.8.9'
+	implementation 'com.google.code.gson:gson:2.9.0'
 	implementation 'org.jsoup:jsoup:1.14.3'
 	implementation 'com.squareup:otto:1.3.8'
 	implementation 'de.psdev:async-otto:1.0.3'
--- a/mastodon/proguard-rules.pro
+++ b/mastodon/proguard-rules.pro
@@ -42,6 +42,13 @@

 -keepattributes LineNumberTable

+-keepattributes *
+-keep,allowobfuscation,allowshrinking class com.google.gson.reflect.TypeToken
+-keep,allowobfuscation,allowshrinking class * extends com.google.gson.reflect.TypeToken
+
+#-keep class javax.** { *; }
+-keep class org.joinmastodon.android.** { *; }
+
 # Parceler library
 -keep interface org.parceler.Parcel
 -keep @org.parceler.Parcel class * { *; }
--- a/mastodon/src/androidTest/java/org/joinmastodon/android/test/StoreScreenshotsGenerator.java
+++ b/mastodon/src/androidTest/java/org/joinmastodon/android/test/StoreScreenshotsGenerator.java
@@ -1,10 +1,8 @@
 package org.joinmastodon.android.test;

-import android.app.Instrumentation;
 import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Bundle;
-import android.os.Environment;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;

@@ -14,10 +12,10 @@ import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.MainActivity;
 import org.joinmastodon.android.MastodonApp;
 import org.joinmastodon.android.R;
-import org.joinmastodon.android.api.requests.instance.GetInstance;
-import org.joinmastodon.android.api.requests.statuses.GetStatusByID;
-import org.joinmastodon.android.api.session.AccountSession;
-import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.api.mastodon.requests.instance.GetInstance;
+import org.joinmastodon.android.api.mastodon.requests.statuses.GetStatusByID;
+import org.joinmastodon.android.api.mastodon.session.AccountSession;
+import org.joinmastodon.android.api.mastodon.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.ComposeFragment;
 import org.joinmastodon.android.fragments.ThreadFragment;
 import org.joinmastodon.android.fragments.onboarding.InstanceRulesFragment;
@@ -32,12 +30,9 @@ import org.parceler.Parcels;

 import java.io.File;
 import java.io.IOException;
-import java.util.concurrent.BrokenBarrierException;
-import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.CyclicBarrier;
 import java.util.concurrent.TimeoutException;

-import androidx.test.core.app.ActivityScenario;
 import androidx.test.espresso.PerformException;
 import androidx.test.espresso.UiController;
 import androidx.test.espresso.ViewAction;
@@ -47,18 +42,15 @@ import androidx.test.ext.junit.rules.ActivityScenarioRule;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
 import androidx.test.platform.app.InstrumentationRegistry;
-import androidx.test.runner.screenshot.ScreenCapture;
 import androidx.test.runner.screenshot.Screenshot;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
 import okio.BufferedSink;
 import okio.Okio;
-import okio.Sink;
 import okio.Source;

 import static androidx.test.espresso.Espresso.*;
 import static androidx.test.espresso.action.ViewActions.*;
-import static androidx.test.espresso.assertion.ViewAssertions.*;
 import static androidx.test.espresso.matcher.ViewMatchers.*;

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

 		<activity android:name=".MainActivity" android:exported="true" android:configChanges="orientation|screenSize" android:windowSoftInputMode="adjustResize" android:launchMode="singleTask">
--- a/mastodon/src/main/assets/blocks.tsv
+++ b/mastodon/src/main/assets/blocks.tsv
@@ -12,7 +12,7 @@ gab.protohype.net
 social.unzensiert.to
 freeatlantis.com

-#	reactionary bigotry and hatespeech against magrinalized groups
+#	reactionary bigotry and hatespeech against marginalized groups
 poa.st
 freespeechextremist.com
 rdrama.cc
--- a/mastodon/src/main/java/org/joinmastodon/android/DomainManager.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/DomainManager.java
@@ -1,62 +1,5 @@
 package org.joinmastodon.android;

-import android.app.Activity;
-import android.app.NotificationManager;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.pm.ShortcutInfo;
-import android.content.pm.ShortcutManager;
-import android.graphics.drawable.Icon;
-import android.net.Uri;
-import android.os.Build;
-import android.util.Log;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.browser.customtabs.CustomTabsIntent;
-
-import org.joinmastodon.android.api.MastodonAPIController;
-import org.joinmastodon.android.api.PushSubscriptionManager;
-import org.joinmastodon.android.api.requests.accounts.GetOwnAccount;
-import org.joinmastodon.android.api.requests.accounts.GetPreferences;
-import org.joinmastodon.android.api.requests.accounts.GetWordFilters;
-import org.joinmastodon.android.api.requests.instance.GetCustomEmojis;
-import org.joinmastodon.android.api.requests.instance.GetInstance;
-import org.joinmastodon.android.api.requests.oauth.CreateOAuthApp;
-import org.joinmastodon.android.api.session.AccountActivationInfo;
-import org.joinmastodon.android.api.session.AccountSession;
-import org.joinmastodon.android.api.session.AccountSessionManager;
-import org.joinmastodon.android.events.EmojiUpdatedEvent;
-import org.joinmastodon.android.model.Account;
-import org.joinmastodon.android.model.Application;
-import org.joinmastodon.android.model.Emoji;
-import org.joinmastodon.android.model.EmojiCategory;
-import org.joinmastodon.android.model.Filter;
-import org.joinmastodon.android.model.Instance;
-import org.joinmastodon.android.model.Preferences;
-import org.joinmastodon.android.model.Token;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import me.grishka.appkit.api.Callback;
-import me.grishka.appkit.api.ErrorResponse;
-
 public class DomainManager {
 	private static final String TAG="DomainManager";

--- a/mastodon/src/main/java/org/joinmastodon/android/ExternalShareActivity.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ExternalShareActivity.java
@@ -9,8 +9,8 @@ import android.os.Bundle;
 import android.text.TextUtils;
 import android.widget.Toast;

-import org.joinmastodon.android.api.session.AccountSession;
-import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.api.mastodon.session.AccountSession;
+import org.joinmastodon.android.api.mastodon.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.ComposeFragment;
 import org.joinmastodon.android.ui.AccountSwitcherSheet;
 import org.joinmastodon.android.ui.utils.UiUtils;
--- a/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
@@ -54,6 +54,7 @@ public class GlobalUserPreferences{
 	public static boolean replyLineAboveHeader;
 	public static boolean swapBookmarkWithBoostAction;
 	public static boolean loadRemoteAccountFollowers;
+	public static boolean mentionRebloggerAutomatically;
 	public static String publishButtonText;
 	public static ThemePreference theme;
 	public static ColorPreference color;
@@ -122,6 +123,7 @@ public class GlobalUserPreferences{
 		confirmBeforeReblog=prefs.getBoolean("confirmBeforeReblog", false);
 		swapBookmarkWithBoostAction=prefs.getBoolean("swapBookmarkWithBoostAction", false);
 		loadRemoteAccountFollowers=prefs.getBoolean("loadRemoteAccountFollowers", true);
+		mentionRebloggerAutomatically=prefs.getBoolean("mentionRebloggerAutomatically", false);
 		publishButtonText=prefs.getString("publishButtonText", "");
 		theme=ThemePreference.values()[prefs.getInt("theme", 0)];
 		recentLanguages=fromJson(prefs.getString("recentLanguages", "{}"), recentLanguagesType, new HashMap<>());
@@ -181,6 +183,7 @@ public class GlobalUserPreferences{
 				.putBoolean("confirmBeforeReblog", confirmBeforeReblog)
 				.putBoolean("swapBookmarkWithBoostAction", swapBookmarkWithBoostAction)
 				.putBoolean("loadRemoteAccountFollowers", loadRemoteAccountFollowers)
+				.putBoolean("mentionRebloggerAutomatically", mentionRebloggerAutomatically)
 				.putInt("theme", theme.ordinal())
 				.putString("color", color.name())
 				.putString("recentLanguages", gson.toJson(recentLanguages))
--- a/mastodon/src/main/java/org/joinmastodon/android/MainActivity.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/MainActivity.java
@@ -11,8 +11,8 @@ import android.os.Bundle;
 import android.util.Log;

 import org.joinmastodon.android.api.ObjectValidationException;
-import org.joinmastodon.android.api.session.AccountSession;
-import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.api.mastodon.session.AccountSession;
+import org.joinmastodon.android.api.mastodon.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.ComposeFragment;
 import org.joinmastodon.android.fragments.HomeFragment;
 import org.joinmastodon.android.fragments.ProfileFragment;
--- a/mastodon/src/main/java/org/joinmastodon/android/OAuthActivity.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/OAuthActivity.java
@@ -6,12 +6,11 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.text.TextUtils;
-import android.util.Log;
 import android.widget.Toast;

-import org.joinmastodon.android.api.requests.accounts.GetOwnAccount;
-import org.joinmastodon.android.api.requests.oauth.GetOauthToken;
-import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.api.mastodon.requests.accounts.GetOwnAccount;
+import org.joinmastodon.android.api.mastodon.requests.oauth.GetOauthToken;
+import org.joinmastodon.android.api.mastodon.session.AccountSessionManager;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Application;
 import org.joinmastodon.android.model.Instance;
--- a/mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
@@ -12,27 +12,25 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.drawable.Drawable;
-import android.opengl.Visibility;
 import android.os.Build;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.Log;

 import org.joinmastodon.android.api.MastodonAPIController;
-import org.joinmastodon.android.api.requests.notifications.GetNotificationByID;
-import org.joinmastodon.android.api.requests.statuses.CreateStatus;
-import org.joinmastodon.android.api.requests.statuses.SetStatusBookmarked;
-import org.joinmastodon.android.api.requests.statuses.SetStatusFavorited;
-import org.joinmastodon.android.api.requests.statuses.SetStatusReblogged;
-import org.joinmastodon.android.api.session.AccountSession;
-import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.api.mastodon.requests.accounts.SetAccountFollowed;
+import org.joinmastodon.android.api.mastodon.requests.notifications.GetNotificationByID;
+import org.joinmastodon.android.api.mastodon.requests.statuses.CreateStatus;
+import org.joinmastodon.android.api.mastodon.requests.statuses.SetStatusBookmarked;
+import org.joinmastodon.android.api.mastodon.requests.statuses.SetStatusFavorited;
+import org.joinmastodon.android.api.mastodon.requests.statuses.SetStatusReblogged;
+import org.joinmastodon.android.api.mastodon.session.AccountSession;
+import org.joinmastodon.android.api.mastodon.session.AccountSessionManager;
 import org.joinmastodon.android.events.NotificationReceivedEvent;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.NotificationAction;
 import org.joinmastodon.android.model.Preferences;
 import org.joinmastodon.android.model.PushNotification;
-import org.joinmastodon.android.model.Status;
-import org.joinmastodon.android.model.StatusPrivacy;
 import org.joinmastodon.android.model.StatusPrivacy;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.parceler.Parcels;
@@ -123,8 +121,16 @@ public class PushNotificationReceiver extends BroadcastReceiver{

 			if(intent.hasExtra("notification")){
 				org.joinmastodon.android.model.Notification notification=Parcels.unwrap(intent.getParcelableExtra("notification"));
-				String statusID=notification.status.id;
-				if (statusID != null) {
+				String statusID = null;
+				String targetAccountID = null;
+
+				if(notification.status != null){
+					statusID = notification.status.id;
+				}
+				if(notification.account != null){
+					targetAccountID = notification.account.id;
+				}
+				if (statusID != null || targetAccountID != null) {
 					AccountSessionManager accountSessionManager = AccountSessionManager.getInstance();
 					Preferences preferences = accountSessionManager.getAccount(accountID).preferences;

@@ -134,6 +140,7 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 						case BOOST -> new SetStatusReblogged(notification.status.id, true, preferences.postingDefaultVisibility).exec(accountID);
 						case UNBOOST -> new SetStatusReblogged(notification.status.id, false, preferences.postingDefaultVisibility).exec(accountID);
 						case REPLY -> handleReplyAction(context, accountID, intent, notification, notificationId, preferences);
+						case FOLLOW_BACK -> new SetAccountFollowed(notification.account.id, true, true, false).exec(accountID);
 						default -> Log.w(TAG, "onReceive: Failed to get NotificationAction");
 					}
 				}
@@ -241,6 +248,9 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 					if(notification.status.reblogged)
 						builder.addAction(buildNotificationAction(context, id, accountID, notification,  context.getString(R.string.sk_undo_reblog), NotificationAction.UNBOOST));
 				}
+				case FOLLOW -> {
+					builder.addAction(buildNotificationAction(context, id, accountID, notification, context.getString(R.string.follow_back), NotificationAction.FOLLOW_BACK));
+				}
 			}
 		}

--- a/mastodon/src/main/java/org/joinmastodon/android/api/CacheController.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/CacheController.java
@@ -11,15 +11,14 @@ import android.util.Log;

 import org.joinmastodon.android.BuildConfig;
 import org.joinmastodon.android.MastodonApp;
-import org.joinmastodon.android.api.requests.notifications.GetNotifications;
-import org.joinmastodon.android.api.requests.timelines.GetHomeTimeline;
-import org.joinmastodon.android.api.session.AccountSession;
-import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.api.adapter.ApiAdapter;
+import org.joinmastodon.android.api.mastodon.requests.notifications.GetNotifications;
+import org.joinmastodon.android.api.mastodon.session.AccountSession;
+import org.joinmastodon.android.api.mastodon.session.AccountSessionManager;
 import org.joinmastodon.android.model.CacheablePaginatedResponse;
 import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.model.Notification;
-import org.joinmastodon.android.model.PaginatedResponse;
 import org.joinmastodon.android.model.SearchResult;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.utils.StatusFilterPredicate;
@@ -88,7 +87,8 @@ public class CacheController{
 						Log.w(TAG, "getHomeTimeline: corrupted status object in database", x);
 					}
 				}
-				new GetHomeTimeline(maxID, null, count, null)
+				ApiAdapter apiAdapter = new ApiAdapter(ApiAdapter.ServerType.MASTODON);
+				apiAdapter.getHomeTimeline(maxID, null, count, null)
 						.setCallback(new Callback<>(){
 							@Override
 							public void onSuccess(List<Status> result){
--- a/mastodon/src/main/java/org/joinmastodon/android/api/MastodonAPIController.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/MastodonAPIController.java
@@ -15,7 +15,7 @@ import org.joinmastodon.android.BuildConfig;
 import org.joinmastodon.android.MastodonApp;
 import org.joinmastodon.android.api.gson.IsoInstantTypeAdapter;
 import org.joinmastodon.android.api.gson.IsoLocalDateTypeAdapter;
-import org.joinmastodon.android.api.session.AccountSession;
+import org.joinmastodon.android.api.mastodon.session.AccountSession;
 import org.joinmastodon.android.model.Status;

 import java.io.BufferedReader;
--- a/mastodon/src/main/java/org/joinmastodon/android/api/MastodonAPIRequest.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/MastodonAPIRequest.java
@@ -9,8 +9,8 @@ import android.util.Pair;
 import com.google.gson.reflect.TypeToken;

 import org.joinmastodon.android.BuildConfig;
-import org.joinmastodon.android.api.session.AccountSession;
-import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.api.mastodon.session.AccountSession;
+import org.joinmastodon.android.api.mastodon.session.AccountSessionManager;
 import org.joinmastodon.android.model.BaseModel;
 import org.joinmastodon.android.model.Token;

--- a/mastodon/src/main/java/org/joinmastodon/android/api/MastodonErrorResponse.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/MastodonErrorResponse.java
@@ -5,8 +5,6 @@ import android.view.View;
 import android.widget.TextView;
 import android.widget.Toast;

-import org.joinmastodon.android.R;
-
 import me.grishka.appkit.api.ErrorResponse;

 public class MastodonErrorResponse extends ErrorResponse{
@@ -22,7 +20,7 @@ public class MastodonErrorResponse extends ErrorResponse{

 	@Override
 	public void bindErrorView(View view){
-		TextView text=view.findViewById(R.id.error_text);
+		TextView text=view.findViewById(me.grishka.appkit.R.id.error_text);
 		text.setText(error);
 	}

--- a/mastodon/src/main/java/org/joinmastodon/android/api/PushSubscriptionManager.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/PushSubscriptionManager.java
@@ -12,10 +12,10 @@ import android.util.Log;

 import org.joinmastodon.android.BuildConfig;
 import org.joinmastodon.android.MastodonApp;
-import org.joinmastodon.android.api.requests.notifications.RegisterForPushNotifications;
-import org.joinmastodon.android.api.requests.notifications.UpdatePushSettings;
-import org.joinmastodon.android.api.session.AccountSession;
-import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.api.mastodon.requests.notifications.RegisterForPushNotifications;
+import org.joinmastodon.android.api.mastodon.requests.notifications.UpdatePushSettings;
+import org.joinmastodon.android.api.mastodon.session.AccountSession;
+import org.joinmastodon.android.api.mastodon.session.AccountSessionManager;
 import org.joinmastodon.android.model.PushNotification;
 import org.joinmastodon.android.model.PushSubscription;

@@ -45,7 +45,6 @@ import javax.crypto.IllegalBlockSizeException;
 import javax.crypto.KeyAgreement;
 import javax.crypto.Mac;
 import javax.crypto.NoSuchPaddingException;
-import javax.crypto.SecretKey;
 import javax.crypto.spec.GCMParameterSpec;
 import javax.crypto.spec.SecretKeySpec;

--- a/mastodon/src/main/java/org/joinmastodon/android/api/StatusInteractionController.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/StatusInteractionController.java
@@ -4,9 +4,9 @@ import android.os.Looper;

 import org.joinmastodon.android.E;
 import org.joinmastodon.android.MastodonApp;
-import org.joinmastodon.android.api.requests.statuses.SetStatusBookmarked;
-import org.joinmastodon.android.api.requests.statuses.SetStatusFavorited;
-import org.joinmastodon.android.api.requests.statuses.SetStatusReblogged;
+import org.joinmastodon.android.api.mastodon.requests.statuses.SetStatusBookmarked;
+import org.joinmastodon.android.api.mastodon.requests.statuses.SetStatusFavorited;
+import org.joinmastodon.android.api.mastodon.requests.statuses.SetStatusReblogged;
 import org.joinmastodon.android.events.StatusCountersUpdatedEvent;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.model.StatusPrivacy;
--- a/mastodon/src/main/java/org/joinmastodon/android/api/adapter/ApiAdapter.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/adapter/ApiAdapter.java
@@ -0,0 +1,47 @@
+package org.joinmastodon.android.api.adapter;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.api.mastodon.requests.statuses.GetStatusByID;
+import org.joinmastodon.android.api.mastodon.requests.timelines.GetHomeTimeline;
+import org.joinmastodon.android.model.Status;
+
+import java.util.List;
+
+public class ApiAdapter {
+    public final ServerType serverType;
+
+    public ApiAdapter(ServerType serverType){
+        this.serverType = serverType;
+    }
+
+    public MastodonAPIRequest<?> getPostById(String id){
+        switch (serverType){
+            case MASTODON -> {
+                return new GetStatusByID(id);
+            }
+            case MISSKEY -> {
+                return null;
+            }
+        }
+        return null;
+    }
+
+    public MastodonAPIRequest<List<Status>> getHomeTimeline(String maxID, String minID, int limit, String sinceID){
+        switch (serverType){
+            case MASTODON -> {
+                return new GetHomeTimeline(maxID, minID, limit, sinceID);
+            }
+            case MISSKEY -> {
+                return null;
+            }
+        }
+        return null;
+    }
+
+
+
+    public enum ServerType {
+        MASTODON,
+        MISSKEY,
+    }
+}
--- a/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/HeaderPaginationRequest.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/HeaderPaginationRequest.java
@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.requests;
+package org.joinmastodon.android.api.mastodon.requests;

 import android.net.Uri;
 import android.text.TextUtils;
--- a/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/AuthorizeFollowRequest.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/AuthorizeFollowRequest.java
@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.requests.accounts;
+package org.joinmastodon.android.api.mastodon.requests.accounts;

 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.Relationship;
--- a/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/GetAccountByHandle.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/GetAccountByHandle.java
@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.requests.accounts;
+package org.joinmastodon.android.api.mastodon.requests.accounts;

 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.Account;
--- a/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/GetAccountByID.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/GetAccountByID.java
@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.requests.accounts;
+package org.joinmastodon.android.api.mastodon.requests.accounts;

 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.Account;
--- a/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/GetAccountFollowers.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/GetAccountFollowers.java
@@ -1,8 +1,8 @@
-package org.joinmastodon.android.api.requests.accounts;
+package org.joinmastodon.android.api.mastodon.requests.accounts;

 import com.google.gson.reflect.TypeToken;

-import org.joinmastodon.android.api.requests.HeaderPaginationRequest;
+import org.joinmastodon.android.api.mastodon.requests.HeaderPaginationRequest;
 import org.joinmastodon.android.model.Account;

 public class GetAccountFollowers extends HeaderPaginationRequest<Account>{
--- a/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/GetAccountFollowing.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/GetAccountFollowing.java
@@ -1,8 +1,8 @@
-package org.joinmastodon.android.api.requests.accounts;
+package org.joinmastodon.android.api.mastodon.requests.accounts;

 import com.google.gson.reflect.TypeToken;

-import org.joinmastodon.android.api.requests.HeaderPaginationRequest;
+import org.joinmastodon.android.api.mastodon.requests.HeaderPaginationRequest;
 import org.joinmastodon.android.model.Account;

 public class GetAccountFollowing extends HeaderPaginationRequest<Account>{
--- a/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/GetAccountRelationships.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/GetAccountRelationships.java
@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.requests.accounts;
+package org.joinmastodon.android.api.mastodon.requests.accounts;

 import com.google.gson.reflect.TypeToken;

--- a/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/GetAccountStatuses.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/GetAccountStatuses.java
@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.requests.accounts;
+package org.joinmastodon.android.api.mastodon.requests.accounts;

 import com.google.gson.reflect.TypeToken;

--- a/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/GetFollowRequests.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/GetFollowRequests.java
@@ -1,8 +1,8 @@
-package org.joinmastodon.android.api.requests.accounts;
+package org.joinmastodon.android.api.mastodon.requests.accounts;

 import com.google.gson.reflect.TypeToken;

-import org.joinmastodon.android.api.requests.HeaderPaginationRequest;
+import org.joinmastodon.android.api.mastodon.requests.HeaderPaginationRequest;
 import org.joinmastodon.android.model.Account;

 public class GetFollowRequests extends HeaderPaginationRequest<Account>{
--- a/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/GetFollowSuggestions.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/GetFollowSuggestions.java
@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.requests.accounts;
+package org.joinmastodon.android.api.mastodon.requests.accounts;

 import com.google.gson.reflect.TypeToken;

--- a/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/GetOwnAccount.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/GetOwnAccount.java
@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.requests.accounts;
+package org.joinmastodon.android.api.mastodon.requests.accounts;

 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.Account;
--- a/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/GetPreferences.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/GetPreferences.java
@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.requests.accounts;
+package org.joinmastodon.android.api.mastodon.requests.accounts;

 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.Preferences;
--- a/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/GetWordFilters.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/GetWordFilters.java
@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.requests.accounts;
+package org.joinmastodon.android.api.mastodon.requests.accounts;

 import com.google.gson.reflect.TypeToken;

--- a/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/RegisterAccount.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/RegisterAccount.java
@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.requests.accounts;
+package org.joinmastodon.android.api.mastodon.requests.accounts;

 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.Token;
--- a/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/RejectFollowRequest.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/RejectFollowRequest.java
@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.requests.accounts;
+package org.joinmastodon.android.api.mastodon.requests.accounts;

 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.Relationship;
--- a/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/ResendConfirmationEmail.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/ResendConfirmationEmail.java
@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.requests.accounts;
+package org.joinmastodon.android.api.mastodon.requests.accounts;

 import org.joinmastodon.android.api.MastodonAPIRequest;

--- a/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/SetAccountBlocked.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/SetAccountBlocked.java
@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.requests.accounts;
+package org.joinmastodon.android.api.mastodon.requests.accounts;

 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.Relationship;
--- a/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/SetAccountFollowed.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/SetAccountFollowed.java
@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.requests.accounts;
+package org.joinmastodon.android.api.mastodon.requests.accounts;

 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.Relationship;
--- a/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/SetAccountMuted.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/SetAccountMuted.java
@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.requests.accounts;
+package org.joinmastodon.android.api.mastodon.requests.accounts;

 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.Relationship;
--- a/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/SetDomainBlocked.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/SetDomainBlocked.java
@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.requests.accounts;
+package org.joinmastodon.android.api.mastodon.requests.accounts;

 import org.joinmastodon.android.api.MastodonAPIRequest;

--- a/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/SetPrivateNote.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/SetPrivateNote.java
@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.requests.accounts;
+package org.joinmastodon.android.api.mastodon.requests.accounts;

 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.Relationship;
--- a/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/UpdateAccountCredentials.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/UpdateAccountCredentials.java
@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.requests.accounts;
+package org.joinmastodon.android.api.mastodon.requests.accounts;

 import android.net.Uri;

--- a/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/announcements/DismissAnnouncement.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/announcements/DismissAnnouncement.java
@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.requests.announcements;
+package org.joinmastodon.android.api.mastodon.requests.announcements;

 import org.joinmastodon.android.api.MastodonAPIRequest;

--- a/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/announcements/GetAnnouncements.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/announcements/GetAnnouncements.java
@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.requests.announcements;
+package org.joinmastodon.android.api.mastodon.requests.announcements;

 import com.google.gson.reflect.TypeToken;

--- a/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/catalog/GetCatalogCategories.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/catalog/GetCatalogCategories.java
@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.requests.catalog;
+package org.joinmastodon.android.api.mastodon.requests.catalog;

 import android.net.Uri;
 import android.text.TextUtils;
--- a/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/catalog/GetCatalogInstances.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/catalog/GetCatalogInstances.java
@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.requests.catalog;
+package org.joinmastodon.android.api.mastodon.requests.catalog;

 import android.net.Uri;
 import android.text.TextUtils;
--- a/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/instance/GetCustomEmojis.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/instance/GetCustomEmojis.java
@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.requests.instance;
+package org.joinmastodon.android.api.mastodon.requests.instance;

 import com.google.gson.reflect.TypeToken;

--- a/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/instance/GetInstance.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/instance/GetInstance.java
@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.requests.instance;
+package org.joinmastodon.android.api.mastodon.requests.instance;

 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.Instance;
--- a/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/lists/AddAccountsToList.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/lists/AddAccountsToList.java
@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.requests.lists;
+package org.joinmastodon.android.api.mastodon.requests.lists;

 import org.joinmastodon.android.api.MastodonAPIRequest;
 import java.util.List;
--- a/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/lists/AddList.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/lists/AddList.java
@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.requests.lists;
+package org.joinmastodon.android.api.mastodon.requests.lists;

 import org.joinmastodon.android.api.MastodonAPIRequest;
 import java.util.List;
--- a/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/lists/CreateList.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/lists/CreateList.java
@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.requests.lists;
+package org.joinmastodon.android.api.mastodon.requests.lists;

 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.ListTimeline;
--- a/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/lists/DeleteList.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/lists/DeleteList.java
@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.requests.lists;
+package org.joinmastodon.android.api.mastodon.requests.lists;

 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.ListTimeline;
--- a/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/lists/EditListName.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/lists/EditListName.java
@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.requests.lists;
+package org.joinmastodon.android.api.mastodon.requests.lists;

 import org.joinmastodon.android.api.MastodonAPIRequest;
 import java.util.List;
--- a/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/lists/GetList.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/lists/GetList.java
@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.requests.lists;
+package org.joinmastodon.android.api.mastodon.requests.lists;

 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.ListTimeline;
--- a/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/lists/GetLists.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/lists/GetLists.java
@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.requests.lists;
+package org.joinmastodon.android.api.mastodon.requests.lists;

 import com.google.gson.reflect.TypeToken;

--- a/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/lists/RemoveAccountsFromList.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/lists/RemoveAccountsFromList.java
@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.requests.lists;
+package org.joinmastodon.android.api.mastodon.requests.lists;

 import org.joinmastodon.android.api.MastodonAPIRequest;
 import java.util.List;
--- a/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/lists/RemoveList.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/lists/RemoveList.java
@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.requests.lists;
+package org.joinmastodon.android.api.mastodon.requests.lists;

 import org.joinmastodon.android.api.MastodonAPIRequest;
 import java.util.List;
--- a/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/lists/UpdateList.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/lists/UpdateList.java
@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.requests.lists;
+package org.joinmastodon.android.api.mastodon.requests.lists;

 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.ListTimeline;
--- a/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/markers/GetMarkers.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/markers/GetMarkers.java
@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.requests.markers;
+package org.joinmastodon.android.api.mastodon.requests.markers;

 import org.joinmastodon.android.api.ApiUtils;
 import org.joinmastodon.android.api.MastodonAPIRequest;
--- a/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/markers/SaveMarkers.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/markers/SaveMarkers.java
@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.requests.markers;
+package org.joinmastodon.android.api.mastodon.requests.markers;

 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.api.gson.JsonObjectBuilder;
--- a/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/notifications/DismissNotification.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/notifications/DismissNotification.java
@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.requests.notifications;
+package org.joinmastodon.android.api.mastodon.requests.notifications;

 import com.google.gson.reflect.TypeToken;

--- a/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/notifications/GetNotificationByID.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/notifications/GetNotificationByID.java
@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.requests.notifications;
+package org.joinmastodon.android.api.mastodon.requests.notifications;

 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.Notification;
--- a/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/notifications/GetNotifications.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/notifications/GetNotifications.java
@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.requests.notifications;
+package org.joinmastodon.android.api.mastodon.requests.notifications;

 import com.google.gson.reflect.TypeToken;

--- a/Show More
+++ b/Show More