refactor: move mastodon api calls to own package

This should help organization for implementing the misskey side of the api

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

@@ -1,10 +1,8 @@
 package org.joinmastodon.android.test;
 
-import android.app.Instrumentation;
 import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Bundle;
-import android.os.Environment;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 
@@ -14,10 +12,10 @@
 import org.joinmastodon.android.MainActivity;
 import org.joinmastodon.android.MastodonApp;
 import org.joinmastodon.android.R;
-import org.joinmastodon.android.api.requests.instance.GetInstance;
-import org.joinmastodon.android.api.requests.statuses.GetStatusByID;
-import org.joinmastodon.android.api.session.AccountSession;
-import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.api.mastodon.requests.instance.GetInstance;
+import org.joinmastodon.android.api.mastodon.requests.statuses.GetStatusByID;
+import org.joinmastodon.android.api.mastodon.session.session.AccountSession;
+import org.joinmastodon.android.api.mastodon.session.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.ComposeFragment;
 import org.joinmastodon.android.fragments.ThreadFragment;
 import org.joinmastodon.android.fragments.onboarding.InstanceRulesFragment;
@@ -32,12 +30,9 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.util.concurrent.BrokenBarrierException;
-import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.CyclicBarrier;
 import java.util.concurrent.TimeoutException;
 
-import androidx.test.core.app.ActivityScenario;
 import androidx.test.espresso.PerformException;
 import androidx.test.espresso.UiController;
 import androidx.test.espresso.ViewAction;
@@ -47,18 +42,15 @@
 import androidx.test.ext.junit.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/main/java/org/joinmastodon/android/DomainManager.java

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

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

@@ -9,8 +9,8 @@
 import android.text.TextUtils;
 import android.widget.Toast;
 
-import org.joinmastodon.android.api.session.AccountSession;
-import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.api.mastodon.session.session.AccountSession;
+import org.joinmastodon.android.api.mastodon.session.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.util.Log;
 
 import org.joinmastodon.android.api.ObjectValidationException;
-import org.joinmastodon.android.api.session.AccountSession;
-import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.api.mastodon.session.session.AccountSession;
+import org.joinmastodon.android.api.mastodon.session.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,12 +6,11 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.text.TextUtils;
-import android.util.Log;
 import android.widget.Toast;
 
-import org.joinmastodon.android.api.requests.accounts.GetOwnAccount;
-import org.joinmastodon.android.api.requests.oauth.GetOauthToken;
-import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.api.mastodon.requests.accounts.GetOwnAccount;
+import org.joinmastodon.android.api.mastodon.requests.oauth.GetOauthToken;
+import org.joinmastodon.android.api.mastodon.session.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,28 +12,25 @@
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.drawable.Drawable;
-import android.opengl.Visibility;
 import android.os.Build;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.Log;
 
 import org.joinmastodon.android.api.MastodonAPIController;
-import org.joinmastodon.android.api.requests.accounts.SetAccountFollowed;
-import org.joinmastodon.android.api.requests.notifications.GetNotificationByID;
-import org.joinmastodon.android.api.requests.statuses.CreateStatus;
-import org.joinmastodon.android.api.requests.statuses.SetStatusBookmarked;
-import org.joinmastodon.android.api.requests.statuses.SetStatusFavorited;
-import org.joinmastodon.android.api.requests.statuses.SetStatusReblogged;
-import org.joinmastodon.android.api.session.AccountSession;
-import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.api.mastodon.requests.accounts.SetAccountFollowed;
+import org.joinmastodon.android.api.mastodon.requests.notifications.GetNotificationByID;
+import org.joinmastodon.android.api.mastodon.requests.statuses.CreateStatus;
+import org.joinmastodon.android.api.mastodon.requests.statuses.SetStatusBookmarked;
+import org.joinmastodon.android.api.mastodon.requests.statuses.SetStatusFavorited;
+import org.joinmastodon.android.api.mastodon.requests.statuses.SetStatusReblogged;
+import org.joinmastodon.android.api.mastodon.session.session.AccountSession;
+import org.joinmastodon.android.api.mastodon.session.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;

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

@@ -12,15 +12,13 @@
 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.requests.timelines.GetHomeTimeline;
-import org.joinmastodon.android.api.session.AccountSession;
-import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.api.mastodon.requests.notifications.GetNotifications;
+import org.joinmastodon.android.api.mastodon.session.session.AccountSession;
+import org.joinmastodon.android.api.mastodon.session.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;

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

@@ -15,7 +15,7 @@
 import org.joinmastodon.android.MastodonApp;
 import org.joinmastodon.android.api.gson.IsoInstantTypeAdapter;
 import org.joinmastodon.android.api.gson.IsoLocalDateTypeAdapter;
-import org.joinmastodon.android.api.session.AccountSession;
+import org.joinmastodon.android.api.mastodon.session.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 com.google.gson.reflect.TypeToken;
 
 import org.joinmastodon.android.BuildConfig;
-import org.joinmastodon.android.api.session.AccountSession;
-import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.api.mastodon.session.session.AccountSession;
+import org.joinmastodon.android.api.mastodon.session.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 org.joinmastodon.android.BuildConfig;
 import org.joinmastodon.android.MastodonApp;
-import org.joinmastodon.android.api.requests.notifications.RegisterForPushNotifications;
-import org.joinmastodon.android.api.requests.notifications.UpdatePushSettings;
-import org.joinmastodon.android.api.session.AccountSession;
-import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.api.mastodon.requests.notifications.RegisterForPushNotifications;
+import org.joinmastodon.android.api.mastodon.requests.notifications.UpdatePushSettings;
+import org.joinmastodon.android.api.mastodon.session.session.AccountSession;
+import org.joinmastodon.android.api.mastodon.session.session.AccountSessionManager;
 import org.joinmastodon.android.model.PushNotification;
 import org.joinmastodon.android.model.PushSubscription;
 
@@ -45,7 +45,6 @@
 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 org.joinmastodon.android.E;
 import org.joinmastodon.android.MastodonApp;
-import org.joinmastodon.android.api.requests.statuses.SetStatusBookmarked;
-import org.joinmastodon.android.api.requests.statuses.SetStatusFavorited;
-import org.joinmastodon.android.api.requests.statuses.SetStatusReblogged;
+import org.joinmastodon.android.api.mastodon.requests.statuses.SetStatusBookmarked;
+import org.joinmastodon.android.api.mastodon.requests.statuses.SetStatusFavorited;
+import org.joinmastodon.android.api.mastodon.requests.statuses.SetStatusReblogged;
 import org.joinmastodon.android.events.StatusCountersUpdatedEvent;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.model.StatusPrivacy;

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

@@ -1,8 +1,8 @@
 package org.joinmastodon.android.api.adapter;
 
 import org.joinmastodon.android.api.MastodonAPIRequest;
-import org.joinmastodon.android.api.requests.statuses.GetStatusByID;
-import org.joinmastodon.android.api.requests.timelines.GetHomeTimeline;
+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;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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