feat: still show the attach menu even if no PhotoPicker is avaiable

This is due to the newly added camera shortcut, which makes the menu necessary even if no PhotoPicker is available

.github/FUNDING.yml

@@ -1,6 +1,7 @@
 # These are supported funding model platforms
 
 github: LucasGGamerM
+custom: ["https://liberapay.com/LucasGGamerM/donate", liberapay.com]
 patreon: # mastodon
 open_collective: # Replace with a single Open Collective username e.g., user1
 tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel

.github/workflows/nightly-builds.yml

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

FAQ.md

@@ -3,3 +3,7 @@
 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. 
+
+Q: Will there ever be a versjon of Moshidon for iOS? 
+
+A: No. As android and iOS apps do not share code, it is incredibly hard to port.

README.md

@@ -19,6 +19,10 @@
 <a href="https://apt.izzysoft.de/fdroid/index/apk/org.joinmastodon.android.moshinda"><img height="50" alt="Get it on IzzyOnDroid" src="img/izzy-badge.png"></a>
 
 ## Help out the project by donating at: https://github.com/sponsors/LucasGGamerM!
+### We also support LiberaPay at: https://liberapay.com/LucasGGamerM/donate!
+
+### You can also donate some Monero through this wallet address as well:
+4886mdarcyB6Yf8Qc6vDJBK1fz6ibHFLZUmHb4GZZz9yLGNhcG3XC64e5UZ8dVQYTLZb82W6P9WhteowW4STJEec97Gf22j
 
 --- 
 
