From f725e46bb2764dc6060cc9c1cb7c951d9b8f816e Mon Sep 17 00:00:00 2001 From: LucasGGamerM Date: Fri, 12 May 2023 14:40:50 -0300 Subject: [PATCH] refactor: move mastodon api calls to own package This should help organization for implementing the misskey side of the api --- .../test/StoreScreenshotsGenerator.java | 16 ++---- .../joinmastodon/android/DomainManager.java | 57 ------------------- .../android/ExternalShareActivity.java | 4 +- .../joinmastodon/android/MainActivity.java | 4 +- .../joinmastodon/android/OAuthActivity.java | 7 +-- .../android/PushNotificationReceiver.java | 19 +++---- .../android/api/CacheController.java | 8 +-- .../android/api/MastodonAPIController.java | 2 +- .../android/api/MastodonAPIRequest.java | 4 +- .../android/api/PushSubscriptionManager.java | 9 ++- .../api/StatusInteractionController.java | 6 +- .../android/api/adapter/ApiAdapter.java | 4 +- .../requests/HeaderPaginationRequest.java | 2 +- .../accounts/AuthorizeFollowRequest.java | 2 +- .../requests/accounts/GetAccountByHandle.java | 2 +- .../requests/accounts/GetAccountByID.java | 2 +- .../accounts/GetAccountFollowers.java | 4 +- .../accounts/GetAccountFollowing.java | 4 +- .../accounts/GetAccountRelationships.java | 2 +- .../requests/accounts/GetAccountStatuses.java | 2 +- .../requests/accounts/GetFollowRequests.java | 4 +- .../accounts/GetFollowSuggestions.java | 2 +- .../requests/accounts/GetOwnAccount.java | 2 +- .../requests/accounts/GetPreferences.java | 2 +- .../requests/accounts/GetWordFilters.java | 2 +- .../requests/accounts/RegisterAccount.java | 2 +- .../accounts/RejectFollowRequest.java | 2 +- .../accounts/ResendConfirmationEmail.java | 2 +- .../requests/accounts/SetAccountBlocked.java | 2 +- .../requests/accounts/SetAccountFollowed.java | 2 +- .../requests/accounts/SetAccountMuted.java | 2 +- .../requests/accounts/SetDomainBlocked.java | 2 +- .../requests/accounts/SetPrivateNote.java | 2 +- .../accounts/UpdateAccountCredentials.java | 2 +- .../announcements/DismissAnnouncement.java | 2 +- .../announcements/GetAnnouncements.java | 2 +- .../catalog/GetCatalogCategories.java | 2 +- .../requests/catalog/GetCatalogInstances.java | 2 +- .../requests/instance/GetCustomEmojis.java | 2 +- .../requests/instance/GetInstance.java | 2 +- .../requests/lists/AddAccountsToList.java | 2 +- .../requests/lists/AddList.java | 2 +- .../requests/lists/CreateList.java | 2 +- .../requests/lists/DeleteList.java | 2 +- .../requests/lists/EditListName.java | 2 +- .../requests/lists/GetList.java | 2 +- .../requests/lists/GetLists.java | 2 +- .../lists/RemoveAccountsFromList.java | 2 +- .../requests/lists/RemoveList.java | 2 +- .../requests/lists/UpdateList.java | 2 +- .../requests/markers/GetMarkers.java | 2 +- .../requests/markers/SaveMarkers.java | 2 +- .../notifications/DismissNotification.java | 2 +- .../notifications/GetNotificationByID.java | 2 +- .../notifications/GetNotifications.java | 2 +- .../RegisterForPushNotifications.java | 2 +- .../notifications/UpdatePushSettings.java | 2 +- .../requests/oauth/CreateOAuthApp.java | 4 +- .../requests/oauth/GetOauthToken.java | 4 +- .../requests/oauth/RevokeOauthToken.java | 2 +- .../requests/polls/SubmitPollVote.java | 2 +- .../requests/reports/SendReport.java | 2 +- .../requests/search/GetSearchResults.java | 2 +- .../requests/statuses/CreateStatus.java | 2 +- .../requests/statuses/DeleteStatus.java | 2 +- .../requests/statuses/EditStatus.java | 2 +- .../requests/statuses/GetAttachmentByID.java | 2 +- .../statuses/GetBookmarkedStatuses.java | 4 +- .../statuses/GetFavoritedStatuses.java | 4 +- .../statuses/GetScheduledStatuses.java | 4 +- .../requests/statuses/GetStatusByID.java | 2 +- .../requests/statuses/GetStatusContext.java | 2 +- .../statuses/GetStatusEditHistory.java | 2 +- .../requests/statuses/GetStatusFavorites.java | 4 +- .../requests/statuses/GetStatusReblogs.java | 4 +- .../statuses/GetStatusSourceText.java | 2 +- .../statuses/SetStatusBookmarked.java | 2 +- .../requests/statuses/SetStatusFavorited.java | 2 +- .../requests/statuses/SetStatusPinned.java | 2 +- .../requests/statuses/SetStatusReblogged.java | 2 +- .../requests/statuses/TranslateStatus.java | 2 +- .../requests/statuses/UpdateAttachment.java | 2 +- .../requests/statuses/UploadAttachment.java | 5 +- .../requests/tags/GetFollowedHashtags.java | 7 +-- .../requests/tags/GetHashtag.java | 2 +- .../requests/tags/SetHashtagFollowed.java | 2 +- .../timelines/GetHashtagTimeline.java | 2 +- .../requests/timelines/GetHomeTimeline.java | 2 +- .../requests/timelines/GetListTimeline.java | 2 +- .../requests/timelines/GetPublicTimeline.java | 2 +- .../requests/trends/GetTrendingHashtags.java | 2 +- .../requests/trends/GetTrendingLinks.java | 2 +- .../requests/trends/GetTrendingStatuses.java | 2 +- .../session/AccountActivationInfo.java | 2 +- .../session}/session/AccountSession.java | 2 +- .../session/AccountSessionManager.java | 16 +++--- .../fragments/AccountTimelineFragment.java | 8 +-- .../fragments/AnnouncementsFragment.java | 26 +-------- .../fragments/BaseStatusListFragment.java | 8 +-- .../BookmarkedStatusListFragment.java | 2 +- .../android/fragments/ComposeFragment.java | 21 +++---- .../ComposeImageDescriptionFragment.java | 3 +- .../CustomLocalTimelineFragment.java | 4 +- .../android/fragments/DomainDisplay.java | 4 +- .../fragments/EditTimelinesFragment.java | 4 +- .../FavoritedStatusListFragment.java | 2 +- .../fragments/FollowRequestsListFragment.java | 4 +- .../fragments/FollowedHashtagsFragment.java | 2 +- .../fragments/HashtagTimelineFragment.java | 7 +-- .../android/fragments/HomeFragment.java | 12 +--- .../android/fragments/HomeTabFragment.java | 7 +-- .../fragments/HomeTimelineFragment.java | 7 +-- .../fragments/ListTimelineFragment.java | 7 +-- .../fragments/ListTimelinesFragment.java | 8 +-- .../fragments/NotificationsFragment.java | 2 +- .../fragments/NotificationsListFragment.java | 4 +- .../fragments/ProfileAboutFragment.java | 2 +- .../android/fragments/ProfileFragment.java | 17 +++--- .../ScheduledStatusListFragment.java | 5 +- .../android/fragments/SettingsFragment.java | 11 ++-- .../android/fragments/SplashFragment.java | 2 +- .../fragments/StatusEditHistoryFragment.java | 2 +- .../android/fragments/ThreadFragment.java | 6 +- .../account_list/BaseAccountListFragment.java | 6 +- .../account_list/FollowerListFragment.java | 4 +- .../account_list/FollowingListFragment.java | 4 +- .../PaginatedAccountListFragment.java | 4 +- .../StatusFavoritesListFragment.java | 4 +- .../StatusReblogsListFragment.java | 4 +- .../discover/DiscoverAccountsFragment.java | 5 +- .../discover/DiscoverNewsFragment.java | 3 +- .../discover/DiscoverPostsFragment.java | 2 +- .../discover/FederatedTimelineFragment.java | 3 +- .../discover/LocalTimelineFragment.java | 2 +- .../fragments/discover/SearchFragment.java | 5 +- .../discover/TrendingHashtagsFragment.java | 3 +- .../onboarding/AccountActivationFragment.java | 13 ++--- .../onboarding/CustomWelcomeFragment.java | 2 +- .../onboarding/InstanceCatalogFragment.java | 2 +- .../InstanceCatalogSignupFragment.java | 4 +- .../InstanceChooserLoginFragment.java | 8 +-- .../OnboardingFollowSuggestionsFragment.java | 10 +--- .../OnboardingProfileSetupFragment.java | 4 +- .../fragments/onboarding/SignupFragment.java | 15 ++--- .../report/ReportAddPostsChoiceFragment.java | 3 +- .../report/ReportCommentFragment.java | 2 +- .../fragments/report/ReportDoneFragment.java | 3 +- .../report/ReportReasonChoiceFragment.java | 2 +- .../report/ReportRuleChoiceFragment.java | 2 +- .../android/ui/AccountSwitcherSheet.java | 6 +- .../ui/ComposeAutocompleteViewController.java | 4 +- .../android/ui/CustomEmojiPopupKeyboard.java | 2 +- .../displayitems/FooterStatusDisplayItem.java | 5 +- .../displayitems/HeaderStatusDisplayItem.java | 21 ++----- .../ui/displayitems/StatusDisplayItem.java | 3 +- .../displayitems/TextStatusDisplayItem.java | 6 +- .../android/ui/utils/UiUtils.java | 32 +++++------ .../android/utils/StatusFilterPredicate.java | 2 +- 158 files changed, 288 insertions(+), 449 deletions(-) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/HeaderPaginationRequest.java (96%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/accounts/AuthorizeFollowRequest.java (85%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/accounts/GetAccountByHandle.java (83%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/accounts/GetAccountByID.java (80%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/accounts/GetAccountFollowers.java (74%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/accounts/GetAccountFollowing.java (74%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/accounts/GetAccountRelationships.java (89%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/accounts/GetAccountStatuses.java (94%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/accounts/GetFollowRequests.java (73%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/accounts/GetFollowSuggestions.java (88%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/accounts/GetOwnAccount.java (80%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/accounts/GetPreferences.java (81%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/accounts/GetWordFilters.java (83%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/accounts/RegisterAccount.java (91%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/accounts/RejectFollowRequest.java (84%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/accounts/ResendConfirmationEmail.java (86%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/accounts/SetAccountBlocked.java (85%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/accounts/SetAccountFollowed.java (92%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/accounts/SetAccountMuted.java (89%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/accounts/SetDomainBlocked.java (86%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/accounts/SetPrivateNote.java (89%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/accounts/UpdateAccountCredentials.java (97%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/announcements/DismissAnnouncement.java (80%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/announcements/GetAnnouncements.java (87%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/catalog/GetCatalogCategories.java (92%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/catalog/GetCatalogInstances.java (93%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/instance/GetCustomEmojis.java (83%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/instance/GetInstance.java (87%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/lists/AddAccountsToList.java (88%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/lists/AddList.java (86%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/lists/CreateList.java (89%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/lists/DeleteList.java (81%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/lists/EditListName.java (87%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/lists/GetList.java (81%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/lists/GetLists.java (88%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/lists/RemoveAccountsFromList.java (88%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/lists/RemoveList.java (80%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/lists/UpdateList.java (88%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/markers/GetMarkers.java (89%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/markers/SaveMarkers.java (92%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/notifications/DismissNotification.java (88%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/notifications/GetNotificationByID.java (80%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/notifications/GetNotifications.java (94%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/notifications/RegisterForPushNotifications.java (94%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/notifications/UpdatePushSettings.java (93%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/oauth/CreateOAuthApp.java (79%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/oauth/GetOauthToken.java (88%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/oauth/RevokeOauthToken.java (90%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/polls/SubmitPollVote.java (88%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/reports/SendReport.java (92%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/search/GetSearchResults.java (90%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/statuses/CreateStatus.java (96%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/statuses/DeleteStatus.java (87%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/statuses/EditStatus.java (82%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/statuses/GetAttachmentByID.java (89%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/statuses/GetBookmarkedStatuses.java (73%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/statuses/GetFavoritedStatuses.java (73%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/statuses/GetScheduledStatuses.java (74%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/statuses/GetStatusByID.java (80%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/statuses/GetStatusContext.java (82%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/statuses/GetStatusEditHistory.java (93%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/statuses/GetStatusFavorites.java (74%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/statuses/GetStatusReblogs.java (74%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/statuses/GetStatusSourceText.java (88%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/statuses/SetStatusBookmarked.java (85%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/statuses/SetStatusFavorited.java (85%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/statuses/SetStatusPinned.java (84%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/statuses/SetStatusReblogged.java (89%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/statuses/TranslateStatus.java (84%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/statuses/UpdateAttachment.java (87%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/statuses/UploadAttachment.java (91%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/tags/GetFollowedHashtags.java (77%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/tags/GetHashtag.java (81%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/tags/SetHashtagFollowed.java (86%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/timelines/GetHashtagTimeline.java (89%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/timelines/GetHomeTimeline.java (92%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/timelines/GetListTimeline.java (91%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/timelines/GetPublicTimeline.java (90%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/trends/GetTrendingHashtags.java (86%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/trends/GetTrendingLinks.java (84%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon}/requests/trends/GetTrendingStatuses.java (88%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon/session}/session/AccountActivationInfo.java (81%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon/session}/session/AccountSession.java (97%) rename mastodon/src/main/java/org/joinmastodon/android/api/{ => mastodon/session}/session/AccountSessionManager.java (96%) diff --git a/mastodon/src/androidTest/java/org/joinmastodon/android/test/StoreScreenshotsGenerator.java b/mastodon/src/androidTest/java/org/joinmastodon/android/test/StoreScreenshotsGenerator.java index d895e4cca6..08a79ed0c9 100644 --- a/mastodon/src/androidTest/java/org/joinmastodon/android/test/StoreScreenshotsGenerator.java +++ b/mastodon/src/androidTest/java/org/joinmastodon/android/test/StoreScreenshotsGenerator.java @@ -1,10 +1,8 @@ package org.joinmastodon.android.test; -import android.app.Instrumentation; import android.graphics.Bitmap; import android.net.Uri; import android.os.Bundle; -import android.os.Environment; import android.view.View; import android.view.inputmethod.InputMethodManager; @@ -14,10 +12,10 @@ import org.joinmastodon.android.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) diff --git a/mastodon/src/main/java/org/joinmastodon/android/DomainManager.java b/mastodon/src/main/java/org/joinmastodon/android/DomainManager.java index 93a9791aea..69d06525fe 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/DomainManager.java +++ b/mastodon/src/main/java/org/joinmastodon/android/DomainManager.java @@ -1,62 +1,5 @@ package org.joinmastodon.android; -import android.app.Activity; -import android.app.NotificationManager; -import android.content.ComponentName; -import android.content.Context; -import android.content.Intent; -import android.content.SharedPreferences; -import android.content.pm.ShortcutInfo; -import android.content.pm.ShortcutManager; -import android.graphics.drawable.Icon; -import android.net.Uri; -import android.os.Build; -import android.util.Log; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.browser.customtabs.CustomTabsIntent; - -import org.joinmastodon.android.api.MastodonAPIController; -import org.joinmastodon.android.api.PushSubscriptionManager; -import org.joinmastodon.android.api.requests.accounts.GetOwnAccount; -import org.joinmastodon.android.api.requests.accounts.GetPreferences; -import org.joinmastodon.android.api.requests.accounts.GetWordFilters; -import org.joinmastodon.android.api.requests.instance.GetCustomEmojis; -import org.joinmastodon.android.api.requests.instance.GetInstance; -import org.joinmastodon.android.api.requests.oauth.CreateOAuthApp; -import org.joinmastodon.android.api.session.AccountActivationInfo; -import org.joinmastodon.android.api.session.AccountSession; -import org.joinmastodon.android.api.session.AccountSessionManager; -import org.joinmastodon.android.events.EmojiUpdatedEvent; -import org.joinmastodon.android.model.Account; -import org.joinmastodon.android.model.Application; -import org.joinmastodon.android.model.Emoji; -import org.joinmastodon.android.model.EmojiCategory; -import org.joinmastodon.android.model.Filter; -import org.joinmastodon.android.model.Instance; -import org.joinmastodon.android.model.Preferences; -import org.joinmastodon.android.model.Token; - -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.OutputStreamWriter; -import java.nio.charset.StandardCharsets; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; - -import me.grishka.appkit.api.Callback; -import me.grishka.appkit.api.ErrorResponse; - public class DomainManager { private static final String TAG="DomainManager"; diff --git a/mastodon/src/main/java/org/joinmastodon/android/ExternalShareActivity.java b/mastodon/src/main/java/org/joinmastodon/android/ExternalShareActivity.java index d99c200fe2..2fbb501c36 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ExternalShareActivity.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ExternalShareActivity.java @@ -9,8 +9,8 @@ import android.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; diff --git a/mastodon/src/main/java/org/joinmastodon/android/MainActivity.java b/mastodon/src/main/java/org/joinmastodon/android/MainActivity.java index 8371fbe95b..6f3b857e6d 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/MainActivity.java +++ b/mastodon/src/main/java/org/joinmastodon/android/MainActivity.java @@ -11,8 +11,8 @@ import android.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; diff --git a/mastodon/src/main/java/org/joinmastodon/android/OAuthActivity.java b/mastodon/src/main/java/org/joinmastodon/android/OAuthActivity.java index 553074599a..d931eeefb2 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/OAuthActivity.java +++ b/mastodon/src/main/java/org/joinmastodon/android/OAuthActivity.java @@ -6,12 +6,11 @@ import android.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; diff --git a/mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java b/mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java index 616b0eb051..b084067322 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java +++ b/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; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/CacheController.java b/mastodon/src/main/java/org/joinmastodon/android/api/CacheController.java index 71e1491d0b..9ab47eeda6 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/CacheController.java +++ b/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; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/MastodonAPIController.java b/mastodon/src/main/java/org/joinmastodon/android/api/MastodonAPIController.java index 56620eb48a..a2db42299d 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/MastodonAPIController.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/MastodonAPIController.java @@ -15,7 +15,7 @@ import org.joinmastodon.android.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; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/MastodonAPIRequest.java b/mastodon/src/main/java/org/joinmastodon/android/api/MastodonAPIRequest.java index 44a740401c..e33b609a53 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/MastodonAPIRequest.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/MastodonAPIRequest.java @@ -9,8 +9,8 @@ import 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; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/PushSubscriptionManager.java b/mastodon/src/main/java/org/joinmastodon/android/api/PushSubscriptionManager.java index 84dd040d2d..dcc308c2cd 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/PushSubscriptionManager.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/PushSubscriptionManager.java @@ -12,10 +12,10 @@ import 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; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/StatusInteractionController.java b/mastodon/src/main/java/org/joinmastodon/android/api/StatusInteractionController.java index ec45b6d90b..c38117643c 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/StatusInteractionController.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/StatusInteractionController.java @@ -4,9 +4,9 @@ import 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; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/adapter/ApiAdapter.java b/mastodon/src/main/java/org/joinmastodon/android/api/adapter/ApiAdapter.java index 6cca670a00..b11065ed7e 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/adapter/ApiAdapter.java +++ b/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; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/HeaderPaginationRequest.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/HeaderPaginationRequest.java similarity index 96% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/HeaderPaginationRequest.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/HeaderPaginationRequest.java index b268b3e6a2..afd8453661 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/HeaderPaginationRequest.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/HeaderPaginationRequest.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests; +package org.joinmastodon.android.api.mastodon.requests; import android.net.Uri; import android.text.TextUtils; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/AuthorizeFollowRequest.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/AuthorizeFollowRequest.java similarity index 85% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/AuthorizeFollowRequest.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/AuthorizeFollowRequest.java index 13ca0fbbbe..135aeb6f35 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/AuthorizeFollowRequest.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/AuthorizeFollowRequest.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.accounts; +package org.joinmastodon.android.api.mastodon.requests.accounts; import org.joinmastodon.android.api.MastodonAPIRequest; import org.joinmastodon.android.model.Relationship; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/GetAccountByHandle.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/GetAccountByHandle.java similarity index 83% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/GetAccountByHandle.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/GetAccountByHandle.java index 584f7819d3..5f94dea53a 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/GetAccountByHandle.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/GetAccountByHandle.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.accounts; +package org.joinmastodon.android.api.mastodon.requests.accounts; import org.joinmastodon.android.api.MastodonAPIRequest; import org.joinmastodon.android.model.Account; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/GetAccountByID.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/GetAccountByID.java similarity index 80% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/GetAccountByID.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/GetAccountByID.java index b178cc8391..f654a0e41c 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/GetAccountByID.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/GetAccountByID.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.accounts; +package org.joinmastodon.android.api.mastodon.requests.accounts; import org.joinmastodon.android.api.MastodonAPIRequest; import org.joinmastodon.android.model.Account; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/GetAccountFollowers.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/GetAccountFollowers.java similarity index 74% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/GetAccountFollowers.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/GetAccountFollowers.java index 72153341c2..efabda0d9a 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/GetAccountFollowers.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/GetAccountFollowers.java @@ -1,8 +1,8 @@ -package org.joinmastodon.android.api.requests.accounts; +package org.joinmastodon.android.api.mastodon.requests.accounts; import com.google.gson.reflect.TypeToken; -import org.joinmastodon.android.api.requests.HeaderPaginationRequest; +import org.joinmastodon.android.api.mastodon.requests.HeaderPaginationRequest; import org.joinmastodon.android.model.Account; public class GetAccountFollowers extends HeaderPaginationRequest{ diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/GetAccountFollowing.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/GetAccountFollowing.java similarity index 74% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/GetAccountFollowing.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/GetAccountFollowing.java index 3aea0b3e19..34438d5162 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/GetAccountFollowing.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/GetAccountFollowing.java @@ -1,8 +1,8 @@ -package org.joinmastodon.android.api.requests.accounts; +package org.joinmastodon.android.api.mastodon.requests.accounts; import com.google.gson.reflect.TypeToken; -import org.joinmastodon.android.api.requests.HeaderPaginationRequest; +import org.joinmastodon.android.api.mastodon.requests.HeaderPaginationRequest; import org.joinmastodon.android.model.Account; public class GetAccountFollowing extends HeaderPaginationRequest{ diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/GetAccountRelationships.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/GetAccountRelationships.java similarity index 89% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/GetAccountRelationships.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/GetAccountRelationships.java index 9c62e58ede..10cea51eae 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/GetAccountRelationships.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/GetAccountRelationships.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.accounts; +package org.joinmastodon.android.api.mastodon.requests.accounts; import com.google.gson.reflect.TypeToken; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/GetAccountStatuses.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/GetAccountStatuses.java similarity index 94% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/GetAccountStatuses.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/GetAccountStatuses.java index d1e8553ff8..a6443ba11e 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/GetAccountStatuses.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/GetAccountStatuses.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.accounts; +package org.joinmastodon.android.api.mastodon.requests.accounts; import com.google.gson.reflect.TypeToken; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/GetFollowRequests.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/GetFollowRequests.java similarity index 73% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/GetFollowRequests.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/GetFollowRequests.java index 46d94b6ec0..714762b4fb 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/GetFollowRequests.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/GetFollowRequests.java @@ -1,8 +1,8 @@ -package org.joinmastodon.android.api.requests.accounts; +package org.joinmastodon.android.api.mastodon.requests.accounts; import com.google.gson.reflect.TypeToken; -import org.joinmastodon.android.api.requests.HeaderPaginationRequest; +import org.joinmastodon.android.api.mastodon.requests.HeaderPaginationRequest; import org.joinmastodon.android.model.Account; public class GetFollowRequests extends HeaderPaginationRequest{ diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/GetFollowSuggestions.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/GetFollowSuggestions.java similarity index 88% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/GetFollowSuggestions.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/GetFollowSuggestions.java index a600470846..20d4c5a61a 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/GetFollowSuggestions.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/GetFollowSuggestions.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.accounts; +package org.joinmastodon.android.api.mastodon.requests.accounts; import com.google.gson.reflect.TypeToken; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/GetOwnAccount.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/GetOwnAccount.java similarity index 80% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/GetOwnAccount.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/GetOwnAccount.java index 932ef9ba4e..db3a5de80a 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/GetOwnAccount.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/GetOwnAccount.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.accounts; +package org.joinmastodon.android.api.mastodon.requests.accounts; import org.joinmastodon.android.api.MastodonAPIRequest; import org.joinmastodon.android.model.Account; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/GetPreferences.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/GetPreferences.java similarity index 81% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/GetPreferences.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/GetPreferences.java index 8d5d79e940..3eca1489a5 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/GetPreferences.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/GetPreferences.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.accounts; +package org.joinmastodon.android.api.mastodon.requests.accounts; import org.joinmastodon.android.api.MastodonAPIRequest; import org.joinmastodon.android.model.Preferences; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/GetWordFilters.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/GetWordFilters.java similarity index 83% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/GetWordFilters.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/GetWordFilters.java index 781035959b..8883033234 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/GetWordFilters.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/GetWordFilters.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.accounts; +package org.joinmastodon.android.api.mastodon.requests.accounts; import com.google.gson.reflect.TypeToken; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/RegisterAccount.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/RegisterAccount.java similarity index 91% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/RegisterAccount.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/RegisterAccount.java index 7656d6d4c4..04ace6356b 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/RegisterAccount.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/RegisterAccount.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.accounts; +package org.joinmastodon.android.api.mastodon.requests.accounts; import org.joinmastodon.android.api.MastodonAPIRequest; import org.joinmastodon.android.model.Token; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/RejectFollowRequest.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/RejectFollowRequest.java similarity index 84% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/RejectFollowRequest.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/RejectFollowRequest.java index fd9ea1d2ba..d4e020df99 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/RejectFollowRequest.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/RejectFollowRequest.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.accounts; +package org.joinmastodon.android.api.mastodon.requests.accounts; import org.joinmastodon.android.api.MastodonAPIRequest; import org.joinmastodon.android.model.Relationship; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/ResendConfirmationEmail.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/ResendConfirmationEmail.java similarity index 86% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/ResendConfirmationEmail.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/ResendConfirmationEmail.java index f1058eebf5..b56d00d928 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/ResendConfirmationEmail.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/ResendConfirmationEmail.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.accounts; +package org.joinmastodon.android.api.mastodon.requests.accounts; import org.joinmastodon.android.api.MastodonAPIRequest; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/SetAccountBlocked.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/SetAccountBlocked.java similarity index 85% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/SetAccountBlocked.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/SetAccountBlocked.java index 5955e53d80..b7aa124757 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/SetAccountBlocked.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/SetAccountBlocked.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.accounts; +package org.joinmastodon.android.api.mastodon.requests.accounts; import org.joinmastodon.android.api.MastodonAPIRequest; import org.joinmastodon.android.model.Relationship; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/SetAccountFollowed.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/SetAccountFollowed.java similarity index 92% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/SetAccountFollowed.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/SetAccountFollowed.java index 4d7ca8571d..183661e1bf 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/SetAccountFollowed.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/SetAccountFollowed.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.accounts; +package org.joinmastodon.android.api.mastodon.requests.accounts; import org.joinmastodon.android.api.MastodonAPIRequest; import org.joinmastodon.android.model.Relationship; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/SetAccountMuted.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/SetAccountMuted.java similarity index 89% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/SetAccountMuted.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/SetAccountMuted.java index d6b91b0fae..6756ca15c2 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/SetAccountMuted.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/SetAccountMuted.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.accounts; +package org.joinmastodon.android.api.mastodon.requests.accounts; import org.joinmastodon.android.api.MastodonAPIRequest; import org.joinmastodon.android.model.Relationship; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/SetDomainBlocked.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/SetDomainBlocked.java similarity index 86% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/SetDomainBlocked.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/SetDomainBlocked.java index dc033efaa6..f04162a5fa 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/SetDomainBlocked.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/SetDomainBlocked.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.accounts; +package org.joinmastodon.android.api.mastodon.requests.accounts; import org.joinmastodon.android.api.MastodonAPIRequest; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/SetPrivateNote.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/SetPrivateNote.java similarity index 89% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/SetPrivateNote.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/SetPrivateNote.java index e9c9fe764a..959b80c49d 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/SetPrivateNote.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/SetPrivateNote.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.accounts; +package org.joinmastodon.android.api.mastodon.requests.accounts; import org.joinmastodon.android.api.MastodonAPIRequest; import org.joinmastodon.android.model.Relationship; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/UpdateAccountCredentials.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/UpdateAccountCredentials.java similarity index 97% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/UpdateAccountCredentials.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/UpdateAccountCredentials.java index 5724a933be..a03b793b32 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/UpdateAccountCredentials.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/accounts/UpdateAccountCredentials.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.accounts; +package org.joinmastodon.android.api.mastodon.requests.accounts; import android.net.Uri; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/announcements/DismissAnnouncement.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/announcements/DismissAnnouncement.java similarity index 80% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/announcements/DismissAnnouncement.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/announcements/DismissAnnouncement.java index 3227a2cd58..27873aaab4 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/announcements/DismissAnnouncement.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/announcements/DismissAnnouncement.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.announcements; +package org.joinmastodon.android.api.mastodon.requests.announcements; import org.joinmastodon.android.api.MastodonAPIRequest; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/announcements/GetAnnouncements.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/announcements/GetAnnouncements.java similarity index 87% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/announcements/GetAnnouncements.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/announcements/GetAnnouncements.java index 4bedba6d6d..84f4d35263 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/announcements/GetAnnouncements.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/announcements/GetAnnouncements.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.announcements; +package org.joinmastodon.android.api.mastodon.requests.announcements; import com.google.gson.reflect.TypeToken; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/catalog/GetCatalogCategories.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/catalog/GetCatalogCategories.java similarity index 92% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/catalog/GetCatalogCategories.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/catalog/GetCatalogCategories.java index 28485a89be..679433dc03 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/catalog/GetCatalogCategories.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/catalog/GetCatalogCategories.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.catalog; +package org.joinmastodon.android.api.mastodon.requests.catalog; import android.net.Uri; import android.text.TextUtils; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/catalog/GetCatalogInstances.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/catalog/GetCatalogInstances.java similarity index 93% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/catalog/GetCatalogInstances.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/catalog/GetCatalogInstances.java index 54a55df5be..66e1683c8e 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/catalog/GetCatalogInstances.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/catalog/GetCatalogInstances.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.catalog; +package org.joinmastodon.android.api.mastodon.requests.catalog; import android.net.Uri; import android.text.TextUtils; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/instance/GetCustomEmojis.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/instance/GetCustomEmojis.java similarity index 83% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/instance/GetCustomEmojis.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/instance/GetCustomEmojis.java index f91eb66948..277815dc17 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/instance/GetCustomEmojis.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/instance/GetCustomEmojis.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.instance; +package org.joinmastodon.android.api.mastodon.requests.instance; import com.google.gson.reflect.TypeToken; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/instance/GetInstance.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/instance/GetInstance.java similarity index 87% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/instance/GetInstance.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/instance/GetInstance.java index 2ed250b96a..87c04d1bfd 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/instance/GetInstance.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/instance/GetInstance.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.instance; +package org.joinmastodon.android.api.mastodon.requests.instance; import org.joinmastodon.android.api.MastodonAPIRequest; import org.joinmastodon.android.model.Instance; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/AddAccountsToList.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/lists/AddAccountsToList.java similarity index 88% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/AddAccountsToList.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/lists/AddAccountsToList.java index f3db76322e..5d185831c3 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/AddAccountsToList.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/lists/AddAccountsToList.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.lists; +package org.joinmastodon.android.api.mastodon.requests.lists; import org.joinmastodon.android.api.MastodonAPIRequest; import java.util.List; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/AddList.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/lists/AddList.java similarity index 86% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/AddList.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/lists/AddList.java index 7c8e2e8521..a66e2f007e 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/AddList.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/lists/AddList.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.lists; +package org.joinmastodon.android.api.mastodon.requests.lists; import org.joinmastodon.android.api.MastodonAPIRequest; import java.util.List; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/CreateList.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/lists/CreateList.java similarity index 89% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/CreateList.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/lists/CreateList.java index f30dde5440..f7dbf039c0 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/CreateList.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/lists/CreateList.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.lists; +package org.joinmastodon.android.api.mastodon.requests.lists; import org.joinmastodon.android.api.MastodonAPIRequest; import org.joinmastodon.android.model.ListTimeline; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/DeleteList.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/lists/DeleteList.java similarity index 81% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/DeleteList.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/lists/DeleteList.java index 64620adac8..6aa8b2082d 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/DeleteList.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/lists/DeleteList.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.lists; +package org.joinmastodon.android.api.mastodon.requests.lists; import org.joinmastodon.android.api.MastodonAPIRequest; import org.joinmastodon.android.model.ListTimeline; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/EditListName.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/lists/EditListName.java similarity index 87% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/EditListName.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/lists/EditListName.java index 7a5d520588..f9a558a243 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/EditListName.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/lists/EditListName.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.lists; +package org.joinmastodon.android.api.mastodon.requests.lists; import org.joinmastodon.android.api.MastodonAPIRequest; import java.util.List; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/GetList.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/lists/GetList.java similarity index 81% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/GetList.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/lists/GetList.java index 19bda79ca7..e9cbe8efd1 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/GetList.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/lists/GetList.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.lists; +package org.joinmastodon.android.api.mastodon.requests.lists; import org.joinmastodon.android.api.MastodonAPIRequest; import org.joinmastodon.android.model.ListTimeline; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/GetLists.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/lists/GetLists.java similarity index 88% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/GetLists.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/lists/GetLists.java index 61abeb03a4..b00d971169 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/GetLists.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/lists/GetLists.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.lists; +package org.joinmastodon.android.api.mastodon.requests.lists; import com.google.gson.reflect.TypeToken; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/RemoveAccountsFromList.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/lists/RemoveAccountsFromList.java similarity index 88% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/RemoveAccountsFromList.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/lists/RemoveAccountsFromList.java index f285d54f6b..ebe72988ad 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/RemoveAccountsFromList.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/lists/RemoveAccountsFromList.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.lists; +package org.joinmastodon.android.api.mastodon.requests.lists; import org.joinmastodon.android.api.MastodonAPIRequest; import java.util.List; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/RemoveList.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/lists/RemoveList.java similarity index 80% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/RemoveList.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/lists/RemoveList.java index 4a14962a28..ef597b2a36 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/RemoveList.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/lists/RemoveList.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.lists; +package org.joinmastodon.android.api.mastodon.requests.lists; import org.joinmastodon.android.api.MastodonAPIRequest; import java.util.List; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/UpdateList.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/lists/UpdateList.java similarity index 88% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/UpdateList.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/lists/UpdateList.java index 0a68142770..6641f59dab 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/UpdateList.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/lists/UpdateList.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.lists; +package org.joinmastodon.android.api.mastodon.requests.lists; import org.joinmastodon.android.api.MastodonAPIRequest; import org.joinmastodon.android.model.ListTimeline; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/markers/GetMarkers.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/markers/GetMarkers.java similarity index 89% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/markers/GetMarkers.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/markers/GetMarkers.java index b7dd6536b1..5ca17708bd 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/markers/GetMarkers.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/markers/GetMarkers.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.markers; +package org.joinmastodon.android.api.mastodon.requests.markers; import org.joinmastodon.android.api.ApiUtils; import org.joinmastodon.android.api.MastodonAPIRequest; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/markers/SaveMarkers.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/markers/SaveMarkers.java similarity index 92% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/markers/SaveMarkers.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/markers/SaveMarkers.java index f432504bf3..0fc7502219 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/markers/SaveMarkers.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/markers/SaveMarkers.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.markers; +package org.joinmastodon.android.api.mastodon.requests.markers; import org.joinmastodon.android.api.MastodonAPIRequest; import org.joinmastodon.android.api.gson.JsonObjectBuilder; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/notifications/DismissNotification.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/notifications/DismissNotification.java similarity index 88% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/notifications/DismissNotification.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/notifications/DismissNotification.java index 5c2399774e..3de561bad4 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/notifications/DismissNotification.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/notifications/DismissNotification.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.notifications; +package org.joinmastodon.android.api.mastodon.requests.notifications; import com.google.gson.reflect.TypeToken; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/notifications/GetNotificationByID.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/notifications/GetNotificationByID.java similarity index 80% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/notifications/GetNotificationByID.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/notifications/GetNotificationByID.java index 472bb4a895..32313397cc 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/notifications/GetNotificationByID.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/notifications/GetNotificationByID.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.notifications; +package org.joinmastodon.android.api.mastodon.requests.notifications; import org.joinmastodon.android.api.MastodonAPIRequest; import org.joinmastodon.android.model.Notification; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/notifications/GetNotifications.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/notifications/GetNotifications.java similarity index 94% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/notifications/GetNotifications.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/notifications/GetNotifications.java index 33aefea528..7a80628887 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/notifications/GetNotifications.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/notifications/GetNotifications.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.notifications; +package org.joinmastodon.android.api.mastodon.requests.notifications; import com.google.gson.reflect.TypeToken; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/notifications/RegisterForPushNotifications.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/notifications/RegisterForPushNotifications.java similarity index 94% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/notifications/RegisterForPushNotifications.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/notifications/RegisterForPushNotifications.java index b1ef8ace91..f5fb5e1253 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/notifications/RegisterForPushNotifications.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/notifications/RegisterForPushNotifications.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.notifications; +package org.joinmastodon.android.api.mastodon.requests.notifications; import org.joinmastodon.android.api.MastodonAPIRequest; import org.joinmastodon.android.model.PushSubscription; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/notifications/UpdatePushSettings.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/notifications/UpdatePushSettings.java similarity index 93% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/notifications/UpdatePushSettings.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/notifications/UpdatePushSettings.java index de607afaca..31eba34bb0 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/notifications/UpdatePushSettings.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/notifications/UpdatePushSettings.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.notifications; +package org.joinmastodon.android.api.mastodon.requests.notifications; import org.joinmastodon.android.api.MastodonAPIRequest; import org.joinmastodon.android.model.PushSubscription; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/oauth/CreateOAuthApp.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/oauth/CreateOAuthApp.java similarity index 79% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/oauth/CreateOAuthApp.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/oauth/CreateOAuthApp.java index bb1e987130..3accbb3ce9 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/oauth/CreateOAuthApp.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/oauth/CreateOAuthApp.java @@ -1,7 +1,7 @@ -package org.joinmastodon.android.api.requests.oauth; +package org.joinmastodon.android.api.mastodon.requests.oauth; import org.joinmastodon.android.api.MastodonAPIRequest; -import org.joinmastodon.android.api.session.AccountSessionManager; +import org.joinmastodon.android.api.mastodon.session.session.AccountSessionManager; import org.joinmastodon.android.model.Application; public class CreateOAuthApp extends MastodonAPIRequest{ diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/oauth/GetOauthToken.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/oauth/GetOauthToken.java similarity index 88% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/oauth/GetOauthToken.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/oauth/GetOauthToken.java index dde85af1b1..18b45aee42 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/oauth/GetOauthToken.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/oauth/GetOauthToken.java @@ -1,9 +1,9 @@ -package org.joinmastodon.android.api.requests.oauth; +package org.joinmastodon.android.api.mastodon.requests.oauth; import com.google.gson.annotations.SerializedName; import org.joinmastodon.android.api.MastodonAPIRequest; -import org.joinmastodon.android.api.session.AccountSessionManager; +import org.joinmastodon.android.api.mastodon.session.session.AccountSessionManager; import org.joinmastodon.android.model.Token; public class GetOauthToken extends MastodonAPIRequest{ diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/oauth/RevokeOauthToken.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/oauth/RevokeOauthToken.java similarity index 90% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/oauth/RevokeOauthToken.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/oauth/RevokeOauthToken.java index efed6b18ab..35fef40488 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/oauth/RevokeOauthToken.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/oauth/RevokeOauthToken.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.oauth; +package org.joinmastodon.android.api.mastodon.requests.oauth; import org.joinmastodon.android.api.MastodonAPIRequest; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/polls/SubmitPollVote.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/polls/SubmitPollVote.java similarity index 88% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/polls/SubmitPollVote.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/polls/SubmitPollVote.java index bc127dc59a..e36cffaa82 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/polls/SubmitPollVote.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/polls/SubmitPollVote.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.polls; +package org.joinmastodon.android.api.mastodon.requests.polls; import org.joinmastodon.android.api.MastodonAPIRequest; import org.joinmastodon.android.model.Poll; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/reports/SendReport.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/reports/SendReport.java similarity index 92% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/reports/SendReport.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/reports/SendReport.java index ed77f25c0d..87e632f994 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/reports/SendReport.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/reports/SendReport.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.reports; +package org.joinmastodon.android.api.mastodon.requests.reports; import org.joinmastodon.android.api.MastodonAPIRequest; import org.joinmastodon.android.model.ReportReason; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/search/GetSearchResults.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/search/GetSearchResults.java similarity index 90% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/search/GetSearchResults.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/search/GetSearchResults.java index a357459881..e9df271b06 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/search/GetSearchResults.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/search/GetSearchResults.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.search; +package org.joinmastodon.android.api.mastodon.requests.search; import org.joinmastodon.android.api.MastodonAPIRequest; import org.joinmastodon.android.model.SearchResults; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/CreateStatus.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/statuses/CreateStatus.java similarity index 96% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/CreateStatus.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/statuses/CreateStatus.java index 267617ff05..153ca92b14 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/CreateStatus.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/statuses/CreateStatus.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.statuses; +package org.joinmastodon.android.api.mastodon.requests.statuses; import org.joinmastodon.android.api.MastodonAPIRequest; import org.joinmastodon.android.model.ScheduledStatus; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/DeleteStatus.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/statuses/DeleteStatus.java similarity index 87% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/DeleteStatus.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/statuses/DeleteStatus.java index 3730a64f63..9800b869c4 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/DeleteStatus.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/statuses/DeleteStatus.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.statuses; +package org.joinmastodon.android.api.mastodon.requests.statuses; import org.joinmastodon.android.api.MastodonAPIRequest; import org.joinmastodon.android.model.Status; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/EditStatus.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/statuses/EditStatus.java similarity index 82% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/EditStatus.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/statuses/EditStatus.java index ecadaf2eb1..6d3c902d8e 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/EditStatus.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/statuses/EditStatus.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.statuses; +package org.joinmastodon.android.api.mastodon.requests.statuses; import org.joinmastodon.android.api.MastodonAPIRequest; import org.joinmastodon.android.model.Status; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/GetAttachmentByID.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/statuses/GetAttachmentByID.java similarity index 89% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/GetAttachmentByID.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/statuses/GetAttachmentByID.java index 0228ade206..512ccec9bf 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/GetAttachmentByID.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/statuses/GetAttachmentByID.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.statuses; +package org.joinmastodon.android.api.mastodon.requests.statuses; import org.joinmastodon.android.api.MastodonAPIRequest; import org.joinmastodon.android.model.Attachment; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/GetBookmarkedStatuses.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/statuses/GetBookmarkedStatuses.java similarity index 73% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/GetBookmarkedStatuses.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/statuses/GetBookmarkedStatuses.java index b8e81c26e8..e4c3dc52ff 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/GetBookmarkedStatuses.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/statuses/GetBookmarkedStatuses.java @@ -1,8 +1,8 @@ -package org.joinmastodon.android.api.requests.statuses; +package org.joinmastodon.android.api.mastodon.requests.statuses; 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.Status; public class GetBookmarkedStatuses extends HeaderPaginationRequest{ diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/GetFavoritedStatuses.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/statuses/GetFavoritedStatuses.java similarity index 73% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/GetFavoritedStatuses.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/statuses/GetFavoritedStatuses.java index 7627d0067c..d2c77c728f 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/GetFavoritedStatuses.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/statuses/GetFavoritedStatuses.java @@ -1,8 +1,8 @@ -package org.joinmastodon.android.api.requests.statuses; +package org.joinmastodon.android.api.mastodon.requests.statuses; 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.Status; public class GetFavoritedStatuses extends HeaderPaginationRequest{ diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/GetScheduledStatuses.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/statuses/GetScheduledStatuses.java similarity index 74% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/GetScheduledStatuses.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/statuses/GetScheduledStatuses.java index fec163f2ff..ac123028da 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/GetScheduledStatuses.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/statuses/GetScheduledStatuses.java @@ -1,8 +1,8 @@ -package org.joinmastodon.android.api.requests.statuses; +package org.joinmastodon.android.api.mastodon.requests.statuses; 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.ScheduledStatus; public class GetScheduledStatuses extends HeaderPaginationRequest{ diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/GetStatusByID.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/statuses/GetStatusByID.java similarity index 80% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/GetStatusByID.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/statuses/GetStatusByID.java index 39600fb6e1..5bc6cf2a72 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/GetStatusByID.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/statuses/GetStatusByID.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.statuses; +package org.joinmastodon.android.api.mastodon.requests.statuses; import org.joinmastodon.android.api.MastodonAPIRequest; import org.joinmastodon.android.model.Status; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/GetStatusContext.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/statuses/GetStatusContext.java similarity index 82% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/GetStatusContext.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/statuses/GetStatusContext.java index b1b5020b27..64cca84eb0 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/GetStatusContext.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/statuses/GetStatusContext.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.statuses; +package org.joinmastodon.android.api.mastodon.requests.statuses; import org.joinmastodon.android.api.MastodonAPIRequest; import org.joinmastodon.android.model.StatusContext; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/GetStatusEditHistory.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/statuses/GetStatusEditHistory.java similarity index 93% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/GetStatusEditHistory.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/statuses/GetStatusEditHistory.java index e682cd02a3..b5acff133a 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/GetStatusEditHistory.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/statuses/GetStatusEditHistory.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.statuses; +package org.joinmastodon.android.api.mastodon.requests.statuses; import com.google.gson.reflect.TypeToken; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/GetStatusFavorites.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/statuses/GetStatusFavorites.java similarity index 74% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/GetStatusFavorites.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/statuses/GetStatusFavorites.java index 9ba0be6b51..02ee9d21c8 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/GetStatusFavorites.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/statuses/GetStatusFavorites.java @@ -1,8 +1,8 @@ -package org.joinmastodon.android.api.requests.statuses; +package org.joinmastodon.android.api.mastodon.requests.statuses; 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 GetStatusFavorites extends HeaderPaginationRequest{ diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/GetStatusReblogs.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/statuses/GetStatusReblogs.java similarity index 74% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/GetStatusReblogs.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/statuses/GetStatusReblogs.java index 41d5d77cdc..c9b73f1a48 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/GetStatusReblogs.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/statuses/GetStatusReblogs.java @@ -1,8 +1,8 @@ -package org.joinmastodon.android.api.requests.statuses; +package org.joinmastodon.android.api.mastodon.requests.statuses; 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 GetStatusReblogs extends HeaderPaginationRequest{ diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/GetStatusSourceText.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/statuses/GetStatusSourceText.java similarity index 88% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/GetStatusSourceText.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/statuses/GetStatusSourceText.java index f1dd895e34..8b87b19b0c 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/GetStatusSourceText.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/statuses/GetStatusSourceText.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.statuses; +package org.joinmastodon.android.api.mastodon.requests.statuses; import org.joinmastodon.android.api.AllFieldsAreRequired; import org.joinmastodon.android.api.MastodonAPIRequest; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/SetStatusBookmarked.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/statuses/SetStatusBookmarked.java similarity index 85% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/SetStatusBookmarked.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/statuses/SetStatusBookmarked.java index 3b010e24bd..7e7c405067 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/SetStatusBookmarked.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/statuses/SetStatusBookmarked.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.statuses; +package org.joinmastodon.android.api.mastodon.requests.statuses; import org.joinmastodon.android.api.MastodonAPIRequest; import org.joinmastodon.android.model.Status; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/SetStatusFavorited.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/statuses/SetStatusFavorited.java similarity index 85% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/SetStatusFavorited.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/statuses/SetStatusFavorited.java index f019c44428..c97f964680 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/SetStatusFavorited.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/statuses/SetStatusFavorited.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.statuses; +package org.joinmastodon.android.api.mastodon.requests.statuses; import org.joinmastodon.android.api.MastodonAPIRequest; import org.joinmastodon.android.model.Status; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/SetStatusPinned.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/statuses/SetStatusPinned.java similarity index 84% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/SetStatusPinned.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/statuses/SetStatusPinned.java index e7c55e63fa..85fc44b0f8 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/SetStatusPinned.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/statuses/SetStatusPinned.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.statuses; +package org.joinmastodon.android.api.mastodon.requests.statuses; import org.joinmastodon.android.api.MastodonAPIRequest; import org.joinmastodon.android.model.Status; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/SetStatusReblogged.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/statuses/SetStatusReblogged.java similarity index 89% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/SetStatusReblogged.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/statuses/SetStatusReblogged.java index 64b2367789..a3b66ed84d 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/SetStatusReblogged.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/statuses/SetStatusReblogged.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.statuses; +package org.joinmastodon.android.api.mastodon.requests.statuses; import org.joinmastodon.android.api.MastodonAPIRequest; import org.joinmastodon.android.model.Status; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/TranslateStatus.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/statuses/TranslateStatus.java similarity index 84% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/TranslateStatus.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/statuses/TranslateStatus.java index bb3c29888d..90b8d61a7b 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/TranslateStatus.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/statuses/TranslateStatus.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.statuses; +package org.joinmastodon.android.api.mastodon.requests.statuses; import org.joinmastodon.android.api.MastodonAPIRequest; import org.joinmastodon.android.model.TranslatedStatus; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/UpdateAttachment.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/statuses/UpdateAttachment.java similarity index 87% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/UpdateAttachment.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/statuses/UpdateAttachment.java index 0128cd39bf..40ceec8334 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/UpdateAttachment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/statuses/UpdateAttachment.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.statuses; +package org.joinmastodon.android.api.mastodon.requests.statuses; import org.joinmastodon.android.api.MastodonAPIRequest; import org.joinmastodon.android.model.Attachment; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/UploadAttachment.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/statuses/UploadAttachment.java similarity index 91% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/UploadAttachment.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/statuses/UploadAttachment.java index 6cb29da11e..c71630c85f 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/UploadAttachment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/statuses/UploadAttachment.java @@ -1,11 +1,8 @@ -package org.joinmastodon.android.api.requests.statuses; +package org.joinmastodon.android.api.mastodon.requests.statuses; -import android.database.Cursor; import android.net.Uri; -import android.provider.OpenableColumns; import android.text.TextUtils; -import org.joinmastodon.android.MastodonApp; import org.joinmastodon.android.api.ContentUriRequestBody; import org.joinmastodon.android.api.MastodonAPIRequest; import org.joinmastodon.android.api.ProgressListener; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/tags/GetFollowedHashtags.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/tags/GetFollowedHashtags.java similarity index 77% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/tags/GetFollowedHashtags.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/tags/GetFollowedHashtags.java index b347fe2357..d978bed561 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/tags/GetFollowedHashtags.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/tags/GetFollowedHashtags.java @@ -1,13 +1,10 @@ -package org.joinmastodon.android.api.requests.tags; +package org.joinmastodon.android.api.mastodon.requests.tags; import com.google.gson.reflect.TypeToken; -import org.joinmastodon.android.api.MastodonAPIRequest; -import org.joinmastodon.android.api.requests.HeaderPaginationRequest; +import org.joinmastodon.android.api.mastodon.requests.HeaderPaginationRequest; import org.joinmastodon.android.model.Hashtag; -import java.util.List; - public class GetFollowedHashtags extends HeaderPaginationRequest { public GetFollowedHashtags() { this(null, null, -1, null); diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/tags/GetHashtag.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/tags/GetHashtag.java similarity index 81% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/tags/GetHashtag.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/tags/GetHashtag.java index 2b4cf8f5c8..fafc61d5c1 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/tags/GetHashtag.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/tags/GetHashtag.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.tags; +package org.joinmastodon.android.api.mastodon.requests.tags; import org.joinmastodon.android.api.MastodonAPIRequest; import org.joinmastodon.android.model.Hashtag; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/tags/SetHashtagFollowed.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/tags/SetHashtagFollowed.java similarity index 86% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/tags/SetHashtagFollowed.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/tags/SetHashtagFollowed.java index 362e6f40de..c20a9ef4b2 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/tags/SetHashtagFollowed.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/tags/SetHashtagFollowed.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.tags; +package org.joinmastodon.android.api.mastodon.requests.tags; import org.joinmastodon.android.api.MastodonAPIRequest; import org.joinmastodon.android.model.Hashtag; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/timelines/GetHashtagTimeline.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/timelines/GetHashtagTimeline.java similarity index 89% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/timelines/GetHashtagTimeline.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/timelines/GetHashtagTimeline.java index 4a3c831df4..8fe01d2769 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/timelines/GetHashtagTimeline.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/timelines/GetHashtagTimeline.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.timelines; +package org.joinmastodon.android.api.mastodon.requests.timelines; import com.google.gson.reflect.TypeToken; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/timelines/GetHomeTimeline.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/timelines/GetHomeTimeline.java similarity index 92% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/timelines/GetHomeTimeline.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/timelines/GetHomeTimeline.java index 3792c5a66e..c496059a6d 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/timelines/GetHomeTimeline.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/timelines/GetHomeTimeline.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.timelines; +package org.joinmastodon.android.api.mastodon.requests.timelines; import com.google.gson.reflect.TypeToken; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/timelines/GetListTimeline.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/timelines/GetListTimeline.java similarity index 91% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/timelines/GetListTimeline.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/timelines/GetListTimeline.java index 145a740bcd..51066bacb4 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/timelines/GetListTimeline.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/timelines/GetListTimeline.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.timelines; +package org.joinmastodon.android.api.mastodon.requests.timelines; import com.google.gson.reflect.TypeToken; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/timelines/GetPublicTimeline.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/timelines/GetPublicTimeline.java similarity index 90% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/timelines/GetPublicTimeline.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/timelines/GetPublicTimeline.java index 6723c18b98..435bfc69c3 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/timelines/GetPublicTimeline.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/timelines/GetPublicTimeline.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.timelines; +package org.joinmastodon.android.api.mastodon.requests.timelines; import android.text.TextUtils; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/trends/GetTrendingHashtags.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/trends/GetTrendingHashtags.java similarity index 86% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/trends/GetTrendingHashtags.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/trends/GetTrendingHashtags.java index 82b368ad6d..d78900356b 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/trends/GetTrendingHashtags.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/trends/GetTrendingHashtags.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.trends; +package org.joinmastodon.android.api.mastodon.requests.trends; import com.google.gson.reflect.TypeToken; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/trends/GetTrendingLinks.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/trends/GetTrendingLinks.java similarity index 84% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/trends/GetTrendingLinks.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/trends/GetTrendingLinks.java index eeea39b335..5b39dd1765 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/trends/GetTrendingLinks.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/trends/GetTrendingLinks.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.trends; +package org.joinmastodon.android.api.mastodon.requests.trends; import com.google.gson.reflect.TypeToken; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/trends/GetTrendingStatuses.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/trends/GetTrendingStatuses.java similarity index 88% rename from mastodon/src/main/java/org/joinmastodon/android/api/requests/trends/GetTrendingStatuses.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/trends/GetTrendingStatuses.java index ea781d716e..0c74cf2b3e 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/trends/GetTrendingStatuses.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/trends/GetTrendingStatuses.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.requests.trends; +package org.joinmastodon.android.api.mastodon.requests.trends; import com.google.gson.reflect.TypeToken; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/session/AccountActivationInfo.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/session/session/AccountActivationInfo.java similarity index 81% rename from mastodon/src/main/java/org/joinmastodon/android/api/session/AccountActivationInfo.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/session/session/AccountActivationInfo.java index 43e5739ae6..5be24a9455 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/session/AccountActivationInfo.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/session/session/AccountActivationInfo.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.session; +package org.joinmastodon.android.api.mastodon.session.session; public class AccountActivationInfo{ public String email; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSession.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/session/session/AccountSession.java similarity index 97% rename from mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSession.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/session/session/AccountSession.java index da32d9d1a6..5c02de39c7 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSession.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/session/session/AccountSession.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.session; +package org.joinmastodon.android.api.mastodon.session.session; import org.joinmastodon.android.api.CacheController; import org.joinmastodon.android.api.MastodonAPIController; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSessionManager.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/session/session/AccountSessionManager.java similarity index 96% rename from mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSessionManager.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/session/session/AccountSessionManager.java index 00ed9cb0c1..93cd130c01 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSessionManager.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/session/session/AccountSessionManager.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.session; +package org.joinmastodon.android.api.mastodon.session.session; import android.app.Activity; import android.app.NotificationManager; @@ -20,13 +20,13 @@ import org.joinmastodon.android.R; import org.joinmastodon.android.api.MastodonAPIController; import org.joinmastodon.android.api.PushSubscriptionManager; -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.accounts.GetOwnAccount; -import org.joinmastodon.android.api.requests.instance.GetInstance; -import org.joinmastodon.android.api.requests.markers.GetMarkers; -import org.joinmastodon.android.api.requests.oauth.CreateOAuthApp; +import org.joinmastodon.android.api.mastodon.requests.accounts.GetPreferences; +import org.joinmastodon.android.api.mastodon.requests.accounts.GetWordFilters; +import org.joinmastodon.android.api.mastodon.requests.instance.GetCustomEmojis; +import org.joinmastodon.android.api.mastodon.requests.accounts.GetOwnAccount; +import org.joinmastodon.android.api.mastodon.requests.instance.GetInstance; +import org.joinmastodon.android.api.mastodon.requests.markers.GetMarkers; +import org.joinmastodon.android.api.mastodon.requests.oauth.CreateOAuthApp; import org.joinmastodon.android.events.EmojiUpdatedEvent; import org.joinmastodon.android.model.Account; import org.joinmastodon.android.model.Application; diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/AccountTimelineFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/AccountTimelineFragment.java index 2c3050ee59..e424b7de99 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/AccountTimelineFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/AccountTimelineFragment.java @@ -3,14 +3,10 @@ import android.app.Activity; import android.os.Bundle; import android.view.View; -import android.view.animation.TranslateAnimation; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; import org.joinmastodon.android.R; -import org.joinmastodon.android.api.requests.accounts.GetAccountStatuses; -import org.joinmastodon.android.api.session.AccountSessionManager; +import org.joinmastodon.android.api.mastodon.requests.accounts.GetAccountStatuses; +import org.joinmastodon.android.api.mastodon.session.session.AccountSessionManager; import org.joinmastodon.android.events.RemoveAccountPostsEvent; import org.joinmastodon.android.events.StatusCreatedEvent; import org.joinmastodon.android.events.StatusUnpinnedEvent; diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/AnnouncementsFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/AnnouncementsFragment.java index a87b8c4658..dd8b914c42 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/AnnouncementsFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/AnnouncementsFragment.java @@ -3,43 +3,23 @@ import static java.util.stream.Collectors.toList; import android.app.Activity; -import android.os.Bundle; import android.text.TextUtils; -import android.view.View; -import android.widget.ImageButton; -import com.squareup.otto.Subscribe; - -import org.joinmastodon.android.E; import org.joinmastodon.android.R; -import org.joinmastodon.android.api.requests.announcements.GetAnnouncements; -import org.joinmastodon.android.api.requests.statuses.CreateStatus; -import org.joinmastodon.android.api.requests.statuses.GetScheduledStatuses; -import org.joinmastodon.android.api.session.AccountSession; -import org.joinmastodon.android.api.session.AccountSessionManager; -import org.joinmastodon.android.events.ScheduledStatusCreatedEvent; -import org.joinmastodon.android.events.ScheduledStatusDeletedEvent; +import org.joinmastodon.android.api.mastodon.requests.announcements.GetAnnouncements; +import org.joinmastodon.android.api.mastodon.session.session.AccountSession; +import org.joinmastodon.android.api.mastodon.session.session.AccountSessionManager; import org.joinmastodon.android.model.Account; import org.joinmastodon.android.model.Announcement; -import org.joinmastodon.android.model.HeaderPaginationList; import org.joinmastodon.android.model.Instance; -import org.joinmastodon.android.model.ScheduledStatus; import org.joinmastodon.android.model.Status; import org.joinmastodon.android.ui.displayitems.HeaderStatusDisplayItem; import org.joinmastodon.android.ui.displayitems.StatusDisplayItem; import org.joinmastodon.android.ui.displayitems.TextStatusDisplayItem; import org.joinmastodon.android.ui.text.HtmlParser; -import org.joinmastodon.android.ui.utils.UiUtils; -import org.parceler.Parcels; -import java.util.ArrayList; -import java.util.Collections; import java.util.List; -import java.util.stream.Collectors; -import java.util.stream.Stream; -import me.grishka.appkit.Nav; -import me.grishka.appkit.api.PaginatedList; import me.grishka.appkit.api.SimpleCallback; public class AnnouncementsFragment extends BaseStatusListFragment { diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java index ad824a5769..f556c196ea 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java @@ -13,7 +13,6 @@ import android.text.StaticLayout; import android.text.TextPaint; import android.text.TextUtils; -import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.view.WindowInsets; @@ -21,14 +20,11 @@ import android.widget.ImageButton; import android.widget.Toolbar; -import org.joinmastodon.android.DomainManager; import org.joinmastodon.android.E; import org.joinmastodon.android.GlobalUserPreferences; -import org.joinmastodon.android.MainActivity; import org.joinmastodon.android.R; -import org.joinmastodon.android.api.requests.accounts.GetAccountRelationships; -import org.joinmastodon.android.api.requests.polls.SubmitPollVote; -import org.joinmastodon.android.api.session.AccountSessionManager; +import org.joinmastodon.android.api.mastodon.requests.accounts.GetAccountRelationships; +import org.joinmastodon.android.api.mastodon.requests.polls.SubmitPollVote; import org.joinmastodon.android.events.PollUpdatedEvent; import org.joinmastodon.android.model.Account; import org.joinmastodon.android.model.DisplayItemsParent; diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/BookmarkedStatusListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/BookmarkedStatusListFragment.java index 6fd12d95da..5933838e6c 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/BookmarkedStatusListFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/BookmarkedStatusListFragment.java @@ -3,7 +3,7 @@ import android.app.Activity; import org.joinmastodon.android.R; -import org.joinmastodon.android.api.requests.statuses.GetBookmarkedStatuses; +import org.joinmastodon.android.api.mastodon.requests.statuses.GetBookmarkedStatuses; import org.joinmastodon.android.model.HeaderPaginationList; import org.joinmastodon.android.model.Status; diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java index 2da7b61615..4c38dfad37 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java @@ -1,10 +1,8 @@ package org.joinmastodon.android.fragments; -import static android.os.ext.SdkExtensions.getExtensionVersion; - import static org.joinmastodon.android.GlobalUserPreferences.recentLanguages; -import static org.joinmastodon.android.api.requests.statuses.CreateStatus.DRAFTS_AFTER_INSTANT; -import static org.joinmastodon.android.api.requests.statuses.CreateStatus.getDraftInstant; +import static org.joinmastodon.android.api.mastodon.requests.statuses.CreateStatus.DRAFTS_AFTER_INSTANT; +import static org.joinmastodon.android.api.mastodon.requests.statuses.CreateStatus.getDraftInstant; import static org.joinmastodon.android.ui.utils.UiUtils.isPhotoPickerAvailable; import static org.joinmastodon.android.utils.MastodonLanguage.allLanguages; import static org.joinmastodon.android.utils.MastodonLanguage.defaultRecentLanguages; @@ -29,7 +27,6 @@ import android.icu.text.BreakIterator; import android.media.MediaMetadataRetriever; import android.net.Uri; -import android.opengl.Visibility; import android.os.Build; import android.os.Bundle; import android.os.Parcelable; @@ -80,13 +77,13 @@ import org.joinmastodon.android.api.MastodonAPIController; import org.joinmastodon.android.api.MastodonErrorResponse; import org.joinmastodon.android.api.ProgressListener; -import org.joinmastodon.android.api.requests.statuses.CreateStatus; -import org.joinmastodon.android.api.requests.statuses.DeleteStatus; -import org.joinmastodon.android.api.requests.statuses.EditStatus; -import org.joinmastodon.android.api.requests.statuses.GetAttachmentByID; -import org.joinmastodon.android.api.requests.statuses.UploadAttachment; -import org.joinmastodon.android.api.session.AccountSession; -import org.joinmastodon.android.api.session.AccountSessionManager; +import org.joinmastodon.android.api.mastodon.requests.statuses.CreateStatus; +import org.joinmastodon.android.api.mastodon.requests.statuses.DeleteStatus; +import org.joinmastodon.android.api.mastodon.requests.statuses.EditStatus; +import org.joinmastodon.android.api.mastodon.requests.statuses.GetAttachmentByID; +import org.joinmastodon.android.api.mastodon.requests.statuses.UploadAttachment; +import org.joinmastodon.android.api.mastodon.session.session.AccountSession; +import org.joinmastodon.android.api.mastodon.session.session.AccountSessionManager; import org.joinmastodon.android.events.ScheduledStatusCreatedEvent; import org.joinmastodon.android.events.ScheduledStatusDeletedEvent; import org.joinmastodon.android.events.StatusCountersUpdatedEvent; diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeImageDescriptionFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeImageDescriptionFragment.java index 02bea5f6dc..80b521f958 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeImageDescriptionFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeImageDescriptionFragment.java @@ -18,14 +18,13 @@ import android.widget.ImageView; import org.joinmastodon.android.R; -import org.joinmastodon.android.api.requests.statuses.UpdateAttachment; +import org.joinmastodon.android.api.mastodon.requests.statuses.UpdateAttachment; import org.joinmastodon.android.model.Attachment; import org.parceler.Parcels; import me.grishka.appkit.Nav; import me.grishka.appkit.api.Callback; import me.grishka.appkit.api.ErrorResponse; -import me.grishka.appkit.fragments.ToolbarFragment; import me.grishka.appkit.imageloader.ViewImageLoader; import me.grishka.appkit.imageloader.requests.UrlImageLoaderRequest; import me.grishka.appkit.utils.V; diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/CustomLocalTimelineFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/CustomLocalTimelineFragment.java index 3fa1dd8fb1..c15adcef57 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/CustomLocalTimelineFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/CustomLocalTimelineFragment.java @@ -2,9 +2,7 @@ import android.app.Activity; -import org.joinmastodon.android.DomainManager; -import org.joinmastodon.android.MainActivity; -import org.joinmastodon.android.api.requests.timelines.GetPublicTimeline; +import org.joinmastodon.android.api.mastodon.requests.timelines.GetPublicTimeline; import org.joinmastodon.android.model.Filter; import org.joinmastodon.android.model.Status; import org.joinmastodon.android.utils.StatusFilterPredicate; diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/DomainDisplay.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/DomainDisplay.java index 523742f24c..071bdab092 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/DomainDisplay.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/DomainDisplay.java @@ -1,7 +1,7 @@ package org.joinmastodon.android.fragments; -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; public interface DomainDisplay { diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/EditTimelinesFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/EditTimelinesFragment.java index 8d986b95ea..071b7381da 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/EditTimelinesFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/EditTimelinesFragment.java @@ -30,8 +30,8 @@ import org.joinmastodon.android.GlobalUserPreferences; import org.joinmastodon.android.R; -import org.joinmastodon.android.api.requests.lists.GetLists; -import org.joinmastodon.android.api.requests.tags.GetFollowedHashtags; +import org.joinmastodon.android.api.mastodon.requests.lists.GetLists; +import org.joinmastodon.android.api.mastodon.requests.tags.GetFollowedHashtags; import org.joinmastodon.android.model.CustomLocalTimeline; import org.joinmastodon.android.model.Hashtag; import org.joinmastodon.android.model.HeaderPaginationList; diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/FavoritedStatusListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/FavoritedStatusListFragment.java index 31fdd84429..9fd74c7730 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/FavoritedStatusListFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/FavoritedStatusListFragment.java @@ -3,7 +3,7 @@ import android.app.Activity; import org.joinmastodon.android.R; -import org.joinmastodon.android.api.requests.statuses.GetFavoritedStatuses; +import org.joinmastodon.android.api.mastodon.requests.statuses.GetFavoritedStatuses; import org.joinmastodon.android.model.HeaderPaginationList; import org.joinmastodon.android.model.Status; diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/FollowRequestsListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/FollowRequestsListFragment.java index 9cd86da83b..98596e3769 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/FollowRequestsListFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/FollowRequestsListFragment.java @@ -14,8 +14,8 @@ import android.widget.TextView; import org.joinmastodon.android.R; -import org.joinmastodon.android.api.requests.accounts.GetAccountRelationships; -import org.joinmastodon.android.api.requests.accounts.GetFollowRequests; +import org.joinmastodon.android.api.mastodon.requests.accounts.GetAccountRelationships; +import org.joinmastodon.android.api.mastodon.requests.accounts.GetFollowRequests; import org.joinmastodon.android.model.Account; import org.joinmastodon.android.model.HeaderPaginationList; import org.joinmastodon.android.model.Relationship; diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/FollowedHashtagsFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/FollowedHashtagsFragment.java index ded699f99f..77a23a1f7b 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/FollowedHashtagsFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/FollowedHashtagsFragment.java @@ -9,7 +9,7 @@ import androidx.recyclerview.widget.RecyclerView; import org.joinmastodon.android.R; -import org.joinmastodon.android.api.requests.tags.GetFollowedHashtags; +import org.joinmastodon.android.api.mastodon.requests.tags.GetFollowedHashtags; import org.joinmastodon.android.model.Hashtag; import org.joinmastodon.android.model.HeaderPaginationList; import org.joinmastodon.android.ui.DividerItemDecoration; diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/HashtagTimelineFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/HashtagTimelineFragment.java index e2244001ab..2bf83cc843 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/HashtagTimelineFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/HashtagTimelineFragment.java @@ -8,15 +8,14 @@ import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; -import android.widget.ImageButton; import android.widget.Toast; import org.joinmastodon.android.DomainManager; import org.joinmastodon.android.E; import org.joinmastodon.android.R; -import org.joinmastodon.android.api.requests.tags.GetHashtag; -import org.joinmastodon.android.api.requests.tags.SetHashtagFollowed; -import org.joinmastodon.android.api.requests.timelines.GetHashtagTimeline; +import org.joinmastodon.android.api.mastodon.requests.tags.GetHashtag; +import org.joinmastodon.android.api.mastodon.requests.tags.SetHashtagFollowed; +import org.joinmastodon.android.api.mastodon.requests.timelines.GetHashtagTimeline; import org.joinmastodon.android.events.HashtagUpdatedEvent; import org.joinmastodon.android.model.Filter; import org.joinmastodon.android.model.Hashtag; diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java index 8a2562c492..7b0d9321b0 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java @@ -21,17 +21,14 @@ import androidx.annotation.Nullable; import org.joinmastodon.android.DomainManager; -import org.joinmastodon.android.GlobalUserPreferences; import org.joinmastodon.android.MainActivity; import org.joinmastodon.android.E; -import org.joinmastodon.android.E; import org.joinmastodon.android.R; -import org.joinmastodon.android.api.requests.notifications.GetNotifications; -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.events.AllNotificationsSeenEvent; import org.joinmastodon.android.events.NotificationReceivedEvent; -import org.joinmastodon.android.fragments.discover.DiscoverAccountsFragment; import org.joinmastodon.android.fragments.discover.DiscoverFragment; import org.joinmastodon.android.fragments.onboarding.OnboardingFollowSuggestionsFragment; import org.joinmastodon.android.model.Account; @@ -46,9 +43,6 @@ import java.util.EnumSet; import java.util.List; -import androidx.annotation.IdRes; -import androidx.annotation.Nullable; - import com.squareup.otto.Subscribe; import me.grishka.appkit.FragmentStackActivity; diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java index fd1a199ce5..958aae26e5 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java @@ -1,7 +1,6 @@ package org.joinmastodon.android.fragments; import static org.joinmastodon.android.GlobalUserPreferences.reduceMotion; -import static org.joinmastodon.android.GlobalUserPreferences.showNewPostsButton; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -41,9 +40,9 @@ import org.joinmastodon.android.E; import org.joinmastodon.android.GlobalUserPreferences; import org.joinmastodon.android.R; -import org.joinmastodon.android.api.requests.announcements.GetAnnouncements; -import org.joinmastodon.android.api.requests.lists.GetLists; -import org.joinmastodon.android.api.requests.tags.GetFollowedHashtags; +import org.joinmastodon.android.api.mastodon.requests.announcements.GetAnnouncements; +import org.joinmastodon.android.api.mastodon.requests.lists.GetLists; +import org.joinmastodon.android.api.mastodon.requests.tags.GetFollowedHashtags; import org.joinmastodon.android.events.HashtagUpdatedEvent; import org.joinmastodon.android.events.ListDeletedEvent; import org.joinmastodon.android.events.ListUpdatedCreatedEvent; diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java index 6de831e183..928877cb4a 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java @@ -8,11 +8,8 @@ import androidx.recyclerview.widget.RecyclerView; import org.joinmastodon.android.GlobalUserPreferences; -import org.joinmastodon.android.E; -import org.joinmastodon.android.R; -import org.joinmastodon.android.api.requests.markers.SaveMarkers; -import org.joinmastodon.android.api.requests.timelines.GetHomeTimeline; -import org.joinmastodon.android.api.session.AccountSessionManager; +import org.joinmastodon.android.api.mastodon.requests.timelines.GetHomeTimeline; +import org.joinmastodon.android.api.mastodon.session.session.AccountSessionManager; import org.joinmastodon.android.events.StatusCreatedEvent; import org.joinmastodon.android.model.CacheablePaginatedResponse; import org.joinmastodon.android.model.Filter; diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelineFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelineFragment.java index fd2155b542..16d51e5c7b 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelineFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelineFragment.java @@ -7,15 +7,14 @@ import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; -import android.widget.ImageButton; import androidx.annotation.Nullable; import org.joinmastodon.android.E; import org.joinmastodon.android.R; -import org.joinmastodon.android.api.requests.lists.GetList; -import org.joinmastodon.android.api.requests.lists.UpdateList; -import org.joinmastodon.android.api.requests.timelines.GetListTimeline; +import org.joinmastodon.android.api.mastodon.requests.lists.GetList; +import org.joinmastodon.android.api.mastodon.requests.lists.UpdateList; +import org.joinmastodon.android.api.mastodon.requests.timelines.GetListTimeline; import org.joinmastodon.android.events.ListDeletedEvent; import org.joinmastodon.android.events.ListUpdatedCreatedEvent; import org.joinmastodon.android.model.Filter; diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java index 3655bd3ee2..46ff157c1e 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java @@ -17,10 +17,10 @@ import org.joinmastodon.android.E; import org.joinmastodon.android.R; import org.joinmastodon.android.api.MastodonAPIRequest; -import org.joinmastodon.android.api.requests.lists.AddAccountsToList; -import org.joinmastodon.android.api.requests.lists.CreateList; -import org.joinmastodon.android.api.requests.lists.GetLists; -import org.joinmastodon.android.api.requests.lists.RemoveAccountsFromList; +import org.joinmastodon.android.api.mastodon.requests.lists.AddAccountsToList; +import org.joinmastodon.android.api.mastodon.requests.lists.CreateList; +import org.joinmastodon.android.api.mastodon.requests.lists.GetLists; +import org.joinmastodon.android.api.mastodon.requests.lists.RemoveAccountsFromList; import org.joinmastodon.android.events.ListDeletedEvent; import org.joinmastodon.android.events.ListUpdatedCreatedEvent; import org.joinmastodon.android.model.ListTimeline; diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsFragment.java index 0cba032d27..f296eec894 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsFragment.java @@ -16,7 +16,7 @@ import org.joinmastodon.android.E; import org.joinmastodon.android.GlobalUserPreferences; import org.joinmastodon.android.R; -import org.joinmastodon.android.api.requests.accounts.GetFollowRequests; +import org.joinmastodon.android.api.mastodon.requests.accounts.GetFollowRequests; import org.joinmastodon.android.events.FollowRequestHandledEvent; import org.joinmastodon.android.model.Account; import org.joinmastodon.android.model.HeaderPaginationList; diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java index eefb855b09..74d8631ae1 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java @@ -9,8 +9,8 @@ import org.joinmastodon.android.E; import org.joinmastodon.android.R; -import org.joinmastodon.android.api.requests.markers.SaveMarkers; -import org.joinmastodon.android.api.session.AccountSessionManager; +import org.joinmastodon.android.api.mastodon.requests.markers.SaveMarkers; +import org.joinmastodon.android.api.mastodon.session.session.AccountSessionManager; import org.joinmastodon.android.events.AllNotificationsSeenEvent; import org.joinmastodon.android.events.PollUpdatedEvent; import org.joinmastodon.android.events.RemoveAccountPostsEvent; diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileAboutFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileAboutFragment.java index e6275e9219..107fc746eb 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileAboutFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileAboutFragment.java @@ -27,7 +27,7 @@ import androidx.recyclerview.widget.RecyclerView; import org.joinmastodon.android.R; -import org.joinmastodon.android.api.requests.accounts.SetPrivateNote; +import org.joinmastodon.android.api.mastodon.requests.accounts.SetPrivateNote; import org.joinmastodon.android.model.AccountField; import org.joinmastodon.android.model.Relationship; import org.joinmastodon.android.ui.BetterItemAnimator; diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java index 32be33eaec..c6143202f4 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java @@ -50,16 +50,15 @@ import org.joinmastodon.android.DomainManager; import org.joinmastodon.android.GlobalUserPreferences; -import org.joinmastodon.android.MainActivity; import org.joinmastodon.android.R; -import org.joinmastodon.android.api.requests.accounts.GetAccountByID; -import org.joinmastodon.android.api.requests.accounts.GetAccountRelationships; -import org.joinmastodon.android.api.requests.accounts.GetAccountStatuses; -import org.joinmastodon.android.api.requests.accounts.GetOwnAccount; -import org.joinmastodon.android.api.requests.accounts.SetAccountFollowed; -import org.joinmastodon.android.api.requests.accounts.SetPrivateNote; -import org.joinmastodon.android.api.requests.accounts.UpdateAccountCredentials; -import org.joinmastodon.android.api.session.AccountSessionManager; +import org.joinmastodon.android.api.mastodon.requests.accounts.GetAccountByID; +import org.joinmastodon.android.api.mastodon.requests.accounts.GetAccountRelationships; +import org.joinmastodon.android.api.mastodon.requests.accounts.GetAccountStatuses; +import org.joinmastodon.android.api.mastodon.requests.accounts.GetOwnAccount; +import org.joinmastodon.android.api.mastodon.requests.accounts.SetAccountFollowed; +import org.joinmastodon.android.api.mastodon.requests.accounts.SetPrivateNote; +import org.joinmastodon.android.api.mastodon.requests.accounts.UpdateAccountCredentials; +import org.joinmastodon.android.api.mastodon.session.session.AccountSessionManager; import org.joinmastodon.android.fragments.account_list.FollowerListFragment; import org.joinmastodon.android.fragments.account_list.FollowingListFragment; import org.joinmastodon.android.fragments.report.ReportReasonChoiceFragment; diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ScheduledStatusListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ScheduledStatusListFragment.java index 58283c5478..5abba68654 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ScheduledStatusListFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ScheduledStatusListFragment.java @@ -3,14 +3,13 @@ import android.app.Activity; import android.os.Bundle; import android.view.View; -import android.widget.ImageButton; import com.squareup.otto.Subscribe; import org.joinmastodon.android.E; import org.joinmastodon.android.R; -import org.joinmastodon.android.api.requests.statuses.CreateStatus; -import org.joinmastodon.android.api.requests.statuses.GetScheduledStatuses; +import org.joinmastodon.android.api.mastodon.requests.statuses.CreateStatus; +import org.joinmastodon.android.api.mastodon.requests.statuses.GetScheduledStatuses; import org.joinmastodon.android.events.ScheduledStatusCreatedEvent; import org.joinmastodon.android.events.ScheduledStatusDeletedEvent; import org.joinmastodon.android.model.Filter; diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java index 28d6035899..663816ffd6 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java @@ -12,7 +12,6 @@ import android.os.Bundle; import android.provider.Settings; import android.text.TextUtils; -import android.util.Log; import android.util.LruCache; import android.util.TypedValue; import android.view.Gravity; @@ -45,14 +44,13 @@ import org.joinmastodon.android.GlobalUserPreferences.ColorPreference; import org.joinmastodon.android.MainActivity; import org.joinmastodon.android.MastodonApp; -import org.joinmastodon.android.PushNotificationReceiver; import org.joinmastodon.android.R; import org.joinmastodon.android.api.MastodonAPIController; import org.joinmastodon.android.api.PushSubscriptionManager; -import org.joinmastodon.android.api.requests.oauth.RevokeOauthToken; -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.api.mastodon.requests.oauth.RevokeOauthToken; +import org.joinmastodon.android.api.mastodon.session.session.AccountActivationInfo; +import org.joinmastodon.android.api.mastodon.session.session.AccountSession; +import org.joinmastodon.android.api.mastodon.session.session.AccountSessionManager; import org.joinmastodon.android.events.SelfUpdateStateChangedEvent; import org.joinmastodon.android.fragments.onboarding.InstanceRulesFragment; import org.joinmastodon.android.model.Instance; @@ -66,7 +64,6 @@ import org.parceler.Parcels; import java.util.ArrayList; -import java.util.Map; import java.util.function.Consumer; import androidx.annotation.DrawableRes; diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/SplashFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/SplashFragment.java index 6b60974588..f9a8983215 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/SplashFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/SplashFragment.java @@ -11,7 +11,7 @@ import org.joinmastodon.android.MastodonApp; import org.joinmastodon.android.R; -import org.joinmastodon.android.api.requests.instance.GetInstance; +import org.joinmastodon.android.api.mastodon.requests.instance.GetInstance; import org.joinmastodon.android.fragments.onboarding.InstanceCatalogSignupFragment; import org.joinmastodon.android.fragments.onboarding.InstanceChooserLoginFragment; import org.joinmastodon.android.fragments.onboarding.InstanceRulesFragment; diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/StatusEditHistoryFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/StatusEditHistoryFragment.java index a6f1e21222..7a1a5408b6 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/StatusEditHistoryFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/StatusEditHistoryFragment.java @@ -5,7 +5,7 @@ import android.view.View; import org.joinmastodon.android.R; -import org.joinmastodon.android.api.requests.statuses.GetStatusEditHistory; +import org.joinmastodon.android.api.mastodon.requests.statuses.GetStatusEditHistory; import org.joinmastodon.android.model.Filter; import org.joinmastodon.android.model.Status; import org.joinmastodon.android.ui.displayitems.ReblogOrReplyLineStatusDisplayItem; diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java index 3693210d0d..002e031257 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java @@ -5,9 +5,9 @@ import org.joinmastodon.android.DomainManager; import org.joinmastodon.android.R; -import org.joinmastodon.android.api.requests.statuses.GetStatusContext; -import org.joinmastodon.android.api.session.AccountSession; -import org.joinmastodon.android.api.session.AccountSessionManager; +import org.joinmastodon.android.api.mastodon.requests.statuses.GetStatusContext; +import org.joinmastodon.android.api.mastodon.session.session.AccountSession; +import org.joinmastodon.android.api.mastodon.session.session.AccountSessionManager; import org.joinmastodon.android.events.StatusCreatedEvent; import org.joinmastodon.android.model.Account; import org.joinmastodon.android.model.Filter; diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/BaseAccountListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/BaseAccountListFragment.java index 36f9913d26..734a4d7b16 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/BaseAccountListFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/BaseAccountListFragment.java @@ -20,9 +20,9 @@ import org.joinmastodon.android.GlobalUserPreferences; import org.joinmastodon.android.R; -import org.joinmastodon.android.api.requests.accounts.GetAccountRelationships; -import org.joinmastodon.android.api.requests.accounts.SetAccountFollowed; -import org.joinmastodon.android.api.session.AccountSessionManager; +import org.joinmastodon.android.api.mastodon.requests.accounts.GetAccountRelationships; +import org.joinmastodon.android.api.mastodon.requests.accounts.SetAccountFollowed; +import org.joinmastodon.android.api.mastodon.session.session.AccountSessionManager; import org.joinmastodon.android.fragments.ListTimelinesFragment; import org.joinmastodon.android.fragments.ProfileFragment; import org.joinmastodon.android.fragments.RecyclerFragment; diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/FollowerListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/FollowerListFragment.java index 9914af9c5a..14a7989f1e 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/FollowerListFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/FollowerListFragment.java @@ -3,8 +3,8 @@ import android.os.Bundle; import org.joinmastodon.android.R; -import org.joinmastodon.android.api.requests.HeaderPaginationRequest; -import org.joinmastodon.android.api.requests.accounts.GetAccountFollowers; +import org.joinmastodon.android.api.mastodon.requests.HeaderPaginationRequest; +import org.joinmastodon.android.api.mastodon.requests.accounts.GetAccountFollowers; import org.joinmastodon.android.model.Account; public class FollowerListFragment extends AccountRelatedAccountListFragment{ diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/FollowingListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/FollowingListFragment.java index 33ca437340..a7167df8a5 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/FollowingListFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/FollowingListFragment.java @@ -3,8 +3,8 @@ import android.os.Bundle; import org.joinmastodon.android.R; -import org.joinmastodon.android.api.requests.HeaderPaginationRequest; -import org.joinmastodon.android.api.requests.accounts.GetAccountFollowing; +import org.joinmastodon.android.api.mastodon.requests.HeaderPaginationRequest; +import org.joinmastodon.android.api.mastodon.requests.accounts.GetAccountFollowing; import org.joinmastodon.android.model.Account; public class FollowingListFragment extends AccountRelatedAccountListFragment{ diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/PaginatedAccountListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/PaginatedAccountListFragment.java index 8e20cfdcee..c4294e7d1c 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/PaginatedAccountListFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/PaginatedAccountListFragment.java @@ -3,8 +3,8 @@ import android.net.Uri; import org.joinmastodon.android.GlobalUserPreferences; -import org.joinmastodon.android.api.requests.HeaderPaginationRequest; -import org.joinmastodon.android.api.session.AccountSessionManager; +import org.joinmastodon.android.api.mastodon.requests.HeaderPaginationRequest; +import org.joinmastodon.android.api.mastodon.session.session.AccountSessionManager; import org.joinmastodon.android.model.Account; import org.joinmastodon.android.model.HeaderPaginationList; import org.joinmastodon.android.ui.utils.UiUtils; diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/StatusFavoritesListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/StatusFavoritesListFragment.java index 9e8f164305..e9cc8a586f 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/StatusFavoritesListFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/StatusFavoritesListFragment.java @@ -3,8 +3,8 @@ import android.os.Bundle; import org.joinmastodon.android.R; -import org.joinmastodon.android.api.requests.HeaderPaginationRequest; -import org.joinmastodon.android.api.requests.statuses.GetStatusFavorites; +import org.joinmastodon.android.api.mastodon.requests.HeaderPaginationRequest; +import org.joinmastodon.android.api.mastodon.requests.statuses.GetStatusFavorites; import org.joinmastodon.android.model.Account; public class StatusFavoritesListFragment extends StatusRelatedAccountListFragment{ diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/StatusReblogsListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/StatusReblogsListFragment.java index 229e64a131..5c6b011073 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/StatusReblogsListFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/StatusReblogsListFragment.java @@ -3,8 +3,8 @@ import android.os.Bundle; import org.joinmastodon.android.R; -import org.joinmastodon.android.api.requests.HeaderPaginationRequest; -import org.joinmastodon.android.api.requests.statuses.GetStatusReblogs; +import org.joinmastodon.android.api.mastodon.requests.HeaderPaginationRequest; +import org.joinmastodon.android.api.mastodon.requests.statuses.GetStatusReblogs; import org.joinmastodon.android.model.Account; public class StatusReblogsListFragment extends StatusRelatedAccountListFragment{ diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverAccountsFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverAccountsFragment.java index 73e7e99d5c..943f2b06d4 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverAccountsFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverAccountsFragment.java @@ -13,12 +13,11 @@ import android.widget.TextView; import org.joinmastodon.android.R; -import org.joinmastodon.android.api.requests.accounts.GetAccountRelationships; -import org.joinmastodon.android.api.requests.accounts.GetFollowSuggestions; +import org.joinmastodon.android.api.mastodon.requests.accounts.GetAccountRelationships; +import org.joinmastodon.android.api.mastodon.requests.accounts.GetFollowSuggestions; import org.joinmastodon.android.fragments.DomainDisplay; import org.joinmastodon.android.fragments.IsOnTop; import org.joinmastodon.android.fragments.ProfileFragment; -import org.joinmastodon.android.fragments.RecyclerFragment; import org.joinmastodon.android.fragments.ScrollableToTop; import org.joinmastodon.android.model.Account; import org.joinmastodon.android.model.FollowSuggestion; diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverNewsFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverNewsFragment.java index be4c5931f4..88fe9d14fe 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverNewsFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverNewsFragment.java @@ -9,10 +9,9 @@ import android.widget.TextView; import org.joinmastodon.android.R; -import org.joinmastodon.android.api.requests.trends.GetTrendingLinks; +import org.joinmastodon.android.api.mastodon.requests.trends.GetTrendingLinks; import org.joinmastodon.android.fragments.DomainDisplay; import org.joinmastodon.android.fragments.IsOnTop; -import org.joinmastodon.android.fragments.RecyclerFragment; import org.joinmastodon.android.fragments.ScrollableToTop; import org.joinmastodon.android.model.Card; import org.joinmastodon.android.ui.DividerItemDecoration; diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverPostsFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverPostsFragment.java index dfbf27c8eb..e27eb59fa8 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverPostsFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverPostsFragment.java @@ -3,7 +3,7 @@ import android.os.Bundle; import android.view.View; -import org.joinmastodon.android.api.requests.trends.GetTrendingStatuses; +import org.joinmastodon.android.api.mastodon.requests.trends.GetTrendingStatuses; import org.joinmastodon.android.fragments.IsOnTop; import org.joinmastodon.android.fragments.StatusListFragment; import org.joinmastodon.android.model.Filter; diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/FederatedTimelineFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/FederatedTimelineFragment.java index e939118ed5..476381c501 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/FederatedTimelineFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/FederatedTimelineFragment.java @@ -3,8 +3,7 @@ import android.os.Bundle; import android.view.View; -import org.joinmastodon.android.R; -import org.joinmastodon.android.api.requests.timelines.GetPublicTimeline; +import org.joinmastodon.android.api.mastodon.requests.timelines.GetPublicTimeline; import org.joinmastodon.android.fragments.StatusListFragment; import org.joinmastodon.android.model.Filter; import org.joinmastodon.android.model.Status; diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/LocalTimelineFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/LocalTimelineFragment.java index 24d7d77023..6363ef242f 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/LocalTimelineFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/LocalTimelineFragment.java @@ -3,7 +3,7 @@ import android.os.Bundle; import android.view.View; -import org.joinmastodon.android.api.requests.timelines.GetPublicTimeline; +import org.joinmastodon.android.api.mastodon.requests.timelines.GetPublicTimeline; import org.joinmastodon.android.fragments.StatusListFragment; import org.joinmastodon.android.model.Filter; import org.joinmastodon.android.model.Status; diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java index 3a2e6cce8c..cf5df0f70b 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java @@ -8,8 +8,8 @@ import android.view.inputmethod.InputMethodManager; import org.joinmastodon.android.R; -import org.joinmastodon.android.api.requests.search.GetSearchResults; -import org.joinmastodon.android.api.session.AccountSessionManager; +import org.joinmastodon.android.api.mastodon.requests.search.GetSearchResults; +import org.joinmastodon.android.api.mastodon.session.session.AccountSessionManager; import org.joinmastodon.android.fragments.BaseStatusListFragment; import org.joinmastodon.android.fragments.ProfileFragment; import org.joinmastodon.android.fragments.ThreadFragment; @@ -38,7 +38,6 @@ import me.grishka.appkit.Nav; import me.grishka.appkit.api.Callback; import me.grishka.appkit.api.ErrorResponse; -import me.grishka.appkit.api.SimpleCallback; import me.grishka.appkit.utils.MergeRecyclerAdapter; import me.grishka.appkit.utils.V; diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/TrendingHashtagsFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/TrendingHashtagsFragment.java index 31628640a8..6ffed41ed3 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/TrendingHashtagsFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/TrendingHashtagsFragment.java @@ -6,10 +6,9 @@ import android.widget.TextView; import org.joinmastodon.android.R; -import org.joinmastodon.android.api.requests.trends.GetTrendingHashtags; +import org.joinmastodon.android.api.mastodon.requests.trends.GetTrendingHashtags; import org.joinmastodon.android.fragments.DomainDisplay; import org.joinmastodon.android.fragments.IsOnTop; -import org.joinmastodon.android.fragments.RecyclerFragment; import org.joinmastodon.android.fragments.ScrollableToTop; import org.joinmastodon.android.model.Hashtag; import org.joinmastodon.android.ui.DividerItemDecoration; diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/AccountActivationFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/AccountActivationFragment.java index 7a20eaa689..e5155ba847 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/AccountActivationFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/AccountActivationFragment.java @@ -17,13 +17,12 @@ import org.joinmastodon.android.MainActivity; import org.joinmastodon.android.R; -import org.joinmastodon.android.api.requests.accounts.GetOwnAccount; -import org.joinmastodon.android.api.requests.accounts.ResendConfirmationEmail; -import org.joinmastodon.android.api.requests.accounts.UpdateAccountCredentials; -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.fragments.HomeFragment; +import org.joinmastodon.android.api.mastodon.requests.accounts.GetOwnAccount; +import org.joinmastodon.android.api.mastodon.requests.accounts.ResendConfirmationEmail; +import org.joinmastodon.android.api.mastodon.requests.accounts.UpdateAccountCredentials; +import org.joinmastodon.android.api.mastodon.session.session.AccountActivationInfo; +import org.joinmastodon.android.api.mastodon.session.session.AccountSession; +import org.joinmastodon.android.api.mastodon.session.session.AccountSessionManager; import org.joinmastodon.android.fragments.SettingsFragment; import org.joinmastodon.android.model.Account; import org.joinmastodon.android.ui.AccountSwitcherSheet; diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/CustomWelcomeFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/CustomWelcomeFragment.java index 8a043aa4b5..55558c72fe 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/CustomWelcomeFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/CustomWelcomeFragment.java @@ -20,7 +20,7 @@ import androidx.recyclerview.widget.RecyclerView; import org.joinmastodon.android.R; -import org.joinmastodon.android.api.session.AccountSessionManager; +import org.joinmastodon.android.api.mastodon.session.session.AccountSessionManager; import org.joinmastodon.android.model.Instance; import org.joinmastodon.android.model.catalog.CatalogInstance; import org.joinmastodon.android.ui.BetterItemAnimator; diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceCatalogFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceCatalogFragment.java index ed7981c15e..c6430dffea 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceCatalogFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceCatalogFragment.java @@ -16,7 +16,7 @@ import org.joinmastodon.android.R; import org.joinmastodon.android.api.MastodonAPIController; import org.joinmastodon.android.api.MastodonErrorResponse; -import org.joinmastodon.android.api.requests.instance.GetInstance; +import org.joinmastodon.android.api.mastodon.requests.instance.GetInstance; import org.joinmastodon.android.fragments.RecyclerFragment; import org.joinmastodon.android.model.Instance; import org.joinmastodon.android.model.catalog.CatalogInstance; diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceCatalogSignupFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceCatalogSignupFragment.java index 798b18ac50..8e127f6d94 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceCatalogSignupFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceCatalogSignupFragment.java @@ -22,8 +22,8 @@ import org.joinmastodon.android.R; import org.joinmastodon.android.api.MastodonAPIRequest; -import org.joinmastodon.android.api.requests.catalog.GetCatalogCategories; -import org.joinmastodon.android.api.requests.catalog.GetCatalogInstances; +import org.joinmastodon.android.api.mastodon.requests.catalog.GetCatalogCategories; +import org.joinmastodon.android.api.mastodon.requests.catalog.GetCatalogInstances; import org.joinmastodon.android.model.Instance; import org.joinmastodon.android.model.catalog.CatalogCategory; import org.joinmastodon.android.model.catalog.CatalogInstance; diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceChooserLoginFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceChooserLoginFragment.java index b0bb6114f2..0cf4a47acb 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceChooserLoginFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceChooserLoginFragment.java @@ -1,10 +1,7 @@ package org.joinmastodon.android.fragments.onboarding; -import android.graphics.Canvas; import android.graphics.Outline; import android.graphics.Rect; -import android.graphics.RectF; -import android.os.Build; import android.os.Bundle; import android.text.Editable; import android.text.TextWatcher; @@ -14,11 +11,10 @@ import android.widget.ImageButton; import android.widget.RadioButton; import android.widget.TextView; -import android.widget.Toolbar; import org.joinmastodon.android.R; -import org.joinmastodon.android.api.requests.catalog.GetCatalogInstances; -import org.joinmastodon.android.api.session.AccountSessionManager; +import org.joinmastodon.android.api.mastodon.requests.catalog.GetCatalogInstances; +import org.joinmastodon.android.api.mastodon.session.session.AccountSessionManager; import org.joinmastodon.android.model.Instance; import org.joinmastodon.android.model.catalog.CatalogInstance; import org.joinmastodon.android.ui.utils.UiUtils; diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/OnboardingFollowSuggestionsFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/OnboardingFollowSuggestionsFragment.java index 069137fabb..7164bc08d2 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/OnboardingFollowSuggestionsFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/OnboardingFollowSuggestionsFragment.java @@ -9,17 +9,14 @@ import android.view.View; import android.view.ViewGroup; import android.view.WindowInsets; -import android.widget.Button; -import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.ProgressBar; import android.widget.TextView; import org.joinmastodon.android.R; -import org.joinmastodon.android.api.requests.accounts.GetAccountRelationships; -import org.joinmastodon.android.api.requests.accounts.GetFollowSuggestions; -import org.joinmastodon.android.api.requests.accounts.SetAccountFollowed; -import org.joinmastodon.android.fragments.HomeFragment; +import org.joinmastodon.android.api.mastodon.requests.accounts.GetAccountRelationships; +import org.joinmastodon.android.api.mastodon.requests.accounts.GetFollowSuggestions; +import org.joinmastodon.android.api.mastodon.requests.accounts.SetAccountFollowed; import org.joinmastodon.android.fragments.ProfileFragment; import org.joinmastodon.android.fragments.RecyclerFragment; import org.joinmastodon.android.model.FollowSuggestion; @@ -49,7 +46,6 @@ import me.grishka.appkit.imageloader.requests.ImageLoaderRequest; import me.grishka.appkit.utils.BindableViewHolder; import me.grishka.appkit.utils.V; -import me.grishka.appkit.views.FragmentRootLinearLayout; import me.grishka.appkit.views.UsableRecyclerView; public class OnboardingFollowSuggestionsFragment extends RecyclerFragment { diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/OnboardingProfileSetupFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/OnboardingProfileSetupFragment.java index 4814fd9903..227722d722 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/OnboardingProfileSetupFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/OnboardingProfileSetupFragment.java @@ -15,8 +15,8 @@ import android.widget.ScrollView; import org.joinmastodon.android.R; -import org.joinmastodon.android.api.requests.accounts.UpdateAccountCredentials; -import org.joinmastodon.android.api.session.AccountSessionManager; +import org.joinmastodon.android.api.mastodon.requests.accounts.UpdateAccountCredentials; +import org.joinmastodon.android.api.mastodon.session.session.AccountSessionManager; import org.joinmastodon.android.fragments.HomeFragment; import org.joinmastodon.android.model.Account; import org.joinmastodon.android.model.AccountField; diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/SignupFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/SignupFragment.java index 1d098b5fc9..c345115c8e 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/SignupFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/SignupFragment.java @@ -1,18 +1,14 @@ package org.joinmastodon.android.fragments.onboarding; import android.app.ProgressDialog; -import android.graphics.Typeface; import android.os.Build; import android.os.Bundle; import android.text.Editable; -import android.text.Html; -import android.text.SpannableString; import android.text.SpannableStringBuilder; import android.text.Spanned; import android.text.TextUtils; import android.text.TextWatcher; import android.text.style.TypefaceSpan; -import android.text.style.URLSpan; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -24,11 +20,11 @@ import org.joinmastodon.android.R; import org.joinmastodon.android.api.MastodonDetailedErrorResponse; -import org.joinmastodon.android.api.requests.accounts.RegisterAccount; -import org.joinmastodon.android.api.requests.oauth.CreateOAuthApp; -import org.joinmastodon.android.api.requests.oauth.GetOauthToken; -import org.joinmastodon.android.api.session.AccountActivationInfo; -import org.joinmastodon.android.api.session.AccountSessionManager; +import org.joinmastodon.android.api.mastodon.requests.accounts.RegisterAccount; +import org.joinmastodon.android.api.mastodon.requests.oauth.CreateOAuthApp; +import org.joinmastodon.android.api.mastodon.requests.oauth.GetOauthToken; +import org.joinmastodon.android.api.mastodon.session.session.AccountActivationInfo; +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; @@ -49,7 +45,6 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.stream.Collectors; import androidx.annotation.Nullable; import me.grishka.appkit.Nav; diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportAddPostsChoiceFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportAddPostsChoiceFragment.java index dff5551a37..4294fa2f7f 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportAddPostsChoiceFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportAddPostsChoiceFragment.java @@ -17,11 +17,10 @@ import org.joinmastodon.android.E; import org.joinmastodon.android.R; -import org.joinmastodon.android.api.requests.accounts.GetAccountStatuses; +import org.joinmastodon.android.api.mastodon.requests.accounts.GetAccountStatuses; import org.joinmastodon.android.events.FinishReportFragmentsEvent; import org.joinmastodon.android.fragments.StatusListFragment; import org.joinmastodon.android.model.Account; -import org.joinmastodon.android.model.Filter; import org.joinmastodon.android.model.Status; import org.joinmastodon.android.ui.displayitems.AudioStatusDisplayItem; import org.joinmastodon.android.ui.displayitems.HeaderStatusDisplayItem; diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportCommentFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportCommentFragment.java index 0e888c798f..7fcad32953 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportCommentFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportCommentFragment.java @@ -16,7 +16,7 @@ import org.joinmastodon.android.E; import org.joinmastodon.android.R; -import org.joinmastodon.android.api.requests.reports.SendReport; +import org.joinmastodon.android.api.mastodon.requests.reports.SendReport; import org.joinmastodon.android.events.FinishReportFragmentsEvent; import org.joinmastodon.android.fragments.MastodonToolbarFragment; import org.joinmastodon.android.model.Account; diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportDoneFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportDoneFragment.java index 751f03e6da..470697db1e 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportDoneFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportDoneFragment.java @@ -13,7 +13,7 @@ import org.joinmastodon.android.E; import org.joinmastodon.android.R; -import org.joinmastodon.android.api.requests.accounts.SetAccountFollowed; +import org.joinmastodon.android.api.mastodon.requests.accounts.SetAccountFollowed; import org.joinmastodon.android.events.RemoveAccountPostsEvent; import org.joinmastodon.android.fragments.MastodonToolbarFragment; import org.joinmastodon.android.model.Account; @@ -26,7 +26,6 @@ import me.grishka.appkit.Nav; import me.grishka.appkit.api.Callback; import me.grishka.appkit.api.ErrorResponse; -import me.grishka.appkit.fragments.ToolbarFragment; import me.grishka.appkit.imageloader.ViewImageLoader; import me.grishka.appkit.imageloader.requests.UrlImageLoaderRequest; import me.grishka.appkit.utils.CubicBezierInterpolator; diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportReasonChoiceFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportReasonChoiceFragment.java index be83dc475d..212b729951 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportReasonChoiceFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportReasonChoiceFragment.java @@ -5,7 +5,7 @@ import com.squareup.otto.Subscribe; import org.joinmastodon.android.R; -import org.joinmastodon.android.api.session.AccountSessionManager; +import org.joinmastodon.android.api.mastodon.session.session.AccountSessionManager; import org.joinmastodon.android.events.FinishReportFragmentsEvent; import org.joinmastodon.android.model.Instance; import org.joinmastodon.android.model.ReportReason; diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportRuleChoiceFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportRuleChoiceFragment.java index b93eb78618..d9f06df438 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportRuleChoiceFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportRuleChoiceFragment.java @@ -5,7 +5,7 @@ import com.squareup.otto.Subscribe; import org.joinmastodon.android.R; -import org.joinmastodon.android.api.session.AccountSessionManager; +import org.joinmastodon.android.api.mastodon.session.session.AccountSessionManager; import org.joinmastodon.android.events.FinishReportFragmentsEvent; import org.joinmastodon.android.model.Instance; import org.parceler.Parcels; diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/AccountSwitcherSheet.java b/mastodon/src/main/java/org/joinmastodon/android/ui/AccountSwitcherSheet.java index 49ff38b218..480131dce4 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/AccountSwitcherSheet.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/AccountSwitcherSheet.java @@ -21,9 +21,9 @@ import org.joinmastodon.android.GlobalUserPreferences; import org.joinmastodon.android.R; -import org.joinmastodon.android.api.requests.oauth.RevokeOauthToken; -import org.joinmastodon.android.api.session.AccountSession; -import org.joinmastodon.android.api.session.AccountSessionManager; +import org.joinmastodon.android.api.mastodon.requests.oauth.RevokeOauthToken; +import org.joinmastodon.android.api.mastodon.session.session.AccountSession; +import org.joinmastodon.android.api.mastodon.session.session.AccountSessionManager; import org.joinmastodon.android.fragments.onboarding.CustomWelcomeFragment; import org.joinmastodon.android.ui.utils.UiUtils; diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/ComposeAutocompleteViewController.java b/mastodon/src/main/java/org/joinmastodon/android/ui/ComposeAutocompleteViewController.java index f93e66bb7f..484d229883 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/ComposeAutocompleteViewController.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/ComposeAutocompleteViewController.java @@ -13,8 +13,8 @@ import android.widget.TextView; import org.joinmastodon.android.R; -import org.joinmastodon.android.api.requests.search.GetSearchResults; -import org.joinmastodon.android.api.session.AccountSessionManager; +import org.joinmastodon.android.api.mastodon.requests.search.GetSearchResults; +import org.joinmastodon.android.api.mastodon.session.session.AccountSessionManager; import org.joinmastodon.android.model.Account; import org.joinmastodon.android.model.Emoji; import org.joinmastodon.android.model.Hashtag; diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/CustomEmojiPopupKeyboard.java b/mastodon/src/main/java/org/joinmastodon/android/ui/CustomEmojiPopupKeyboard.java index 5eef47b716..991593d1c0 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/CustomEmojiPopupKeyboard.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/CustomEmojiPopupKeyboard.java @@ -21,7 +21,7 @@ import org.joinmastodon.android.GlobalUserPreferences; import org.joinmastodon.android.R; -import org.joinmastodon.android.api.session.AccountSessionManager; +import org.joinmastodon.android.api.mastodon.session.session.AccountSessionManager; import org.joinmastodon.android.events.EmojiUpdatedEvent; import org.joinmastodon.android.model.Emoji; import org.joinmastodon.android.model.EmojiCategory; diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java index ba4db0ea2a..370c3372e3 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java @@ -16,7 +16,6 @@ import android.view.animation.AlphaAnimation; import android.view.animation.Animation; import android.view.animation.AnimationSet; -import android.view.animation.BounceInterpolator; import android.view.animation.RotateAnimation; import android.widget.Button; import android.widget.FrameLayout; @@ -25,8 +24,8 @@ import org.joinmastodon.android.GlobalUserPreferences; import org.joinmastodon.android.R; -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.BaseStatusListFragment; import org.joinmastodon.android.fragments.ComposeFragment; import org.joinmastodon.android.model.Instance; diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java index 4fd615f9b6..c253de31a1 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java @@ -1,11 +1,9 @@ package org.joinmastodon.android.ui.displayitems; -import android.annotation.SuppressLint; import android.app.Activity; import android.app.ProgressDialog; import android.graphics.Outline; import android.graphics.Paint; -import android.graphics.Rect; import android.graphics.Typeface; import android.graphics.drawable.Animatable; import android.graphics.drawable.Drawable; @@ -13,9 +11,6 @@ import android.os.Bundle; import android.text.SpannableStringBuilder; import android.text.TextUtils; -import android.text.style.ImageSpan; -import android.util.Log; -import android.util.TypedValue; import android.view.Menu; import android.view.MenuItem; import android.view.SubMenu; @@ -27,16 +22,14 @@ import android.widget.TextView; import android.widget.Toast; -import androidx.annotation.StringRes; - import org.joinmastodon.android.GlobalUserPreferences; import org.joinmastodon.android.R; -import org.joinmastodon.android.api.requests.accounts.GetAccountRelationships; -import org.joinmastodon.android.api.requests.announcements.DismissAnnouncement; -import org.joinmastodon.android.api.requests.statuses.CreateStatus; -import org.joinmastodon.android.api.requests.statuses.GetStatusSourceText; -import org.joinmastodon.android.api.session.AccountSession; -import org.joinmastodon.android.api.session.AccountSessionManager; +import org.joinmastodon.android.api.mastodon.requests.accounts.GetAccountRelationships; +import org.joinmastodon.android.api.mastodon.requests.announcements.DismissAnnouncement; +import org.joinmastodon.android.api.mastodon.requests.statuses.CreateStatus; +import org.joinmastodon.android.api.mastodon.requests.statuses.GetStatusSourceText; +import org.joinmastodon.android.api.mastodon.session.session.AccountSession; +import org.joinmastodon.android.api.mastodon.session.session.AccountSessionManager; import org.joinmastodon.android.fragments.BaseStatusListFragment; import org.joinmastodon.android.fragments.ComposeFragment; import org.joinmastodon.android.fragments.ListTimelinesFragment; @@ -51,7 +44,6 @@ import org.joinmastodon.android.model.Relationship; import org.joinmastodon.android.model.ScheduledStatus; import org.joinmastodon.android.model.Status; -import org.joinmastodon.android.model.StatusPrivacy; import org.joinmastodon.android.ui.text.HtmlParser; import org.joinmastodon.android.ui.utils.CustomEmojiHelper; import org.joinmastodon.android.ui.utils.UiUtils; @@ -61,7 +53,6 @@ import java.time.ZoneId; import java.time.format.DateTimeFormatter; import java.time.format.FormatStyle; -import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Locale; diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java index 274564a6de..09a916d517 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java @@ -9,8 +9,7 @@ import org.joinmastodon.android.GlobalUserPreferences; import org.joinmastodon.android.R; -import org.joinmastodon.android.api.session.AccountSession; -import org.joinmastodon.android.api.session.AccountSessionManager; +import org.joinmastodon.android.api.mastodon.session.session.AccountSessionManager; import org.joinmastodon.android.fragments.BaseStatusListFragment; import org.joinmastodon.android.fragments.HashtagTimelineFragment; import org.joinmastodon.android.fragments.HomeTabFragment; diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java index cee067fc5e..00e794e62a 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java @@ -17,9 +17,9 @@ import org.joinmastodon.android.GlobalUserPreferences; import org.joinmastodon.android.R; -import org.joinmastodon.android.api.requests.statuses.TranslateStatus; -import org.joinmastodon.android.api.session.AccountSession; -import org.joinmastodon.android.api.session.AccountSessionManager; +import org.joinmastodon.android.api.mastodon.requests.statuses.TranslateStatus; +import org.joinmastodon.android.api.mastodon.session.session.AccountSession; +import org.joinmastodon.android.api.mastodon.session.session.AccountSessionManager; import org.joinmastodon.android.fragments.BaseStatusListFragment; import org.joinmastodon.android.model.Instance; import org.joinmastodon.android.model.Status; diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java index 5e9f8e9415..0eb73aa0c9 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java @@ -56,22 +56,22 @@ import org.joinmastodon.android.MastodonApp; import org.joinmastodon.android.R; import org.joinmastodon.android.api.StatusInteractionController; -import org.joinmastodon.android.api.requests.accounts.GetAccountByHandle; -import org.joinmastodon.android.api.requests.accounts.SetAccountBlocked; -import org.joinmastodon.android.api.requests.accounts.SetAccountFollowed; -import org.joinmastodon.android.api.requests.accounts.SetAccountMuted; -import org.joinmastodon.android.api.requests.accounts.SetDomainBlocked; -import org.joinmastodon.android.api.requests.accounts.AuthorizeFollowRequest; -import org.joinmastodon.android.api.requests.accounts.RejectFollowRequest; -import org.joinmastodon.android.api.requests.lists.DeleteList; -import org.joinmastodon.android.api.requests.notifications.DismissNotification; -import org.joinmastodon.android.api.requests.search.GetSearchResults; -import org.joinmastodon.android.api.requests.statuses.CreateStatus; -import org.joinmastodon.android.api.requests.statuses.DeleteStatus; -import org.joinmastodon.android.api.requests.statuses.GetStatusByID; -import org.joinmastodon.android.api.requests.statuses.SetStatusPinned; -import org.joinmastodon.android.api.session.AccountSession; -import org.joinmastodon.android.api.session.AccountSessionManager; +import org.joinmastodon.android.api.mastodon.requests.accounts.GetAccountByHandle; +import org.joinmastodon.android.api.mastodon.requests.accounts.SetAccountBlocked; +import org.joinmastodon.android.api.mastodon.requests.accounts.SetAccountFollowed; +import org.joinmastodon.android.api.mastodon.requests.accounts.SetAccountMuted; +import org.joinmastodon.android.api.mastodon.requests.accounts.SetDomainBlocked; +import org.joinmastodon.android.api.mastodon.requests.accounts.AuthorizeFollowRequest; +import org.joinmastodon.android.api.mastodon.requests.accounts.RejectFollowRequest; +import org.joinmastodon.android.api.mastodon.requests.lists.DeleteList; +import org.joinmastodon.android.api.mastodon.requests.notifications.DismissNotification; +import org.joinmastodon.android.api.mastodon.requests.search.GetSearchResults; +import org.joinmastodon.android.api.mastodon.requests.statuses.CreateStatus; +import org.joinmastodon.android.api.mastodon.requests.statuses.DeleteStatus; +import org.joinmastodon.android.api.mastodon.requests.statuses.GetStatusByID; +import org.joinmastodon.android.api.mastodon.requests.statuses.SetStatusPinned; +import org.joinmastodon.android.api.mastodon.session.session.AccountSession; +import org.joinmastodon.android.api.mastodon.session.session.AccountSessionManager; import org.joinmastodon.android.events.ScheduledStatusDeletedEvent; import org.joinmastodon.android.events.StatusCountersUpdatedEvent; import org.joinmastodon.android.events.FollowRequestHandledEvent; diff --git a/mastodon/src/main/java/org/joinmastodon/android/utils/StatusFilterPredicate.java b/mastodon/src/main/java/org/joinmastodon/android/utils/StatusFilterPredicate.java index 9e4b914139..a1be3a1e32 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/utils/StatusFilterPredicate.java +++ b/mastodon/src/main/java/org/joinmastodon/android/utils/StatusFilterPredicate.java @@ -1,6 +1,6 @@ package org.joinmastodon.android.utils; -import org.joinmastodon.android.api.session.AccountSessionManager; +import org.joinmastodon.android.api.mastodon.session.session.AccountSessionManager; import org.joinmastodon.android.model.Filter; import org.joinmastodon.android.model.Status;