feat: rework SettingsCategoryItem, and add visual appearance settings

What is an enclosed class? What am I missing?

FAQ.md

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

README.md

@@ -18,27 +18,27 @@
  
 <a href="https://apt.izzysoft.de/fdroid/index/apk/org.joinmastodon.android.moshinda"><img height="50" alt="Get it on IzzyOnDroid" src="img/izzy-badge.png"></a>
 
-## Help out the project by donating at: https://github.com/sponsors/LucasGGamerM!
+--- 
+
+## F.A.Q
+
+### Q: What are the main differences between Moshidon and Megalodon?
+
+### A: There are many, but the most outstanding differences are: the ability to have other server's local timeline inside the app. It can be acessed in the "Add community" option in the top right corner of the Edit timelines screen. Other outstanding features that Moshidon has are some quality of life improvements, such as notification actions and allowing for unlisted replies by default.  Most other features are pretty minor, such as profile notes directly available in the person's profile. Other features are quite minor usability and visibility improvements. All of which can be found in the settings page. 
 
 ---
 
 ## Key features
 
-### **The ability to add other server's local timeline to your timelines**
+### **The ability to add new custom local timelines!**
 
-It can be accessed in the "Edit timelines" menu, where you can add a new "Community" to see other server's local posts!
+#### It can be accessed in the "Edit timelines" menu, where you can add a new "Community" to see other server's local posts!
 
-### **View remote profiles**
+### **Material you theme support on Android 12+ devices!**
 
-You can now see all of a profile follows and followers, by directly loading them from the profile's home instance. In case of a failed lookup, the app will automatically fall back to the older method.
+### **Show posts filtered with a warning!**
 
-### **Translate posts easily**
+**Allows you to have filtered posts collapsed with a warning! As shown in the screenshots:**
-
-Allows you to easily translate posts in another language with a translate button! Your instance must support translation, otherwise it will not work.
-
-### **Show posts filtered with a warning**
-
-Allows you to have filtered posts collapsed with a warning! As shown in the screenshots:
 
 Before             |  After
 :-------------------------:|:-------------------------:
@@ -47,7 +47,7 @@ Before             |  After
 
 ### **Color themes**
 
-Allows you to change theme within the app. Supports Material You, purple, pink, green, blue, red, orange, yellow and Nord!
+**Allows you to change theme within the app. Supports Purple, pink, green, blue, red, orange, yellow and Nord!**
 
 ### **Unlisted posting**
 
@@ -71,10 +71,6 @@ That’s one of the reasons why choosing a small, **well-moderated instance is i
 
 This is important to **ensure the content you’re sharing is as accessible as possible** to people who can’t see the images and rely on software to read back the provided content descriptions. Thankfully, it’s quite common for people on the Fediverse to provide such alt texts, and hopefully things stay this way!
 
-### **Reminder to add alt text to attached media**
-
-By default, Moshidon will show a warning to add alt text if your post has any attachments without any alt text. This is for better accessibility, and it can easily be bypassed and disabled in settings.
-
 ### **Pinning posts**
 
 **This lets you can highlight important posts on your profile. A dedicated “Pinned” tab in people’s profiles shows all the posts they pinned.**