@@ -191,6 +195,8 @@ This project is released under the [GPL-3 License](./LICENSE).
 
 [Official matrix chatroom:](https://matrix.to/#/#moshidon:floss.social) https://matrix.to/#/#moshidon:floss.social
 
+[Moshidon roadmap](https://github.com/users/LucasGGamerM/projects/1)
+
 <a rel="me" href="https://floss.social/@moshidon">@moshidon<wbr>@floss.social</a>
 
 ---

build.gradle

@@ -3,6 +3,7 @@ buildscript {
 	repositories {
 		google()
 		mavenCentral()
+		mavenLocal()
 	}
 	dependencies {
 		classpath 'com.android.tools.build:gradle:8.0.0'

mastodon/build.gradle

@@ -20,7 +20,7 @@ android {
 		versionName "1.3.0+fork.100.moshinda"
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         resourceConfigurations += ['ar-rSA', 'ar-rDZ', 'be-rBY', 'bn-rBD', 'bs-rBA', 'ca-rES', 'cs-rCZ', 'da-rDK', 'de-rDE', 'el-rGR', 'es-rES', 'eu-rES', 'fa-rIR', 'fi-rFI', 'fil-rPH', 'fr-rFR', 'ga-rIE', 'gd-rGB', 'gl-rES', 'hi-rIN', 'hr-rHR', 'hu-rHU', 'hy-rAM', 'ig-rNG', 'in-rID', 'is-rIS', 'it-rIT', 'iw-rIL', 'ja-rJP', 'kab', 'ko-rKR', 'my-rMM', 'nl-rNL', 'no-rNO', 'oc-rFR', 'pl-rPL', 'pt-rBR', 'pt-rPT', 'ro-rRO', 'ru-rRU', 'si-rLK', 'sl-rSI', 'sv-rSE', 'th-rTH', 'tr-rTR', 'uk-rUA', 'ur-rIN', 'vi-rVN', 'zh-rCN', 'zh-rTW']
-   	}
+    }
 
 	signingConfigs {
 		nightly{
@@ -62,7 +62,6 @@ android {
 			initWith release
 		}
 		nightly{
-			initWith release
 			if(System.getenv("CURRENT_DATE") != null){
 				versionNameSuffix '-nightly+@' + System.getenv("CURRENT_DATE")
 			} else {
@@ -71,6 +70,7 @@ android {
 				versionNameSuffix '-nightly+@' + properties.getProperty('CURRENT_DATE')
 			}
 			applicationIdSuffix '.nightly'
+
 			signingConfig signingConfigs.nightly
 			manifestPlaceholders = [oAuthScheme:"moshidon-android-nightly-auth"]
 		}
@@ -114,7 +114,7 @@ dependencies {
 	implementation 'me.grishka.litex:dynamicanimation:1.1.0-alpha03'
 	implementation 'me.grishka.litex:viewpager:1.0.0'
 	implementation 'me.grishka.litex:viewpager2:1.0.0'
-	implementation 'me.grishka.appkit:appkit:1.2.7'
+	implementation 'me.grishka.appkit:appkit:1.2.8'
 	implementation 'com.google.code.gson:gson:2.9.0'
 	implementation 'org.jsoup:jsoup:1.14.3'
 	implementation 'com.squareup:otto:1.3.8'

mastodon/src/androidTest/java/org/joinmastodon/android/fragments/ThreadFragmentTest.java

@@ -0,0 +1,113 @@
+package org.joinmastodon.android.fragments;
+
+import static org.junit.Assert.*;
+
+import org.joinmastodon.android.events.StatusCountersUpdatedEvent;
+import org.joinmastodon.android.events.StatusUpdatedEvent;
+import org.joinmastodon.android.model.Status;
+import org.joinmastodon.android.model.StatusContext;
+import org.junit.Test;
+
+import java.time.Instant;
+import java.util.List;
+
+public class ThreadFragmentTest {
+
+	private Status fakeStatus(String id, String inReplyTo) {
+		Status status = Status.ofFake(id, null, null);
+		status.inReplyToId = inReplyTo;
+		return status;
+	}
+
+	private ThreadFragment.NeighborAncestryInfo fakeInfo(Status s, Status d, Status a) {
+		return new ThreadFragment.NeighborAncestryInfo(s, d, a);
+	}
+
+	@Test
+	public void mapNeighborhoodAncestry() {
+		StatusContext context = new StatusContext();
+		context.ancestors = List.of(
+				fakeStatus("oldest ancestor", null),
+				fakeStatus("younger ancestor", "oldest ancestor")
+		);
+		Status mainStatus = fakeStatus("main status", "younger ancestor");
+		context.descendants = List.of(
+				fakeStatus("first reply", "main status"),
+				fakeStatus("reply to first reply", "first reply"),
+				fakeStatus("third level reply", "reply to first reply"),
+				fakeStatus("another reply", "main status")
+		);
+
+		List<ThreadFragment.NeighborAncestryInfo> neighbors =
+				ThreadFragment.mapNeighborhoodAncestry(mainStatus, context);
+
+		assertEquals(List.of(
+				fakeInfo(context.ancestors.get(0), context.ancestors.get(1), null),
+				fakeInfo(context.ancestors.get(1), mainStatus, context.ancestors.get(0)),
+				fakeInfo(mainStatus, context.descendants.get(0), context.ancestors.get(1)),
+				fakeInfo(context.descendants.get(0), context.descendants.get(1), mainStatus),
+				fakeInfo(context.descendants.get(1), context.descendants.get(2), context.descendants.get(0)),
+				fakeInfo(context.descendants.get(2), null, context.descendants.get(1)),
+				fakeInfo(context.descendants.get(3), null, null)
+		), neighbors);
+	}
+
+	@Test
+	public void maybeApplyMainStatus() {
+		ThreadFragment fragment = new ThreadFragment();
+		fragment.contextInitiallyRendered = true;
+		fragment.mainStatus = Status.ofFake("123456", "original text", Instant.EPOCH);
+
+		Status update1 = Status.ofFake("123456", "updated text", Instant.EPOCH);
+		update1.editedAt = Instant.ofEpochSecond(1);
+		fragment.updatedStatus = update1;
+		StatusUpdatedEvent event1 = (StatusUpdatedEvent) fragment.maybeApplyMainStatus();
+		assertEquals("fired update event", update1, event1.status);
+		assertEquals("updated main status", update1, fragment.mainStatus);
+
+		Status update2 = Status.ofFake("123456", "updated text", Instant.EPOCH);
+		update2.favouritesCount = 123;
+		fragment.updatedStatus = update2;
+		StatusCountersUpdatedEvent event2 = (StatusCountersUpdatedEvent) fragment.maybeApplyMainStatus();
+		assertEquals("only fired counter update event", update2.id, event2.id);
+		assertEquals("updated counter is correct", 123, event2.favorites);
+		assertEquals("updated main status", update2, fragment.mainStatus);
+
+		Status update3 = Status.ofFake("123456", "whatever", Instant.EPOCH);
+		fragment.contextInitiallyRendered = false;
+		fragment.updatedStatus = update3;
+		assertNull("no update when context hasn't been rendered", fragment.maybeApplyMainStatus());
+	}
+
+	@Test
+	public void sortStatusContext() {
+		StatusContext context = new StatusContext();
+		context.ancestors = List.of(
+				fakeStatus("younger ancestor", "oldest ancestor"),
+				fakeStatus("oldest ancestor", null)
+		);
+		context.descendants = List.of(
+				fakeStatus("reply to first reply", "first reply"),
+				fakeStatus("third level reply", "reply to first reply"),
+				fakeStatus("first reply", "main status"),
+				fakeStatus("another reply", "main status")
+		);
+
+		ThreadFragment.sortStatusContext(
+				fakeStatus("main status", "younger ancestor"),
+				context
+		);
+		List<Status> expectedAncestors = List.of(
+				fakeStatus("oldest ancestor", null),
+				fakeStatus("younger ancestor", "oldest ancestor")
+		);
+		List<Status> expectedDescendants = List.of(
+				fakeStatus("first reply", "main status"),
+				fakeStatus("reply to first reply", "first reply"),
+				fakeStatus("third level reply", "reply to first reply"),
+				fakeStatus("another reply", "main status")
+		);
+
+		// TODO: ??? i have no idea how this code works. it certainly doesn't return what i'd expect
+	}
+}

mastodon/src/androidTest/java/org/joinmastodon/android/test/StoreScreenshotsGenerator.java

@@ -1,8 +1,10 @@
 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;
 
@@ -12,10 +14,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.mastodon.requests.instance.GetInstance;
+import org.joinmastodon.android.api.requests.instance.GetInstance;
-import org.joinmastodon.android.api.mastodon.requests.statuses.GetStatusByID;
+import org.joinmastodon.android.api.requests.statuses.GetStatusByID;
-import org.joinmastodon.android.api.mastodon.session.AccountSession;
+import org.joinmastodon.android.api.session.AccountSession;
-import org.joinmastodon.android.api.mastodon.session.AccountSessionManager;
+import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.ComposeFragment;
 import org.joinmastodon.android.fragments.ThreadFragment;
 import org.joinmastodon.android.fragments.onboarding.InstanceRulesFragment;
@@ -30,9 +32,12 @@ 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;
@@ -42,15 +47,18 @@ 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)

mastodon/src/androidTest/java/org/joinmastodon/android/ui/utils/UiUtilsTest.java

@@ -0,0 +1,106 @@
+package org.joinmastodon.android.ui.utils;
+
+import static org.junit.Assert.*;
+
+import android.util.Pair;
+
+import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.model.Instance;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import java.util.Optional;
+
+public class UiUtilsTest {
+	@BeforeClass
+	public static void createDummySession() {
+		Instance dummyInstance = new Instance();
+		dummyInstance.uri = "test.tld";
+		Account dummyAccount = new Account();
+		dummyAccount.id = "123456";
+		AccountSessionManager.getInstance().addAccount(dummyInstance, null, dummyAccount, null, null);
+	}
+
+	@AfterClass
+	public static void cleanUp() {
+		AccountSessionManager.getInstance().removeAccount("test.tld_123456");
+	}
+
+	@Test
+	public void parseFediverseHandle() {
+		assertEquals(
+				Optional.of(Pair.create("megalodon", Optional.of("floss.social"))),
+				UiUtils.parseFediverseHandle("megalodon@floss.social")
+		);
+
+		assertEquals(
+				Optional.of(Pair.create("megalodon", Optional.of("floss.social"))),
+				UiUtils.parseFediverseHandle("@megalodon@floss.social")
+		);
+
+		assertEquals(
+				Optional.of(Pair.create("megalodon", Optional.empty())),
+				UiUtils.parseFediverseHandle("@megalodon")
+		);
+
+		assertEquals(
+				Optional.of(Pair.create("megalodon", Optional.of("floss.social"))),
+				UiUtils.parseFediverseHandle("mailto:megalodon@floss.social")
+		);
+
+		assertEquals(
+				Optional.empty(),
+				UiUtils.parseFediverseHandle("megalodon")
+		);
+
+		assertEquals(
+				Optional.empty(),
+				UiUtils.parseFediverseHandle("this is not a fedi handle")
+		);
+
+		assertEquals(
+				Optional.empty(),
+				UiUtils.parseFediverseHandle("not@a-domain")
+		);
+	}
+
+	@Test
+	public void acctMatches() {
+		assertTrue("local account, domain not specified", UiUtils.acctMatches(
+				"test.tld_123456",
+				"someone",
+				"someone",
+				null
+		));
+
+		assertTrue("domain not specified", UiUtils.acctMatches(
+				"test.tld_123456",
+				"someone@somewhere.social",
+				"someone",
+				null
+		));
+
+		assertTrue("local account, domain specified, different casing", UiUtils.acctMatches(
+				"test.tld_123456",
+				"SomeOne",
+				"someone",
+				"Test.TLD"
+		));
+
+		assertFalse("username doesn't match", UiUtils.acctMatches(
+				"test.tld_123456",
+				"someone-else@somewhere.social",
+				"someone",
+				"somewhere.social"
+		));
+
+		assertFalse("domain doesn't match", UiUtils.acctMatches(
+				"test.tld_123456",
+				"someone@somewhere.social",
+				"someone",
+				"somewhere.else"
+		));
+	}
+}

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

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

mastodon/src/main/AndroidManifest.xml

@@ -5,6 +5,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.CAMERA" />
     <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"/>
@@ -40,6 +41,22 @@
 				<category android:name="android.intent.category.LAUNCHER"/>
 			</intent-filter>
 		</activity>
+		<activity
+			android:name=".PanicResponderActivity"
+			android:exported="true"
+			android:launchMode="singleInstance"
+			android:noHistory="true"
+			android:theme="@android:style/Theme.NoDisplay">
+			<intent-filter>
+				<action android:name="info.guardianproject.panic.action.TRIGGER" />
+
+				<category android:name="android.intent.category.DEFAULT" />
+			</intent-filter>
+		</activity>
+		<activity
+			android:name=".ExitActivity"
+			android:exported="false"
+			android:theme="@android:style/Theme.NoDisplay" />
 		<activity android:name=".OAuthActivity" android:exported="true" android:configChanges="orientation|screenSize" android:launchMode="singleTask">
 			<intent-filter>
 				<action android:name="android.intent.action.VIEW"/>

mastodon/src/main/assets/blocks.tsv

@@ -1,89 +0,0 @@
-#	lists.d Mastodon Blocklist	(c) 2022 Greyhat Academy	LICENSED  UNDER: CC-BY-NC-SA 4.0
-#	https://raw.githubusercontent.com/greyhat-academy/lists.d/main/mastodon.domains.block.list.tsv
-#	This list contains domains of toxic mastodon instances
-#	Last-Modified:	1672044500
-
-#	gab - a neonazi social network
-gab.ai
-gab.com
-gab.protohype.net
-
-#	consequence-free speech
-social.unzensiert.to
-freeatlantis.com
-
-#	reactionary bigotry and hatespeech against marginalized groups
-poa.st
-freespeechextremist.com
-rdrama.cc
-outpoa.st
-anime.website
-gameliberty.club
-social.byoblu.com
-yggdrasil.social
-smuglo.li
-dogeposting.social
-unsafe.space
-freezepeach.xyz
-
-#	+ CSAM
-rojogato.com
-
-#	antivaxxer shitposting & fearmongering
-shadowsocial.org
-
-#	Kiwifarms
-kiwifarms.net
-kiwifarms.cc
-kiwifarms.is
-kiwifarms.pleroma.net
-
-
-# https://mastodon.art/@Curator/109649354849593592
-
-poa.st antisemitic racist homophobic
-nicecrew.digital antisemitic
-beefyboys.win antisemitic racist homophobic harassment
-cawfee.club antisemitic racist homophobic
-comfyboy.club antisemitic racist homophobic
-freespeechextremist.com racist homophobic
-cum.salon racist misogynist
-bae.st racist
-natehiggers.online racist
-rapemeat.solutions misogynist
-rapist.town misogynist
-rapefeminists.network misogynist
-kiwifarms.cc harassment
-noagendasocial.com noagenda
-posting.lolicon.rocks underage
-urchan.org harassment homophobic racist
-ryona.agency harassment
-yggdrasil.social antisemitic homophobic racist
-genderheretics.xyz transphobic
-baraag.net underage
-lolison.top underage
-shota.house underage
-shota.social underage
-aethy.com underage
-taullo.social underage
-childpawn.shop underage
-posting.lolicon.rocks underage
-loli.best underage
-gothloli.club underage
-smuglo.li underage
-youjo.love underage
-pedo.school underage
-lolison.network underage
-freak.university underage
-mirr0r.city underage
-xhais.love underage
-refusal.biz underage
-refusal.llc underage
-mirr0r.city underage
-nnia.space underage
-ignorelist.com malicious
-repl.co malicious
-
-# custom
-
-pawoo.net csam

mastodon/src/main/assets/blocks.txt

@@ -0,0 +1,171 @@
+13bells.com
+4aem.com
+aethy.com
+anime.website
+annihilation.social
+anon-kenkai.com
+asbestos.cafe
+bae.st
+bajax.us
+banepo.st
+baraag.net
+beefyboys.win
+beepboop.ga
+berserker.town
+bikeshed.party
+boks.moe
+brainsoap.net
+breastmilk.club
+brighteon.social
+cawfee.club
+clew.lol
+clubcyberia.co
+collapsitarian.io
+comfyboy.club
+contrapointsfan.club
+cum.camp
+cum.salon
+cybercriminal.eu
+darknight-coffee.org
+dembased.xyz
+desupost.soy
+detroitriotcity.com
+eatthebugs.social
+eientei.org
+elementality.org
+eveningzoo.club
+firedragonstudios.com
+firefaithfellowship.com
+fluf.club
+foxfam.club
+freak.university
+freeatlantis.com
+freecumextremist.com
+freedomstrike.org
+freesoftwareextremist.com
+freespeech.group
+freespeechextremist.com
+freetalklive.com
+froth.zone
+fulltermprivacy.com
+gameliberty.club
+gearlandia.haus
+genderheretics.xyz
+geofront.rocks
+gleasonator.com
+glee.li
+glindr.org
+goyim.app
+goyslop.cafe
+haeder.net
+handholding.io
+hidamari.apartments
+hitchhiker.social
+hunk.city
+iddqd.social
+intkos.link
+justicewarrior.social
+kawa-kun.com
+kitsunemimi.club
+kiwifarms.cc
+kompost.cz
+kurosawa.moe
+leafposter.club
+leftychan.net
+lewdieheaven.com
+liberdon.com
+ligma.pro
+lizards.live
+lolicon.rocks
+lolison.top
+lovingexpressions.net
+lucasvl.nl
+mahodou.moe
+makemysarcophagus.com
+maladaptive.art
+masochi.st
+mastinator.com
+merovingian.club
+midwaytrades.com
+mirr0r.city
+moa.st
+mouse.services
+mugicha.club
+narrativerry.xyz
+natehiggers.online
+neckbeard.xyz
+needs.vodka
+neenster.org
+nicecrew.digital
+nnia.space
+noagendasocial.com
+noagendasocial.nl
+noagendatube.com
+nobodyhasthe.biz
+nukem.biz
+obo.sh
+onionfarms.org
+outpoa.st
+pawlicker.com
+pawoo.net
+pedo.school
+piazza.today
+pibvt.net
+pieville.net
+pisskey.io
+plagu.ee
+pmth.us
+poa.st
+poast.org
+poast.tv
+poster.place
+prospeech.space
+quodverum.com
+rakket.app
+rapemeat.solutions
+rdrama.cc
+rebelbase.site
+retardedniggers.forsale
+rojogato.com
+ryona.agency
+schwartzwelt.xyz
+seal.cafe
+shigusegubu.club
+shitpost.cloud
+shitposter.club
+shota.house
+silliness.observer
+skinheads.eu
+skinheads.io
+skinheads.social
+skinheads.uk
+skippers-bin.com
+skyshanty.xyz
+slash.cl
+sleepy.cafe
+smuglo.li
+sneed.social
+sonichu.com
+spinster.xyz
+springbo.cc
+starnix.network
+stereophonic.space
+strelizia.net
+syspxl.xyz
+tastingtraffic.net
+teci.world
+theapex.social
+thepostearthdestination.com
+tkammer.de
+trumpislovetrumpis.life
+truthsocial.co.in
+urchan.org
+varishangout.net
+whinge.house
+whinge.town
+wideboys.org
+wolfgirl.bar
+xn--p1abe3d.xn--80asehdb
+yggdrasil.social
+youjo.love
+zztails.gay

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

@@ -1,5 +1,62 @@
 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";
 

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

@@ -0,0 +1,24 @@
+package org.joinmastodon.android;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+
+public class ExitActivity extends Activity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        finishAndRemoveTask();
+    }
+
+    public static void exit(Context context) {
+        Intent intent = new Intent(context, ExitActivity.class);
+        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
+        context.startActivity(intent);
+    }
+
+}

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

@@ -1,16 +1,17 @@
 package org.joinmastodon.android;
 
 import android.app.Fragment;
-import android.app.assist.AssistContent;
 import android.content.ClipData;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.text.TextUtils;
+import android.util.Pair;
 import android.widget.Toast;
 
-import org.joinmastodon.android.api.mastodon.session.AccountSession;
+import org.joinmastodon.android.api.MastodonAPIRequest;
-import org.joinmastodon.android.api.mastodon.session.AccountSessionManager;
+import org.joinmastodon.android.api.session.AccountSession;
+import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.ComposeFragment;
 import org.joinmastodon.android.ui.AccountSwitcherSheet;
 import org.joinmastodon.android.ui.utils.UiUtils;
@@ -19,6 +20,8 @@ import org.jsoup.internal.StringUtil;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Optional;
+import java.util.function.BiConsumer;
 
 import androidx.annotation.Nullable;
 import me.grishka.appkit.FragmentStackActivity;
@@ -30,22 +33,51 @@ public class ExternalShareActivity extends FragmentStackActivity{
 		super.onCreate(savedInstanceState);
 		if(savedInstanceState==null){
 
-			String text = getIntent().getStringExtra(Intent.EXTRA_TEXT);
+			Optional<String> text = Optional.ofNullable(getIntent().getStringExtra(Intent.EXTRA_TEXT));
-			boolean isMastodonURL = UiUtils.looksLikeMastodonUrl(text);
+			Optional<Pair<String, Optional<String>>> fediHandle = text.flatMap(UiUtils::parseFediverseHandle);
+			boolean isFediUrl = text.map(UiUtils::looksLikeMastodonUrl).orElse(false);
+			boolean isOpenable = isFediUrl || fediHandle.isPresent();
 
 			List<AccountSession> sessions=AccountSessionManager.getInstance().getLoggedInAccounts();
-			if(sessions.isEmpty()){
+			if (sessions.isEmpty()){
 				Toast.makeText(this, R.string.err_not_logged_in, Toast.LENGTH_SHORT).show();
 				finish();
-			}else if(sessions.size()==1 && !isMastodonURL){
+			} else if (isOpenable || sessions.size() > 1) {
+				AccountSwitcherSheet sheet = new AccountSwitcherSheet(this, null, true, isOpenable);
+				sheet.setOnClick((accountId, open) -> {
+					if (open && text.isPresent()) {
+						BiConsumer<Class<? extends Fragment>, Bundle> callback = (clazz, args) -> {
+							if (clazz == null) {
+								Toast.makeText(this, R.string.sk_open_in_app_failed, Toast.LENGTH_SHORT).show();
+								// TODO: do something about the window getting leaked
+								sheet.dismiss();
+								finish();
+								return;
+							}
+							args.putString("fromExternalShare", clazz.getSimpleName());
+							Intent intent = new Intent(this, MainActivity.class);
+							intent.putExtras(args);
+							finish();
+							startActivity(intent);
+						};
+
+						fediHandle
+								.<MastodonAPIRequest<?>>map(handle ->
+										UiUtils.lookupAccountHandle(this, accountId, handle, callback))
+								.or(() ->
+										UiUtils.lookupURL(this, accountId, text.get(), callback))
+								.ifPresent(req ->
+										req.wrapProgress(this, R.string.loading, true, d -> {
+											UiUtils.transformDialogForLookup(this, accountId, isFediUrl ? text.get() : null, d);
+											d.setOnDismissListener((ev) -> finish());
+										}));
+					} else {
+						openComposeFragment(accountId);
+					}
+				});
+				sheet.show();
+			} else if (sessions.size() == 1) {
 				openComposeFragment(sessions.get(0).getID());
-			}else{
-				new AccountSwitcherSheet(this, false, false, isMastodonURL, accountSession -> {
-					if(accountSession!=null)
-						openComposeFragment(accountSession.getID());
-					else
-						UiUtils.openURL(this, AccountSessionManager.getInstance().getLastActiveAccountID(), text);
-				}).show();
 			}
 		}
 	}
@@ -108,11 +140,4 @@ public class ExternalShareActivity extends FragmentStackActivity{
 			return null;
 		return new ArrayList<>(l);
 	}
-
-	@Override
-	public void onProvideAssistContent(AssistContent outContent) {
-		super.onProvideAssistContent(outContent);
-
-		outContent.setWebUri(Uri.parse(DomainManager.getInstance().getCurrentDomain()));
-	}
 }

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

@@ -9,6 +9,7 @@ import android.os.Build;
 import com.google.gson.JsonSyntaxException;
 import com.google.gson.reflect.TypeToken;
 
+import org.joinmastodon.android.model.ContentType;
 import org.joinmastodon.android.model.TimelineDefinition;
 
 import java.lang.reflect.Type;
@@ -30,14 +31,14 @@ public class GlobalUserPreferences{
 	public static boolean alwaysExpandContentWarnings;
 	public static boolean disableMarquee;
 	public static boolean disableSwipe;
-	public static boolean disableDividers;
+	public static boolean showDividers;
 	public static boolean voteButtonForSingleChoice;
-	public static boolean uniformNotificationIcon;
 	public static boolean enableDeleteNotifications;
+	public static boolean translateButtonOpenedOnly;
+	public static boolean uniformNotificationIcon;
 	public static boolean relocatePublishButton;
 	public static boolean reduceMotion;
 	public static boolean keepOnlyLatestNotification;
-	public static boolean enableFabAutoHide;
 	public static boolean disableAltTextReminder;
 	public static boolean showAltIndicator;
 	public static boolean showNoAltIndicator;
@@ -48,23 +49,28 @@ public class GlobalUserPreferences{
 	public static boolean spectatorMode;
 	public static boolean autoHideFab;
 	public static boolean defaultToUnlistedReplies;
-	public static boolean disableDoubleTapToSwipe;
+	public static boolean doubleTapToSwipe;
 	public static boolean compactReblogReplyLine;
 	public static boolean confirmBeforeReblog;
 	public static boolean replyLineAboveHeader;
 	public static boolean swapBookmarkWithBoostAction;
 	public static boolean loadRemoteAccountFollowers;
 	public static boolean mentionRebloggerAutomatically;
+	public static boolean allowRemoteLoading;
+	public static AutoRevealMode autoRevealEqualSpoilers;
 	public static String publishButtonText;
 	public static ThemePreference theme;
 	public static ColorPreference color;
 
 	private final static Type recentLanguagesType = new TypeToken<Map<String, List<String>>>() {}.getType();
 	private final static Type pinnedTimelinesType = new TypeToken<Map<String, List<TimelineDefinition>>>() {}.getType();
+	private final static Type accountsDefaultContentTypesType = new TypeToken<Map<String, ContentType>>() {}.getType();
 	public static Map<String, List<String>> recentLanguages;
 	public static Map<String, List<TimelineDefinition>> pinnedTimelines;
 	public static Set<String> accountsWithLocalOnlySupport;
 	public static Set<String> accountsInGlitchMode;
+	public static Set<String> accountsWithContentTypesEnabled;
+	public static Map<String, ContentType> accountsDefaultContentTypes;
 
 	private final static Type recentEmojisType = new TypeToken<Map<String, Integer>>() {}.getType();
 	public static Map<String, Integer> recentEmojis;
@@ -74,7 +80,6 @@ public class GlobalUserPreferences{
 	 */
 	public static String replyVisibility;
 
-
 	public static SharedPreferences getPrefs(){
 		return MastodonApp.context.getSharedPreferences("global", Context.MODE_PRIVATE);
 	}
@@ -85,6 +90,16 @@ public class GlobalUserPreferences{
 		catch (JsonSyntaxException ignored) { return orElse; }
 	}
 
+	public static void removeAccount(String accountId) {
+		recentLanguages.remove(accountId);
+		pinnedTimelines.remove(accountId);
+		accountsInGlitchMode.remove(accountId);
+		accountsWithLocalOnlySupport.remove(accountId);
+		accountsWithContentTypesEnabled.remove(accountId);
+		accountsDefaultContentTypes.remove(accountId);
+		save();
+	}
+
 	public static void load(){
 		SharedPreferences prefs=getPrefs();
 		playGifs=prefs.getBoolean("playGifs", true);
@@ -99,13 +114,14 @@ public class GlobalUserPreferences{
 		alwaysExpandContentWarnings=prefs.getBoolean("alwaysExpandContentWarnings", false);
 		disableMarquee=prefs.getBoolean("disableMarquee", false);
 		disableSwipe=prefs.getBoolean("disableSwipe", false);
-		disableDividers=prefs.getBoolean("disableDividers", true);
+		showDividers =prefs.getBoolean("showDividers", false);
 		relocatePublishButton=prefs.getBoolean("relocatePublishButton", true);
 		voteButtonForSingleChoice=prefs.getBoolean("voteButtonForSingleChoice", true);
 		enableDeleteNotifications=prefs.getBoolean("enableDeleteNotifications", false);
+		translateButtonOpenedOnly=prefs.getBoolean("translateButtonOpenedOnly", false);
+		uniformNotificationIcon=prefs.getBoolean("uniformNotificationIcon", false);
 		reduceMotion=prefs.getBoolean("reduceMotion", false);
 		keepOnlyLatestNotification=prefs.getBoolean("keepOnlyLatestNotification", false);
-		enableFabAutoHide=prefs.getBoolean("enableFabAutoHide", true);
 		disableAltTextReminder=prefs.getBoolean("disableAltTextReminder", false);
 		showAltIndicator=prefs.getBoolean("showAltIndicator", true);
 		showNoAltIndicator=prefs.getBoolean("showNoAltIndicator", true);
@@ -117,7 +133,7 @@ public class GlobalUserPreferences{
 		autoHideFab=prefs.getBoolean("autoHideFab", true);
 		compactReblogReplyLine=prefs.getBoolean("compactReblogReplyLine", true);
 		defaultToUnlistedReplies=prefs.getBoolean("defaultToUnlistedReplies", false);
-		disableDoubleTapToSwipe=prefs.getBoolean("disableDoubleTapToSwipe", false);
+		doubleTapToSwipe =prefs.getBoolean("doubleTapToSwipe", true);
 		replyLineAboveHeader=prefs.getBoolean("replyLineAboveHeader", true);
 		compactReblogReplyLine=prefs.getBoolean("compactReblogReplyLine", true);
 		confirmBeforeReblog=prefs.getBoolean("confirmBeforeReblog", false);
@@ -133,6 +149,10 @@ public class GlobalUserPreferences{
 		accountsWithLocalOnlySupport=prefs.getStringSet("accountsWithLocalOnlySupport", new HashSet<>());
 		accountsInGlitchMode=prefs.getStringSet("accountsInGlitchMode", new HashSet<>());
 		replyVisibility=prefs.getString("replyVisibility", null);
+		accountsWithContentTypesEnabled=prefs.getStringSet("accountsWithContentTypesEnabled", new HashSet<>());
+		accountsDefaultContentTypes=fromJson(prefs.getString("accountsDefaultContentTypes", null), accountsDefaultContentTypesType, new HashMap<>());
+		allowRemoteLoading=prefs.getBoolean("allowRemoteLoading", true);
+		autoRevealEqualSpoilers=AutoRevealMode.valueOf(prefs.getString("autoRevealEqualSpoilers", AutoRevealMode.THREADS.name()));
 
 		try {
 			if(android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.S){
@@ -159,13 +179,12 @@ public class GlobalUserPreferences{
 				.putBoolean("alwaysExpandContentWarnings", alwaysExpandContentWarnings)
 				.putBoolean("disableMarquee", disableMarquee)
 				.putBoolean("disableSwipe", disableSwipe)
-				.putBoolean("disableDividers", disableDividers)
+				.putBoolean("showDividers", showDividers)
 				.putBoolean("relocatePublishButton", relocatePublishButton)
 				.putBoolean("uniformNotificationIcon", uniformNotificationIcon)
 				.putBoolean("enableDeleteNotifications", enableDeleteNotifications)
 				.putBoolean("reduceMotion", reduceMotion)
 				.putBoolean("keepOnlyLatestNotification", keepOnlyLatestNotification)
-				.putBoolean("enableFabAutoHide", enableFabAutoHide)
 				.putBoolean("disableAltTextReminder", disableAltTextReminder)
 				.putBoolean("showAltIndicator", showAltIndicator)
 				.putBoolean("showNoAltIndicator", showNoAltIndicator)
@@ -174,10 +193,11 @@ public class GlobalUserPreferences{
 				.putBoolean("collapseLongPosts", collapseLongPosts)
 				.putBoolean("spectatorMode", spectatorMode)
 				.putBoolean("autoHideFab", autoHideFab)
+				.putBoolean("compactReblogReplyLine", compactReblogReplyLine)
 				.putString("publishButtonText", publishButtonText)
 				.putBoolean("bottomEncoding", bottomEncoding)
 				.putBoolean("defaultToUnlistedReplies", defaultToUnlistedReplies)
-				.putBoolean("disableDoubleTapToSwipe", disableDoubleTapToSwipe)
+				.putBoolean("doubleTapToSwipe", doubleTapToSwipe)
 				.putBoolean("compactReblogReplyLine", compactReblogReplyLine)
 				.putBoolean("replyLineAboveHeader", replyLineAboveHeader)
 				.putBoolean("confirmBeforeReblog", confirmBeforeReblog)
@@ -192,6 +212,10 @@ public class GlobalUserPreferences{
 				.putStringSet("accountsWithLocalOnlySupport", accountsWithLocalOnlySupport)
 				.putStringSet("accountsInGlitchMode", accountsInGlitchMode)
 				.putString("replyVisibility", replyVisibility)
+				.putStringSet("accountsWithContentTypesEnabled", accountsWithContentTypesEnabled)
+				.putString("accountsDefaultContentTypes", gson.toJson(accountsDefaultContentTypes))
+				.putBoolean("allowRemoteLoading", allowRemoteLoading)
+				.putString("autoRevealEqualSpoilers", autoRevealEqualSpoilers.name())
 				.apply();
 	}
 
@@ -212,5 +236,10 @@ public class GlobalUserPreferences{
 		LIGHT,
 		DARK
 	}
-}
 
+	public enum AutoRevealMode {
+		NEVER,
+		THREADS,
+		DISCUSSIONS
+	}
+}

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

@@ -1,18 +1,28 @@
 package org.joinmastodon.android;
 
+import static org.joinmastodon.android.fragments.ComposeFragment.CAMERA_PERMISSION_CODE;
+import static org.joinmastodon.android.fragments.ComposeFragment.CAMERA_PIC_REQUEST_CODE;
+
 import android.Manifest;
+import android.app.Activity;
 import android.app.Fragment;
 import android.app.assist.AssistContent;
 import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
+import android.provider.MediaStore;
 import android.util.Log;
+import android.view.View;
+import android.widget.FrameLayout;
+import android.widget.Toast;
 
 import org.joinmastodon.android.api.ObjectValidationException;
-import org.joinmastodon.android.api.mastodon.session.AccountSession;
+import org.joinmastodon.android.api.session.AccountSession;
-import org.joinmastodon.android.api.mastodon.session.AccountSessionManager;
+import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.events.PictureTakenEvent;
 import org.joinmastodon.android.fragments.ComposeFragment;
 import org.joinmastodon.android.fragments.HomeFragment;
 import org.joinmastodon.android.fragments.ProfileFragment;
@@ -22,13 +32,13 @@ import org.joinmastodon.android.fragments.onboarding.CustomWelcomeFragment;
 import org.joinmastodon.android.model.Notification;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.updater.GithubSelfUpdater;
+import org.joinmastodon.android.utils.ProvidesAssistContent;
 import org.parceler.Parcels;
 
 import androidx.annotation.Nullable;
 import me.grishka.appkit.FragmentStackActivity;
 
-public class MainActivity extends FragmentStackActivity{
+public class MainActivity extends FragmentStackActivity implements ProvidesAssistContent {
-
 	@Override
 	protected void onCreate(@Nullable Bundle savedInstanceState){
 		UiUtils.setUserPreferredTheme(this);
@@ -38,10 +48,18 @@ public class MainActivity extends FragmentStackActivity{
 			if(AccountSessionManager.getInstance().getLoggedInAccounts().isEmpty()){
 				showFragmentClearingBackStack(new CustomWelcomeFragment());
 			}else{
-				AccountSessionManager.getInstance().maybeUpdateLocalInfo();
 				AccountSession session;
 				Bundle args=new Bundle();
 				Intent intent=getIntent();
+				if(intent.hasExtra("fromExternalShare")) {
+					AccountSessionManager.getInstance()
+							.setLastActiveAccountID(intent.getStringExtra("account"));
+					AccountSessionManager.getInstance().maybeUpdateLocalInfo(
+							AccountSessionManager.getInstance().getLastActiveAccount());
+					showFragmentForExternalShare(intent.getExtras());
+					return;
+				}
+
 				boolean fromNotification = intent.getBooleanExtra("fromNotification", false);
 				boolean hasNotification = intent.hasExtra("notification");
 				if(fromNotification){
@@ -55,6 +73,7 @@ public class MainActivity extends FragmentStackActivity{
 				}else{
 					session=AccountSessionManager.getInstance().getLastActiveAccount();
 				}
+				AccountSessionManager.getInstance().maybeUpdateLocalInfo(session);
 				args.putString("account", session.getID());
 				Fragment fragment=session.activated ? new HomeFragment() : new AccountActivationFragment();
 				fragment.setArguments(args);
@@ -78,12 +97,12 @@ public class MainActivity extends FragmentStackActivity{
 	@Override
 	protected void onNewIntent(Intent intent){
 		super.onNewIntent(intent);
-		if(intent.getBooleanExtra("fromNotification", false)){
+		AccountSessionManager.getInstance().maybeUpdateLocalInfo();
+		if (intent.hasExtra("fromExternalShare")) showFragmentForExternalShare(intent.getExtras());
+		else if (intent.getBooleanExtra("fromNotification", false)) {
 			String accountID=intent.getStringExtra("accountID");
-			AccountSession accountSession;
 			try{
-				accountSession=AccountSessionManager.getInstance().getAccount(accountID);
+				AccountSessionManager.getInstance().getAccount(accountID);
-				DomainManager.getInstance().setCurrentDomain(accountSession.domain);
 			}catch(IllegalStateException x){
 				return;
 			}
@@ -107,23 +126,24 @@ public class MainActivity extends FragmentStackActivity{
 	}
 
 	private void showFragmentForNotification(Notification notification, String accountID){
-		Fragment fragment;
-		Bundle args=new Bundle();
-		args.putString("account", accountID);
-		args.putBoolean("_can_go_back", true);
 		try{
 			notification.postprocess();
 		}catch(ObjectValidationException x){
 			Log.w("MainActivity", x);
 			return;
 		}
-		if(notification.status!=null){
+		UiUtils.showFragmentForNotification(this, notification, accountID, null);
-			fragment=new ThreadFragment();
+	}
-			args.putParcelable("status", Parcels.wrap(notification.status));
+
-		}else{
+	private void showFragmentForExternalShare(Bundle args) {
-			fragment=new ProfileFragment();
+		String className = args.getString("fromExternalShare");
-			args.putParcelable("profileAccount", Parcels.wrap(notification.account));
+		Fragment fragment = switch (className) {
-		}
+			case "ThreadFragment" -> new ThreadFragment();
+			case "ProfileFragment" -> new ProfileFragment();
+			default -> null;
+		};
+		if (fragment == null) return;
+		args.putBoolean("_can_go_back", true);
 		fragment.setArguments(args);
 		showFragment(fragment);
 	}
@@ -157,25 +177,61 @@ public class MainActivity extends FragmentStackActivity{
 				(fragmentContainers.get(fragmentContainers.size() - 1)).getId()
 		);
 		Bundle currentArgs = currentFragment.getArguments();
-		if (this.fragmentContainers.size() == 1
+		if (fragmentContainers.size() != 1
-				&& currentArgs != null
+				|| currentArgs == null
-				&& currentArgs.getBoolean("_can_go_back", false)
+				|| !currentArgs.getBoolean("_can_go_back", false)) {
-				&& currentArgs.containsKey("account")) {
+			super.onBackPressed();
+			return;
+		}
+		if (currentArgs.getBoolean("_finish_on_back", false)) {
+			finish();
+		} else if (currentArgs.containsKey("account")) {
 			Bundle args = new Bundle();
 			args.putString("account", currentArgs.getString("account"));
-			args.putString("tab", "notifications");
+			if (getIntent().getBooleanExtra("fromNotification", false)) {
+				args.putString("tab", "notifications");
+			}
 			Fragment fragment=new HomeFragment();
 			fragment.setArguments(args);
 			showFragmentClearingBackStack(fragment);
-		} else {
-			super.onBackPressed();
 		}
 	}
-	@Override
-	public void onProvideAssistContent(AssistContent outContent) {
-		super.onProvideAssistContent(outContent);
 
-		outContent.setWebUri(Uri.parse(DomainManager.getInstance().getCurrentDomain()));
+	@Override
+	public void onActivityResult(int requestCode, int resultCode, Intent data){
+		if(requestCode==CAMERA_PIC_REQUEST_CODE && resultCode== Activity.RESULT_OK){
+			Bitmap image = (Bitmap) data.getExtras().get("data");
+			String path = MediaStore.Images.Media.insertImage(this.getContentResolver(), image, null, null);
+			E.post(new PictureTakenEvent(Uri.parse(path)));
+		}
 	}
 
+	@Override
+	public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
+		super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+
+		if (requestCode == CAMERA_PERMISSION_CODE && (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED)) {
+			Intent cameraIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
+			startActivityForResult(cameraIntent, CAMERA_PIC_REQUEST_CODE);
+		} else {
+			Toast.makeText(this, R.string.permission_required, Toast.LENGTH_SHORT);
+		}
+	}
+
+	public Fragment getCurrentFragment() {
+		for (int i = fragmentContainers.size() - 1; i >= 0; i--) {
+			FrameLayout fl = fragmentContainers.get(i);
+			if (fl.getVisibility() == View.VISIBLE) {
+				return getFragmentManager().findFragmentById(fl.getId());
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public void onProvideAssistContent(AssistContent assistContent) {
+		super.onProvideAssistContent(assistContent);
+		Fragment fragment = getCurrentFragment();
+		if (fragment != null) callFragmentToProvideAssistContent(fragment, assistContent);
+	}
 }

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

@@ -6,11 +6,12 @@ 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.mastodon.requests.accounts.GetOwnAccount;
+import org.joinmastodon.android.api.requests.accounts.GetOwnAccount;
-import org.joinmastodon.android.api.mastodon.requests.oauth.GetOauthToken;
+import org.joinmastodon.android.api.requests.oauth.GetOauthToken;
-import org.joinmastodon.android.api.mastodon.session.AccountSessionManager;
+import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Application;
 import org.joinmastodon.android.model.Instance;
@@ -60,6 +61,9 @@ public class OAuthActivity extends Activity{
 					@Override
 					public void onSuccess(Token token){
 						new GetOwnAccount()
+								// in case the instance (looking at pixelfed) wants to redirect to a
+								// website, we need to pass a context so we can launch a browser
+								.setContext(OAuthActivity.this)
 								.setCallback(new Callback<>(){
 									@Override
 									public void onSuccess(Account account){

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

@@ -0,0 +1,49 @@
+package org.joinmastodon.android;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+
+import org.joinmastodon.android.api.requests.oauth.RevokeOauthToken;
+import org.joinmastodon.android.api.session.AccountSession;
+import org.joinmastodon.android.api.session.AccountSessionManager;
+
+import me.grishka.appkit.api.Callback;
+import me.grishka.appkit.api.ErrorResponse;
+
+
+public class PanicResponderActivity extends Activity {
+    public static final String PANIC_TRIGGER_ACTION = "info.guardianproject.panic.action.TRIGGER";
+
+    @Override
+    protected void onCreate(final Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        final Intent intent = getIntent();
+        if (intent != null && PANIC_TRIGGER_ACTION.equals(intent.getAction())) {
+            AccountSessionManager.getInstance().getLoggedInAccounts().forEach(accountSession -> logOut(accountSession.getID()));
+            ExitActivity.exit(this);
+        }
+        finishAndRemoveTask();
+    }
+
+    private void logOut(String accountID){
+        AccountSession session=AccountSessionManager.getInstance().getAccount(accountID);
+        new RevokeOauthToken(session.app.clientId, session.app.clientSecret, session.token.accessToken)
+                .setCallback(new Callback<>(){
+                    @Override
+                    public void onSuccess(Object result){
+                        onLoggedOut(accountID);
+                    }
+
+                    @Override
+                    public void onError(ErrorResponse error){
+                        onLoggedOut(accountID);
+                    }
+                })
+                .exec(accountID);
+    }
+
+    private void onLoggedOut(String accountID){
+        AccountSessionManager.getInstance().removeAccount(accountID);
+    }
+}

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

@@ -12,29 +12,34 @@ 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.mastodon.requests.accounts.SetAccountFollowed;
+import org.joinmastodon.android.api.requests.accounts.SetAccountFollowed;
-import org.joinmastodon.android.api.mastodon.requests.notifications.GetNotificationByID;
+import org.joinmastodon.android.api.requests.notifications.GetNotificationByID;
-import org.joinmastodon.android.api.mastodon.requests.statuses.CreateStatus;
+import org.joinmastodon.android.api.requests.statuses.CreateStatus;
-import org.joinmastodon.android.api.mastodon.requests.statuses.SetStatusBookmarked;
+import org.joinmastodon.android.api.requests.statuses.SetStatusBookmarked;
-import org.joinmastodon.android.api.mastodon.requests.statuses.SetStatusFavorited;
+import org.joinmastodon.android.api.requests.statuses.SetStatusFavorited;
-import org.joinmastodon.android.api.mastodon.requests.statuses.SetStatusReblogged;
+import org.joinmastodon.android.api.requests.statuses.SetStatusReblogged;
-import org.joinmastodon.android.api.mastodon.session.AccountSession;
+import org.joinmastodon.android.api.session.AccountSession;
-import org.joinmastodon.android.api.mastodon.session.AccountSessionManager;
+import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.events.NotificationReceivedEvent;
 import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.model.Mention;
 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;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Random;
@@ -54,7 +59,7 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 	private static final String ACTION_KEY_TEXT_REPLY = "ACTION_KEY_TEXT_REPLY";
 
 	private static final int SUMMARY_ID = 791;
-	private static int notificationId;
+	private static int notificationId = 0;
 
 	@Override
 	public void onReceive(Context context, Intent intent){
@@ -295,27 +300,60 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 		}
 		CharSequence input = remoteInput.getCharSequence(ACTION_KEY_TEXT_REPLY);
 
+		// copied from ComposeFragment - TODO: generalize?
+		ArrayList<String> mentions=new ArrayList<>();
+		Status status = notification.status;
+		String ownID=AccountSessionManager.getInstance().getAccount(accountID).self.id;
+		if(!status.account.id.equals(ownID))
+			mentions.add('@'+status.account.acct);
+		for(Mention mention:status.mentions){
+			if(mention.id.equals(ownID))
+				continue;
+			String m='@'+mention.acct;
+			if(!mentions.contains(m))
+				mentions.add(m);
+		}
+		String initialText=mentions.isEmpty() ? "" : TextUtils.join(" ", mentions)+" ";
+
 		CreateStatus.Request req=new CreateStatus.Request();
-		req.status = input.toString() + "\n\n" + "@" + notification.status.account.acct;
+		req.status = initialText + input.toString();
-		req.language = notification.status.language;
+		req.language = preferences.postingDefaultLanguage;
-		req.visibility = (notification.status.visibility == StatusPrivacy.PUBLIC && GlobalUserPreferences.defaultToUnlistedReplies ? StatusPrivacy.UNLISTED : notification.status.visibility);
+		req.visibility = preferences.postingDefaultVisibility;
 		req.inReplyToId = notification.status.id;
 		if(!notification.status.spoilerText.isEmpty() && GlobalUserPreferences.prefixRepliesWithRe && !notification.status.spoilerText.startsWith("re: ")){
 			req.spoilerText = "re: " + notification.status.spoilerText;
 		}
 
-		new CreateStatus(req, UUID.randomUUID().toString()).exec(accountID);
+		new CreateStatus(req, UUID.randomUUID().toString()).setCallback(new Callback<>() {
+			@Override
+			public void onSuccess(Status status) {
+				NotificationManager notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+				Notification.Builder builder = android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O ?
+						new Notification.Builder(context, accountID+"_"+notification.type) :
+						new Notification.Builder(context)
+								.setPriority(Notification.PRIORITY_DEFAULT)
+								.setDefaults(Notification.DEFAULT_SOUND | Notification.DEFAULT_VIBRATE);
 
-		NotificationManager notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+				notification.status = status;
-		Notification.Builder builder = android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O ?
+				Intent contentIntent=new Intent(context, MainActivity.class);
-				new Notification.Builder(context, accountID+"_"+notification.type) :
+				contentIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-				new Notification.Builder(context)
+				contentIntent.putExtra("fromNotification", true);
-					.setPriority(Notification.PRIORITY_DEFAULT)
+				contentIntent.putExtra("accountID", accountID);
-					.setDefaults(Notification.DEFAULT_SOUND | Notification.DEFAULT_VIBRATE);
+				contentIntent.putExtra("notification", Parcels.wrap(notification));
 
-		Notification repliedNotification = builder.setSmallIcon(R.drawable.ic_ntf_logo)
+				Notification repliedNotification = builder.setSmallIcon(R.drawable.ic_ntf_logo)
-				.setContentText(context.getString(R.string.mo_notification_action_replied, notification.status.account.getDisplayUsername()))
+						.setContentTitle(context.getString(R.string.sk_notification_action_replied, notification.status.account.displayName))
-				.build();
+						.setContentText(status.getStrippedText())
-		notificationManager.notify(accountID, notificationId, repliedNotification);
+						.setCategory(Notification.CATEGORY_SOCIAL)
+						.setContentIntent(PendingIntent.getActivity(context, notificationId, contentIntent, PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT))
+						.build();
+				notificationManager.notify(accountID, notificationId, repliedNotification);
+			}
+
+			@Override
+			public void onError(ErrorResponse errorResponse) {
+
+			}
+		}).exec(accountID);
 	}
 }

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

@@ -11,10 +11,10 @@ import android.util.Log;
 
 import org.joinmastodon.android.BuildConfig;
 import org.joinmastodon.android.MastodonApp;
-import org.joinmastodon.android.api.adapter.ApiAdapter;
+import org.joinmastodon.android.api.requests.notifications.GetNotifications;
-import org.joinmastodon.android.api.mastodon.requests.notifications.GetNotifications;
+import org.joinmastodon.android.api.requests.timelines.GetHomeTimeline;
-import org.joinmastodon.android.api.mastodon.session.AccountSession;
+import org.joinmastodon.android.api.session.AccountSession;
-import org.joinmastodon.android.api.mastodon.session.AccountSessionManager;
+import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.model.CacheablePaginatedResponse;
 import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.Instance;
@@ -36,7 +36,7 @@ import me.grishka.appkit.utils.WorkerThread;
 
 public class CacheController{
 	private static final String TAG="CacheController";
-	private static final int DB_VERSION=3;
+	private static final int DB_VERSION=4;
 	private static final WorkerThread databaseThread=new WorkerThread("databaseThread");
 	private static final Handler uiHandler=new Handler(Looper.getMainLooper());
 
@@ -61,7 +61,7 @@ public class CacheController{
 				List<Filter> filters=AccountSessionManager.getInstance().getAccount(accountID).wordFilters.stream().filter(f->f.context.contains(Filter.FilterContext.HOME)).collect(Collectors.toList());
 				if(!forceReload){
 					SQLiteDatabase db=getOrOpenDatabase();
-					try(Cursor cursor=db.query("home_timeline", new String[]{"json", "flags"}, maxID==null ? null : "`id`<?", maxID==null ? null : new String[]{maxID}, null, null, "`id` DESC", count+"")){
+					try(Cursor cursor=db.query("home_timeline", new String[]{"json", "flags"}, maxID==null ? null : "`id`<?", maxID==null ? null : new String[]{maxID}, null, null, "`time` DESC", count+"")){
 						if(cursor.getCount()==count){
 							ArrayList<Status> result=new ArrayList<>();
 							cursor.moveToFirst();
@@ -73,10 +73,8 @@ public class CacheController{
 								int flags=cursor.getInt(1);
 								status.hasGapAfter=((flags & POST_FLAG_GAP_AFTER)!=0);
 								newMaxID=status.id;
-								for(Filter filter:filters){
+								if (!new StatusFilterPredicate(filters, Filter.FilterContext.HOME).test(status))
-									if(filter.matches(status))
+									continue outer;
-										continue outer;
-								}
 								result.add(status);
 							}while(cursor.moveToNext());
 							String _newMaxID=newMaxID;
@@ -87,12 +85,11 @@ public class CacheController{
 						Log.w(TAG, "getHomeTimeline: corrupted status object in database", x);
 					}
 				}
-				ApiAdapter apiAdapter = new ApiAdapter(ApiAdapter.ServerType.MASTODON);
+				new GetHomeTimeline(maxID, null, count, null)
-				apiAdapter.getHomeTimeline(maxID, null, count, null)
 						.setCallback(new Callback<>(){
 							@Override
 							public void onSuccess(List<Status> result){
-								callback.onSuccess(new CacheablePaginatedResponse<>(result.stream().filter(new StatusFilterPredicate(filters)).collect(Collectors.toList()), result.isEmpty() ? null : result.get(result.size()-1).id, false));
+								callback.onSuccess(new CacheablePaginatedResponse<>(result.stream().filter(new StatusFilterPredicate(filters, Filter.FilterContext.HOME)).collect(Collectors.toList()), result.isEmpty() ? null : result.get(result.size()-1).id, false));
 								putHomeTimeline(result, maxID==null);
 							}
 
@@ -115,7 +112,7 @@ public class CacheController{
 		runOnDbThread((db)->{
 			if(clear)
 				db.delete("home_timeline", null, null);
-			ContentValues values=new ContentValues(3);
+			ContentValues values=new ContentValues(4);
 			for(Status s:posts){
 				values.put("id", s.id);
 				values.put("json", MastodonAPIController.gson.toJson(s));
@@ -123,6 +120,7 @@ public class CacheController{
 				if(s.hasGapAfter)
 					flags|=POST_FLAG_GAP_AFTER;
 				values.put("flags", flags);
+				values.put("time", s.createdAt.getEpochSecond());
 				db.insertWithOnConflict("home_timeline", null, values, SQLiteDatabase.CONFLICT_REPLACE);
 			}
 		});
@@ -137,7 +135,7 @@ public class CacheController{
 				if(!forceReload){
 					SQLiteDatabase db=getOrOpenDatabase();
 					String table=onlyPosts ? "notifications_posts" : onlyMentions ? "notifications_mentions" : "notifications_all";
-					try(Cursor cursor=db.query(table, new String[]{"json"}, maxID==null ? null : "`id`<?", maxID==null ? null : new String[]{maxID}, null, null, "`id` DESC", count+"")){
+					try(Cursor cursor=db.query(table, new String[]{"json"}, maxID==null ? null : "`id`<?", maxID==null ? null : new String[]{maxID}, null, null, "`time` DESC", count+"")){
 						if(cursor.getCount()==count){
 							ArrayList<Notification> result=new ArrayList<>();
 							cursor.moveToFirst();
@@ -148,10 +146,8 @@ public class CacheController{
 								ntf.postprocess();
 								newMaxID=ntf.id;
 								if(ntf.status!=null){
-									for(Filter filter:filters){
+									if (!new StatusFilterPredicate(filters, Filter.FilterContext.NOTIFICATIONS).test(ntf.status))
-										if(filter.matches(ntf.status))
+										continue outer;
-											continue outer;
-									}
 								}
 								result.add(ntf);
 							}while(cursor.moveToNext());
@@ -164,17 +160,13 @@ public class CacheController{
 					}
 				}
 				Instance instance=AccountSessionManager.getInstance().getInstanceInfo(accountSession.domain);
-				new GetNotifications(maxID, count, onlyPosts ? EnumSet.of(Notification.Type.STATUS) : onlyMentions ? EnumSet.of(Notification.Type.MENTION): EnumSet.allOf(Notification.Type.class), instance.pleroma != null)
+				new GetNotifications(maxID, count, onlyPosts ? EnumSet.of(Notification.Type.STATUS) : onlyMentions ? EnumSet.of(Notification.Type.MENTION): EnumSet.allOf(Notification.Type.class), instance.isAkkoma())
 						.setCallback(new Callback<>(){
 							@Override
 							public void onSuccess(List<Notification> result){
 								callback.onSuccess(new CacheablePaginatedResponse<>(result.stream().filter(ntf->{
 									if(ntf.status!=null){
-										for(Filter filter:filters){
+										return new StatusFilterPredicate(filters, Filter.FilterContext.NOTIFICATIONS).test(ntf.status);
-											if(filter.matches(ntf.status)){
-												return false;
-											}
-										}
 									}
 									return true;
 								}).collect(Collectors.toList()), result.isEmpty() ? null : result.get(result.size()-1).id, false));
@@ -201,7 +193,7 @@ public class CacheController{
 			String table=onlyPosts ? "notifications_posts" : onlyMentions ? "notifications_mentions" : "notifications_all";
 			if(clear)
 				db.delete(table, null, null);
-			ContentValues values=new ContentValues(3);
+			ContentValues values=new ContentValues(4);
 			for(Notification n:notifications){
 				if(n.type==null){
 					continue;
@@ -209,6 +201,7 @@ public class CacheController{
 				values.put("id", n.id);
 				values.put("json", MastodonAPIController.gson.toJson(n));
 				values.put("type", n.type.ordinal());
+				values.put("time", n.createdAt.getEpochSecond());
 				db.insertWithOnConflict(table, null, values, SQLiteDatabase.CONFLICT_REPLACE);
 			}
 		});
@@ -305,21 +298,24 @@ public class CacheController{
 						CREATE TABLE `home_timeline` (
 							`id` VARCHAR(25) NOT NULL PRIMARY KEY,
 							`json` TEXT NOT NULL,
-							`flags` INTEGER NOT NULL DEFAULT 0
+							`flags` INTEGER NOT NULL DEFAULT 0,
+							`time` INTEGER NOT NULL
 						)""");
 			db.execSQL("""
 						CREATE TABLE `notifications_all` (
 							`id` VARCHAR(25) NOT NULL PRIMARY KEY,
 							`json` TEXT NOT NULL,
 							`flags` INTEGER NOT NULL DEFAULT 0,
-							`type` INTEGER NOT NULL
+							`type` INTEGER NOT NULL,
+							`time` INTEGER NOT NULL
 						)""");
 			db.execSQL("""
 						CREATE TABLE `notifications_mentions` (
 							`id` VARCHAR(25) NOT NULL PRIMARY KEY,
 							`json` TEXT NOT NULL,
 							`flags` INTEGER NOT NULL DEFAULT 0,
-							`type` INTEGER NOT NULL
+							`type` INTEGER NOT NULL,
+							`time` INTEGER NOT NULL
 						)""");
 			createRecentSearchesTable(db);
 			createPostsNotificationsTable(db);
@@ -327,12 +323,16 @@ public class CacheController{
 
 		@Override
 		public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion){
-			if(oldVersion==1){
+			if(oldVersion<2){
 				createRecentSearchesTable(db);
 			}
-			if(oldVersion==2){
+			if(oldVersion<3){
+				// MEGALODON-SPECIFIC
 				createPostsNotificationsTable(db);
 			}
+			if(oldVersion<4){
+				addTimeColumns(db);
+			}
 		}
 
 		private void createRecentSearchesTable(SQLiteDatabase db){
@@ -350,9 +350,21 @@ public class CacheController{
 							`id` VARCHAR(25) NOT NULL PRIMARY KEY,
 							`json` TEXT NOT NULL,
 							`flags` INTEGER NOT NULL DEFAULT 0,
-							`type` INTEGER NOT NULL
+							`type` INTEGER NOT NULL,
+							`time` INTEGER NOT NULL
 						)""");
 		}
+
+		private void addTimeColumns(SQLiteDatabase db){
+			db.execSQL("DELETE FROM `home_timeline`");
+			db.execSQL("DELETE FROM `notifications_all`");
+			db.execSQL("DELETE FROM `notifications_mentions`");
+			db.execSQL("DELETE FROM `notifications_posts`");
+			db.execSQL("ALTER TABLE `home_timeline` ADD `time` INTEGER NOT NULL DEFAULT 0");
+			db.execSQL("ALTER TABLE `notifications_all` ADD `time` INTEGER NOT NULL DEFAULT 0");
+			db.execSQL("ALTER TABLE `notifications_mentions` ADD `time` INTEGER NOT NULL DEFAULT 0");
+			db.execSQL("ALTER TABLE `notifications_posts` ADD `time` INTEGER NOT NULL DEFAULT 0");
+		}
 	}
 
 	@FunctionalInterface

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

@@ -15,8 +15,9 @@ 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.mastodon.session.AccountSession;
+import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.model.Status;
+import org.joinmastodon.android.ui.utils.UiUtils;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -28,6 +29,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -51,7 +53,9 @@ public class MastodonAPIController{
 			.registerTypeAdapter(Status.class, new Status.StatusDeserializer())
 			.create();
 	private static WorkerThread thread=new WorkerThread("MastodonAPIController");
-	private static OkHttpClient httpClient=new OkHttpClient.Builder().build();
+	private static OkHttpClient httpClient=new OkHttpClient.Builder()
+			.readTimeout(5, TimeUnit.MINUTES)
+			.build();
 
 	private AccountSession session;
 	private static List<String> badDomains = new ArrayList<>();
@@ -60,7 +64,7 @@ public class MastodonAPIController{
 		thread.start();
 		try {
 			final BufferedReader reader = new BufferedReader(new InputStreamReader(
-					MastodonApp.context.getAssets().open("blocks.tsv")
+					MastodonApp.context.getAssets().open("blocks.txt")
 			));
 			String line;
 			while ((line = reader.readLine()) != null) {
@@ -91,7 +95,7 @@ public class MastodonAPIController{
 				Request.Builder builder=new Request.Builder()
 						.url(req.getURL().toString())
 						.method(req.getMethod(), req.getRequestBody())
-						.header("User-Agent", "MastodonAndroid/"+BuildConfig.VERSION_NAME);
+						.header("User-Agent", "MoshidonAndroid/"+BuildConfig.VERSION_NAME);
 
 				String token=null;
 				if(session!=null)
@@ -158,6 +162,11 @@ public class MastodonAPIController{
 											respObj=gson.fromJson(reader, req.respClass);
 									}
 								}catch(JsonIOException|JsonSyntaxException x){
+									if (req.context != null && response.body().contentType().subtype().equals("html")) {
+										UiUtils.launchWebBrowser(req.context, response.request().url().toString());
+										req.cancel();
+										return;
+									}
 									if(BuildConfig.DEBUG)
 										Log.w(TAG, "["+(session==null ? "no-auth" : session.getID())+"] "+response+" error parsing or reading body", x);
 									req.onError(x.getLocalizedMessage(), response.code(), x);

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

@@ -2,6 +2,7 @@ package org.joinmastodon.android.api;
 
 import android.app.Activity;
 import android.app.ProgressDialog;
+import android.content.Context;
 import android.net.Uri;
 import android.util.Log;
 import android.util.Pair;
@@ -9,8 +10,8 @@ import android.util.Pair;
 import com.google.gson.reflect.TypeToken;
 
 import org.joinmastodon.android.BuildConfig;
-import org.joinmastodon.android.api.mastodon.session.AccountSession;
+import org.joinmastodon.android.api.session.AccountSession;
-import org.joinmastodon.android.api.mastodon.session.AccountSessionManager;
+import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.model.BaseModel;
 import org.joinmastodon.android.model.Token;
 
@@ -20,9 +21,11 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.function.Consumer;
 
 import androidx.annotation.CallSuper;
+import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import me.grishka.appkit.api.APIRequest;
 import me.grishka.appkit.api.Callback;
@@ -44,10 +47,11 @@ public abstract class MastodonAPIRequest<T> extends APIRequest<T>{
 	TypeToken<T> respTypeToken;
 	Call okhttpCall;
 	Token token;
-	boolean canceled;
+	boolean canceled, isRemote;
 	Map<String, String> headers;
 	private ProgressDialog progressDialog;
 	protected boolean removeUnsupportedItems;
+	@Nullable Context context;
 
 	public MastodonAPIRequest(HttpMethod method, String path, Class<T> respClass){
 		this.path=path;
@@ -101,6 +105,21 @@ public abstract class MastodonAPIRequest<T> extends APIRequest<T>{
 		return this;
 	}
 
+	public MastodonAPIRequest<T> execRemote(String domain) {
+		return execRemote(domain, null);
+	}
+
+	public MastodonAPIRequest<T> execRemote(String domain, @Nullable AccountSession remoteSession) {
+		this.isRemote = true;
+		return Optional.ofNullable(remoteSession)
+				.or(() -> AccountSessionManager.getInstance().getLoggedInAccounts().stream()
+						.filter(acc -> acc.domain.equals(domain))
+						.findAny())
+				.map(AccountSession::getID)
+				.map(this::exec)
+				.orElse(this.execNoAuth(domain));
+	}
+
 	public MastodonAPIRequest<T> wrapProgress(Activity activity, @StringRes int message, boolean cancelable){
 		return wrapProgress(activity, message, cancelable, null);
 	}
@@ -164,9 +183,20 @@ public abstract class MastodonAPIRequest<T> extends APIRequest<T>{
 		return this;
 	}
 
+	public MastodonAPIRequest<T> setContext(Context context) {
+		this.context = context;
+		return this;
+	}
+
+	@Nullable
+	public Context getContext() {
+		return context;
+	}
+
 	@CallSuper
 	public void validateAndPostprocessResponse(T respObj, Response httpResponse) throws IOException{
 		if(respObj instanceof BaseModel){
+			((BaseModel) respObj).isRemote = isRemote;
 			((BaseModel) respObj).postprocess();
 		}else if(respObj instanceof List){
 			if(removeUnsupportedItems){
@@ -175,6 +205,7 @@ public abstract class MastodonAPIRequest<T> extends APIRequest<T>{
 					Object item=itr.next();
 					if(item instanceof BaseModel){
 						try{
+							((BaseModel) item).isRemote = isRemote;
 							((BaseModel) item).postprocess();
 						}catch(ObjectValidationException x){
 							Log.w(TAG, "Removing invalid object from list", x);
@@ -182,15 +213,20 @@ public abstract class MastodonAPIRequest<T> extends APIRequest<T>{
 						}
 					}
 				}
+				// no idea why we're post-processing twice, but well, as long
+				// as upstream does it like this, i don't wanna break anything
 				for(Object item:((List<?>) respObj)){
 					if(item instanceof BaseModel){
+						((BaseModel) item).isRemote = isRemote;
 						((BaseModel) item).postprocess();
 					}
 				}
 			}else{
 				for(Object item:((List<?>) respObj)){
-					if(item instanceof BaseModel)
+					if(item instanceof BaseModel) {
+						((BaseModel) item).isRemote = isRemote;
 						((BaseModel) item).postprocess();
+					}
 				}
 			}
 		}

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.mastodon.requests.notifications.RegisterForPushNotifications;
+import org.joinmastodon.android.api.requests.notifications.RegisterForPushNotifications;
-import org.joinmastodon.android.api.mastodon.requests.notifications.UpdatePushSettings;
+import org.joinmastodon.android.api.requests.notifications.UpdatePushSettings;
-import org.joinmastodon.android.api.mastodon.session.AccountSession;
+import org.joinmastodon.android.api.session.AccountSession;
-import org.joinmastodon.android.api.mastodon.session.AccountSessionManager;
+import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.model.PushNotification;
 import org.joinmastodon.android.model.PushSubscription;
 
@@ -45,6 +45,7 @@ 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;
 

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.mastodon.requests.statuses.SetStatusBookmarked;
+import org.joinmastodon.android.api.requests.statuses.SetStatusBookmarked;
-import org.joinmastodon.android.api.mastodon.requests.statuses.SetStatusFavorited;
+import org.joinmastodon.android.api.requests.statuses.SetStatusFavorited;
-import org.joinmastodon.android.api.mastodon.requests.statuses.SetStatusReblogged;
+import org.joinmastodon.android.api.requests.statuses.SetStatusReblogged;
 import org.joinmastodon.android.events.StatusCountersUpdatedEvent;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.model.StatusPrivacy;
@@ -46,7 +46,7 @@ public class StatusInteractionController{
 					@Override
 					public void onSuccess(Status result){
 						runningFavoriteRequests.remove(status.id);
-						result.favouritesCount = Math.max(0, status.favouritesCount) + (favorited ? 1 : -1);
+						result.favouritesCount = Math.max(0, status.favouritesCount + (favorited ? 1 : -1));
 						cb.accept(result);
 						if (updateCounters) E.post(new StatusCountersUpdatedEvent(result));
 					}
@@ -80,7 +80,7 @@ public class StatusInteractionController{
 					public void onSuccess(Status reblog){
 						Status result = reblog.getContentStatus();
 						runningReblogRequests.remove(status.id);
-						result.reblogsCount = Math.max(0, status.reblogsCount) + (reblogged ? 1 : -1);
+						result.reblogsCount = Math.max(0, status.reblogsCount + (reblogged ? 1 : -1));
 						cb.accept(result);
 						if (updateCounters) E.post(new StatusCountersUpdatedEvent(result));
 					}

mastodon/src/main/java/org/joinmastodon/android/api/adapter/ApiAdapter.java

@@ -1,47 +0,0 @@
-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,
-    }
-}

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

@@ -1,25 +0,0 @@
-package org.joinmastodon.android.api.mastodon.requests.timelines;
-
-import com.google.gson.reflect.TypeToken;
-
-import org.joinmastodon.android.GlobalUserPreferences;
-import org.joinmastodon.android.api.MastodonAPIRequest;
-import org.joinmastodon.android.model.Status;
-
-import java.util.List;
-
-public class GetHomeTimeline extends MastodonAPIRequest<List<Status>>{
-	public GetHomeTimeline(String maxID, String minID, int limit, String sinceID){
-		super(HttpMethod.GET, "/timelines/home", new TypeToken<>(){});
-		if(maxID!=null)
-			addQueryParameter("max_id", maxID);
-		if(minID!=null)
-			addQueryParameter("min_id", minID);
-		if(sinceID!=null)
-			addQueryParameter("since_id", sinceID);
-		if(limit>0)
-			addQueryParameter("limit", ""+limit);
-		if(GlobalUserPreferences.replyVisibility != null)
-			addQueryParameter("reply_visibility", GlobalUserPreferences.replyVisibility);
-	}
-}

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

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.mastodon.requests;
+package org.joinmastodon.android.api.requests;
 
 import android.net.Uri;
 import android.text.TextUtils;

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

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.mastodon.requests.accounts;
+package org.joinmastodon.android.api.requests.accounts;
 
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.Relationship;

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

@@ -1,9 +1,13 @@
-package org.joinmastodon.android.api.mastodon.requests.accounts;
+package org.joinmastodon.android.api.requests.accounts;
 
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.Account;
 
 public class GetAccountByHandle extends MastodonAPIRequest<Account>{
+    /**
+     * note that this method usually only returns a result if the instance already knows about an
+     * account - so it makes sense for looking up local users, search might be preferred otherwise
+     */
     public GetAccountByHandle(String acct){
         super(HttpMethod.GET, "/accounts/lookup", Account.class);
         addQueryParameter("acct", acct);

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

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.mastodon.requests.accounts;
+package org.joinmastodon.android.api.requests.accounts;
 
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.Account;

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

@@ -1,8 +1,8 @@
-package org.joinmastodon.android.api.mastodon.requests.accounts;
+package org.joinmastodon.android.api.requests.accounts;
 
 import com.google.gson.reflect.TypeToken;
 
-import org.joinmastodon.android.api.mastodon.requests.HeaderPaginationRequest;
+import org.joinmastodon.android.api.requests.HeaderPaginationRequest;
 import org.joinmastodon.android.model.Account;
 
 public class GetAccountFollowers extends HeaderPaginationRequest<Account>{

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

@@ -1,8 +1,8 @@
-package org.joinmastodon.android.api.mastodon.requests.accounts;
+package org.joinmastodon.android.api.requests.accounts;
 
 import com.google.gson.reflect.TypeToken;
 
-import org.joinmastodon.android.api.mastodon.requests.HeaderPaginationRequest;
+import org.joinmastodon.android.api.requests.HeaderPaginationRequest;
 import org.joinmastodon.android.model.Account;
 
 public class GetAccountFollowing extends HeaderPaginationRequest<Account>{

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

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.mastodon.requests.accounts;
+package org.joinmastodon.android.api.requests.accounts;
 
 import com.google.gson.reflect.TypeToken;
 

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

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.mastodon.requests.accounts;
+package org.joinmastodon.android.api.requests.accounts;
 
 import com.google.gson.reflect.TypeToken;
 

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

@@ -1,8 +1,8 @@
-package org.joinmastodon.android.api.mastodon.requests.accounts;
+package org.joinmastodon.android.api.requests.accounts;
 
 import com.google.gson.reflect.TypeToken;
 
-import org.joinmastodon.android.api.mastodon.requests.HeaderPaginationRequest;
+import org.joinmastodon.android.api.requests.HeaderPaginationRequest;
 import org.joinmastodon.android.model.Account;
 
 public class GetFollowRequests extends HeaderPaginationRequest<Account>{

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

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.mastodon.requests.accounts;
+package org.joinmastodon.android.api.requests.accounts;
 
 import com.google.gson.reflect.TypeToken;
 

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

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.mastodon.requests.accounts;
+package org.joinmastodon.android.api.requests.accounts;
 
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.Account;

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

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.mastodon.requests.accounts;
+package org.joinmastodon.android.api.requests.accounts;
 
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.Preferences;

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

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.mastodon.requests.accounts;
+package org.joinmastodon.android.api.requests.accounts;
 
 import com.google.gson.reflect.TypeToken;
 

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

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.mastodon.requests.accounts;
+package org.joinmastodon.android.api.requests.accounts;
 
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.Token;

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

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.mastodon.requests.accounts;
+package org.joinmastodon.android.api.requests.accounts;
 
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.Relationship;

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

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.mastodon.requests.accounts;
+package org.joinmastodon.android.api.requests.accounts;
 
 import org.joinmastodon.android.api.MastodonAPIRequest;
 

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

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.mastodon.requests.accounts;
+package org.joinmastodon.android.api.requests.accounts;
 
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.Relationship;

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

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.mastodon.requests.accounts;
+package org.joinmastodon.android.api.requests.accounts;
 
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.Relationship;

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

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.mastodon.requests.accounts;
+package org.joinmastodon.android.api.requests.accounts;
 
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.Relationship;

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

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.mastodon.requests.accounts;
+package org.joinmastodon.android.api.requests.accounts;
 
 import org.joinmastodon.android.api.MastodonAPIRequest;
 

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

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.mastodon.requests.accounts;
+package org.joinmastodon.android.api.requests.accounts;
 
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.Relationship;

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

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.mastodon.requests.accounts;
+package org.joinmastodon.android.api.requests.accounts;
 
 import android.net.Uri;
 

mastodon/src/main/java/org/joinmastodon/android/api/requests/announcements/DismissAnnouncement.java

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.mastodon.requests.announcements;
+package org.joinmastodon.android.api.requests.announcements;
 
 import org.joinmastodon.android.api.MastodonAPIRequest;
 

mastodon/src/main/java/org/joinmastodon/android/api/requests/announcements/GetAnnouncements.java

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.mastodon.requests.announcements;
+package org.joinmastodon.android.api.requests.announcements;
 
 import com.google.gson.reflect.TypeToken;
 

mastodon/src/main/java/org/joinmastodon/android/api/requests/catalog/GetCatalogCategories.java

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.mastodon.requests.catalog;
+package org.joinmastodon.android.api.requests.catalog;
 
 import android.net.Uri;
 import android.text.TextUtils;

mastodon/src/main/java/org/joinmastodon/android/api/requests/catalog/GetCatalogInstances.java

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.mastodon.requests.catalog;
+package org.joinmastodon.android.api.requests.catalog;
 
 import android.net.Uri;
 import android.text.TextUtils;

mastodon/src/main/java/org/joinmastodon/android/api/requests/instance/GetCustomEmojis.java

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.mastodon.requests.instance;
+package org.joinmastodon.android.api.requests.instance;
 
 import com.google.gson.reflect.TypeToken;
 

mastodon/src/main/java/org/joinmastodon/android/api/requests/instance/GetDomainBlocks.java

@@ -0,0 +1,16 @@
+package org.joinmastodon.android.api.requests.instance;
+
+import com.google.gson.reflect.TypeToken;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.model.DomainBlock;
+import org.joinmastodon.android.model.ExtendedDescription;
+
+import java.util.List;
+
+public class GetDomainBlocks extends MastodonAPIRequest<List<DomainBlock>>{
+	public GetDomainBlocks(){
+		super(HttpMethod.GET, "/instance/domain_blocks", new TypeToken<>(){});
+	}
+
+}

mastodon/src/main/java/org/joinmastodon/android/api/requests/instance/GetExtendedDescription.java

@@ -0,0 +1,12 @@
+package org.joinmastodon.android.api.requests.instance;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.model.ExtendedDescription;
+import org.joinmastodon.android.model.Instance;
+
+public class GetExtendedDescription extends MastodonAPIRequest<ExtendedDescription>{
+	public GetExtendedDescription(){
+		super(HttpMethod.GET, "/instance/extended_description", ExtendedDescription.class);
+	}
+
+}

mastodon/src/main/java/org/joinmastodon/android/api/requests/instance/GetInstance.java

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.mastodon.requests.instance;
+package org.joinmastodon.android.api.requests.instance;
 
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.Instance;

mastodon/src/main/java/org/joinmastodon/android/api/requests/instance/GetWeeklyActivity.java

@@ -0,0 +1,15 @@
+package org.joinmastodon.android.api.requests.instance;
+
+import com.google.gson.reflect.TypeToken;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.model.WeeklyActivity;
+
+import java.util.List;
+
+public class GetWeeklyActivity extends MastodonAPIRequest<List<WeeklyActivity>>{
+	public GetWeeklyActivity(){
+		super(HttpMethod.GET, "/instance/activity", new TypeToken<>(){});
+	}
+
+}

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

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.mastodon.requests.lists;
+package org.joinmastodon.android.api.requests.lists;
 
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import java.util.List;

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

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.mastodon.requests.lists;
+package org.joinmastodon.android.api.requests.lists;
 
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import java.util.List;

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

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.mastodon.requests.lists;
+package org.joinmastodon.android.api.requests.lists;
 
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.ListTimeline;

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

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.mastodon.requests.lists;
+package org.joinmastodon.android.api.requests.lists;
 
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.ListTimeline;

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

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.mastodon.requests.lists;
+package org.joinmastodon.android.api.requests.lists;
 
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import java.util.List;

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

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.mastodon.requests.lists;
+package org.joinmastodon.android.api.requests.lists;
 
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.ListTimeline;

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

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.mastodon.requests.lists;
+package org.joinmastodon.android.api.requests.lists;
 
 import com.google.gson.reflect.TypeToken;
 

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

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.mastodon.requests.lists;
+package org.joinmastodon.android.api.requests.lists;
 
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import java.util.List;

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

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.mastodon.requests.lists;
+package org.joinmastodon.android.api.requests.lists;
 
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import java.util.List;

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

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.mastodon.requests.lists;
+package org.joinmastodon.android.api.requests.lists;
 
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.ListTimeline;

mastodon/src/main/java/org/joinmastodon/android/api/requests/markers/GetMarkers.java

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.mastodon.requests.markers;
+package org.joinmastodon.android.api.requests.markers;
 
 import org.joinmastodon.android.api.ApiUtils;
 import org.joinmastodon.android.api.MastodonAPIRequest;

mastodon/src/main/java/org/joinmastodon/android/api/requests/markers/SaveMarkers.java

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.mastodon.requests.markers;
+package org.joinmastodon.android.api.requests.markers;
 
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.api.gson.JsonObjectBuilder;

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

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.mastodon.requests.notifications;
+package org.joinmastodon.android.api.requests.notifications;
 
 import com.google.gson.reflect.TypeToken;
 

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

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.mastodon.requests.notifications;
+package org.joinmastodon.android.api.requests.notifications;
 
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.Notification;

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

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.mastodon.requests.notifications;
+package org.joinmastodon.android.api.requests.notifications;
 
 import com.google.gson.reflect.TypeToken;
 

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

@@ -0,0 +1,30 @@
+package org.joinmastodon.android.api.requests.notifications;
+
+import android.text.TextUtils;
+
+import com.google.gson.reflect.TypeToken;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.model.Notification;
+
+import java.util.List;
+
+import okhttp3.MultipartBody;
+import okhttp3.RequestBody;
+
+public class PleromaMarkNotificationsRead extends MastodonAPIRequest<List<Notification>> {
+    private String maxID;
+    public PleromaMarkNotificationsRead(String maxID) {
+        super(HttpMethod.POST, "/pleroma/notifications/read", new TypeToken<>(){});
+        this.maxID = maxID;
+    }
+
+    @Override
+    public RequestBody getRequestBody() {
+        MultipartBody.Builder builder=new MultipartBody.Builder()
+                .setType(MultipartBody.FORM);
+        if(!TextUtils.isEmpty(maxID))
+            builder.addFormDataPart("max_id", maxID);
+        return builder.build();
+    }
+}

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

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.mastodon.requests.notifications;
+package org.joinmastodon.android.api.requests.notifications;
 
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.PushSubscription;

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

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.mastodon.requests.notifications;
+package org.joinmastodon.android.api.requests.notifications;
 
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.PushSubscription;

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

@@ -1,7 +1,7 @@
-package org.joinmastodon.android.api.mastodon.requests.oauth;
+package org.joinmastodon.android.api.requests.oauth;
 
 import org.joinmastodon.android.api.MastodonAPIRequest;
-import org.joinmastodon.android.api.mastodon.session.AccountSessionManager;
+import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.model.Application;
 
 public class CreateOAuthApp extends MastodonAPIRequest<Application>{

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

@@ -1,9 +1,9 @@
-package org.joinmastodon.android.api.mastodon.requests.oauth;
+package org.joinmastodon.android.api.requests.oauth;
 
 import com.google.gson.annotations.SerializedName;
 
 import org.joinmastodon.android.api.MastodonAPIRequest;
-import org.joinmastodon.android.api.mastodon.session.AccountSessionManager;
+import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.model.Token;
 
 public class GetOauthToken extends MastodonAPIRequest<Token>{

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

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.mastodon.requests.oauth;
+package org.joinmastodon.android.api.requests.oauth;
 
 import org.joinmastodon.android.api.MastodonAPIRequest;
 

mastodon/src/main/java/org/joinmastodon/android/api/requests/polls/SubmitPollVote.java

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.mastodon.requests.polls;
+package org.joinmastodon.android.api.requests.polls;
 
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.Poll;

mastodon/src/main/java/org/joinmastodon/android/api/requests/reports/SendReport.java

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.mastodon.requests.reports;
+package org.joinmastodon.android.api.requests.reports;
 
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.ReportReason;

mastodon/src/main/java/org/joinmastodon/android/api/requests/search/GetSearchResults.java

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.mastodon.requests.search;
+package org.joinmastodon.android.api.requests.search;
 
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.SearchResults;

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

@@ -1,6 +1,7 @@
-package org.joinmastodon.android.api.mastodon.requests.statuses;
+package org.joinmastodon.android.api.requests.statuses;
 
 import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.model.ContentType;
 import org.joinmastodon.android.model.ScheduledStatus;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.model.StatusPrivacy;
@@ -46,6 +47,7 @@ public class CreateStatus extends MastodonAPIRequest<Status>{
 		public String language;
 
 		public String quoteId;
+		public ContentType contentType;
 
 		public static class Poll{
 			public ArrayList<String> options=new ArrayList<>();

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

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.mastodon.requests.statuses;
+package org.joinmastodon.android.api.requests.statuses;
 
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.Status;

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

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.mastodon.requests.statuses;
+package org.joinmastodon.android.api.requests.statuses;
 
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.Status;

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

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.mastodon.requests.statuses;
+package org.joinmastodon.android.api.requests.statuses;
 
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.Attachment;

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

@@ -1,8 +1,8 @@
-package org.joinmastodon.android.api.mastodon.requests.statuses;
+package org.joinmastodon.android.api.requests.statuses;
 
 import com.google.gson.reflect.TypeToken;
 
-import org.joinmastodon.android.api.mastodon.requests.HeaderPaginationRequest;
+import org.joinmastodon.android.api.requests.HeaderPaginationRequest;
 import org.joinmastodon.android.model.Status;
 
 public class GetBookmarkedStatuses extends HeaderPaginationRequest<Status>{

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

@@ -1,8 +1,8 @@
-package org.joinmastodon.android.api.mastodon.requests.statuses;
+package org.joinmastodon.android.api.requests.statuses;
 
 import com.google.gson.reflect.TypeToken;
 
-import org.joinmastodon.android.api.mastodon.requests.HeaderPaginationRequest;
+import org.joinmastodon.android.api.requests.HeaderPaginationRequest;
 import org.joinmastodon.android.model.Status;
 
 public class GetFavoritedStatuses extends HeaderPaginationRequest<Status>{

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

@@ -1,8 +1,8 @@
-package org.joinmastodon.android.api.mastodon.requests.statuses;
+package org.joinmastodon.android.api.requests.statuses;
 
 import com.google.gson.reflect.TypeToken;
 
-import org.joinmastodon.android.api.mastodon.requests.HeaderPaginationRequest;
+import org.joinmastodon.android.api.requests.HeaderPaginationRequest;
 import org.joinmastodon.android.model.ScheduledStatus;
 
 public class GetScheduledStatuses extends HeaderPaginationRequest<ScheduledStatus>{

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

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.mastodon.requests.statuses;
+package org.joinmastodon.android.api.requests.statuses;
 
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.Status;

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

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.mastodon.requests.statuses;
+package org.joinmastodon.android.api.requests.statuses;
 
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.StatusContext;

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

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.mastodon.requests.statuses;
+package org.joinmastodon.android.api.requests.statuses;
 
 import com.google.gson.reflect.TypeToken;
 

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

@@ -1,8 +1,8 @@
-package org.joinmastodon.android.api.mastodon.requests.statuses;
+package org.joinmastodon.android.api.requests.statuses;
 
 import com.google.gson.reflect.TypeToken;
 
-import org.joinmastodon.android.api.mastodon.requests.HeaderPaginationRequest;
+import org.joinmastodon.android.api.requests.HeaderPaginationRequest;
 import org.joinmastodon.android.model.Account;
 
 public class GetStatusFavorites extends HeaderPaginationRequest<Account>{

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

@@ -1,8 +1,8 @@
-package org.joinmastodon.android.api.mastodon.requests.statuses;
+package org.joinmastodon.android.api.requests.statuses;
 
 import com.google.gson.reflect.TypeToken;
 
-import org.joinmastodon.android.api.mastodon.requests.HeaderPaginationRequest;
+import org.joinmastodon.android.api.requests.HeaderPaginationRequest;
 import org.joinmastodon.android.model.Account;
 
 public class GetStatusReblogs extends HeaderPaginationRequest<Account>{

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

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

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

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.mastodon.requests.statuses;
+package org.joinmastodon.android.api.requests.statuses;
 
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.Status;

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

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.mastodon.requests.statuses;
+package org.joinmastodon.android.api.requests.statuses;
 
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.Status;

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

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.mastodon.requests.statuses;
+package org.joinmastodon.android.api.requests.statuses;
 
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.Status;

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

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.mastodon.requests.statuses;
+package org.joinmastodon.android.api.requests.statuses;
 
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.Status;