From b29189ad2a1f845b2532f919ce20e9de1872e199 Mon Sep 17 00:00:00 2001 From: LucasGGamerM Date: Sun, 14 May 2023 14:43:57 -0300 Subject: [PATCH] refactor: move mastodon/session/session to mastodon/session package --- .../android/test/StoreScreenshotsGenerator.java | 4 ++-- .../org/joinmastodon/android/ExternalShareActivity.java | 4 ++-- .../main/java/org/joinmastodon/android/MainActivity.java | 4 ++-- .../main/java/org/joinmastodon/android/OAuthActivity.java | 2 +- .../org/joinmastodon/android/PushNotificationReceiver.java | 4 ++-- .../java/org/joinmastodon/android/api/CacheController.java | 4 ++-- .../org/joinmastodon/android/api/MastodonAPIController.java | 2 +- .../org/joinmastodon/android/api/MastodonAPIRequest.java | 4 ++-- .../joinmastodon/android/api/PushSubscriptionManager.java | 4 ++-- .../android/api/mastodon/requests/oauth/CreateOAuthApp.java | 2 +- .../android/api/mastodon/requests/oauth/GetOauthToken.java | 2 +- .../session/{session => }/AccountActivationInfo.java | 2 +- .../api/mastodon/session/{session => }/AccountSession.java | 2 +- .../session/{session => }/AccountSessionManager.java | 2 +- .../android/fragments/AccountTimelineFragment.java | 2 +- .../android/fragments/AnnouncementsFragment.java | 4 ++-- .../org/joinmastodon/android/fragments/ComposeFragment.java | 4 ++-- .../org/joinmastodon/android/fragments/DomainDisplay.java | 4 ++-- .../org/joinmastodon/android/fragments/HomeFragment.java | 4 ++-- .../android/fragments/HomeTimelineFragment.java | 2 +- .../android/fragments/NotificationsListFragment.java | 2 +- .../org/joinmastodon/android/fragments/ProfileFragment.java | 2 +- .../joinmastodon/android/fragments/SettingsFragment.java | 6 +++--- .../org/joinmastodon/android/fragments/ThreadFragment.java | 4 ++-- .../fragments/account_list/BaseAccountListFragment.java | 2 +- .../account_list/PaginatedAccountListFragment.java | 2 +- .../android/fragments/discover/SearchFragment.java | 2 +- .../fragments/onboarding/AccountActivationFragment.java | 6 +++--- .../android/fragments/onboarding/CustomWelcomeFragment.java | 2 +- .../fragments/onboarding/InstanceChooserLoginFragment.java | 2 +- .../onboarding/OnboardingProfileSetupFragment.java | 2 +- .../android/fragments/onboarding/SignupFragment.java | 4 ++-- .../fragments/report/ReportReasonChoiceFragment.java | 2 +- .../android/fragments/report/ReportRuleChoiceFragment.java | 2 +- .../org/joinmastodon/android/ui/AccountSwitcherSheet.java | 4 ++-- .../android/ui/ComposeAutocompleteViewController.java | 2 +- .../joinmastodon/android/ui/CustomEmojiPopupKeyboard.java | 2 +- .../android/ui/displayitems/FooterStatusDisplayItem.java | 4 ++-- .../android/ui/displayitems/HeaderStatusDisplayItem.java | 4 ++-- .../android/ui/displayitems/StatusDisplayItem.java | 2 +- .../android/ui/displayitems/TextStatusDisplayItem.java | 4 ++-- .../java/org/joinmastodon/android/ui/utils/UiUtils.java | 4 ++-- .../joinmastodon/android/utils/StatusFilterPredicate.java | 2 +- 43 files changed, 65 insertions(+), 65 deletions(-) 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 (99%) 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 08a79ed0c..292c483d4 100644 --- a/mastodon/src/androidTest/java/org/joinmastodon/android/test/StoreScreenshotsGenerator.java +++ b/mastodon/src/androidTest/java/org/joinmastodon/android/test/StoreScreenshotsGenerator.java @@ -14,8 +14,8 @@ import org.joinmastodon.android.MastodonApp; import org.joinmastodon.android.R; 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.api.mastodon.session.AccountSession; +import org.joinmastodon.android.api.mastodon.session.AccountSessionManager; import org.joinmastodon.android.fragments.ComposeFragment; import org.joinmastodon.android.fragments.ThreadFragment; import org.joinmastodon.android.fragments.onboarding.InstanceRulesFragment; diff --git a/mastodon/src/main/java/org/joinmastodon/android/ExternalShareActivity.java b/mastodon/src/main/java/org/joinmastodon/android/ExternalShareActivity.java index 2fbb501c3..5ca29ac8c 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.os.Bundle; import android.text.TextUtils; import android.widget.Toast; -import org.joinmastodon.android.api.mastodon.session.session.AccountSession; -import org.joinmastodon.android.api.mastodon.session.session.AccountSessionManager; +import org.joinmastodon.android.api.mastodon.session.AccountSession; +import org.joinmastodon.android.api.mastodon.session.AccountSessionManager; import org.joinmastodon.android.fragments.ComposeFragment; import org.joinmastodon.android.ui.AccountSwitcherSheet; import org.joinmastodon.android.ui.utils.UiUtils; diff --git a/mastodon/src/main/java/org/joinmastodon/android/MainActivity.java b/mastodon/src/main/java/org/joinmastodon/android/MainActivity.java index 6f3b857e6..6d6f522ba 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.os.Bundle; import android.util.Log; import org.joinmastodon.android.api.ObjectValidationException; -import org.joinmastodon.android.api.mastodon.session.session.AccountSession; -import org.joinmastodon.android.api.mastodon.session.session.AccountSessionManager; +import org.joinmastodon.android.api.mastodon.session.AccountSession; +import org.joinmastodon.android.api.mastodon.session.AccountSessionManager; import org.joinmastodon.android.fragments.ComposeFragment; import org.joinmastodon.android.fragments.HomeFragment; import org.joinmastodon.android.fragments.ProfileFragment; diff --git a/mastodon/src/main/java/org/joinmastodon/android/OAuthActivity.java b/mastodon/src/main/java/org/joinmastodon/android/OAuthActivity.java index d931eeefb..3ee715bfd 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/OAuthActivity.java +++ b/mastodon/src/main/java/org/joinmastodon/android/OAuthActivity.java @@ -10,7 +10,7 @@ import android.widget.Toast; 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.api.mastodon.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 b08406732..3ddcd2b91 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java +++ b/mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java @@ -24,8 +24,8 @@ 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.api.mastodon.session.AccountSession; +import org.joinmastodon.android.api.mastodon.session.AccountSessionManager; import org.joinmastodon.android.events.NotificationReceivedEvent; import org.joinmastodon.android.model.Account; import org.joinmastodon.android.model.NotificationAction; 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 9ab47eeda..a725fe559 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/CacheController.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/CacheController.java @@ -13,8 +13,8 @@ import org.joinmastodon.android.BuildConfig; import org.joinmastodon.android.MastodonApp; import org.joinmastodon.android.api.adapter.ApiAdapter; 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.api.mastodon.session.AccountSession; +import org.joinmastodon.android.api.mastodon.session.AccountSessionManager; import org.joinmastodon.android.model.CacheablePaginatedResponse; import org.joinmastodon.android.model.Filter; import org.joinmastodon.android.model.Instance; 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 a2db42299..7cea5ad25 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.BuildConfig; import org.joinmastodon.android.MastodonApp; import org.joinmastodon.android.api.gson.IsoInstantTypeAdapter; import org.joinmastodon.android.api.gson.IsoLocalDateTypeAdapter; -import org.joinmastodon.android.api.mastodon.session.session.AccountSession; +import org.joinmastodon.android.api.mastodon.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 e33b609a5..d788eb919 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 android.util.Pair; import com.google.gson.reflect.TypeToken; import org.joinmastodon.android.BuildConfig; -import org.joinmastodon.android.api.mastodon.session.session.AccountSession; -import org.joinmastodon.android.api.mastodon.session.session.AccountSessionManager; +import org.joinmastodon.android.api.mastodon.session.AccountSession; +import org.joinmastodon.android.api.mastodon.session.AccountSessionManager; import org.joinmastodon.android.model.BaseModel; import org.joinmastodon.android.model.Token; 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 dcc308c2c..1b0c3d729 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/PushSubscriptionManager.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/PushSubscriptionManager.java @@ -14,8 +14,8 @@ import org.joinmastodon.android.BuildConfig; import org.joinmastodon.android.MastodonApp; 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.api.mastodon.session.AccountSession; +import org.joinmastodon.android.api.mastodon.session.AccountSessionManager; import org.joinmastodon.android.model.PushNotification; import org.joinmastodon.android.model.PushSubscription; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/oauth/CreateOAuthApp.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/oauth/CreateOAuthApp.java index 3accbb3ce..832e2ed8c 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/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.mastodon.requests.oauth; import org.joinmastodon.android.api.MastodonAPIRequest; -import org.joinmastodon.android.api.mastodon.session.session.AccountSessionManager; +import org.joinmastodon.android.api.mastodon.session.AccountSessionManager; import org.joinmastodon.android.model.Application; public class CreateOAuthApp extends MastodonAPIRequest{ diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/oauth/GetOauthToken.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/oauth/GetOauthToken.java index 18b45aee4..1a10989c8 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/oauth/GetOauthToken.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/requests/oauth/GetOauthToken.java @@ -3,7 +3,7 @@ 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.mastodon.session.session.AccountSessionManager; +import org.joinmastodon.android.api.mastodon.session.AccountSessionManager; import org.joinmastodon.android.model.Token; public class GetOauthToken extends MastodonAPIRequest{ diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/session/session/AccountActivationInfo.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/session/AccountActivationInfo.java similarity index 81% rename from mastodon/src/main/java/org/joinmastodon/android/api/mastodon/session/session/AccountActivationInfo.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/session/AccountActivationInfo.java index 5be24a945..3a1102d86 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/session/session/AccountActivationInfo.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/session/AccountActivationInfo.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.mastodon.session.session; +package org.joinmastodon.android.api.mastodon.session; public class AccountActivationInfo{ public String email; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/session/session/AccountSession.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/session/AccountSession.java similarity index 97% rename from mastodon/src/main/java/org/joinmastodon/android/api/mastodon/session/session/AccountSession.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/session/AccountSession.java index 5c02de39c..d2e07f7c3 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/session/session/AccountSession.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/session/AccountSession.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.mastodon.session.session; +package org.joinmastodon.android.api.mastodon.session; import org.joinmastodon.android.api.CacheController; import org.joinmastodon.android.api.MastodonAPIController; diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/session/session/AccountSessionManager.java b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/session/AccountSessionManager.java similarity index 99% rename from mastodon/src/main/java/org/joinmastodon/android/api/mastodon/session/session/AccountSessionManager.java rename to mastodon/src/main/java/org/joinmastodon/android/api/mastodon/session/AccountSessionManager.java index 93cd130c0..171528ab1 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/session/session/AccountSessionManager.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/mastodon/session/AccountSessionManager.java @@ -1,4 +1,4 @@ -package org.joinmastodon.android.api.mastodon.session.session; +package org.joinmastodon.android.api.mastodon.session; import android.app.Activity; import android.app.NotificationManager; 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 e424b7de9..53865861c 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/AccountTimelineFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/AccountTimelineFragment.java @@ -6,7 +6,7 @@ import android.view.View; import org.joinmastodon.android.R; import org.joinmastodon.android.api.mastodon.requests.accounts.GetAccountStatuses; -import org.joinmastodon.android.api.mastodon.session.session.AccountSessionManager; +import org.joinmastodon.android.api.mastodon.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 dd8b914c4..be75ef18b 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/AnnouncementsFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/AnnouncementsFragment.java @@ -7,8 +7,8 @@ import android.text.TextUtils; import org.joinmastodon.android.R; 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.api.mastodon.session.AccountSession; +import org.joinmastodon.android.api.mastodon.session.AccountSessionManager; import org.joinmastodon.android.model.Account; import org.joinmastodon.android.model.Announcement; import org.joinmastodon.android.model.Instance; 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 4c38dfad3..eb4d03e4e 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java @@ -82,8 +82,8 @@ 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.api.mastodon.session.AccountSession; +import org.joinmastodon.android.api.mastodon.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/DomainDisplay.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/DomainDisplay.java index 071bdab09..d29cc3aeb 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.mastodon.session.session.AccountSession; -import org.joinmastodon.android.api.mastodon.session.session.AccountSessionManager; +import org.joinmastodon.android.api.mastodon.session.AccountSession; +import org.joinmastodon.android.api.mastodon.session.AccountSessionManager; public interface DomainDisplay { 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 7b0d9321b..ca919defe 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java @@ -25,8 +25,8 @@ import org.joinmastodon.android.MainActivity; import org.joinmastodon.android.E; import org.joinmastodon.android.R; 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.api.mastodon.session.AccountSession; +import org.joinmastodon.android.api.mastodon.session.AccountSessionManager; import org.joinmastodon.android.events.AllNotificationsSeenEvent; import org.joinmastodon.android.events.NotificationReceivedEvent; import org.joinmastodon.android.fragments.discover.DiscoverFragment; 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 928877cb4..25d7b817b 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java @@ -9,7 +9,7 @@ import androidx.recyclerview.widget.RecyclerView; import org.joinmastodon.android.GlobalUserPreferences; import org.joinmastodon.android.api.mastodon.requests.timelines.GetHomeTimeline; -import org.joinmastodon.android.api.mastodon.session.session.AccountSessionManager; +import org.joinmastodon.android.api.mastodon.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/NotificationsListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java index 74d8631ae..5b2c11e9c 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java @@ -10,7 +10,7 @@ import com.squareup.otto.Subscribe; import org.joinmastodon.android.E; import org.joinmastodon.android.R; import org.joinmastodon.android.api.mastodon.requests.markers.SaveMarkers; -import org.joinmastodon.android.api.mastodon.session.session.AccountSessionManager; +import org.joinmastodon.android.api.mastodon.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/ProfileFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java index c6143202f..90500e31c 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java @@ -58,7 +58,7 @@ 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.api.mastodon.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/SettingsFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java index 663816ffd..4010d249f 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java @@ -48,9 +48,9 @@ import org.joinmastodon.android.R; import org.joinmastodon.android.api.MastodonAPIController; import org.joinmastodon.android.api.PushSubscriptionManager; 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.api.mastodon.session.AccountActivationInfo; +import org.joinmastodon.android.api.mastodon.session.AccountSession; +import org.joinmastodon.android.api.mastodon.session.AccountSessionManager; import org.joinmastodon.android.events.SelfUpdateStateChangedEvent; import org.joinmastodon.android.fragments.onboarding.InstanceRulesFragment; import org.joinmastodon.android.model.Instance; 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 002e03125..7501b1dae 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java @@ -6,8 +6,8 @@ import android.view.View; import org.joinmastodon.android.DomainManager; import org.joinmastodon.android.R; 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.api.mastodon.session.AccountSession; +import org.joinmastodon.android.api.mastodon.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 734a4d7b1..626b77000 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 @@ -22,7 +22,7 @@ import org.joinmastodon.android.GlobalUserPreferences; import org.joinmastodon.android.R; 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.api.mastodon.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/PaginatedAccountListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/PaginatedAccountListFragment.java index c4294e7d1..e57002a67 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 @@ -4,7 +4,7 @@ import android.net.Uri; import org.joinmastodon.android.GlobalUserPreferences; import org.joinmastodon.android.api.mastodon.requests.HeaderPaginationRequest; -import org.joinmastodon.android.api.mastodon.session.session.AccountSessionManager; +import org.joinmastodon.android.api.mastodon.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/discover/SearchFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java index cf5df0f70..f4c540018 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 @@ -9,7 +9,7 @@ import android.view.inputmethod.InputMethodManager; import org.joinmastodon.android.R; import org.joinmastodon.android.api.mastodon.requests.search.GetSearchResults; -import org.joinmastodon.android.api.mastodon.session.session.AccountSessionManager; +import org.joinmastodon.android.api.mastodon.session.AccountSessionManager; import org.joinmastodon.android.fragments.BaseStatusListFragment; import org.joinmastodon.android.fragments.ProfileFragment; import org.joinmastodon.android.fragments.ThreadFragment; 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 e5155ba84..bae8a437e 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 @@ -20,9 +20,9 @@ import org.joinmastodon.android.R; 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.api.mastodon.session.AccountActivationInfo; +import org.joinmastodon.android.api.mastodon.session.AccountSession; +import org.joinmastodon.android.api.mastodon.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 55558c72f..1427c80e5 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.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; import org.joinmastodon.android.R; -import org.joinmastodon.android.api.mastodon.session.session.AccountSessionManager; +import org.joinmastodon.android.api.mastodon.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/InstanceChooserLoginFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceChooserLoginFragment.java index 0cf4a47ac..2b3c28f21 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 @@ -14,7 +14,7 @@ import android.widget.TextView; import org.joinmastodon.android.R; import org.joinmastodon.android.api.mastodon.requests.catalog.GetCatalogInstances; -import org.joinmastodon.android.api.mastodon.session.session.AccountSessionManager; +import org.joinmastodon.android.api.mastodon.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/OnboardingProfileSetupFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/OnboardingProfileSetupFragment.java index 227722d72..a034a0cf7 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 @@ -16,7 +16,7 @@ import android.widget.ScrollView; import org.joinmastodon.android.R; import org.joinmastodon.android.api.mastodon.requests.accounts.UpdateAccountCredentials; -import org.joinmastodon.android.api.mastodon.session.session.AccountSessionManager; +import org.joinmastodon.android.api.mastodon.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 c345115c8..c2acebd40 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 @@ -23,8 +23,8 @@ import org.joinmastodon.android.api.MastodonDetailedErrorResponse; 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.api.mastodon.session.AccountActivationInfo; +import org.joinmastodon.android.api.mastodon.session.AccountSessionManager; import org.joinmastodon.android.model.Account; import org.joinmastodon.android.model.Application; import org.joinmastodon.android.model.Instance; 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 212b72995..6b90e8e03 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 android.os.Bundle; import com.squareup.otto.Subscribe; import org.joinmastodon.android.R; -import org.joinmastodon.android.api.mastodon.session.session.AccountSessionManager; +import org.joinmastodon.android.api.mastodon.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 d9f06df43..47fec4b5b 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 android.os.Bundle; import com.squareup.otto.Subscribe; import org.joinmastodon.android.R; -import org.joinmastodon.android.api.mastodon.session.session.AccountSessionManager; +import org.joinmastodon.android.api.mastodon.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 480131dce..bfed2e27c 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/AccountSwitcherSheet.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/AccountSwitcherSheet.java @@ -22,8 +22,8 @@ import androidx.recyclerview.widget.LinearLayoutManager; import org.joinmastodon.android.GlobalUserPreferences; import org.joinmastodon.android.R; 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.api.mastodon.session.AccountSession; +import org.joinmastodon.android.api.mastodon.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 484d22988..950442337 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/ComposeAutocompleteViewController.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/ComposeAutocompleteViewController.java @@ -14,7 +14,7 @@ import android.widget.TextView; import org.joinmastodon.android.R; import org.joinmastodon.android.api.mastodon.requests.search.GetSearchResults; -import org.joinmastodon.android.api.mastodon.session.session.AccountSessionManager; +import org.joinmastodon.android.api.mastodon.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 991593d1c..76b790bb5 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 com.squareup.otto.Subscribe; import org.joinmastodon.android.GlobalUserPreferences; import org.joinmastodon.android.R; -import org.joinmastodon.android.api.mastodon.session.session.AccountSessionManager; +import org.joinmastodon.android.api.mastodon.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 370c3372e..bd0db510e 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 @@ -24,8 +24,8 @@ import android.widget.TextView; import org.joinmastodon.android.GlobalUserPreferences; import org.joinmastodon.android.R; -import org.joinmastodon.android.api.mastodon.session.session.AccountSession; -import org.joinmastodon.android.api.mastodon.session.session.AccountSessionManager; +import org.joinmastodon.android.api.mastodon.session.AccountSession; +import org.joinmastodon.android.api.mastodon.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 c253de31a..094716338 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 @@ -28,8 +28,8 @@ import org.joinmastodon.android.api.mastodon.requests.accounts.GetAccountRelatio 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.api.mastodon.session.AccountSession; +import org.joinmastodon.android.api.mastodon.session.AccountSessionManager; import org.joinmastodon.android.fragments.BaseStatusListFragment; import org.joinmastodon.android.fragments.ComposeFragment; import org.joinmastodon.android.fragments.ListTimelinesFragment; 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 09a916d51..26f81968a 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,7 +9,7 @@ import android.view.ViewGroup; import org.joinmastodon.android.GlobalUserPreferences; import org.joinmastodon.android.R; -import org.joinmastodon.android.api.mastodon.session.session.AccountSessionManager; +import org.joinmastodon.android.api.mastodon.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 00e794e62..d25fbf862 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 @@ -18,8 +18,8 @@ import com.github.bottomSoftwareFoundation.bottom.TranslationError; import org.joinmastodon.android.GlobalUserPreferences; import org.joinmastodon.android.R; 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.api.mastodon.session.AccountSession; +import org.joinmastodon.android.api.mastodon.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 0eb73aa0c..ed998502b 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 @@ -70,8 +70,8 @@ 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.api.mastodon.session.AccountSession; +import org.joinmastodon.android.api.mastodon.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 a1be3a1e3..6dbcfc5fd 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.mastodon.session.session.AccountSessionManager; +import org.joinmastodon.android.api.mastodon.session.AccountSessionManager; import org.joinmastodon.android.model.Filter; import org.joinmastodon.android.model.Status;