@@ -99,22 +95,12 @@ Moshidon is also available in [IzzyOnDroid repo](https://apt.izzysoft.de/fdroid/
 
 ## Release variants
 
-### Stable variant
+All downloads can be found on the [Releases](https://github.com/LucasGGamerM/moshidon/releases) page.
-
-All stable version downloads can be found on the [Releases](https://github.com/LucasGGamerM/moshidon/releases) page.
 
 **`moshidon.apk`**
 
 Variant with an integrated updater. If you download Moshidon from here (and not from an app store), just download the regular `moshidon.apk`.
 
-### Nightly variant
-
-All nightly builds can be downloaded at [Nightly Releases](https://github.com/LucasGGamerM/moshidon-nightly/releases) page.
-
-**`moshidon-nightly.apk`**
-
-Unstable variant with an integrated updater. It's for development and testing purposes. If you find any bugs with it, please file a bug report at our [issues](https://github.com/LucasGGamerM/moshidon/issues) page.
-
 ---
 
 
@@ -122,18 +108,16 @@ Unstable variant with an integrated updater. It's for development and testing pu
 
 ### Features
 
-* [Adding the ability to view other server's local timelines](https://github.com/LucasGGamerM/moshidon/tree/feature/local-timelines)
-* [Adding the ability to load followers and following from remote instance](https://github.com/LucasGGamerM/moshidon/tree/feature/remote-followers)
 * [Adding the ability to have filtered posts show with a warning](https://github.com/LucasGGamerM/moshidon/tree/feature/filters_again)
 * [Add “Unlisted” as a post visibility option](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/enable-unlisted)
   ([Pull request](https://github.com/mastodon/mastodon-android/pull/103))
-* Adding a useful private profile note box
+* Adding a useful private profile note box!*
-* Auto hiding the compose button on scroll
+* Auto hiding the compose button on scroll!*
-* Adding the ability to remind yourself to add alt text to images
+* Adding the ability to remind yourself to add alt text to images!*
-* An indicator for if an image has alt text or not
+* An indicator for if an image has alt text or not*
-* Adding the ability to have drafts
+* Adding the ability to have drafts!*
-* Also adding the ability to view announcements from your instance
+* Also adding the ability to view announcements from your instance!*
-* Adding the ability to post for local timeline only (Only on instances that support it!)
+* Adding the ability to post for local timeline only (Only on instances that support it!)*
 * [Add image description button and viewer](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/display-alt-text) ([Pull request](https://github.com/mastodon/mastodon-android/pull/129))
 * [Implement pinning posts and displaying pinned posts](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/pin-posts) ([Pull request](https://github.com/mastodon/mastodon-android/pull/140))
 * [Implement deleting and re-drafting](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/delete-redraft) ([Closes issue](https://github.com/mastodon/mastodon-android/issues/21))
@@ -155,7 +139,6 @@ Unstable variant with an integrated updater. It's for development and testing pu
 
 ### Behavior
 
-* Allow for confirmation before reblogging
 * Adding a bottom option for the publish button, allowing for easier use on larger screens!
 * [Make back button return to the home tab before exiting the app](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/back-returns-home) ([Closes issue](https://github.com/mastodon/mastodon-android/issues/118))
 * [Always preserve content warnings when replying](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/always-preserve-cw) ([Closes issue](https://github.com/mastodon/mastodon-android/issues/113))
@@ -187,10 +170,6 @@ This project is released under the [GPL-3 License](./LICENSE).
 
 ## Links
 
-[F.A.Q](FAQ.md)
+[Official matrix chatroom:](https://matrix.to/#/#moshidon:matrix.org) https://matrix.to/#/#moshidon:matrix.org
-
-[Official matrix chatroom:](https://matrix.to/#/#moshidon:floss.social) https://matrix.to/#/#moshidon:floss.social
 
 <a rel="me" href="https://floss.social/@moshidon">@moshidon<wbr>@floss.social</a>
-
----

mastodon/build.gradle

@@ -16,8 +16,8 @@ android {
 		applicationId "org.joinmastodon.android.moshinda"
 		minSdk 23
 		targetSdk 33
-		versionCode 100
+		versionCode 99
-		versionName "1.3.0+fork.100.moshinda"
+		versionName "1.2.0+fork.99.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']
    	}
@@ -91,7 +91,7 @@ android {
 			setRoot "src/github"
 		}
 		debug {
-			setRoot "src/debug"
+			setRoot "src/github"
 		}
 	}
 	namespace 'org.joinmastodon.android'

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/debug/java/org/joinmastodon/android/updater/GithubSelfUpdaterImpl.java

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

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

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

mastodon/src/main/assets/blocks.tsv

@@ -12,7 +12,7 @@ gab.protohype.net
 social.unzensiert.to
 freeatlantis.com
 
-#	reactionary bigotry and hatespeech against marginalized groups
+#	reactionary bigotry and hatespeech against magrinalized groups
 poa.st
 freespeechextremist.com
 rdrama.cc

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

@@ -9,8 +9,8 @@ import android.os.Bundle;
 import android.text.TextUtils;
 import android.widget.Toast;
 
-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.ui.AccountSwitcherSheet;
 import org.joinmastodon.android.ui.utils.UiUtils;

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

@@ -11,8 +11,8 @@ import android.os.Bundle;
 import android.util.Log;
 
 import org.joinmastodon.android.api.ObjectValidationException;
-import org.joinmastodon.android.api.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.HomeFragment;
 import org.joinmastodon.android.fragments.ProfileFragment;

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;

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

@@ -12,25 +12,27 @@ 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.notifications.GetNotificationByID;
-import org.joinmastodon.android.api.mastodon.requests.notifications.GetNotificationByID;
+import org.joinmastodon.android.api.requests.statuses.CreateStatus;
-import org.joinmastodon.android.api.mastodon.requests.statuses.CreateStatus;
+import org.joinmastodon.android.api.requests.statuses.SetStatusBookmarked;
-import org.joinmastodon.android.api.mastodon.requests.statuses.SetStatusBookmarked;
+import org.joinmastodon.android.api.requests.statuses.SetStatusFavorited;
-import org.joinmastodon.android.api.mastodon.requests.statuses.SetStatusFavorited;
+import org.joinmastodon.android.api.requests.statuses.SetStatusReblogged;
-import org.joinmastodon.android.api.mastodon.requests.statuses.SetStatusReblogged;
+import org.joinmastodon.android.api.session.AccountSession;
-import org.joinmastodon.android.api.mastodon.session.AccountSession;
+import org.joinmastodon.android.api.session.AccountSessionManager;
-import org.joinmastodon.android.api.mastodon.session.AccountSessionManager;
 import org.joinmastodon.android.events.NotificationReceivedEvent;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.NotificationAction;
 import org.joinmastodon.android.model.Preferences;
 import org.joinmastodon.android.model.PushNotification;
+import org.joinmastodon.android.model.Status;
+import org.joinmastodon.android.model.StatusPrivacy;
 import org.joinmastodon.android.model.StatusPrivacy;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.parceler.Parcels;
@@ -121,16 +123,8 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 
 			if(intent.hasExtra("notification")){
 				org.joinmastodon.android.model.Notification notification=Parcels.unwrap(intent.getParcelableExtra("notification"));
-				String statusID = null;
+				String statusID=notification.status.id;
-				String targetAccountID = null;
+				if (statusID != null) {
-
-				if(notification.status != null){
-					statusID = notification.status.id;
-				}
-				if(notification.account != null){
-					targetAccountID = notification.account.id;
-				}
-				if (statusID != null || targetAccountID != null) {
 					AccountSessionManager accountSessionManager = AccountSessionManager.getInstance();
 					Preferences preferences = accountSessionManager.getAccount(accountID).preferences;
 
@@ -140,7 +134,6 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 						case BOOST -> new SetStatusReblogged(notification.status.id, true, preferences.postingDefaultVisibility).exec(accountID);
 						case UNBOOST -> new SetStatusReblogged(notification.status.id, false, preferences.postingDefaultVisibility).exec(accountID);
 						case REPLY -> handleReplyAction(context, accountID, intent, notification, notificationId, preferences);
-						case FOLLOW_BACK -> new SetAccountFollowed(notification.account.id, true, true, false).exec(accountID);
 						default -> Log.w(TAG, "onReceive: Failed to get NotificationAction");
 					}
 				}
@@ -248,9 +241,6 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 					if(notification.status.reblogged)
 						builder.addAction(buildNotificationAction(context, id, accountID, notification,  context.getString(R.string.sk_undo_reblog), NotificationAction.UNBOOST));
 				}
-				case FOLLOW -> {
-					builder.addAction(buildNotificationAction(context, id, accountID, notification, context.getString(R.string.follow_back), NotificationAction.FOLLOW_BACK));
-				}
 			}
 		}
 

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

@@ -11,14 +11,15 @@ 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;
 import org.joinmastodon.android.model.Notification;
+import org.joinmastodon.android.model.PaginatedResponse;
 import org.joinmastodon.android.model.SearchResult;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.utils.StatusFilterPredicate;
@@ -87,8 +88,7 @@ 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){

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

@@ -15,7 +15,7 @@ import org.joinmastodon.android.BuildConfig;
 import org.joinmastodon.android.MastodonApp;
 import org.joinmastodon.android.api.gson.IsoInstantTypeAdapter;
 import org.joinmastodon.android.api.gson.IsoLocalDateTypeAdapter;
-import org.joinmastodon.android.api.mastodon.session.AccountSession;
+import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.model.Status;
 
 import java.io.BufferedReader;

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

@@ -9,8 +9,8 @@ import android.util.Pair;
 import com.google.gson.reflect.TypeToken;
 
 import org.joinmastodon.android.BuildConfig;
-import org.joinmastodon.android.api.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;
 

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;

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,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/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/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/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/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,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.ScheduledStatus;

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;